bnxt_en: Add new NPAR and dual media device IDs.

Add 5741X/5731X NPAR device IDs and dual media SFP/10GBase-T device IDs.

Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index eac0f2b9133c4846ab84c020ec8c908e1182361f..2cf79100c9cb2241b8172cd4a8543cd28b73a7c1 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -73,19 +73,28 @@ enum board_idx {
        BCM57301,
        BCM57302,
        BCM57304,
+       BCM57417_NPAR,
        BCM58700,
        BCM57311,
        BCM57312,
        BCM57402,
        BCM57404,
        BCM57406,
-       BCM57404_NPAR,
+       BCM57402_NPAR,
+       BCM57407,
        BCM57412,
        BCM57414,
        BCM57416,
        BCM57417,
-       BCM57414_NPAR,
+       BCM57412_NPAR,
        BCM57314,
+       BCM57417_SFP,
+       BCM57416_SFP,
+       BCM57404_NPAR,
+       BCM57406_NPAR,
+       BCM57407_SFP,
+       BCM57414_NPAR,
+       BCM57416_NPAR,
        BCM57304_VF,
        BCM57404_VF,
        BCM57414_VF,
@@ -99,19 +108,28 @@ static const struct {
        { "Broadcom BCM57301 NetXtreme-C Single-port 10Gb Ethernet" },
        { "Broadcom BCM57302 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },
        { "Broadcom BCM57304 NetXtreme-C Dual-port 10Gb/25Gb/40Gb/50Gb Ethernet" },
+       { "Broadcom BCM57417 NetXtreme-E Ethernet Partition" },
        { "Broadcom BCM58700 Nitro 4-port 1Gb/2.5Gb/10Gb Ethernet" },
        { "Broadcom BCM57311 NetXtreme-C Single-port 10Gb Ethernet" },
        { "Broadcom BCM57312 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },
        { "Broadcom BCM57402 NetXtreme-E Dual-port 10Gb Ethernet" },
        { "Broadcom BCM57404 NetXtreme-E Dual-port 10Gb/25Gb Ethernet" },
        { "Broadcom BCM57406 NetXtreme-E Dual-port 10GBase-T Ethernet" },
-       { "Broadcom BCM57404 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57402 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57407 NetXtreme-E Dual-port 10GBase-T Ethernet" },
        { "Broadcom BCM57412 NetXtreme-E Dual-port 10Gb Ethernet" },
        { "Broadcom BCM57414 NetXtreme-E Dual-port 10Gb/25Gb Ethernet" },
        { "Broadcom BCM57416 NetXtreme-E Dual-port 10GBase-T Ethernet" },
        { "Broadcom BCM57417 NetXtreme-E Dual-port 10GBase-T Ethernet" },
-       { "Broadcom BCM57414 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57412 NetXtreme-E Ethernet Partition" },
        { "Broadcom BCM57314 NetXtreme-C Dual-port 10Gb/25Gb/40Gb/50Gb Ethernet" },
+       { "Broadcom BCM57417 NetXtreme-E Dual-port 10Gb/25Gb Ethernet" },
+       { "Broadcom BCM57416 NetXtreme-E Dual-port 10Gb Ethernet" },
+       { "Broadcom BCM57404 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57406 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57407 NetXtreme-E Dual-port 25Gb Ethernet" },
+       { "Broadcom BCM57414 NetXtreme-E Ethernet Partition" },
+       { "Broadcom BCM57416 NetXtreme-E Ethernet Partition" },
        { "Broadcom BCM57304 NetXtreme-C Ethernet Virtual Function" },
        { "Broadcom BCM57404 NetXtreme-E Ethernet Virtual Function" },
        { "Broadcom BCM57414 NetXtreme-E Ethernet Virtual Function" },
@@ -122,19 +140,28 @@ static const struct pci_device_id bnxt_pci_tbl[] = {
        { PCI_VDEVICE(BROADCOM, 0x16c8), .driver_data = BCM57301 },
        { PCI_VDEVICE(BROADCOM, 0x16c9), .driver_data = BCM57302 },
        { PCI_VDEVICE(BROADCOM, 0x16ca), .driver_data = BCM57304 },
+       { PCI_VDEVICE(BROADCOM, 0x16cc), .driver_data = BCM57417_NPAR },
        { PCI_VDEVICE(BROADCOM, 0x16cd), .driver_data = BCM58700 },
        { PCI_VDEVICE(BROADCOM, 0x16ce), .driver_data = BCM57311 },
        { PCI_VDEVICE(BROADCOM, 0x16cf), .driver_data = BCM57312 },
        { PCI_VDEVICE(BROADCOM, 0x16d0), .driver_data = BCM57402 },
        { PCI_VDEVICE(BROADCOM, 0x16d1), .driver_data = BCM57404 },
        { PCI_VDEVICE(BROADCOM, 0x16d2), .driver_data = BCM57406 },
-       { PCI_VDEVICE(BROADCOM, 0x16d4), .driver_data = BCM57404_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16d4), .driver_data = BCM57402_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16d5), .driver_data = BCM57407 },
        { PCI_VDEVICE(BROADCOM, 0x16d6), .driver_data = BCM57412 },
        { PCI_VDEVICE(BROADCOM, 0x16d7), .driver_data = BCM57414 },
        { PCI_VDEVICE(BROADCOM, 0x16d8), .driver_data = BCM57416 },
        { PCI_VDEVICE(BROADCOM, 0x16d9), .driver_data = BCM57417 },
-       { PCI_VDEVICE(BROADCOM, 0x16de), .driver_data = BCM57414_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16de), .driver_data = BCM57412_NPAR },
        { PCI_VDEVICE(BROADCOM, 0x16df), .driver_data = BCM57314 },
+       { PCI_VDEVICE(BROADCOM, 0x16e2), .driver_data = BCM57417_SFP },
+       { PCI_VDEVICE(BROADCOM, 0x16e3), .driver_data = BCM57416_SFP },
+       { PCI_VDEVICE(BROADCOM, 0x16e7), .driver_data = BCM57404_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16e8), .driver_data = BCM57406_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16e9), .driver_data = BCM57407_SFP },
+       { PCI_VDEVICE(BROADCOM, 0x16ec), .driver_data = BCM57414_NPAR },
+       { PCI_VDEVICE(BROADCOM, 0x16ee), .driver_data = BCM57416_NPAR },
 #ifdef CONFIG_BNXT_SRIOV
        { PCI_VDEVICE(BROADCOM, 0x16cb), .driver_data = BCM57304_VF },
        { PCI_VDEVICE(BROADCOM, 0x16d3), .driver_data = BCM57404_VF },