Bluetooth: btintel_pcie: Load IOSF debug regs by controller variant
PATCH 1/1 Bluetooth: btintel_pcie: Load IOSF debug regs by controller variant
From: Sai Teja Aluvala <[email protected]>
Load the IOSF DBGC base address based on the controller hardware variant when reading DRAM buffers during a trace dump. Scorpius Peak family controllers (SCP/SCP2/SCP2F) use a different DBGC base address (0xf0d5d500) than Blazar family controllers (BZRI/BZRIW, 0xf3800300).
--- drivers/bluetooth/btintel.h | 1 + drivers/bluetooth/btintel_pcie.c | 30 ++++++++++++++++++++++++------ drivers/bluetooth/btintel_pcie.h | 4 ++++ 3 files changed, 29 insertions(+), 6 deletions(-)
drivers/bluetooth/btintel.h +1 -0
@@ -78,6 +78,7 @@ struct intel_tlv {#define BTINTEL_HWID_BZRU 0x1d/* BlazarU - Meteor Lake */ #define BTINTEL_HWID_SCP 0x1f/* Scorpius Peak - Panther Lake */ #define BTINTEL_HWID_SCP2 0x20/* Scorpius Peak2 - Nova Lake */ +#define BTINTEL_HWID_SCP2F 0x21/* Scorpius Peak2-F - Nova Lake */ #define BTINTEL_HWID_BZRIW 0x22/* BlazarIW - Wildcat Lake */ extern const guid_t btintel_guid_dsm;
drivers/bluetooth/btintel_pcie.c +24 -6
@@ -654,9 +654,10 @@ static void *btintel_pcie_copy_tlv(void *dest, enum btintel_pcie_tlv_type type,static int btintel_pcie_read_dram_buffers (struct btintel_pcie_data *data) {u32 offset, prev_size, wr_ptr_status, dump_size, data_len; +u32 status_reg, wrap_reg;struct btintel_pcie_dbgc *dbgc = &data->dbgc;struct hci_dev *hdev = data->hdev; -u8 *pdata, *p, buf_idx; +u8 *pdata, *p, buf_idx, hw_variant;struct intel_tlv *tlv;struct timespec64 now;struct tm tm_now;
@@ -669,7 +670,28 @@ static int btintel_pcie_read_dram_buffers(struct btintel_pcie_data *data)return -EOPNOTSUPP ; - wr_ptr_status =btintel_pcie_rd_dev_mem (data,BTINTEL_PCIE_DBGC_CUR_DBGBUFF_STATUS ); + hw_variant =INTEL_HW_VARIANT (data->cnvi); +switch (hw_variant) { +case BTINTEL_HWID_BZRI : +case BTINTEL_HWID_BZRIW : + status_reg =BTINTEL_PCIE_DBGC_CUR_DBGBUFF_STATUS ; + wrap_reg =BTINTEL_PCIE_DBGC_DBGBUFF_WRAP_ARND ; +break ; +case BTINTEL_HWID_SCP : +case BTINTEL_HWID_SCP2 : +case BTINTEL_HWID_SCP2F : + status_reg =BTINTEL_PCIE_DBGC_CUR_DBGBUFF_STATUS_SCP ; + wrap_reg =BTINTEL_PCIE_DBGC_DBGBUFF_WRAP_ARND_SCP ; +break ; +default : +bt_dev_err (hdev,"Unsupported Intel hardware variant (0x%2.2x)" , + hw_variant); +return -EINVAL ; + } + + wr_ptr_status =btintel_pcie_rd_dev_mem (data, status_reg); + data->dmp_hdr.wrap_ctr =btintel_pcie_rd_dev_mem (data, wrap_reg); + offset = wr_ptr_status &BTINTEL_PCIE_DBG_OFFSET_BIT_MASK ; buf_idx =BTINTEL_PCIE_DBGC_DBG_BUF_IDX (wr_ptr_status);
@@ -751,10 +773,6 @@ static int btintel_pcie_read_dram_buffers(struct btintel_pcie_data *data) sizeof(data->dmp_hdr.write_ptr)); p =btintel_pcie_copy_tlv (p,BTINTEL_WRAP_CTR , &data->dmp_hdr.wrap_ctr,sizeof (data->dmp_hdr.wrap_ctr)); - - data->dmp_hdr.wrap_ctr =btintel_pcie_rd_dev_mem (data, -BTINTEL_PCIE_DBGC_DBGBUFF_WRAP_ARND ); - p =btintel_pcie_copy_tlv (p,BTINTEL_TRIGGER_REASON , &data->dmp_hdr.trigger_reason,sizeof (data->dmp_hdr.trigger_reason)); p = btintel_pcie_copy_tlv(p, BTINTEL_FW_SHA, &data->dmp_hdr.fw_git_sha1,
drivers/bluetooth/btintel_pcie.h +4 -0
@@ -68,6 +68,10 @@#define BTINTEL_PCIE_DBGC_CUR_DBGBUFF_STATUS (BTINTEL_PCIE_DBGC_BASE_ADDR + 0x1C)#define BTINTEL_PCIE_DBGC_DBGBUFF_WRAP_ARND (BTINTEL_PCIE_DBGC_BASE_ADDR + 0x2C) +#define BTINTEL_PCIE_DBGC_BASE_ADDR_SCP (0xf0d5d500) +#define BTINTEL_PCIE_DBGC_CUR_DBGBUFF_STATUS_SCP (BTINTEL_PCIE_DBGC_BASE_ADDR_SCP + 0x1C) +#define BTINTEL_PCIE_DBGC_DBGBUFF_WRAP_ARND_SCP (BTINTEL_PCIE_DBGC_BASE_ADDR_SCP + 0x2C) +#define BTINTEL_PCIE_DBG_IDX_BIT_MASK 0x0F#define BTINTEL_PCIE_DBGC_DBG_BUF_IDX (data) (((data) >> 24) & BTINTEL_PCIE_DBG_IDX_BIT_MASK)#define BTINTEL_PCIE_DBG_OFFSET_BIT_MASK 0xFFFFFF
Signature · 1 line
2.54.0
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=1107196
---Test result---
Test Summary:
CheckPatch PASS 0.99 seconds VerifyFixes PASS 0.07 seconds VerifySignedoff PASS 0.07 seconds GitLint PASS 0.21 seconds SubjectPrefix PASS 0.07 seconds BuildKernel PASS 26.37 seconds CheckAllWarning PASS 28.88 seconds CheckSparse PASS 27.39 seconds BuildKernel32 PASS 25.69 seconds TestRunnerSetup PASS 572.88 seconds IncrementalBuild PASS 24.74 seconds
https://github.com/bluez/bluetooth-next/pull/291
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 9 lines · On Sun, 7 Jun 2026 11:51:17 +0530 you wrote:
From: Sai Teja Aluvala <[email protected]>
Load the IOSF DBGC base address based on the controller hardware variant when reading DRAM buffers during a trace dump. Scorpius Peak family controllers (SCP/SCP2/SCP2F) use a different DBGC base address (
0xf0d5d500) than Blazar family controllers (BZRI/BZRIW,0xf3800300).[...]
Here is the summary with links:
- [v1] Bluetooth: btintel_pcie: Load IOSF debug regs by controller variant
https://git.kernel.org/bluetooth/bluetooth-next/c/e5ea095d9bd1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html