Skip to content

Commit

Permalink
ath10k: skip the wait for completion to recovery in shutdown path
Browse files Browse the repository at this point in the history
Currently in the shutdown callback we wait for recovery to complete
before freeing up the resources. This results in additional two seconds
delay during the shutdown and thereby increase the shutdown time.

As an attempt to take less time during shutdown, remove the wait for
recovery completion in the shutdown callback and added an API to freeing
the reosurces in which they were common for shutdown and removing
the module.

Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1

Signed-off-by: Youghandhar Chintala <youghand@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210223142908.23374-1-youghand@codeaurora.org
  • Loading branch information
Youghandhar Chintala authored and Kalle Valo committed Mar 9, 2021
1 parent e3de5bb commit 018e3fa
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions drivers/net/wireless/ath/ath10k/snoc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1759,17 +1759,11 @@ static int ath10k_snoc_probe(struct platform_device *pdev)
return ret;
}

static int ath10k_snoc_remove(struct platform_device *pdev)
static int ath10k_snoc_free_resources(struct ath10k *ar)
{
struct ath10k *ar = platform_get_drvdata(pdev);
struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc remove\n");

reinit_completion(&ar->driver_recovery);

if (test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))
wait_for_completion_timeout(&ar->driver_recovery, 3 * HZ);
ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc free resources\n");

set_bit(ATH10K_SNOC_FLAG_UNREGISTERING, &ar_snoc->flags);

Expand All @@ -1783,12 +1777,29 @@ static int ath10k_snoc_remove(struct platform_device *pdev)
return 0;
}

static int ath10k_snoc_remove(struct platform_device *pdev)
{
struct ath10k *ar = platform_get_drvdata(pdev);
struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc remove\n");

reinit_completion(&ar->driver_recovery);

if (test_bit(ATH10K_SNOC_FLAG_RECOVERY, &ar_snoc->flags))
wait_for_completion_timeout(&ar->driver_recovery, 3 * HZ);

ath10k_snoc_free_resources(ar);

return 0;
}

static void ath10k_snoc_shutdown(struct platform_device *pdev)
{
struct ath10k *ar = platform_get_drvdata(pdev);

ath10k_dbg(ar, ATH10K_DBG_SNOC, "snoc shutdown\n");
ath10k_snoc_remove(pdev);
ath10k_snoc_free_resources(ar);
}

static struct platform_driver ath10k_snoc_driver = {
Expand Down

0 comments on commit 018e3fa

Please sign in to comment.