mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-29 23:06:42 +07:00
iwlegacy: do not use interruptible waits
iwlegacy version of fix:
commit effd4d9aec
Author: Johannes Berg <johannes.berg@intel.com>
Date: Thu Sep 15 11:46:52 2011 -0700
iwlagn: do not use interruptible waits
Since the dawn of its time, iwlwifi has used
interruptible waits to wait for synchronous
commands and firmware loading.
This leads to "interesting" bugs, because it
can't actually handle the interruptions; for
example when a command sending is interrupted
it will assume the command completed fully,
and then leave it pending, which leads to all
kinds of trouble when the command finishes
later.
Since there's no easy way to gracefully deal
with interruptions, fix the driver to not use
interruptible waits.
This at least fixes the error
iwlagn 0000:02:00.0: Error: Response NULL in 'REPLY_SCAN_ABORT_CMD'
I have seen in P2P testing, but it is likely
that there are other errors caused by this.
Cc: stable@kernel.org # 2.6.39+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
2e2a41d6ca
commit
65d0f19e58
@ -937,7 +937,7 @@ void iwl_legacy_irq_handle_error(struct iwl_priv *priv)
|
|||||||
&priv->contexts[IWL_RXON_CTX_BSS]);
|
&priv->contexts[IWL_RXON_CTX_BSS]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
|
|
||||||
/* Keep the restart process from trying to send host
|
/* Keep the restart process from trying to send host
|
||||||
* commands by clearing the INIT status bit */
|
* commands by clearing the INIT status bit */
|
||||||
@ -1746,7 +1746,7 @@ int iwl_legacy_force_reset(struct iwl_priv *priv, bool external)
|
|||||||
|
|
||||||
/* Set the FW error flag -- cleared on iwl_down */
|
/* Set the FW error flag -- cleared on iwl_down */
|
||||||
set_bit(STATUS_FW_ERROR, &priv->status);
|
set_bit(STATUS_FW_ERROR, &priv->status);
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
/*
|
/*
|
||||||
* Keep the restart process from trying to send host
|
* Keep the restart process from trying to send host
|
||||||
* commands by clearing the INIT status bit
|
* commands by clearing the INIT status bit
|
||||||
|
@ -167,7 +167,7 @@ int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = wait_event_interruptible_timeout(priv->wait_command_queue,
|
ret = wait_event_timeout(priv->wait_command_queue,
|
||||||
!test_bit(STATUS_HCMD_ACTIVE, &priv->status),
|
!test_bit(STATUS_HCMD_ACTIVE, &priv->status),
|
||||||
HOST_COMPLETE_TIMEOUT);
|
HOST_COMPLETE_TIMEOUT);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
@ -647,7 +647,7 @@ iwl_legacy_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
|
|||||||
clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
|
clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
|
||||||
IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",
|
IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",
|
||||||
iwl_legacy_get_cmd_string(cmd->hdr.cmd));
|
iwl_legacy_get_cmd_string(cmd->hdr.cmd));
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Mark as unmapped */
|
/* Mark as unmapped */
|
||||||
|
@ -841,7 +841,7 @@ static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,
|
|||||||
wiphy_rfkill_set_hw_state(priv->hw->wiphy,
|
wiphy_rfkill_set_hw_state(priv->hw->wiphy,
|
||||||
test_bit(STATUS_RF_KILL_HW, &priv->status));
|
test_bit(STATUS_RF_KILL_HW, &priv->status));
|
||||||
else
|
else
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2269,7 +2269,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
|
|||||||
iwl3945_reg_txpower_periodic(priv);
|
iwl3945_reg_txpower_periodic(priv);
|
||||||
|
|
||||||
IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
|
IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -2300,7 +2300,7 @@ static void __iwl3945_down(struct iwl_priv *priv)
|
|||||||
iwl_legacy_clear_driver_stations(priv);
|
iwl_legacy_clear_driver_stations(priv);
|
||||||
|
|
||||||
/* Unblock any waiting calls */
|
/* Unblock any waiting calls */
|
||||||
wake_up_interruptible_all(&priv->wait_command_queue);
|
wake_up_all(&priv->wait_command_queue);
|
||||||
|
|
||||||
/* Wipe out the EXIT_PENDING status bit if we are not actually
|
/* Wipe out the EXIT_PENDING status bit if we are not actually
|
||||||
* exiting the module */
|
* exiting the module */
|
||||||
@ -2853,7 +2853,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
|
|||||||
|
|
||||||
/* Wait for START_ALIVE from ucode. Otherwise callbacks from
|
/* Wait for START_ALIVE from ucode. Otherwise callbacks from
|
||||||
* mac80211 will not be run successfully. */
|
* mac80211 will not be run successfully. */
|
||||||
ret = wait_event_interruptible_timeout(priv->wait_command_queue,
|
ret = wait_event_timeout(priv->wait_command_queue,
|
||||||
test_bit(STATUS_READY, &priv->status),
|
test_bit(STATUS_READY, &priv->status),
|
||||||
UCODE_READY_TIMEOUT);
|
UCODE_READY_TIMEOUT);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
@ -576,7 +576,7 @@ static void iwl4965_rx_card_state_notif(struct iwl_priv *priv,
|
|||||||
wiphy_rfkill_set_hw_state(priv->hw->wiphy,
|
wiphy_rfkill_set_hw_state(priv->hw->wiphy,
|
||||||
test_bit(STATUS_RF_KILL_HW, &priv->status));
|
test_bit(STATUS_RF_KILL_HW, &priv->status));
|
||||||
else
|
else
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -926,7 +926,7 @@ static void iwl4965_irq_tasklet(struct iwl_priv *priv)
|
|||||||
handled |= CSR_INT_BIT_FH_TX;
|
handled |= CSR_INT_BIT_FH_TX;
|
||||||
/* Wake up uCode load routine, now that load is complete */
|
/* Wake up uCode load routine, now that load is complete */
|
||||||
priv->ucode_write_complete = 1;
|
priv->ucode_write_complete = 1;
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (inta & ~handled) {
|
if (inta & ~handled) {
|
||||||
@ -1795,7 +1795,7 @@ static void iwl4965_alive_start(struct iwl_priv *priv)
|
|||||||
iwl4965_rf_kill_ct_config(priv);
|
iwl4965_rf_kill_ct_config(priv);
|
||||||
|
|
||||||
IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
|
IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
|
||||||
wake_up_interruptible(&priv->wait_command_queue);
|
wake_up(&priv->wait_command_queue);
|
||||||
|
|
||||||
iwl_legacy_power_update_mode(priv, true);
|
iwl_legacy_power_update_mode(priv, true);
|
||||||
IWL_DEBUG_INFO(priv, "Updated power mode\n");
|
IWL_DEBUG_INFO(priv, "Updated power mode\n");
|
||||||
@ -1828,7 +1828,7 @@ static void __iwl4965_down(struct iwl_priv *priv)
|
|||||||
iwl_legacy_clear_driver_stations(priv);
|
iwl_legacy_clear_driver_stations(priv);
|
||||||
|
|
||||||
/* Unblock any waiting calls */
|
/* Unblock any waiting calls */
|
||||||
wake_up_interruptible_all(&priv->wait_command_queue);
|
wake_up_all(&priv->wait_command_queue);
|
||||||
|
|
||||||
/* Wipe out the EXIT_PENDING status bit if we are not actually
|
/* Wipe out the EXIT_PENDING status bit if we are not actually
|
||||||
* exiting the module */
|
* exiting the module */
|
||||||
@ -2266,7 +2266,7 @@ int iwl4965_mac_start(struct ieee80211_hw *hw)
|
|||||||
|
|
||||||
/* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
|
/* Wait for START_ALIVE from Run Time ucode. Otherwise callbacks from
|
||||||
* mac80211 will not be run successfully. */
|
* mac80211 will not be run successfully. */
|
||||||
ret = wait_event_interruptible_timeout(priv->wait_command_queue,
|
ret = wait_event_timeout(priv->wait_command_queue,
|
||||||
test_bit(STATUS_READY, &priv->status),
|
test_bit(STATUS_READY, &priv->status),
|
||||||
UCODE_READY_TIMEOUT);
|
UCODE_READY_TIMEOUT);
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
Loading…
Reference in New Issue
Block a user