APPLIED: [SRU][J][PATCH] Bluetooth: btrtl: Ask ic_info to drop firmware

[Roxana Nicolescu]

On 05/07/2023 15:29, Juerg Haefliger wrote:
> From: Hilda Wu <hildawu at realtek.com>
>
> BugLink: https://bugs.launchpad.net/bugs/2026028
>
> Some un-support wakeup platforms keep USB power and suspend signal
> is coming late, this makes Realtek some chip keep its firmware,
> and make it never load new firmware.
>
> So use vendor specific HCI command to ask them drop its firmware after
> system shutdown or resume.
>
> Signed-off-by: Hilda Wu <hildawu at realtek.com>
> Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
>
> (cherry picked from commit cd36742a957c37f6cd17124dac6dd1d61aeba4ab)
> Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
> ---
>   drivers/bluetooth/btrtl.c | 12 +++++++-----
>   1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 1f8afa0244d8..60ddba8962ff 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -594,8 +594,10 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
>   	hci_rev = le16_to_cpu(resp->hci_rev);
>   	lmp_subver = le16_to_cpu(resp->lmp_subver);
>   
> -	if (resp->hci_ver == 0x8 && le16_to_cpu(resp->hci_rev) == 0x826c &&
> -	    resp->lmp_ver == 0x8 && le16_to_cpu(resp->lmp_subver) == 0xa99e)
> +	btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
> +					    hdev->bus);
> +
> +	if (!btrtl_dev->ic_info)
>   		btrtl_dev->drop_fw = true;
>   
>   	if (btrtl_dev->drop_fw) {
> @@ -634,13 +636,13 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
>   		hci_ver = resp->hci_ver;
>   		hci_rev = le16_to_cpu(resp->hci_rev);
>   		lmp_subver = le16_to_cpu(resp->lmp_subver);
> +
> +		btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
> +						    hdev->bus);
>   	}
>   out_free:
>   	kfree_skb(skb);
>   
> -	btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
> -					    hdev->bus);
> -
>   	if (!btrtl_dev->ic_info) {
>   		rtl_dev_info(hdev, "unknown IC info, lmp subver %04x, hci rev %04x, hci ver %04x",
>   			    lmp_subver, hci_rev, hci_ver);
Applied to jammy:master-next. I removed the line before "(cherry-picked 
from..".  Thanks!

Roxana