Bug#1118660: closing 1118660

[Guido Berhoerster <guido+debian@berhoerster.name>]

Hi Salvatore,

On Thu, 23 Oct 2025 21:48:34 +0200 Salvatore Bonaccorso
<carnil@debian.org> wrote:
> close 1118660 6.13~rc6-1~exp1
> thanks
> 
> Hi,
> 
> Fixed in 6.13-rc1 upstream so upating the metadata.
> 
> At first glance commit d88a8bb8bbbe ("Bluetooth: btintel: Add DSBR support for
> BlazarIW, BlazarU and GaP") does not look like a candidate accepted by upstream
> for stable series, but might be worth a try.

that is the reason I kindly ask to include the attached (rebased) patch
in the trixie kernel package. It's already upstream, it fixes hardware
which will be very common during the trixie lifecycle and the backported
has already been tested and deployed by other distros such as Ubuntu or
SUSE*.
> Once that has happend the fix will flow in one of the next 6.12.y stable series
> updates.
Thanks,-- Guido Berhoerster*
https://bugs.launchpad.net/ubuntu/+source/linux-firmware/+bug/2085538

https://code.opensuse.org/kernel/kernel-source/c/a37dcc1c6f5bf37cc957662de69eb7d2c519c31a?branch=8f4705b70a5b7c733278b56ea318bde7a101e7e1

From: Kiran K <kiran.k@intel.com>
Date: Tue, 15 Oct 2024 17:57:07 +0530
Subject: Bluetooth: btintel: Add DSBR support for BlazarIW, BlazarU and GaP
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d88a8bb8bbbec9d57b84232a2d6f8dab84221959

Add DSBR support for BlazarIW, BlazarU and Gale Peak2 cores.

Refer commit eb9e749c0182 ("Bluetooth: btintel: Allow configuring drive
strength of BRI") for details about DSBR.

Signed-off-by: Kiran K <kiran.k@intel.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
 drivers/bluetooth/btintel.c | 28 ++++++++++++++++++++--------
 drivers/bluetooth/btintel.h |  3 +++
 2 files changed, 23 insertions(+), 8 deletions(-)

--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2734,20 +2734,32 @@
 
 	struct btintel_dsbr_cmd cmd;
 	struct sk_buff *skb;
+	u32 dsbr, cnvi;
 	u8 status;
-	u32 dsbr;
-	bool apply_dsbr;
 	int err;
 
-	/* DSBR command needs to be sent for BlazarI + B0 step product after
-	 * downloading IML image.
+	cnvi = ver->cnvi_top & 0xfff;
+	/* DSBR command needs to be sent for,
+	 * 1. BlazarI or BlazarIW + B0 step product in IML image.
+	 * 2. Gale Peak2 or BlazarU in OP image.
 	 */
-	apply_dsbr = (ver->img_type == BTINTEL_IMG_IML &&
-		((ver->cnvi_top & 0xfff) == BTINTEL_CNVI_BLAZARI) &&
-		INTEL_CNVX_TOP_STEP(ver->cnvi_top) == 0x01);
 
-	if (!apply_dsbr)
+	switch (cnvi) {
+	case BTINTEL_CNVI_BLAZARI:
+	case BTINTEL_CNVI_BLAZARIW:
+		if (ver->img_type == BTINTEL_IMG_IML &&
+		    INTEL_CNVX_TOP_STEP(ver->cnvi_top) == 0x01)
+			break;
 		return 0;
+	case BTINTEL_CNVI_GAP:
+	case BTINTEL_CNVI_BLAZARU:
+		if (ver->img_type == BTINTEL_IMG_OP &&
+		    hdev->bus == HCI_USB)
+			break;
+		return 0;
+	default:
+		return 0;
+	}
 
 	dsbr = 0;
 	err = btintel_uefi_get_dsbr(&dsbr);
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -53,6 +53,9 @@
 } __packed;
 
 #define BTINTEL_CNVI_BLAZARI		0x900
+#define BTINTEL_CNVI_BLAZARIW		0x901
+#define BTINTEL_CNVI_GAP		0x910
+#define BTINTEL_CNVI_BLAZARU		0x930
 
 #define BTINTEL_IMG_BOOTLOADER		0x01	/* Bootloader image */
 #define BTINTEL_IMG_IML			0x02	/* Intermediate image */