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

Commit 3095947a authored by Rajesh Borundia's avatar Rajesh Borundia Committed by Sasha Levin
Browse files

qlcnic: Fix mailbox completion handling during spurious interrupt 



[ Upstream commit 819bfe764dceec2f6b4551768453f374b4c60443 ]

o While the driver is in the middle of a MB completion processing
and it receives a spurious MB interrupt, it is mistaken as a good MB
completion interrupt leading to premature completion of the next MB
request. Fix the driver to guard against this by checking the current
state of MB processing and ignore the spurious interrupt.
Also added a stats counter to record this condition.

Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 532d55d0

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

+1 −0
Original line number Diff line number Diff line
@@ -567,6 +567,7 @@ struct qlcnic_adapter_stats { 
	u64  tx_dma_map_error;

	u64  spurious_intr;

	u64  mac_filter_limit_overrun;

	u64  mbx_spurious_intr;

};



/*

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+11 −4
Original line number Diff line number Diff line
@@ -2338,9 +2338,9 @@ static void qlcnic_83xx_handle_link_aen(struct qlcnic_adapter *adapter, 


static irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data)

{

	u32 mask, resp, event, rsp_status = QLC_83XX_MBX_RESPONSE_ARRIVED;

	struct qlcnic_adapter *adapter = data;

	struct qlcnic_mailbox *mbx;

	u32 mask, resp, event;

	unsigned long flags;



	mbx = adapter->ahw->mailbox;
@@ -2350,10 +2350,14 @@ static irqreturn_t qlcnic_83xx_handle_aen(int irq, void *data) 
		goto out;



	event = readl(QLCNIC_MBX_FW(adapter->ahw, 0));

	if (event &  QLCNIC_MBX_ASYNC_EVENT)

	if (event &  QLCNIC_MBX_ASYNC_EVENT) {

		__qlcnic_83xx_process_aen(adapter);

	else

	} else {

		if (mbx->rsp_status != rsp_status)

			qlcnic_83xx_notify_mbx_response(mbx);

		else

			adapter->stats.mbx_spurious_intr++;

	}



out:

	mask = QLCRDX(adapter->ahw, QLCNIC_DEF_INT_MASK);
@@ -4028,6 +4032,7 @@ static void qlcnic_83xx_mailbox_worker(struct work_struct *work) 
	struct list_head *head = &mbx->cmd_q;

	struct qlcnic_hardware_context *ahw;

	struct qlcnic_cmd_args *cmd = NULL;

	unsigned long flags;



	ahw = adapter->ahw;
@@ -4037,7 +4042,9 @@ static void qlcnic_83xx_mailbox_worker(struct work_struct *work) 
			return;

		}



		spin_lock_irqsave(&mbx->aen_lock, flags);

		mbx->rsp_status = QLC_83XX_MBX_RESPONSE_WAIT;

		spin_unlock_irqrestore(&mbx->aen_lock, flags);



		spin_lock(&mbx->queue_lock);

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ static const struct qlcnic_stats qlcnic_gstrings_stats[] = { 
	 QLC_OFF(stats.mac_filter_limit_overrun)},

	{"spurious intr", QLC_SIZEOF(stats.spurious_intr),

	 QLC_OFF(stats.spurious_intr)},



	{"mbx spurious intr", QLC_SIZEOF(stats.mbx_spurious_intr),

	 QLC_OFF(stats.mbx_spurious_intr)},

};



static const char qlcnic_device_gstrings_stats[][ETH_GSTRING_LEN] = {