Commit 5917dd39 authored by Sai Teja Aluvala's avatar Sai Teja Aluvala Committed by Luiz Augusto von Dentz
Browse files

Bluetooth: btintel_pcie: treat boot stage bit 12 as warning 



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.

Fixes: 19037750 ("Bluetooth: btintel_pcie: Dump debug registers on error")
Signed-off-by: default avatarKiran K <kiran.k@intel.com>
Signed-off-by: default avatarSai Teja Aluvala <aluvala.sai.teja@intel.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 4e37f645

drivers/bluetooth/btintel_pcie.c

+10 −3
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ static inline void btintel_pcie_dump_debug_registers(struct hci_dev *hdev) 
	skb_put_data(skb, buf, strlen(buf));

	data->boot_stage_cache = reg;



	if (reg & BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_WARNING)

		bt_dev_warn(hdev, "Controller device warning (boot_stage: 0x%8.8x)", reg);



	reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_IPC_STATUS_REG);

	snprintf(buf, sizeof(buf), "ipc status: 0x%8.8x", reg);

	skb_put_data(skb, buf, strlen(buf));
@@ -880,8 +883,11 @@ 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);

	if (data->boot_stage_cache & BTINTEL_PCIE_CSR_BOOT_STAGE_DEVICE_WARNING)

		bt_dev_warn(data->hdev, "Controller device warning (boot_stage: 0x%8.8x)",

			    data->boot_stage_cache);



	return	data->boot_stage_cache & BTINTEL_PCIE_CSR_BOOT_STAGE_ABORT_HANDLER;

}



static void btintel_pcie_msix_gp1_handler(struct btintel_pcie_data *data)
@@ -914,7 +920,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
Original line number Diff line number Diff line
@@ -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))