Commit 20937353 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'bnxt_en-3-bug-fixes' 

Michael Chan says:

====================
bnxt_en: 3 Bug fixes

This series contains 3 small bug fixes covering ethtool self test, PCI
ID string typos, and some missing 200G link speed ethtool reporting logic.
====================

Link: https://lore.kernel.org/r/20230329013021.5205-1-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c5cff16f 581bce7b

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

+4 −4
Original line number Diff line number Diff line
@@ -175,12 +175,12 @@ static const struct pci_device_id bnxt_pci_tbl[] = { 
	{ PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 },

	{ PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 },

	{ PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 },

	{ PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57508_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57502_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57508_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57502_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1804), .driver_data = BCM57504_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57502_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57508_NPAR },

	{ PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 },

	{ PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 },

#ifdef CONFIG_BNXT_SRIOV

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+1 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,7 @@ struct bnxt_link_info { 
#define BNXT_LINK_SPEED_40GB	PORT_PHY_QCFG_RESP_LINK_SPEED_40GB

#define BNXT_LINK_SPEED_50GB	PORT_PHY_QCFG_RESP_LINK_SPEED_50GB

#define BNXT_LINK_SPEED_100GB	PORT_PHY_QCFG_RESP_LINK_SPEED_100GB

#define BNXT_LINK_SPEED_200GB	PORT_PHY_QCFG_RESP_LINK_SPEED_200GB

	u16			support_speeds;

	u16			support_pam4_speeds;

	u16			auto_link_speeds;	/* fw adv setting */

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

+3 −0
Original line number Diff line number Diff line
@@ -1714,6 +1714,8 @@ u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed) 
		return SPEED_50000;

	case BNXT_LINK_SPEED_100GB:

		return SPEED_100000;

	case BNXT_LINK_SPEED_200GB:

		return SPEED_200000;

	default:

		return SPEED_UNKNOWN;

	}
@@ -3738,6 +3740,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
		bnxt_ulp_stop(bp);

		rc = bnxt_close_nic(bp, true, false);

		if (rc) {

			etest->flags |= ETH_TEST_FL_FAILED;

			bnxt_ulp_start(bp, rc);

			return;

		}