From: Wen Gong <wgong@codeaurora.org>
To: Justin Capella <justincapella@gmail.com>
Cc: ath10k <ath10k@lists.infradead.org>, linux-wireless@vger.kernel.org
Subject: Re: [PATCH v4 1/2] ath10k: add refcount for ath10k_core_restart
Date: Fri, 10 Jan 2020 18:29:34 +0800 [thread overview]
Message-ID: <55ab2d64e78d51a9da587f276899e08b@codeaurora.org> (raw)
In-Reply-To: <CAMrEMU-UTtxJ-eMoNEBONXJCTpaZCcGc8Mu34wqQNXkpVz=gJA@mail.gmail.com>
On 2020-01-08 20:02, Justin Capella wrote:
> I think this might break the "wedged" state.
>
> Would simply not taking action unless STATE ON avoid the problems with
> multiple calls to _restart? ie:
>
ath10k_core_restart is one part of the recovery process,
after ath10k_core_restart, it has other things do in mac80211/ath10k...,
it need to make sure all the recovery
finished(ath10k_reconfig_complete),
then the next recovery can start from ath10k_core_restart.
so it can not simply change like below.
> diff --git a/drivers/net/wireless/ath/ath10k/core.c
> b/drivers/net/wireless/ath/ath10k/core.c
> index 5ec16ce19b69..a6c11b2bc97c 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -2198,11 +2198,8 @@ static int ath10k_init_hw_params(struct ath10k
> *ar)
> return 0;
> }
>
> -static void ath10k_core_restart(struct work_struct *work)
> +static void inline _ath10k_core_restart(struct ath10k *ar)
> {
> - struct ath10k *ar = container_of(work, struct ath10k, restart_work);
> - int ret;
> -
> set_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags);
>
> /* Place a barrier to make sure the compiler doesn't reorder
> @@ -2232,14 +2229,28 @@ static void ath10k_core_restart(struct
> work_struct *work)
> */
> cancel_work_sync(&ar->set_coverage_class_work);
>
> + ath10k_halt(ar);
> + ath10k_scan_finish(ar);
> + ieee80211_restart_hw(ar->hw);
> +
> + ret = ath10k_coredump_submit(ar);
> + if (ret)
> + ath10k_warn(ar, "failed to send firmware crash dump via devcoredump:
> %d", ret);
> +
> + complete(&ar->driver_recovery);
> +}
> +
> +static void ath10k_core_restart(struct work_struct *work)
> +{
> + struct ath10k *ar = container_of(work, struct ath10k, restart_work);
> + int ret;
> +
> mutex_lock(&ar->conf_mutex);
>
> switch (ar->state) {
> case ATH10K_STATE_ON:
> ar->state = ATH10K_STATE_RESTARTING;
> - ath10k_halt(ar);
> - ath10k_scan_finish(ar);
> - ieee80211_restart_hw(ar->hw);
> + _ath10k_core_restart(ar);
> break;
> case ATH10K_STATE_OFF:
> /* this can happen if driver is being unloaded
> @@ -2262,13 +2273,6 @@ static void ath10k_core_restart(struct
> work_struct *work)
> }
>
> mutex_unlock(&ar->conf_mutex);
> -
> - ret = ath10k_coredump_submit(ar);
> - if (ret)
> - ath10k_warn(ar, "failed to send firmware crash dump via devcoredump:
> %d",
> - ret);
> -
> - complete(&ar->driver_recovery);
> }
>
> static void ath10k_core_set_coverage_class_work(struct work_struct
> *work)
>
> On Tue, Jan 7, 2020 at 7:20 PM Wen Gong <wgong@codeaurora.org> wrote:
next prev parent reply other threads:[~2020-01-10 10:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 3:19 [PATCH v4 0/2] start recovery process when payload length overflow for sdio Wen Gong
2020-01-08 3:19 ` [PATCH v4 1/2] ath10k: add refcount for ath10k_core_restart Wen Gong
2020-01-08 12:02 ` Justin Capella
2020-01-10 10:29 ` Wen Gong [this message]
2020-01-17 7:19 ` Wen Gong
2020-01-20 9:38 ` Justin Capella
2020-01-20 13:34 ` Wen Gong
2020-01-20 15:37 ` Justin Capella
2020-08-14 17:19 ` Kalle Valo
2020-08-18 8:39 ` Wen Gong
2020-09-07 15:52 ` Kalle Valo
2020-08-19 12:01 ` Wen Gong
2020-08-20 9:18 ` Wen Gong
2020-08-24 4:36 ` Wen Gong
2020-09-07 15:55 ` Kalle Valo
[not found] ` <871rjd37kz.fsf@codeaurora.org>
2020-09-08 3:47 ` Wen Gong
2020-01-08 3:19 ` [PATCH v4 2/2] ath10k: start recovery process when payload length exceeds max htc length for sdio Wen Gong
2020-08-14 15:37 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55ab2d64e78d51a9da587f276899e08b@codeaurora.org \
--to=wgong@codeaurora.org \
--cc=ath10k@lists.infradead.org \
--cc=justincapella@gmail.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).