Bluetooth: btintel_pcie: Setup buffers for firmware traces
PATCH v3 1/2 Bluetooth: btintel_pcie: Setup buffers for firmware traces
This patch allocates the host memory which is used by controller to dump the firmware traces. The memory needs to be shared with controller via context information.
--- drivers/bluetooth/btintel_pcie.c | 89 ++++++++++++++++++++++++++++++++ drivers/bluetooth/btintel_pcie.h | 32 ++++++++++++ 2 files changed, 121 insertions(+)
drivers/bluetooth/btintel_pcie.c +89 -0
@@ -49,6 +49,8 @@ MODULE_DEVICE_TABLE(pci, btintel_pcie_table);#define BTINTEL_PCIE_HCI_EVT_PKT 0x00000004#define BTINTEL_PCIE_HCI_ISO_PKT 0x00000005 +#define BTINTEL_PCIE_MAGIC_NUM 0xA5A5A5A5 +/* Alive interrupt context */ enum {BTINTEL_PCIE_ROM ,
@@ -60,6 +62,83 @@ enum {BTINTEL_PCIE_D3 }; +/* Structure for dbgc fragment buffer +* @buf_addr_lsb: LSB of the buffer's physical address +* @buf_addr_msb: MSB of the buffer's physical address +* @buf_size: Total size of the buffer +*/ +struct btintel_pcie_dbgc_ctxt_buf { +u32 buf_addr_lsb; +u32 buf_addr_msb; +u32 buf_size; +}; + +/* Structure for dbgc fragment +* @magic_num: 0XA5A5A5A5 +* @ver: For Driver-FW compatibility +* @total_size: Total size of the payload debug info +* @num_buf: Num of allocated debug bufs +* @bufs: All buffer's addresses and sizes +*/ +struct btintel_pcie_dbgc_ctxt { +u32 magic_num; +u32 ver; +u32 total_size; +u32 num_buf; +struct btintel_pcie_dbgc_ctxt_buf bufs[BTINTEL_PCIE_DBGC_BUFFER_COUNT ]; +}; + +/* This function initializes the memory for DBGC buffers and formats the +* DBGC fragment which consists header info and DBGC buffer's LSB, MSB and +* size as the payload +*/ +static int btintel_pcie_setup_dbgc (struct btintel_pcie_data *data) +{ +struct btintel_pcie_dbgc_ctxt db_frag; +struct data_buf *buf; +int i; + + data->dbgc.count =BTINTEL_PCIE_DBGC_BUFFER_COUNT ; + data->dbgc.bufs =devm_kcalloc (&data->pdev->dev, data->dbgc.count, +sizeof (*buf),GFP_KERNEL ); +if (!data->dbgc.bufs) +return -ENOMEM ; + + data->dbgc.buf_v_addr =dmam_alloc_coherent (&data->pdev->dev, + data->dbgc.count * +BTINTEL_PCIE_DBGC_BUFFER_SIZE , + &data->dbgc.buf_p_addr, +GFP_KERNEL | __GFP_NOWARN); +if (!data->dbgc.buf_v_addr) +return -ENOMEM ; + + data->dbgc.frag_v_addr =dmam_alloc_coherent (&data->pdev->dev, +sizeof (struct btintel_pcie_dbgc_ctxt ), + &data->dbgc.frag_p_addr, +GFP_KERNEL | __GFP_NOWARN); +if (!data->dbgc.frag_v_addr) +return -ENOMEM ; + + data->dbgc.frag_size =sizeof (struct btintel_pcie_dbgc_ctxt ); + + db_frag.magic_num =BTINTEL_PCIE_MAGIC_NUM ; + db_frag.ver =BTINTEL_PCIE_DBGC_FRAG_VERSION ; + db_frag.total_size =BTINTEL_PCIE_DBGC_FRAG_PAYLOAD_SIZE ; + db_frag.num_buf =BTINTEL_PCIE_DBGC_FRAG_BUFFER_COUNT ; + +for (i =0 ; i < data->dbgc.count; i++) { + buf = &data->dbgc.bufs[i]; + buf->data_p_addr = data->dbgc.buf_p_addr + i *BTINTEL_PCIE_DBGC_BUFFER_SIZE ; + buf->data = data->dbgc.buf_v_addr + i *BTINTEL_PCIE_DBGC_BUFFER_SIZE ; + db_frag.bufs[i].buf_addr_lsb = (u32)(buf->data_p_addr &0xffffffff ); + db_frag.bufs[i].buf_addr_msb = (u32)((buf->data_p_addr >>32 ) &0xffffffff ); + db_frag.bufs[i].buf_size =BTINTEL_PCIE_DBGC_BUFFER_SIZE ; + } + +memcpy (data->dbgc.frag_v_addr, &db_frag,sizeof (db_frag)); +return 0 ; +} +static inline void ipc_print_ia_ring (struct hci_dev *hdev,struct ia *ia,u16 queue_num) {
@@ -1008,6 +1087,11 @@ static void btintel_pcie_init_ci(struct btintel_pcie_data *data, ci->addr_urbdq1 = data->rxq.urbd1s_p_addr; ci->num_urbdq1 = data->rxq.count; ci->urbdq_db_vec =BTINTEL_PCIE_RXQ_NUM ; + + ci->dbg_output_mode =0x01 ; + ci->dbgc_addr = data->dbgc.frag_p_addr; + ci->dbgc_size = data->dbgc.frag_size; + ci->dbg_preset =0x00 ; } static void btintel_pcie_free_txq_bufs(struct btintel_pcie_data *data,
@@ -1220,6 +1304,11 @@ static int btintel_pcie_alloc(struct btintel_pcie_data *data)/* Setup Index Array */ btintel_pcie_setup_ia (data, p_addr, v_addr, &data->ia); +/* Setup data buffers for dbgc */ + err =btintel_pcie_setup_dbgc (data); +if (err) + goto exit_error_txq; +/* Setup Context Information */ p_addr +=sizeof (u16) *BTINTEL_PCIE_NUM_QUEUES *4 ; v_addr +=sizeof (u16) *BTINTEL_PCIE_NUM_QUEUES *4 ;
drivers/bluetooth/btintel_pcie.h +32 -0
@@ -48,6 +48,21 @@#define BTINTEL_PCIE_CSR_MSIX_IVAR_BASE (BTINTEL_PCIE_CSR_MSIX_BASE + 0x0880)#define BTINTEL_PCIE_CSR_MSIX_IVAR (cause) (BTINTEL_PCIE_CSR_MSIX_IVAR_BASE + (cause)) +/* The DRAM buffer count, each buffer size, and +* fragment buffer size +*/ +#define BTINTEL_PCIE_DBGC_BUFFER_COUNT 16 +#define BTINTEL_PCIE_DBGC_BUFFER_SIZE (256 * 1024)/* 256 KB */ + +#define BTINTEL_PCIE_DBGC_FRAG_VERSION 1 +#define BTINTEL_PCIE_DBGC_FRAG_BUFFER_COUNT BTINTEL_PCIE_DBGC_BUFFER_COUNT + +/* Magic number(4), version(4), size of payload length(4) */ +#define BTINTEL_PCIE_DBGC_FRAG_HEADER_SIZE 12 + +/* Num of alloc Dbg buff (4) + (LSB(4), MSB(4), Size(4)) for each buffer */ +#define BTINTEL_PCIE_DBGC_FRAG_PAYLOAD_SIZE 196 +/* Causes for the FH register interrupts */ enum msix_fh_int_causes {BTINTEL_PCIE_MSIX_FH_INT_CAUSES_0 =BIT (0 ),/* cause 0 */
@@ -325,6 +340,22 @@ struct rxq {struct data_buf *bufs; }; +/* Structure for DRAM Buffer +* @count: Number of descriptors +* @buf: Array of data_buf structure +*/ +struct btintel_pcie_dbgc { +u16 count; + +void *frag_v_addr; +dma_addr_t frag_p_addr; +u16 frag_size; + +dma_addr_t buf_p_addr; +void *buf_v_addr; +struct data_buf *bufs; +}; +/* struct btintel_pcie_data * @pdev: pci device * @hdev: hdev device
@@ -405,6 +436,7 @@ struct btintel_pcie_data {struct txq txq;struct rxq rxq;u32 alive_intr_ctxt; +struct btintel_pcie_dbgc dbgc; }; static inline u32 btintel_pcie_rd_reg32(struct btintel_pcie_data *data,
Signature · 1 line
2.43.0
PATCH v3 2/2 Bluetooth: btintel_pcie: Read hardware exception data
On hardware error, controller writes hardware error event and optional vendor specific hci events in device memory in TLV format and raises MSIX interrupt. Driver reads the device memory and passes the events to the stack for further processing.
--- drivers/bluetooth/btintel.h | 1 + drivers/bluetooth/btintel_pcie.c | 224 ++++++++++++++++++++++++++++++- drivers/bluetooth/btintel_pcie.h | 23 ++++ 3 files changed, 247 insertions(+), 1 deletion(-)
drivers/bluetooth/btintel.h +1 -0
@@ -190,6 +190,7 @@ enum {struct btintel_data { DECLARE_BITMAP(flags, __INTEL_NUM_FLAGS);int (*acpi_reset_method)(struct hci_dev *hdev); +u32 cnvi_top; };#define btintel_set_flag (hdev, nr) \
drivers/bluetooth/btintel_pcie.c +223 -1
278 lines not on this page · raw message
drivers/bluetooth/btintel_pcie.h +23 -0
@@ -16,6 +16,8 @@#define BTINTEL_PCIE_CSR_CI_ADDR_LSB_REG (BTINTEL_PCIE_CSR_BASE + 0x118)#define BTINTEL_PCIE_CSR_CI_ADDR_MSB_REG (BTINTEL_PCIE_CSR_BASE + 0x11C)#define BTINTEL_PCIE_CSR_IMG_RESPONSE_REG (BTINTEL_PCIE_CSR_BASE + 0x12C) +#define BTINTEL_PCIE_PRPH_DEV_ADDR_REG (BTINTEL_PCIE_CSR_BASE + 0x440) +#define BTINTEL_PCIE_PRPH_DEV_RD_REG (BTINTEL_PCIE_CSR_BASE + 0x458)#define BTINTEL_PCIE_CSR_HBUS_TARG_WRPTR (BTINTEL_PCIE_CSR_BASE + 0x460)/* BTINTEL_PCIE_CSR Function Control Register */
@@ -23,6 +25,12 @@#define BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_INIT (BIT(6))#define BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_INIT (BIT(7))#define BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_ACCESS_STS (BIT(20)) + +#define BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_ACCESS_REQ (BIT(21)) +/* Stop MAC Access disconnection request */ +#define BTINTEL_PCIE_CSR_FUNC_CTRL_STOP_MAC_ACCESS_DIS (BIT(22)) +#define BTINTEL_PCIE_CSR_FUNC_CTRL_XTAL_CLK_REQ (BIT(23)) +#define BTINTEL_PCIE_CSR_FUNC_CTRL_BUS_MASTER_STS (BIT(28))#define BTINTEL_PCIE_CSR_FUNC_CTRL_BUS_MASTER_DISCON (BIT(29))#define BTINTEL_PCIE_CSR_FUNC_CTRL_SW_RESET (BIT(31))
@@ -72,6 +80,7 @@ enum msix_fh_int_causes {/* Causes for the HW register interrupts */ enum msix_hw_int_causes {BTINTEL_PCIE_MSIX_HW_INT_CAUSES_GP0 =BIT (0 ),/* cause 32 */ +BTINTEL_PCIE_MSIX_HW_INT_CAUSES_HWEXP =BIT (3 ),/* cause 35 */ };/* PCIe device states
@@ -84,6 +93,12 @@ enum {BTINTEL_PCIE_STATE_D3_HOT =2 , BTINTEL_PCIE_STATE_D3_COLD = 3, }; + +enum { +BTINTEL_PCIE_CORE_HALTED , +BTINTEL_PCIE_HWEXP_INPROGRESS , +}; +#define BTINTEL_PCIE_MSIX_NON_AUTO_CLEAR_CAUSE BIT(7)/* Minimum and Maximum number of MSI-X Vector
@@ -476,3 +491,11 @@ static inline void btintel_pcie_clr_reg_bits(struct btintel_pcie_data *data, r &= ~bits;iowrite32 (r, data->base_addr + offset); } + +static inline u32 btintel_pcie_rd_dev_mem (struct btintel_pcie_data *data, +u32 addr) +{ +btintel_pcie_wr_reg32 (data,BTINTEL_PCIE_PRPH_DEV_ADDR_REG , addr); +return btintel_pcie_rd_reg32 (data,BTINTEL_PCIE_PRPH_DEV_RD_REG ); +} +
Signature · 1 line
2.43.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=937476
---Test result---
Test Summary:
CheckPatch PENDING 0.27 seconds GitLint PENDING 0.24 seconds SubjectPrefix PASS 0.19 seconds BuildKernel PASS 24.46 seconds CheckAllWarning PASS 26.58 seconds CheckSparse PASS 30.08 seconds BuildKernel32 PASS 23.97 seconds TestRunnerSetup PASS 433.40 seconds TestRunner_l2cap-tester PASS 23.68 seconds TestRunner_iso-tester PASS 29.59 seconds TestRunner_bnep-tester PASS 4.80 seconds TestRunner_mgmt-tester FAIL 129.34 seconds TestRunner_rfcomm-tester PASS 11.61 seconds TestRunner_sco-tester PASS 15.34 seconds TestRunner_ioctl-tester PASS 8.66 seconds TestRunner_mesh-tester PASS 6.42 seconds TestRunner_smp-tester PASS 7.41 seconds TestRunner_userchan-tester PASS 5.73 seconds IncrementalBuild PENDING 0.64 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 490, Passed: 484 (98.8%), Failed: 2, Not Run: 4
Failed Test Cases
LL Privacy - Add Device 2 (2 Devices to AL) Failed 0.183 seconds LL Privacy - Set Flags 2 (Enable RL) Failed 0.152 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 9 lines · On Tue, 25 Feb 2025 17:13:10 +0530 you wrote:
This patch allocates the host memory which is used by controller to dump the firmware traces. The memory needs to be shared with controller via context information.
Co-developed-by Vijay Satija <[email protected]>Signed-off-by Vijay Satija <[email protected]>Signed-off-by Kiran K <[email protected]>[...]
Here is the summary with links:
- [v3,1/2] Bluetooth: btintel_pcie: Setup buffers for firmware traces
https://git.kernel.org/bluetooth/bluetooth-next/c/3104ae5ad1b7 - [v3,2/2] Bluetooth: btintel_pcie: Read hardware exception data https://git.kernel.org/bluetooth/bluetooth-next/c/978777bfa2d8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html