Commit c7e457f4 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Allow PHY settings on multi-function or NPAR PFs if allowed by FW. 



Currently, the driver does not allow PHY settings on a multi-function or
NPAR NIC whose port is shared by more than one function.  Newer
firmware now allows PHY settings on some of these NICs.  Check for
this new firmware setting and allow the user to set the PHY settings
accordingly.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent b1613e78

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

+5 −1
Original line number Diff line number Diff line
@@ -8456,6 +8456,10 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp) 
		if (bp->test_info)

			bp->test_info->flags |= BNXT_TEST_FL_AN_PHY_LPBK;

	}

	if (resp->flags & PORT_PHY_QCAPS_RESP_FLAGS_SHARED_PHY_CFG_SUPPORTED) {

		if (BNXT_PF(bp))

			bp->fw_cap |= BNXT_FW_CAP_SHARED_PORT_CFG;

	}

	if (resp->supported_speeds_auto_mode)

		link_info->support_auto_speeds =

			le16_to_cpu(resp->supported_speeds_auto_mode);
@@ -8570,7 +8574,7 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	}

	mutex_unlock(&bp->hwrm_cmd_lock);



	if (!BNXT_SINGLE_PF(bp))

	if (!BNXT_PHY_CFG_ABLE(bp))

		return 0;



	diff = link_info->support_auto_speeds ^ link_info->advertising;

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

+3 −0
Original line number Diff line number Diff line
@@ -1548,6 +1548,8 @@ struct bnxt { 
#define BNXT_NPAR(bp)		((bp)->port_partition_type)

#define BNXT_MH(bp)		((bp)->flags & BNXT_FLAG_MULTI_HOST)

#define BNXT_SINGLE_PF(bp)	(BNXT_PF(bp) && !BNXT_NPAR(bp) && !BNXT_MH(bp))

#define BNXT_PHY_CFG_ABLE(bp)	(BNXT_SINGLE_PF(bp) ||			\

				 ((bp)->fw_cap & BNXT_FW_CAP_SHARED_PORT_CFG))

#define BNXT_CHIP_TYPE_NITRO_A0(bp) ((bp)->flags & BNXT_FLAG_CHIP_NITRO_A0)

#define BNXT_RX_PAGE_MODE(bp)	((bp)->flags & BNXT_FLAG_RX_PAGE_MODE)

#define BNXT_SUPPORTS_TPA(bp)	(!BNXT_CHIP_TYPE_NITRO_A0(bp) &&	\
@@ -1682,6 +1684,7 @@ struct bnxt { 
	#define BNXT_FW_CAP_EXT_STATS_SUPPORTED		0x00040000

	#define BNXT_FW_CAP_ERR_RECOVER_RELOAD		0x00100000

	#define BNXT_FW_CAP_HOT_RESET			0x00200000

	#define BNXT_FW_CAP_SHARED_PORT_CFG		0x00400000



#define BNXT_NEW_RM(bp)		((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)

	u32			hwrm_spec_code;

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

+4 −4
Original line number Diff line number Diff line
@@ -1590,7 +1590,7 @@ static int bnxt_set_link_ksettings(struct net_device *dev, 
	u32 speed;

	int rc = 0;



	if (!BNXT_SINGLE_PF(bp))

	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	mutex_lock(&bp->link_lock);
@@ -1662,7 +1662,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, 
	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_link_info *link_info = &bp->link_info;



	if (!BNXT_SINGLE_PF(bp))

	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	if (epause->autoneg) {
@@ -2399,7 +2399,7 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
		 _bnxt_fw_to_ethtool_adv_spds(link_info->advertising, 0);

	int rc = 0;



	if (!BNXT_SINGLE_PF(bp))

	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	if (!(bp->flags & BNXT_FLAG_EEE_CAP))
@@ -2586,7 +2586,7 @@ static int bnxt_nway_reset(struct net_device *dev) 
	struct bnxt *bp = netdev_priv(dev);

	struct bnxt_link_info *link_info = &bp->link_info;



	if (!BNXT_SINGLE_PF(bp))

	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	if (!(link_info->autoneg & BNXT_AUTONEG_SPEED))

CRA Git | Maintained and supported by SUSTech CRA and CCSE