scsi: ufs-qcom: Enable Hibern8, MCQ, and Testbus registers Dump
Subsystems (3)
v7 cover scsi: ufs-qcom: Enable Hibern8, MCQ, and Testbus registers Dump
Adding support to enhance the debugging capabilities of the Qualcomm UFS
Host Controller, including HW and SW Hibern8 counts, MCQ registers, and
testbus registers dump.
---
Changes in v7:
- Addressed Bart's comment and used table-based approach to for ufs_qcom_dump_regs(). Changes in v6:
- Added ufs_qcom_dump_regs() API for MCQ dump due, as SoC vendors explicitly allocate MCQ resource.
Changes in v5:
- Addressed Mani's comment and used cond_resched() instead of usleep().
Changes in v4:
- Addressed Mani's comment and used kmalloc_array() for testbus mem allocation.
- Removed usleep_range from ufs_qcom_dump_testbus.
- Updated commit text.
Changes in v3:
- Addressed Bart's comment and Annotated the 'testbus' declaration with __free.
- Converted the switch-statements into an array lookup.
- Introduced struct testbus_info{} for handling testbus switch-statements to an array lookup. Changes in v2:
- Rebased patchsets.
- Link to v1: https://lore.kernel.org/linux-arm-msm/[email protected]/
---
Manish Pandey (3):
scsi: ufs-qcom: Add support for dumping HW and SW hibern8 count
scsi: ufs-qcom: Add support to dump MCQ registers
scsi: ufs-qcom: Add support to dump testbus registers
drivers/ufs/host/ufs-qcom.c | 124 ++++++++++++++++++++++++++++++++++++ drivers/ufs/host/ufs-qcom.h | 11 ++++ 2 files changed, 135 insertions(+)
Signature · 1 line
2.17.1
PATCH v7 1/3 scsi: ufs-qcom: Add support for dumping HW and SW hibern8 count
Add support to dump HW and SW hibern8 enter and exit counts to enhance the debugging of hibern8 state transitions.
--- drivers/ufs/host/ufs-qcom.c | 9 +++++++++ drivers/ufs/host/ufs-qcom.h | 9 +++++++++ 2 files changed, 18 insertions(+)
drivers/ufs/host/ufs-qcom.c +9 -0
@@ -1573,6 +1573,15 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) host =ufshcd_get_variant (hba); +dev_err (hba->dev,"HW_H8_ENTER_CNT=%d\n" ,ufshcd_readl (hba,REG_UFS_HW_H8_ENTER_CNT )); +dev_err (hba->dev,"HW_H8_EXIT_CNT=%d\n" ,ufshcd_readl (hba,REG_UFS_HW_H8_EXIT_CNT )); + +dev_err (hba->dev,"SW_H8_ENTER_CNT=%d\n" ,ufshcd_readl (hba,REG_UFS_SW_H8_ENTER_CNT )); +dev_err (hba->dev,"SW_H8_EXIT_CNT=%d\n" ,ufshcd_readl (hba,REG_UFS_SW_H8_EXIT_CNT )); + +dev_err (hba->dev,"SW_AFTER_HW_H8_ENTER_CNT=%d\n" , +ufshcd_readl (hba,REG_UFS_SW_AFTER_HW_H8_ENTER_CNT )); +ufshcd_dump_regs (hba,REG_UFS_SYS1CLK_1US ,16 *4 ,"HCI Vendor Specific Registers " );
drivers/ufs/host/ufs-qcom.h +9 -0
@@ -75,6 +75,15 @@ enum { UFS_UFS_DBG_RD_EDTL_RAM = 0x1900, }; +/* QCOM UFS HC vendor specific Hibern8 count registers */ +enum { +REG_UFS_HW_H8_ENTER_CNT =0x2700 , +REG_UFS_SW_H8_ENTER_CNT =0x2704 , +REG_UFS_SW_AFTER_HW_H8_ENTER_CNT =0x2708 , +REG_UFS_HW_H8_EXIT_CNT =0x270C , +REG_UFS_SW_H8_EXIT_CNT =0x2710 , +}; +enum {UFS_MEM_CQIS_VS =0x8 , };
Signature · 1 line
2.17.1
PATCH v7 2/3 scsi: ufs-qcom: Add support to dump MCQ registers
In reply to Manish PandeyAdd support to dump UFS MCQ registers to enhance debugging capabilities for the Qualcomm UFS Host Controller.
--- drivers/ufs/host/ufs-qcom.c | 65 +++++++++++++++++++++++++++++++++++++ drivers/ufs/host/ufs-qcom.h | 2 ++ 2 files changed, 67 insertions(+)
drivers/ufs/host/ufs-qcom.c +65 -0
@@ -1566,6 +1566,59 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host)return 0 ; } +static int ufs_qcom_dump_regs (struct ufs_hba *hba,size_t offset,size_t len, +const char *prefix,enum ufshcd_res id) +{ + u32 *regs __free(kfree) = NULL; +size_t pos; + +if (offset %4 !=0 || len %4 !=0 ) +return -EINVAL ; + + regs =kzalloc (len,GFP_ATOMIC ); +if (!regs) +return -ENOMEM ; + +for (pos =0 ; pos < len; pos +=4 ) + regs[pos /4 ] =readl (hba->res[id].base + offset + pos); + +print_hex_dump (KERN_ERR , prefix, + len >4 ?DUMP_PREFIX_OFFSET :DUMP_PREFIX_NONE , +16 ,4 , regs, len, false); + +return 0 ; +} + +static void ufs_qcom_dump_mcq_hci_regs (struct ufs_hba *hba) +{ +struct dump_info { +size_t offset; +size_t len; +const char *prefix; +enum ufshcd_res id; + }; + +struct dump_info mcq_dumps[] = { + {0x0 ,256 *4 ,"MCQ HCI-0 " ,RES_MCQ }, + {0x400 ,256 *4 ,"MCQ HCI-1 " ,RES_MCQ }, + {0x0 ,5 *4 ,"MCQ VS-0 " ,RES_MCQ_VS }, + {0x0 ,256 *4 ,"MCQ SQD-0 " ,RES_MCQ_SQD }, + {0x400 ,256 *4 ,"MCQ SQD-1 " ,RES_MCQ_SQD }, + {0x800 ,256 *4 ,"MCQ SQD-2 " ,RES_MCQ_SQD }, + {0xc00 ,256 *4 ,"MCQ SQD-3 " ,RES_MCQ_SQD }, + {0x1000 ,256 *4 ,"MCQ SQD-4 " ,RES_MCQ_SQD }, + {0x1400 ,256 *4 ,"MCQ SQD-5 " ,RES_MCQ_SQD }, + {0x1800 ,256 *4 ,"MCQ SQD-6 " ,RES_MCQ_SQD }, + {0x1c00 ,256 *4 ,"MCQ SQD-7 " ,RES_MCQ_SQD }, + }; + +for (int i =0 ; i <ARRAY_SIZE (mcq_dumps); i++) { +ufs_qcom_dump_regs (hba, mcq_dumps[i].offset, mcq_dumps[i].len, + mcq_dumps[i].prefix, mcq_dumps[i].id); +cond_resched (); + } +} +static void ufs_qcom_dump_dbg_regs (struct ufs_hba *hba) {u32 reg;
@@ -1624,6 +1677,18 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba) reg =ufs_qcom_get_debug_reg_offset (host,UFS_DBG_RD_REG_TMRLUT );ufshcd_dump_regs (hba, reg,9 *4 ,"UFS_DBG_RD_REG_TMRLUT " ); + +if (hba->mcq_enabled) { + reg =ufs_qcom_get_debug_reg_offset (host,UFS_RD_REG_MCQ ); +ufshcd_dump_regs (hba, reg,64 *4 ,"HCI MCQ Debug Registers " ); + } + +/* ensure below dumps occur only in task context due to blocking calls. */ +if (in_task ()) { +/* Dump MCQ Host Vendor Specific Registers */ +if (hba->mcq_enabled) +ufs_qcom_dump_mcq_hci_regs (hba); + } }/**
drivers/ufs/host/ufs-qcom.h +2 -0
@@ -50,6 +50,8 @@ enum {*/ UFS_AH8_CFG =0xFC , +UFS_RD_REG_MCQ =0xD00 , +REG_UFS_MEM_ICE_CONFIG =0x260C , REG_UFS_MEM_ICE_NUM_CORE = 0x2664,
Signature · 1 line
2.17.1
PATCH v7 3/3 scsi: ufs-qcom: Add support to dump testbus registers
In reply to Manish PandeyAdd support to dump testbus registers to enhance debugging capabilities for the Qualcomm UFS Host Controller.
--- drivers/ufs/host/ufs-qcom.c | 50 +++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)
drivers/ufs/host/ufs-qcom.c +50 -0
@@ -5,6 +5,7 @@#include <linux/acpi.h> #include <linux/clk.h> +#include <linux/cleanup.h> #include <linux/delay.h> #include <linux/devfreq.h> #include <linux/gpio/consumer.h>
@@ -98,6 +99,24 @@ static const struct __ufs_qcom_bw_table { [MODE_MAX][0][0] = { 7643136, 819200 }, }; +static const struct { +int nminor; +char *prefix; +} testbus_info[TSTBUS_MAX ] = { + [TSTBUS_UAWM ] = {32 ,"TSTBUS_UAWM" }, + [TSTBUS_UARM ] = {32 ,"TSTBUS_UARM" }, + [TSTBUS_TXUC ] = {32 ,"TSTBUS_TXUC" }, + [TSTBUS_RXUC ] = {32 ,"TSTBUS_RXUC" }, + [TSTBUS_DFC ] = {32 ,"TSTBUS_DFC" }, + [TSTBUS_TRLUT ] = {32 ,"TSTBUS_TRLUT" }, + [TSTBUS_TMRLUT ] = {32 ,"TSTBUS_TMRLUT" }, + [TSTBUS_OCSC ] = {32 ,"TSTBUS_OCSC" }, + [TSTBUS_UTP_HCI ] = {32 ,"TSTBUS_UTP_HCI" }, + [TSTBUS_COMBINED ] = {32 ,"TSTBUS_COMBINED" }, + [TSTBUS_WRAPPER ] = {32 ,"TSTBUS_WRAPPER" }, + [TSTBUS_UNIPRO ] = {256 ,"TSTBUS_UNIPRO" }, +}; +static void ufs_qcom_get_default_testbus_cfg (struct ufs_qcom_host *host);static int ufs_qcom_set_core_clk_ctrl (struct ufs_hba *hba,unsigned long freq);
@@ -1566,6 +1585,32 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host)return 0 ; } +static void ufs_qcom_dump_testbus (struct ufs_hba *hba) +{ +struct ufs_qcom_host *host =ufshcd_get_variant (hba); +int i, j, nminor =0 , testbus_len =0 ; + u32 *testbus __free(kfree) = NULL; +char *prefix; + + testbus =kmalloc_array (256 ,sizeof (u32),GFP_KERNEL ); +if (!testbus) +return ; + +for (j =0 ; j <TSTBUS_MAX ; j++) { + nminor = testbus_info[j].nminor; + prefix = testbus_info[j].prefix; + host->testbus.select_major = j; + testbus_len = nminor *sizeof (u32); +for (i =0 ; i < nminor; i++) { + host->testbus.select_minor = i; +ufs_qcom_testbus_config (host); + testbus[i] =ufshcd_readl (hba,UFS_TEST_BUS ); + } +print_hex_dump (KERN_ERR , prefix,DUMP_PREFIX_OFFSET , +16 ,4 , testbus, testbus_len, false); + } +} +static int ufs_qcom_dump_regs (struct ufs_hba *hba,size_t offset,size_t len,const char *prefix,enum ufshcd_res id) {
@@ -1688,6 +1733,11 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba)/* Dump MCQ Host Vendor Specific Registers */ if (hba->mcq_enabled)ufs_qcom_dump_mcq_hci_regs (hba); + +/* voluntarily yield the CPU as we are dumping too much data */ +ufshcd_dump_regs (hba,UFS_TEST_BUS ,4 ,"UFS_TEST_BUS " ); +cond_resched (); +ufs_qcom_dump_testbus (hba); } }
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedManish,
Quoted 3 lines
Adding support to enhance the debugging capabilities of the Qualcomm UFS Host Controller, including HW and SW Hibern8 counts, MCQ registers, and testbus registers dump.
Applied to 6.16/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 4 lines · Manish Pandey
Adding support to enhance the debugging capabilities of the Qualcomm UFS Host Controller, including HW and SW Hibern8 counts, MCQ registers, and testbus registers dump.
Applied to 6.16/scsi-queue, thanks!
[1/3] scsi: ufs-qcom: Add support for dumping HW and SW hibern8 count
https://git.kernel.org/mkp/scsi/c/fe016bb54dd1 [2/3] scsi: ufs-qcom: Add support to dump MCQ registers https://git.kernel.org/mkp/scsi/c/82edd868888a [3/3] scsi: ufs-qcom: Add support to dump testbus registers https://git.kernel.org/mkp/scsi/c/25b5ee122b79
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering