Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa853dda authored by Prashant Sreedharan's avatar Prashant Sreedharan Committed by David S. Miller
Browse files

bnxt_en: Add BCM58700 PCI device ID for NS2 Nitro. 



A bridge device in NS2 has the same device ID as the ethernet controller.
Add check to avoid probing the bridge device.

Signed-off-by: default avatarPrashant Sreedharan <prashant.sreedharan@broadcom.com>
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc52c6c7

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,7 @@ enum board_idx { 
	BCM57301,

	BCM57301,

	BCM57302,

	BCM57302,

	BCM57304,

	BCM57304,

	BCM58700,

	BCM57311,

	BCM57311,

	BCM57312,

	BCM57312,

	BCM57402,

	BCM57402,
@@ -98,6 +99,7 @@ static const struct { 
	{ "Broadcom BCM57301 NetXtreme-C Single-port 10Gb Ethernet" },

	{ "Broadcom BCM57301 NetXtreme-C Single-port 10Gb Ethernet" },

	{ "Broadcom BCM57302 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },

	{ "Broadcom BCM57302 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },

	{ "Broadcom BCM57304 NetXtreme-C Dual-port 10Gb/25Gb/40Gb/50Gb Ethernet" },

	{ "Broadcom BCM57304 NetXtreme-C Dual-port 10Gb/25Gb/40Gb/50Gb Ethernet" },

	{ "Broadcom BCM58700 Nitro 4-port 1Gb/2.5Gb/10Gb Ethernet" },

	{ "Broadcom BCM57311 NetXtreme-C Single-port 10Gb Ethernet" },

	{ "Broadcom BCM57311 NetXtreme-C Single-port 10Gb Ethernet" },

	{ "Broadcom BCM57312 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },

	{ "Broadcom BCM57312 NetXtreme-C Dual-port 10Gb/25Gb Ethernet" },

	{ "Broadcom BCM57402 NetXtreme-E Dual-port 10Gb Ethernet" },

	{ "Broadcom BCM57402 NetXtreme-E Dual-port 10Gb Ethernet" },
@@ -120,6 +122,7 @@ static const struct pci_device_id bnxt_pci_tbl[] = { 
	{ PCI_VDEVICE(BROADCOM, 0x16c8), .driver_data = BCM57301 },

	{ PCI_VDEVICE(BROADCOM, 0x16c8), .driver_data = BCM57301 },

	{ PCI_VDEVICE(BROADCOM, 0x16c9), .driver_data = BCM57302 },

	{ PCI_VDEVICE(BROADCOM, 0x16c9), .driver_data = BCM57302 },

	{ PCI_VDEVICE(BROADCOM, 0x16ca), .driver_data = BCM57304 },

	{ PCI_VDEVICE(BROADCOM, 0x16ca), .driver_data = BCM57304 },

	{ PCI_VDEVICE(BROADCOM, 0x16cd), .driver_data = BCM58700 },

	{ PCI_VDEVICE(BROADCOM, 0x16ce), .driver_data = BCM57311 },

	{ PCI_VDEVICE(BROADCOM, 0x16ce), .driver_data = BCM57311 },

	{ PCI_VDEVICE(BROADCOM, 0x16cf), .driver_data = BCM57312 },

	{ PCI_VDEVICE(BROADCOM, 0x16cf), .driver_data = BCM57312 },

	{ PCI_VDEVICE(BROADCOM, 0x16d0), .driver_data = BCM57402 },

	{ PCI_VDEVICE(BROADCOM, 0x16d0), .driver_data = BCM57402 },
@@ -6715,6 +6718,9 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct bnxt *bp;

	struct bnxt *bp;

	int rc, max_irqs;

	int rc, max_irqs;





	if (pdev->device == 0x16cd && pci_is_bridge(pdev))

		return -ENODEV;



	if (version_printed++ == 0)

	if (version_printed++ == 0)

		pr_info("%s", version);

		pr_info("%s", version);