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

Commit 9c855975 authored by Suresh Reddy's avatar Suresh Reddy Committed by David S. Miller
Browse files

be2net: make SET_LOOPBACK_MODE cmd asynchrounous 



The SET_LOOPBACK_MODE command is always issued from ethtool only in a
process context. So, while waiting for the cmd to complete, the driver
can sleep instead of holding spin_lock_bh() on the mcc_lock. This is done
by calling be_mcc_notify() instead of be_mcc_notify_wait() (that returns
only after the cmd completes while the MCCQ is locked).

Signed-off-by: default avatarSuresh Reddy <suresh.reddy@avagotech.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@avagotech.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8af65c2f

drivers/net/ethernet/emulex/benet/be_cmds.c

+20 −3
Original line number Diff line number Diff line
@@ -172,6 +172,12 @@ static void be_async_cmd_process(struct be_adapter *adapter, 
		return;

	}



	if (opcode == OPCODE_LOWLEVEL_SET_LOOPBACK_MODE &&

	    subsystem == CMD_SUBSYSTEM_LOWLEVEL) {

		complete(&adapter->et_cmd_compl);

		return;

	}



	if ((opcode == OPCODE_COMMON_WRITE_FLASHROM ||

	     opcode == OPCODE_COMMON_WRITE_OBJECT) &&

	    subsystem == CMD_SUBSYSTEM_COMMON) {
@@ -2600,7 +2606,7 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num, 
	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

		goto err_unlock;

	}



	req = embedded_payload(wrb);
@@ -2614,8 +2620,19 @@ int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num, 
	req->loopback_type = loopback_type;

	req->loopback_state = enable;



	status = be_mcc_notify_wait(adapter);

err:

	status = be_mcc_notify(adapter);

	if (status)

		goto err_unlock;



	spin_unlock_bh(&adapter->mcc_lock);



	if (!wait_for_completion_timeout(&adapter->et_cmd_compl,

					 msecs_to_jiffies(SET_LB_MODE_TIMEOUT)))

		status = -ETIMEDOUT;



	return status;



err_unlock:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}

drivers/net/ethernet/emulex/benet/be_cmds.h

+2 −0
Original line number Diff line number Diff line
@@ -1495,6 +1495,8 @@ struct be_cmd_resp_acpi_wol_magic_config_v1 { 
#define BE_PME_D3COLD_CAP		0x80



/********************** LoopBack test *********************/

#define SET_LB_MODE_TIMEOUT		12000



struct be_cmd_req_loopback_test {

	struct be_cmd_req_hdr hdr;

	u32 loopback_type;

drivers/net/ethernet/emulex/benet/be_ethtool.c

+13 −2
Original line number Diff line number Diff line
@@ -847,10 +847,21 @@ static int be_test_ddr_dma(struct be_adapter *adapter) 
static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,

			    u64 *status)

{

	be_cmd_set_loopback(adapter, adapter->hba_port_num, loopback_type, 1);

	int ret;



	ret = be_cmd_set_loopback(adapter, adapter->hba_port_num,

				  loopback_type, 1);

	if (ret)

		return ret;



	*status = be_cmd_loopback_test(adapter, adapter->hba_port_num,

				       loopback_type, 1500, 2, 0xabc);

	be_cmd_set_loopback(adapter, adapter->hba_port_num, BE_NO_LOOPBACK, 1);



	ret = be_cmd_set_loopback(adapter, adapter->hba_port_num,

				  BE_NO_LOOPBACK, 1);

	if (ret)

		return ret;



	return *status;

}