[PATCH v3 0/2] Fix SSR unable to wake up bug

[PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

This patch series fixes delayed hw_error handling during SSR.

Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
Patch 2 corrects the timeout unit from jiffies to ms.

Changes v3:
- patch2 add Fixes tag
- Link to v2
  https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/

Changes v2:
- Split timeout conversion into a separate patch.
- Clarified commit messages and added test case description.
- Link to v1
  https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/

Shuai Zhang (2):
  Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
    during SSR
  Bluetooth: hci_qca: Convert timeout from jiffies to ms

 drivers/bluetooth/hci_qca.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
2.34.1

[PATCH v3 1/2] Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup during SSR

[Shuai Zhang]

When Bluetooth controller encounters a coredump, it triggers
the Subsystem Restart (SSR) mechanism. The controller first
reports the coredump data, and once the data upload is complete,
it sends a hw_error event. The host relies on this event to
proceed with subsequent recovery actions.

If the host has not finished processing the coredump data
when the hw_error event is received,
it sets a timer to wait until either the data processing is complete
or the timeout expires before handling the event.

The current implementation lacks a wakeup trigger. As a result,
even if the coredump data has already been processed, the host
continues to wait until the timer expires, causing unnecessary
delays in handling the hw_error event.

To fix this issue, adds a `wake_up_bit()` call after the host finishes
processing the coredump data. This ensures that the waiting thread is
promptly notified and can proceed to handle the hw_error event without
waiting for the timeout.

Test case:
- Trigger controller coredump using the command: `hcitool cmd 0x3f 0c 26`.
- Use `btmon` to capture HCI logs.
- Observe the time interval between receiving the hw_error event
and the execution of the power-off sequence in the HCI log.

Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
---
 drivers/bluetooth/hci_qca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index 888176b0f..fa6be1992 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1103,7 +1103,7 @@ static void qca_controller_memdump(struct work_struct *work)
 				qca->qca_memdump = NULL;
 				qca->memdump_state = QCA_MEMDUMP_COLLECTED;
 				cancel_delayed_work(&qca->ctrl_memdump_timeout);
-				clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
+				clear_and_wake_up_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
 				clear_bit(QCA_IBS_DISABLED, &qca->flags);
 				mutex_unlock(&qca->hci_memdump_lock);
 				return;
@@ -1181,7 +1181,7 @@ static void qca_controller_memdump(struct work_struct *work)
 			kfree(qca->qca_memdump);
 			qca->qca_memdump = NULL;
 			qca->memdump_state = QCA_MEMDUMP_COLLECTED;
-			clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
+			clear_and_wake_up_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
 		}
 
 		mutex_unlock(&qca->hci_memdump_lock);
-- 
2.34.1

[PATCH v3 2/2] Bluetooth: hci_qca: Convert timeout from jiffies to ms

[Shuai Zhang]

Since the timer uses jiffies as its unit rather than ms, the timeout value
must be converted from ms to jiffies when configuring the timer. Otherwise,
the intended 8s timeout is incorrectly set to approximately 33s.

Cc: stable@vger.kernel.org
Fixes: d841502c79e3 ("Bluetooth: hci_qca: Collect controller memory dump during SSR")
Signed-off-by: Shuai Zhang <quic_shuaz@quicinc.com>
---
 drivers/bluetooth/hci_qca.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c
index fa6be1992..c14b2fa9d 100644
--- a/drivers/bluetooth/hci_qca.c
+++ b/drivers/bluetooth/hci_qca.c
@@ -1602,7 +1602,7 @@ static void qca_wait_for_dump_collection(struct hci_dev *hdev)
 	struct qca_data *qca = hu->priv;
 
 	wait_on_bit_timeout(&qca->flags, QCA_MEMDUMP_COLLECTION,
-			    TASK_UNINTERRUPTIBLE, MEMDUMP_TIMEOUT_MS);
+			    TASK_UNINTERRUPTIBLE, msecs_to_jiffies(MEMDUMP_TIMEOUT_MS));
 
 	clear_bit(QCA_MEMDUMP_COLLECTION, &qca->flags);
 }
-- 
2.34.1

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Bartosz Golaszewski]

On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
> This patch series fixes delayed hw_error handling during SSR.
>
> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
> Patch 2 corrects the timeout unit from jiffies to ms.
>
> Changes v3:
> - patch2 add Fixes tag
> - Link to v2
>   https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>
> Changes v2:
> - Split timeout conversion into a separate patch.
> - Clarified commit messages and added test case description.
> - Link to v1
>   https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>
> Shuai Zhang (2):
>   Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>     during SSR
>   Bluetooth: hci_qca: Convert timeout from jiffies to ms
>
>  drivers/bluetooth/hci_qca.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> --

Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

Hi Bartosz

On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
>> This patch series fixes delayed hw_error handling during SSR.
>>
>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
>> Patch 2 corrects the timeout unit from jiffies to ms.
>>
>> Changes v3:
>> - patch2 add Fixes tag
>> - Link to v2
>>    https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>>
>> Changes v2:
>> - Split timeout conversion into a separate patch.
>> - Clarified commit messages and added test case description.
>> - Link to v1
>>    https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>>
>> Shuai Zhang (2):
>>    Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>>      during SSR
>>    Bluetooth: hci_qca: Convert timeout from jiffies to ms
>>
>>   drivers/bluetooth/hci_qca.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> --
> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

  Just a gentle ping. This patch series has been Acked but I haven’t 
seen it picked up by linux-next.

Do you need anything else from me?

Thanks,

Shuai

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Bartosz Golaszewski]

On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
<shuai.zhang@oss.qualcomm.com> wrote:
>
> Hi Bartosz
>
> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
> > On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
> >> This patch series fixes delayed hw_error handling during SSR.
> >>
> >> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
> >> Patch 2 corrects the timeout unit from jiffies to ms.
> >>
> >> Changes v3:
> >> - patch2 add Fixes tag
> >> - Link to v2
> >>    https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
> >>
> >> Changes v2:
> >> - Split timeout conversion into a separate patch.
> >> - Clarified commit messages and added test case description.
> >> - Link to v1
> >>    https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
> >>
> >> Shuai Zhang (2):
> >>    Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
> >>      during SSR
> >>    Bluetooth: hci_qca: Convert timeout from jiffies to ms
> >>
> >>   drivers/bluetooth/hci_qca.c | 6 +++---
> >>   1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >> --
> > Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>
>   Just a gentle ping. This patch series has been Acked but I haven’t
> seen it picked up by linux-next.
>
> Do you need anything else from me?

I don't pick up bluetooth patches, Luiz or Marcel do.

Thanks,
Bartosz

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

Hi Luiz, Marcel

On 1/16/2026 5:20 PM, Bartosz Golaszewski wrote:
> On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
> <shuai.zhang@oss.qualcomm.com> wrote:
>> Hi Bartosz
>>
>> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
>>> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
>>>> This patch series fixes delayed hw_error handling during SSR.
>>>>
>>>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
>>>> Patch 2 corrects the timeout unit from jiffies to ms.
>>>>
>>>> Changes v3:
>>>> - patch2 add Fixes tag
>>>> - Link to v2
>>>>     https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>>>>
>>>> Changes v2:
>>>> - Split timeout conversion into a separate patch.
>>>> - Clarified commit messages and added test case description.
>>>> - Link to v1
>>>>     https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>>>>
>>>> Shuai Zhang (2):
>>>>     Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>>>>       during SSR
>>>>     Bluetooth: hci_qca: Convert timeout from jiffies to ms
>>>>
>>>>    drivers/bluetooth/hci_qca.c | 6 +++---
>>>>    1 file changed, 3 insertions(+), 3 deletions(-)
>>>>
>>>> --
>>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>>    Just a gentle ping. This patch series has been Acked but I haven’t
>> seen it picked up by linux-next.
>>
>> Do you need anything else from me?
> I don't pick up bluetooth patches, Luiz or Marcel do.
>
> Thanks,
> Bartosz

Could you please help clarify this?


Thanks，

Shuai

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Luiz Augusto von Dentz]

Hi Shuai,

On Fri, Jan 16, 2026 at 4:48 AM Shuai Zhang
<shuai.zhang@oss.qualcomm.com> wrote:
>
> Hi Luiz, Marcel
>
> On 1/16/2026 5:20 PM, Bartosz Golaszewski wrote:
> > On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
> > <shuai.zhang@oss.qualcomm.com> wrote:
> >> Hi Bartosz
> >>
> >> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
> >>> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
> >>>> This patch series fixes delayed hw_error handling during SSR.
> >>>>
> >>>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
> >>>> Patch 2 corrects the timeout unit from jiffies to ms.
> >>>>
> >>>> Changes v3:
> >>>> - patch2 add Fixes tag
> >>>> - Link to v2
> >>>>     https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
> >>>>
> >>>> Changes v2:
> >>>> - Split timeout conversion into a separate patch.
> >>>> - Clarified commit messages and added test case description.
> >>>> - Link to v1
> >>>>     https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
> >>>>
> >>>> Shuai Zhang (2):
> >>>>     Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
> >>>>       during SSR
> >>>>     Bluetooth: hci_qca: Convert timeout from jiffies to ms
> >>>>
> >>>>    drivers/bluetooth/hci_qca.c | 6 +++---
> >>>>    1 file changed, 3 insertions(+), 3 deletions(-)
> >>>>
> >>>> --
> >>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >>    Just a gentle ping. This patch series has been Acked but I haven’t
> >> seen it picked up by linux-next.
> >>
> >> Do you need anything else from me?
> > I don't pick up bluetooth patches, Luiz or Marcel do.
> >
> > Thanks,
> > Bartosz
>
> Could you please help clarify this?

There were no Fixes: or Cc: Stable in your changes to indicate they
need to be applied to the currently RC and stable trees, in which case
it will only be merged to next-next at a later stage.

If that is not correct then lets us know if that needs either a Fixes
or stable tag so I can send a pull request immediately.

>
> Thanks，
>
> Shuai
>


-- 
Luiz Augusto von Dentz

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

Hi Luiz

On 1/16/2026 10:42 PM, Luiz Augusto von Dentz wrote:
> Hi Shuai,
>
> On Fri, Jan 16, 2026 at 4:48 AM Shuai Zhang
> <shuai.zhang@oss.qualcomm.com> wrote:
>> Hi Luiz, Marcel
>>
>> On 1/16/2026 5:20 PM, Bartosz Golaszewski wrote:
>>> On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
>>> <shuai.zhang@oss.qualcomm.com> wrote:
>>>> Hi Bartosz
>>>>
>>>> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
>>>>> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
>>>>>> This patch series fixes delayed hw_error handling during SSR.
>>>>>>
>>>>>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
>>>>>> Patch 2 corrects the timeout unit from jiffies to ms.
>>>>>>
>>>>>> Changes v3:
>>>>>> - patch2 add Fixes tag
>>>>>> - Link to v2
>>>>>>      https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Changes v2:
>>>>>> - Split timeout conversion into a separate patch.
>>>>>> - Clarified commit messages and added test case description.
>>>>>> - Link to v1
>>>>>>      https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Shuai Zhang (2):
>>>>>>      Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>>>>>>        during SSR
>>>>>>      Bluetooth: hci_qca: Convert timeout from jiffies to ms
>>>>>>
>>>>>>     drivers/bluetooth/hci_qca.c | 6 +++---
>>>>>>     1 file changed, 3 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> --
>>>>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>>>>     Just a gentle ping. This patch series has been Acked but I haven’t
>>>> seen it picked up by linux-next.
>>>>
>>>> Do you need anything else from me?
>>> I don't pick up bluetooth patches, Luiz or Marcel do.
>>>
>>> Thanks,
>>> Bartosz
>> Could you please help clarify this?
> There were no Fixes: or Cc: Stable in your changes to indicate they
> need to be applied to the currently RC and stable trees, in which case
> it will only be merged to next-next at a later stage.
>
> If that is not correct then lets us know if that needs either a Fixes
> or stable tag so I can send a pull request immediately.


I will add Fix tags then update patch.


>> Thanks，
>>
>> Shuai
>>
>

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

Hi  Luiz

On 1/16/2026 10:42 PM, Luiz Augusto von Dentz wrote:
> Hi Shuai,
>
> On Fri, Jan 16, 2026 at 4:48 AM Shuai Zhang
> <shuai.zhang@oss.qualcomm.com> wrote:
>> Hi Luiz, Marcel
>>
>> On 1/16/2026 5:20 PM, Bartosz Golaszewski wrote:
>>> On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
>>> <shuai.zhang@oss.qualcomm.com> wrote:
>>>> Hi Bartosz
>>>>
>>>> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
>>>>> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
>>>>>> This patch series fixes delayed hw_error handling during SSR.
>>>>>>
>>>>>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
>>>>>> Patch 2 corrects the timeout unit from jiffies to ms.
>>>>>>
>>>>>> Changes v3:
>>>>>> - patch2 add Fixes tag
>>>>>> - Link to v2
>>>>>>      https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Changes v2:
>>>>>> - Split timeout conversion into a separate patch.
>>>>>> - Clarified commit messages and added test case description.
>>>>>> - Link to v1
>>>>>>      https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Shuai Zhang (2):
>>>>>>      Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>>>>>>        during SSR
>>>>>>      Bluetooth: hci_qca: Convert timeout from jiffies to ms
>>>>>>
>>>>>>     drivers/bluetooth/hci_qca.c | 6 +++---
>>>>>>     1 file changed, 3 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> --
>>>>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>>>>     Just a gentle ping. This patch series has been Acked but I haven’t
>>>> seen it picked up by linux-next.
>>>>
>>>> Do you need anything else from me?
>>> I don't pick up bluetooth patches, Luiz or Marcel do.
>>>
>>> Thanks,
>>> Bartosz
>> Could you please help clarify this?
> There were no Fixes: or Cc: Stable in your changes to indicate they
> need to be applied to the currently RC and stable trees, in which case
> it will only be merged to next-next at a later stage.
>
> If that is not correct then lets us know if that needs either a Fixes
> or stable tag so I can send a pull request immediately.

I saw that it has already been acked-by, but I don’t see this change in 
linux-next.

>> Thanks，
>>
>> Shuai
>>
>

Re: [PATCH v3 0/2] Fix SSR unable to wake up bug

[Shuai Zhang]

Hi  Luiz

On 1/16/2026 10:42 PM, Luiz Augusto von Dentz wrote:
> Hi Shuai,
>
> On Fri, Jan 16, 2026 at 4:48 AM Shuai Zhang
> <shuai.zhang@oss.qualcomm.com> wrote:
>> Hi Luiz, Marcel
>>
>> On 1/16/2026 5:20 PM, Bartosz Golaszewski wrote:
>>> On Fri, Jan 16, 2026 at 9:37 AM Shuai Zhang
>>> <shuai.zhang@oss.qualcomm.com> wrote:
>>>> Hi Bartosz
>>>>
>>>> On 11/7/2025 11:37 PM, Bartosz Golaszewski wrote:
>>>>> On Fri, 7 Nov 2025 04:39:22 +0100, Shuai Zhang <quic_shuaz@quicinc.com> said:
>>>>>> This patch series fixes delayed hw_error handling during SSR.
>>>>>>
>>>>>> Patch 1 adds a wakeup to ensure hw_error is processed promptly after coredump collection.
>>>>>> Patch 2 corrects the timeout unit from jiffies to ms.
>>>>>>
>>>>>> Changes v3:
>>>>>> - patch2 add Fixes tag
>>>>>> - Link to v2
>>>>>>      https://lore.kernel.org/all/20251106140103.1406081-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Changes v2:
>>>>>> - Split timeout conversion into a separate patch.
>>>>>> - Clarified commit messages and added test case description.
>>>>>> - Link to v1
>>>>>>      https://lore.kernel.org/all/20251104112601.2670019-1-quic_shuaz@quicinc.com/
>>>>>>
>>>>>> Shuai Zhang (2):
>>>>>>      Bluetooth: qca: Fix delayed hw_error handling due to missing wakeup
>>>>>>        during SSR
>>>>>>      Bluetooth: hci_qca: Convert timeout from jiffies to ms
>>>>>>
>>>>>>     drivers/bluetooth/hci_qca.c | 6 +++---
>>>>>>     1 file changed, 3 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> --
>>>>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
>>>>     Just a gentle ping. This patch series has been Acked but I haven’t
>>>> seen it picked up by linux-next.
>>>>
>>>> Do you need anything else from me?
>>> I don't pick up bluetooth patches, Luiz or Marcel do.
>>>
>>> Thanks,
>>> Bartosz
>> Could you please help clarify this?
> There were no Fixes: or Cc: Stable in your changes to indicate they
> need to be applied to the currently RC and stable trees, in which case
> it will only be merged to next-next at a later stage.
>
> If that is not correct then lets us know if that needs either a Fixes
> or stable tag so I can send a pull request immediately.


So far, I haven’t seen this change merged into linux-next or any other 
branch, although it has already been Acked-by.

I’m wondering whether I might be missing some information, or if there 
is any additional action needed from my side.

Please let me know.

[1] Patch history: 
https://lore.kernel.org/all/20251107033924.3707495-1-quic_shuaz@quicinc.com/


>> Thanks，
>>
>> Shuai
>>
>