Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=167cdf5fbc64ab8f4eae2cd6d9d0892478d569d7
Commit:     167cdf5fbc64ab8f4eae2cd6d9d0892478d569d7
Parent:     c64c2eaeaaf04f9c8a303508f804ba256435d79f
Author:     Divy Le Ray <[EMAIL PROTECTED]>
AuthorDate: Tue Aug 21 20:49:36 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:50:50 2007 -0700

    cxgb3 - log adapter serial number
    
    Log HW serial number when cxgb3 module is loaded.
    
    Signed-off-by: Divy Le Ray <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/cxgb3/common.h     |    2 ++
 drivers/net/cxgb3/cxgb3_main.c |    6 ++++--
 drivers/net/cxgb3/t3_hw.c      |    3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/cxgb3/common.h b/drivers/net/cxgb3/common.h
index d6c7760..510e93f 100644
--- a/drivers/net/cxgb3/common.h
+++ b/drivers/net/cxgb3/common.h
@@ -97,6 +97,7 @@ enum {
        MAX_NPORTS = 2,         /* max # of ports */
        MAX_FRAME_SIZE = 10240, /* max MAC frame size, including header + FCS */
        EEPROMSIZE = 8192,      /* Serial EEPROM size */
+       SERNUM_LEN     = 16,    /* Serial # length */
        RSS_TABLE_SIZE = 64,    /* size of RSS lookup and mapping tables */
        TCB_SIZE = 128,         /* TCB size */
        NMTUS = 16,             /* size of MTU table */
@@ -391,6 +392,7 @@ struct vpd_params {
        unsigned int uclk;
        unsigned int mdc;
        unsigned int mem_timing;
+       u8 sn[SERNUM_LEN + 1];
        u8 eth_base[6];
        u8 port_type[MAX_NPORTS];
        unsigned short xauicfg[2];
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index c00f2df..3ee465d 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -2360,10 +2360,12 @@ static void __devinit print_port_info(struct adapter 
*adap,
                       (adap->flags & USING_MSIX) ? " MSI-X" :
                       (adap->flags & USING_MSI) ? " MSI" : "");
                if (adap->name == dev->name && adap->params.vpd.mclk)
-                       printk(KERN_INFO "%s: %uMB CM, %uMB PMTX, %uMB PMRX\n",
+                       printk(KERN_INFO
+                              "%s: %uMB CM, %uMB PMTX, %uMB PMRX, S/N: %s\n",
                               adap->name, t3_mc7_size(&adap->cm) >> 20,
                               t3_mc7_size(&adap->pmtx) >> 20,
-                              t3_mc7_size(&adap->pmrx) >> 20);
+                              t3_mc7_size(&adap->pmrx) >> 20,
+                              adap->params.vpd.sn);
        }
 }
 
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index b02d15d..3f7f06b 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -505,7 +505,7 @@ struct t3_vpd {
        u8 vpdr_len[2];
        VPD_ENTRY(pn, 16);      /* part number */
        VPD_ENTRY(ec, 16);      /* EC level */
-       VPD_ENTRY(sn, 16);      /* serial number */
+       VPD_ENTRY(sn, SERNUM_LEN); /* serial number */
        VPD_ENTRY(na, 12);      /* MAC address base */
        VPD_ENTRY(cclk, 6);     /* core clock */
        VPD_ENTRY(mclk, 6);     /* mem clock */
@@ -648,6 +648,7 @@ static int get_vpd_params(struct adapter *adapter, struct 
vpd_params *p)
        p->uclk = simple_strtoul(vpd.uclk_data, NULL, 10);
        p->mdc = simple_strtoul(vpd.mdc_data, NULL, 10);
        p->mem_timing = simple_strtoul(vpd.mt_data, NULL, 10);
+       memcpy(p->sn, vpd.sn_data, SERNUM_LEN);
 
        /* Old eeproms didn't have port information */
        if (adapter->params.rev == 0 && !vpd.port0_data[0]) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to