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

Commit 3fc07953 authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Emmanuel Grumbach
Browse files

iwlwifi: trans: prevent tx and cmds during FW error 



Stop Tx and commands from arriving to the transport layer when a FW
error has occurred. A HW recovery should take place before. Remove
transport specific checks of the same nature (note that not all
transports were protected).

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent eb7ff77e

drivers/net/wireless/iwlwifi/iwl-trans.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -620,6 +620,9 @@ static inline int iwl_trans_send_cmd(struct iwl_trans *trans, 
{

{

	int ret;

	int ret;





	if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status)))

		return -EIO;



	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) {

	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE)) {

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

		return -EIO;

		return -EIO;
@@ -659,6 +662,9 @@ static inline void iwl_trans_free_tx_cmd(struct iwl_trans *trans, 
static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,

static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb,

			       struct iwl_device_cmd *dev_cmd, int queue)

			       struct iwl_device_cmd *dev_cmd, int queue)

{

{

	if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status)))

		return -EIO;



	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE))

	if (unlikely(trans->state != IWL_TRANS_FW_ALIVE))

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

		IWL_ERR(trans, "%s bad state = %d", __func__, trans->state);

drivers/net/wireless/iwlwifi/pcie/tx.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1606,9 +1606,6 @@ cancel: 




int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)

int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)

{

{

	if (test_bit(STATUS_FW_ERROR, &trans->status))

		return -EIO;



	if (!(cmd->flags & CMD_SEND_IN_RFKILL) &&

	if (!(cmd->flags & CMD_SEND_IN_RFKILL) &&

	    test_bit(STATUS_RFKILL, &trans->status)) {

	    test_bit(STATUS_RFKILL, &trans->status)) {

		IWL_DEBUG_RF_KILL(trans, "Dropping CMD 0x%x: RF KILL\n",

		IWL_DEBUG_RF_KILL(trans, "Dropping CMD 0x%x: RF KILL\n",