Commit b0d28207 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Add a new phy_flags field to the main driver structure. 



Copy the phy related feature flags from the firmware call
HWRM_PORT_PHY_QCAPS to this new field.  We can also remove the flags
field in the bnxt_test_info structure.  It's cleaner to have all PHY
related flags in one location, directly copied from the firmware.

To keep the BNXT_PHY_CFG_ABLE() macro logic the same, we need to make
a slight adjustment to check that it is a PF.

Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d2deb61

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

+6 −23
Original line number Diff line number Diff line
@@ -4145,7 +4145,7 @@ static void bnxt_free_mem(struct bnxt *bp, bool irq_re_init) 
	bnxt_free_ntp_fltrs(bp, irq_re_init);

	if (irq_re_init) {

		bnxt_free_ring_stats(bp);

		if (!(bp->fw_cap & BNXT_FW_CAP_PORT_STATS_NO_RESET) ||

		if (!(bp->phy_flags & BNXT_PHY_FL_PORT_STATS_NO_RESET) ||

		    test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))

			bnxt_free_port_stats(bp);

		bnxt_free_ring_grps(bp);
@@ -9116,7 +9116,7 @@ static void bnxt_report_link(struct bnxt *bp) 
		}

		netdev_info(bp->dev, "NIC Link is Up, %u Mbps %s%s duplex, Flow control: %s\n",

			    speed, signal, duplex, flow_ctrl);

		if (bp->flags & BNXT_FLAG_EEE_CAP)

		if (bp->phy_flags & BNXT_PHY_FL_EEE_CAP)

			netdev_info(bp->dev, "EEE is %s\n",

				    bp->eee.eee_active ? "active" :

							 "not active");
@@ -9148,10 +9148,6 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp) 
	struct hwrm_port_phy_qcaps_output *resp = bp->hwrm_cmd_resp_addr;

	struct bnxt_link_info *link_info = &bp->link_info;



	bp->flags &= ~BNXT_FLAG_EEE_CAP;

	if (bp->test_info)

		bp->test_info->flags &= ~(BNXT_TEST_FL_EXT_LPBK |

					  BNXT_TEST_FL_AN_PHY_LPBK);

	if (bp->hwrm_spec_code < 0x10201)

		return 0;
@@ -9162,31 +9158,17 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp) 
	if (rc)

		goto hwrm_phy_qcaps_exit;



	bp->phy_flags = resp->flags;

	if (resp->flags & PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED) {

		struct ethtool_eee *eee = &bp->eee;

		u16 fw_speeds = le16_to_cpu(resp->supported_speeds_eee_mode);



		bp->flags |= BNXT_FLAG_EEE_CAP;

		eee->supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);

		bp->lpi_tmr_lo = le32_to_cpu(resp->tx_lpi_timer_low) &

				 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK;

		bp->lpi_tmr_hi = le32_to_cpu(resp->valid_tx_lpi_timer_high) &

				 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_HIGH_MASK;

	}

	if (resp->flags & PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED) {

		if (bp->test_info)

			bp->test_info->flags |= BNXT_TEST_FL_EXT_LPBK;

	}

	if (resp->flags & PORT_PHY_QCAPS_RESP_FLAGS_AUTONEG_LPBK_SUPPORTED) {

		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->flags & PORT_PHY_QCAPS_RESP_FLAGS_CUMULATIVE_COUNTERS_ON_RESET)

		bp->fw_cap |= BNXT_FW_CAP_PORT_STATS_NO_RESET;



	if (bp->hwrm_spec_code >= 0x10a01) {

		if (bnxt_phy_qcaps_no_speed(resp)) {
@@ -9277,7 +9259,7 @@ int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
			      PORT_PHY_QCFG_RESP_PHY_ADDR_MASK;

	link_info->module_status = resp->module_status;



	if (bp->flags & BNXT_FLAG_EEE_CAP) {

	if (bp->phy_flags & BNXT_PHY_FL_EEE_CAP) {

		struct ethtool_eee *eee = &bp->eee;

		u16 fw_speeds;
@@ -9855,7 +9837,7 @@ static bool bnxt_eee_config_ok(struct bnxt *bp) 
	struct ethtool_eee *eee = &bp->eee;

	struct bnxt_link_info *link_info = &bp->link_info;



	if (!(bp->flags & BNXT_FLAG_EEE_CAP))

	if (!(bp->phy_flags & BNXT_PHY_FL_EEE_CAP))

		return true;



	if (eee->eee_enabled) {
@@ -12450,6 +12432,7 @@ static int bnxt_probe_phy(struct bnxt *bp, bool fw_dflt) 
	int rc = 0;

	struct bnxt_link_info *link_info = &bp->link_info;



	bp->phy_flags = 0;

	rc = bnxt_hwrm_phy_qcaps(bp);

	if (rc) {

		netdev_err(bp->dev, "Probe phy can't get phy capabilities (rc: %x)\n",

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

+12 −7
Original line number Diff line number Diff line
@@ -1341,9 +1341,6 @@ struct bnxt_led_info { 


struct bnxt_test_info {

	u8 offline_mask;

	u8 flags;

#define BNXT_TEST_FL_EXT_LPBK		0x1

#define BNXT_TEST_FL_AN_PHY_LPBK	0x2

	u16 timeout;

	char string[BNXT_MAX_TEST][ETH_GSTRING_LEN];

};
@@ -1693,7 +1690,6 @@ struct bnxt { 
	#define BNXT_FLAG_SHARED_RINGS	0x200

	#define BNXT_FLAG_PORT_STATS	0x400

	#define BNXT_FLAG_UDP_RSS_CAP	0x800

	#define BNXT_FLAG_EEE_CAP	0x1000

	#define BNXT_FLAG_NEW_RSS_CAP	0x2000

	#define BNXT_FLAG_WOL_CAP	0x4000

	#define BNXT_FLAG_ROCEV1_CAP	0x8000
@@ -1720,8 +1716,10 @@ 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_SH_PORT_CFG_OK(bp)	(BNXT_PF(bp) &&				\

				 ((bp)->phy_flags & BNXT_PHY_FL_SHARED_PORT_CFG))

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

				  ((bp)->fw_cap & BNXT_FW_CAP_SHARED_PORT_CFG)) && \

				  BNXT_SH_PORT_CFG_OK(bp)) &&		\

				 (bp)->link_info.phy_state == BNXT_PHY_STATE_ENABLED)

#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)
@@ -1871,11 +1869,9 @@ 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_FW_CAP_VLAN_RX_STRIP		0x01000000

	#define BNXT_FW_CAP_VLAN_TX_INSERT		0x02000000

	#define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED	0x04000000

	#define BNXT_FW_CAP_PORT_STATS_NO_RESET		0x10000000

	#define BNXT_FW_CAP_RING_MONITOR		0x40000000



#define BNXT_NEW_RM(bp)		((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)
@@ -2010,6 +2006,15 @@ struct bnxt { 
	u32			lpi_tmr_lo;

	u32			lpi_tmr_hi;



	/* copied from flags in hwrm_port_phy_qcaps_output */

	u8			phy_flags;

#define BNXT_PHY_FL_EEE_CAP		PORT_PHY_QCAPS_RESP_FLAGS_EEE_SUPPORTED

#define BNXT_PHY_FL_EXT_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_EXTERNAL_LPBK_SUPPORTED

#define BNXT_PHY_FL_AN_PHY_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_AUTONEG_LPBK_SUPPORTED

#define BNXT_PHY_FL_SHARED_PORT_CFG	PORT_PHY_QCAPS_RESP_FLAGS_SHARED_PHY_CFG_SUPPORTED

#define BNXT_PHY_FL_PORT_STATS_NO_RESET	PORT_PHY_QCAPS_RESP_FLAGS_CUMULATIVE_COUNTERS_ON_RESET

#define BNXT_PHY_FL_NO_PHY_LPBK		PORT_PHY_QCAPS_RESP_FLAGS_LOCAL_LPBK_NOT_SUPPORTED



	u8			num_tests;

	struct bnxt_test_info	*test_info;

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

+4 −4
Original line number Diff line number Diff line
@@ -2912,7 +2912,7 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_eee *edata) 
	if (!BNXT_PHY_CFG_ABLE(bp))

		return -EOPNOTSUPP;



	if (!(bp->flags & BNXT_FLAG_EEE_CAP))

	if (!(bp->phy_flags & BNXT_PHY_FL_EEE_CAP))

		return -EOPNOTSUPP;



	mutex_lock(&bp->link_lock);
@@ -2963,7 +2963,7 @@ static int bnxt_get_eee(struct net_device *dev, struct ethtool_eee *edata) 
{

	struct bnxt *bp = netdev_priv(dev);



	if (!(bp->flags & BNXT_FLAG_EEE_CAP))

	if (!(bp->phy_flags & BNXT_PHY_FL_EEE_CAP))

		return -EOPNOTSUPP;



	*edata = bp->eee;
@@ -3215,7 +3215,7 @@ static int bnxt_disable_an_for_lpbk(struct bnxt *bp, 
	int rc;



	if (!link_info->autoneg ||

	    (bp->test_info->flags & BNXT_TEST_FL_AN_PHY_LPBK))

	    (bp->phy_flags & BNXT_PHY_FL_AN_PHY_LPBK))

		return 0;



	rc = bnxt_query_force_speeds(bp, &fw_advertising);
@@ -3416,7 +3416,7 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
	}



	if ((etest->flags & ETH_TEST_FL_EXTERNAL_LB) &&

	    (bp->test_info->flags & BNXT_TEST_FL_EXT_LPBK))

	    (bp->phy_flags & BNXT_PHY_FL_EXT_LPBK))

		do_ext_lpbk = true;



	if (etest->flags & ETH_TEST_FL_OFFLINE) {