From: Kalle Valo <kvalo@codeaurora.org>
To: Anilkumar Kolli <akolli@codeaurora.org>
Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org
Subject: Re: [PATCH v3] ath11k: fix rmmod failure if qmi sequence fails
Date: Wed, 09 Dec 2020 08:57:17 +0200 [thread overview]
Message-ID: <877dprcvqq.fsf@codeaurora.org> (raw)
In-Reply-To: <1606916215-24643-1-git-send-email-akolli@codeaurora.org> (Anilkumar Kolli's message of "Wed, 2 Dec 2020 19:06:55 +0530")
Anilkumar Kolli <akolli@codeaurora.org> writes:
> QMI sequence fails if caldata file is not available.
> It is observed that 'rmmod ath11k' fails if qmi message fails.
> With this patch rmmod/insmod is working.
>
> Logs:
> Direct firmware load for IPQ8074/caldata.bin failed with error -2
> Falling back to user helper
> qmi failed to load CAL: IPQ8074/caldata.bin
> qmi failed to load board data file:-11
>
> Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.4.0.1-00009-QCAHKSWPL_SILICONZ-1
> Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01699-QCAHSTSWPLZ_V2_TO_X86-1
>
> Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
[...]
> @@ -2637,6 +2643,7 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)
> event_work);
> struct ath11k_qmi_driver_event *event;
> struct ath11k_base *ab = qmi->ab;
> + int ret = 0;
>
> spin_lock(&qmi->event_lock);
> while (!list_empty(&qmi->event_list)) {
> @@ -2650,19 +2657,20 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)
>
> switch (event->type) {
> case ATH11K_QMI_EVENT_SERVER_ARRIVE:
> - ath11k_qmi_event_server_arrive(qmi);
> + ret = ath11k_qmi_event_server_arrive(qmi);
> break;
> case ATH11K_QMI_EVENT_SERVER_EXIT:
> set_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags);
> set_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags);
> break;
> case ATH11K_QMI_EVENT_REQUEST_MEM:
> - ath11k_qmi_event_mem_request(qmi);
> + ret = ath11k_qmi_event_mem_request(qmi);
> break;
> case ATH11K_QMI_EVENT_FW_MEM_READY:
> - ath11k_qmi_event_load_bdf(qmi);
> + ret = ath11k_qmi_event_load_bdf(qmi);
> break;
> case ATH11K_QMI_EVENT_FW_READY:
> + clear_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags);
> if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) {
> ath11k_hal_dump_srng_stats(ab);
> queue_work(ab->workqueue, &ab->restart_work);
> @@ -2688,6 +2696,9 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)
> break;
> }
> kfree(event);
> + if (ret < 0)
> + set_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags);
> +
In the pending branch I moved the error handling after the function
calls to make it more visible. Here readibility is more important than
reducing lines of code.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
next prev parent reply other threads:[~2020-12-09 6:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 13:36 [PATCH v3] ath11k: fix rmmod failure if qmi sequence fails Anilkumar Kolli
2020-12-09 6:57 ` Kalle Valo [this message]
2020-12-09 7:00 ` 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=877dprcvqq.fsf@codeaurora.org \
--to=kvalo@codeaurora.org \
--cc=akolli@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--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).