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

Commit 9106e5db authored by Rajesh Borundia's avatar Rajesh Borundia Committed by David S. Miller
Browse files

qlcnic: Fix mailbox response handling. 



o Fix mailbox response poll time to maximum 5 seconds which
  includes mailbox response time as well as time required for
  processing AEN if any.
o Driver need to read firmware control mailbox register instead
  of host control mailbox register.

Signed-off-by: default avatarJitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: default avatarRajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13a82b44

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

+5 −8
Original line number Diff line number Diff line
@@ -696,15 +696,14 @@ u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *adapter) 
	return 1;

}



u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter)

u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *adapter, u32 *wait_time)

{

	u32 data;

	unsigned long wait_time = 0;

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	/* wait for mailbox completion */

	do {

		data = QLCRDX(ahw, QLCNIC_FW_MBX_CTRL);

		if (++wait_time > QLCNIC_MBX_TIMEOUT) {

		if (++(*wait_time) > QLCNIC_MBX_TIMEOUT) {

			data = QLCNIC_RCODE_TIMEOUT;

			break;

		}
@@ -720,8 +719,8 @@ int qlcnic_83xx_mbx_op(struct qlcnic_adapter *adapter, 
	u16 opcode;

	u8 mbx_err_code;

	unsigned long flags;

	u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd;

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd, wait_time = 0;



	opcode = LSW(cmd->req.arg[0]);

	if (!test_bit(QLC_83XX_MBX_READY, &adapter->ahw->idc.status)) {
@@ -754,14 +753,12 @@ int qlcnic_83xx_mbx_op(struct qlcnic_adapter *adapter, 
	/* Signal FW about the impending command */

	QLCWRX(ahw, QLCNIC_HOST_MBX_CTRL, QLCNIC_SET_OWNER);

poll:

	rsp = qlcnic_83xx_mbx_poll(adapter);

	rsp = qlcnic_83xx_mbx_poll(adapter, &wait_time);

	if (rsp != QLCNIC_RCODE_TIMEOUT) {

		/* Get the FW response data */

		fw_data = readl(QLCNIC_MBX_FW(ahw, 0));

		if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {

			__qlcnic_83xx_process_aen(adapter);

			mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);

			if (mbx_val)

			goto poll;

		}

		mbx_err_code = QLCNIC_MBX_STATUS(fw_data);

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

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ int qlcnic_83xx_flash_test(struct qlcnic_adapter *); 
int qlcnic_83xx_enable_flash_write(struct qlcnic_adapter *);

int qlcnic_83xx_disable_flash_write(struct qlcnic_adapter *);

u32 qlcnic_83xx_mac_rcode(struct qlcnic_adapter *);

u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *);

u32 qlcnic_83xx_mbx_poll(struct qlcnic_adapter *, u32 *);

void qlcnic_83xx_enable_mbx_poll(struct qlcnic_adapter *);

void qlcnic_83xx_disable_mbx_poll(struct qlcnic_adapter *);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ struct qlcnic_mailbox_metadata { 


#define QLCNIC_SET_OWNER        1

#define QLCNIC_CLR_OWNER        0

#define QLCNIC_MBX_TIMEOUT      10000

#define QLCNIC_MBX_TIMEOUT      5000



#define QLCNIC_MBX_RSP_OK	1

#define QLCNIC_MBX_PORT_RSP_OK	0x1a

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

+3 −5
Original line number Diff line number Diff line
@@ -280,9 +280,9 @@ void qlcnic_sriov_cleanup(struct qlcnic_adapter *adapter) 
static int qlcnic_sriov_post_bc_msg(struct qlcnic_adapter *adapter, u32 *hdr,

				    u32 *pay, u8 pci_func, u8 size)

{

	u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd, val, wait_time = 0;

	struct qlcnic_hardware_context *ahw = adapter->ahw;

	unsigned long flags;

	u32 rsp, mbx_val, fw_data, rsp_num, mbx_cmd, val;

	u16 opcode;

	u8 mbx_err_code;

	int i, j;
@@ -330,14 +330,12 @@ static int qlcnic_sriov_post_bc_msg(struct qlcnic_adapter *adapter, u32 *hdr, 
	 * assume something is wrong.

	 */

poll:

	rsp = qlcnic_83xx_mbx_poll(adapter);

	rsp = qlcnic_83xx_mbx_poll(adapter, &wait_time);

	if (rsp != QLCNIC_RCODE_TIMEOUT) {

		/* Get the FW response data */

		fw_data = readl(QLCNIC_MBX_FW(ahw, 0));

		if (fw_data &  QLCNIC_MBX_ASYNC_EVENT) {

			__qlcnic_83xx_process_aen(adapter);

			mbx_val = QLCRDX(ahw, QLCNIC_HOST_MBX_CTRL);

			if (mbx_val)

			goto poll;

		}

		mbx_err_code = QLCNIC_MBX_STATUS(fw_data);