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

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

bnxt_en: Simplify and improve unsupported SFP+ module reporting. 



The current code is more complicated than necessary and can only report
unsupported SFP+ module if it is plugged in after the device is up.

Rename bnxt_port_module_event() to bnxt_get_port_module_status().  We
already have the current module_status in the link_info structure, so
just check that and report any unsupported SFP+ module status.  Delete
the unnecessary last_port_module_event.  Call this function at the
end of bnxt_open to report unsupported module already plugged in.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8578d6c1

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

+30 −36
Original line number Diff line number Diff line
@@ -1324,15 +1324,6 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons, 
	((data) &				\

	 HWRM_ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_MASK)



#define BNXT_EVENT_POLICY_MASK	\

	HWRM_ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_MASK



#define BNXT_EVENT_POLICY_SFT	\

	HWRM_ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_ENFORCEMENT_POLICY_SFT



#define BNXT_GET_EVENT_POLICY(data)	\

	(((data) & BNXT_EVENT_POLICY_MASK) >> BNXT_EVENT_POLICY_SFT)



static int bnxt_async_event_process(struct bnxt *bp,

				    struct hwrm_async_event_cmpl *cmpl)

{
@@ -1371,9 +1362,6 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		if (bp->pf.port_id != port_id)

			break;



		bp->link_info.last_port_module_event =

			BNXT_GET_EVENT_POLICY(data1);



		set_bit(BNXT_HWRM_PORT_MODULE_SP_EVENT, &bp->sp_event);

		break;

	}
@@ -4788,6 +4776,33 @@ static int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	return 0;

}



static void bnxt_get_port_module_status(struct bnxt *bp)

{

	struct bnxt_link_info *link_info = &bp->link_info;

	struct hwrm_port_phy_qcfg_output *resp = &link_info->phy_qcfg_resp;

	u8 module_status;



	if (bnxt_update_link(bp, true))

		return;



	module_status = link_info->module_status;

	switch (module_status) {

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_DISABLETX:

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN:

	case PORT_PHY_QCFG_RESP_MODULE_STATUS_WARNINGMSG:

		netdev_warn(bp->dev, "Unqualified SFP+ module detected on port %d\n",

			    bp->pf.port_id);

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

			netdev_warn(bp->dev, "Module part number %s\n",

				    resp->phy_vendor_partnumber);

		}

		if (module_status == PORT_PHY_QCFG_RESP_MODULE_STATUS_DISABLETX)

			netdev_warn(bp->dev, "TX is disabled\n");

		if (module_status == PORT_PHY_QCFG_RESP_MODULE_STATUS_PWRDOWN)

			netdev_warn(bp->dev, "SFP+ module is shutdown\n");

	}

}



static void

bnxt_hwrm_set_pause_common(struct bnxt *bp, struct hwrm_port_phy_cfg_input *req)

{
@@ -5080,7 +5095,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) 
	/* Enable TX queues */

	bnxt_tx_enable(bp);

	mod_timer(&bp->timer, jiffies + bp->current_interval);

	bnxt_update_link(bp, true);

	/* Poll link status and check for SFP+ module status */

	bnxt_get_port_module_status(bp);



	return 0;
@@ -5615,28 +5631,6 @@ static void bnxt_timer(unsigned long data) 
	mod_timer(&bp->timer, jiffies + bp->current_interval);

}



static void bnxt_port_module_event(struct bnxt *bp)

{

	struct bnxt_link_info *link_info = &bp->link_info;

	struct hwrm_port_phy_qcfg_output *resp = &link_info->phy_qcfg_resp;



	if (bnxt_update_link(bp, true))

		return;



	if (link_info->last_port_module_event != 0) {

		netdev_warn(bp->dev, "Unqualified SFP+ module detected on port %d\n",

			    bp->pf.port_id);

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

			netdev_warn(bp->dev, "Module part number %s\n",

				    resp->phy_vendor_partnumber);

		}

	}

	if (link_info->last_port_module_event == 1)

		netdev_warn(bp->dev, "TX is disabled\n");

	if (link_info->last_port_module_event == 3)

		netdev_warn(bp->dev, "Shutdown SFP+ module\n");

}



static void bnxt_cfg_ntp_filters(struct bnxt *);



static void bnxt_sp_task(struct work_struct *work)
@@ -5685,7 +5679,7 @@ static void bnxt_sp_task(struct work_struct *work) 
	}



	if (test_and_clear_bit(BNXT_HWRM_PORT_MODULE_SP_EVENT, &bp->sp_event))

		bnxt_port_module_event(bp);

		bnxt_get_port_module_status(bp);



	if (test_and_clear_bit(BNXT_PERIODIC_STATS_SP_EVENT, &bp->sp_event))

		bnxt_hwrm_port_qstats(bp);

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

+0 −1
Original line number Diff line number Diff line
@@ -850,7 +850,6 @@ struct bnxt_link_info { 
	u32			advertising;

	bool			force_link_chng;



	u8			last_port_module_event;

	/* a copy of phy_qcfg output used to report link

	 * info to VF

	 */