3 files changed, 54 insertions, 7 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 11596b2c4702..5d47c08ed99e 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -68,6 +68,8 @@
 
 #define PFX                     "bnx2fc: "
 
+#define BCM_CHIP_LEN            16
+
 #define BNX2X_DOORBELL_PCI_BAR          2
 
 #define BNX2FC_MAX_BD_LEN               0xffff
@@ -241,6 +243,8 @@ struct bnx2fc_hba {
         int wait_for_link_down;
         int num_ofld_sess;
         struct list_head vports;
+
+        char chip_num[BCM_CHIP_LEN];
 };
 
 struct bnx2fc_interface {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 7dffec1e5715..a76925716986 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -679,6 +679,7 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
 {
         struct fcoe_port *port = lport_priv(lport);
         struct bnx2fc_interface *interface = port->priv;
+        struct bnx2fc_hba *hba = interface->hba;
         struct Scsi_Host *shost = lport->host;
         int rc = 0;
 
@@ -699,8 +700,9 @@ static int bnx2fc_shost_config(struct fc_lport *lport, struct device *dev)
         }
         if (!lport->vport)
                 fc_host_max_npiv_vports(lport->host) = USHRT_MAX;
-        sprintf(fc_host_symbolic_name(lport->host), "%s v%s over %s",
-                BNX2FC_NAME, BNX2FC_VERSION,
+        snprintf(fc_host_symbolic_name(lport->host), 256,
+                 "%s (Broadcom %s) v%s over %s",
+                BNX2FC_NAME, hba->chip_num, BNX2FC_VERSION,
                 interface->netdev->name);
 
         return 0;
@@ -1656,23 +1658,60 @@ mem_err:
 static int bnx2fc_bind_pcidev(struct bnx2fc_hba *hba)
 {
         struct cnic_dev *cnic;
+        struct pci_dev *pdev;
 
         if (!hba->cnic) {
                 printk(KERN_ERR PFX "cnic is NULL\n");
                 return -ENODEV;
         }
         cnic = hba->cnic;
-        hba->pcidev = cnic->pcidev;
-        if (hba->pcidev)
-                pci_dev_get(hba->pcidev);
+        pdev = hba->pcidev = cnic->pcidev;
+        if (!hba->pcidev)
+                return -ENODEV;
 
+        switch (pdev->device) {
+        case PCI_DEVICE_ID_NX2_57710:
+                strncpy(hba->chip_num, "BCM57710", BCM_CHIP_LEN);
+                break;
+        case PCI_DEVICE_ID_NX2_57711:
+                strncpy(hba->chip_num, "BCM57711", BCM_CHIP_LEN);
+                break;
+        case PCI_DEVICE_ID_NX2_57712:
+        case PCI_DEVICE_ID_NX2_57712_MF:
+        case PCI_DEVICE_ID_NX2_57712_VF:
+                strncpy(hba->chip_num, "BCM57712", BCM_CHIP_LEN);
+                break;
+        case PCI_DEVICE_ID_NX2_57800:
+        case PCI_DEVICE_ID_NX2_57800_MF:
+        case PCI_DEVICE_ID_NX2_57800_VF:
+                strncpy(hba->chip_num, "BCM57800", BCM_CHIP_LEN);
+                break;
+        case PCI_DEVICE_ID_NX2_57810:
+        case PCI_DEVICE_ID_NX2_57810_MF:
+        case PCI_DEVICE_ID_NX2_57810_VF:
+                strncpy(hba->chip_num, "BCM57810", BCM_CHIP_LEN);
+                break;
+        case PCI_DEVICE_ID_NX2_57840:
+        case PCI_DEVICE_ID_NX2_57840_MF:
+        case PCI_DEVICE_ID_NX2_57840_VF:
+        case PCI_DEVICE_ID_NX2_57840_2_20:
+        case PCI_DEVICE_ID_NX2_57840_4_10:
+                strncpy(hba->chip_num, "BCM57840", BCM_CHIP_LEN);
+                break;
+        default:
+                pr_err(PFX "Unknown device id 0x%x\n", pdev->device);
+                break;
+        }
+        pci_dev_get(hba->pcidev);
         return 0;
 }
 
 static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba)
 {
-        if (hba->pcidev)
+        if (hba->pcidev) {
+                hba->chip_num[0] = '\0';
                 pci_dev_put(hba->pcidev);
+        }
         hba->pcidev = NULL;
 }
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2b85c521f737..c12916248469 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2147,11 +2147,13 @@
 #define PCI_DEVICE_ID_TIGON3_5705M_2    0x165e
 #define PCI_DEVICE_ID_NX2_57712         0x1662
 #define PCI_DEVICE_ID_NX2_57712E        0x1663
+#define PCI_DEVICE_ID_NX2_57712_MF      0x1663
 #define PCI_DEVICE_ID_TIGON3_5714       0x1668
 #define PCI_DEVICE_ID_TIGON3_5714S      0x1669
 #define PCI_DEVICE_ID_TIGON3_5780       0x166a
 #define PCI_DEVICE_ID_TIGON3_5780S      0x166b
 #define PCI_DEVICE_ID_TIGON3_5705F      0x166e
+#define PCI_DEVICE_ID_NX2_57712_VF      0x166f
 #define PCI_DEVICE_ID_TIGON3_5754M      0x1672
 #define PCI_DEVICE_ID_TIGON3_5755M      0x1673
 #define PCI_DEVICE_ID_TIGON3_5756       0x1674
@@ -2177,13 +2179,15 @@
 #define PCI_DEVICE_ID_TIGON3_5787       0x169b
 #define PCI_DEVICE_ID_TIGON3_5788       0x169c
 #define PCI_DEVICE_ID_TIGON3_5789       0x169d
+#define PCI_DEVICE_ID_NX2_57840_4_10    0x16a1
+#define PCI_DEVICE_ID_NX2_57840_2_20    0x16a2
+#define PCI_DEVICE_ID_NX2_57840_MF      0x16a4
 #define PCI_DEVICE_ID_NX2_57800_MF      0x16a5
 #define PCI_DEVICE_ID_TIGON3_5702X      0x16a6
 #define PCI_DEVICE_ID_TIGON3_5703X      0x16a7
 #define PCI_DEVICE_ID_TIGON3_5704S      0x16a8
 #define PCI_DEVICE_ID_NX2_57800_VF      0x16a9
 #define PCI_DEVICE_ID_NX2_5706S         0x16aa
-#define PCI_DEVICE_ID_NX2_57840_MF      0x16a4
 #define PCI_DEVICE_ID_NX2_5708S         0x16ac
 #define PCI_DEVICE_ID_NX2_57840_VF      0x16ad
 #define PCI_DEVICE_ID_NX2_57810_MF      0x16ae