Skip to contentSkip to conversation

Bluetooth: btintel_pcie: treat boot stage bit 12 as warning

PATCH Superseded Kiran K 2 participants 2 messages Apr 19 Bluetooth drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Kiran K

author
#0 lore raw

PATCH 1/1 Bluetooth: btintel_pcie: treat boot stage bit 12 as warning

From: Sai Teja Aluvala <[email protected]>

CSR boot stage register bit 12 is documented as a device warning, not a fatal error. Rename the bit definition accordingly and stop including it in btintel_pcie_in_error().

This keeps warning-only boot stage values from being classified as errors while preserving abort-handler state as the actual error condition.

Signed-off-by Kiran K <[email protected]>
Signed-off-by Sai Teja Aluvala <[email protected]>
---
 drivers/bluetooth/btintel_pcie.c | 6 +++---
 drivers/bluetooth/btintel_pcie.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/bluetooth/btintel_pcie.c +3 -3
index 076beb45c410..46b2637b64aa 100644
@@ -892,8 +892,7 @@ static inline bool btintel_pcie_in_lockdown(struct btintel_pcie_data *data)
 
 static inline bool btintel_pcie_in_error(struct btintel_pcie_data *data)
 {
-	return (data->boot_stage_cache & BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_ERR) ||
-		(data->boot_stage_cache & BTINTEL_PCIE_CSR_BOOT_STAGE_ABORT_HANDLER);
+	return	data->boot_stage_cache & BTINTEL_PCIE_CSR_BOOT_STAGE_ABORT_HANDLER;
 }
 
 static void btintel_pcie_msix_gp1_handler(struct btintel_pcie_data *data)

@@ -926,7 +925,8 @@ static void btintel_pcie_msix_gp0_handler(struct btintel_pcie_data *data)
 		data->img_resp_cache = reg;
 
 	if (btintel_pcie_in_error(data)) {
-		bt_dev_err(data->hdev, "Controller in error state");
+		bt_dev_err(data->hdev, "Controller in error state: boot_stage: 0x%8.8x",
+			   data->boot_stage_cache);
 		btintel_pcie_dump_debug_registers(data->hdev);
 		return;
 	}
drivers/bluetooth/btintel_pcie.h +1 -1
index d5b6d5121548..2db85f71b2f8 100644
@@ -48,7 +48,7 @@
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_OPFW		(BIT(2))
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_ROM_LOCKDOWN	(BIT(10))
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_IML_LOCKDOWN	(BIT(11))
-#define BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_ERR		(BIT(12))
+#define BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_WARNING	(BIT(12))
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_ABORT_HANDLER	(BIT(13))
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_HALTED	(BIT(14))
 #define BTINTEL_PCIE_CSR_BOOT_STAGE_MAC_ACCESS_ON	(BIT(16))
Signature · 1 line
2.53.0
#1 lore raw

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1082909

---Test result---

Test Summary:

CheckPatch                    PASS      0.88 seconds
GitLint                       PASS      0.30 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      26.86 seconds
CheckAllWarning               PASS      28.20 seconds
CheckSparse                   PASS      27.12 seconds
BuildKernel32                 PASS      25.09 seconds
TestRunnerSetup               PASS      562.87 seconds
IncrementalBuild              PASS      24.45 seconds

https://github.com/bluez/bluetooth-next/pull/105

---
Regards,
Linux Bluetooth