Re: [PATCH 3/4] scsi: ufs: ufs-qcom: Remove usage of dbg_print_en

Manivannan Sadhasivam
2022-12-02T07:40:04Z

On Thu, Dec 01, 2022 at 05:08:09PM -0600, Andrew Halaney wrote:
> This bitmask is unconditionally set in the current driver,
> so all conditionals using it can be considered bit rot.
>
> Let's take the current default conditional path everywhere and remove
> dbg_print_en from the driver.
>
> Signed-off-by: Andrew Halaney <ahalaney@redhat.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

Thanks,
Mani

> ---
> drivers/ufs/host/ufs-qcom.c | 18 +++---------------
> drivers/ufs/host/ufs-qcom.h | 11 -----------
> 2 files changed, 3 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
> index 1b0dfbbdcdf3..b1fcff1fad0c 100644
> --- a/drivers/ufs/host/ufs-qcom.c
> +++ b/drivers/ufs/host/ufs-qcom.c
> @@ -22,9 +22,6 @@
> #include <ufs/ufshci.h>
> #include <ufs/ufs_quirks.h>
>
> -#define UFS_QCOM_DEFAULT_DBG_PRINT_EN \
> - (UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
> -
> enum {
> TSTBUS_UAWM,
> TSTBUS_UARM,
> @@ -1040,7 +1037,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
> if (hba->dev->id < MAX_UFS_QCOM_HOSTS)
> ufs_qcom_hosts[hba->dev->id] = host;
>
> - host->dbg_print_en |= UFS_QCOM_DEFAULT_DBG_PRINT_EN;
> ufs_qcom_get_default_testbus_cfg(host);
> err = ufs_qcom_testbus_config(host);
> if (err) {
> @@ -1191,14 +1187,9 @@ static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,
>
> static void ufs_qcom_enable_test_bus(struct ufs_qcom_host *host)
> {
> - if (host->dbg_print_en & UFS_QCOM_DBG_PRINT_TEST_BUS_EN) {
> - ufshcd_rmwl(host->hba, UFS_REG_TEST_BUS_EN,
> - UFS_REG_TEST_BUS_EN, REG_UFS_CFG1);
> - ufshcd_rmwl(host->hba, TEST_BUS_EN, TEST_BUS_EN, REG_UFS_CFG1);
> - } else {
> - ufshcd_rmwl(host->hba, UFS_REG_TEST_BUS_EN, 0, REG_UFS_CFG1);
> - ufshcd_rmwl(host->hba, TEST_BUS_EN, 0, REG_UFS_CFG1);
> - }
> + ufshcd_rmwl(host->hba, UFS_REG_TEST_BUS_EN,
> + UFS_REG_TEST_BUS_EN, REG_UFS_CFG1);
> + ufshcd_rmwl(host->hba, TEST_BUS_EN, TEST_BUS_EN, REG_UFS_CFG1);
> }
>
> static void ufs_qcom_get_default_testbus_cfg(struct ufs_qcom_host *host)
> @@ -1315,9 +1306,6 @@ static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba)
> ufshcd_dump_regs(hba, REG_UFS_SYS1CLK_1US, 16 * 4,
> "HCI Vendor Specific Registers ");
>
> - if (!(host->dbg_print_en & UFS_QCOM_DBG_PRINT_REGS_EN))
> - return;
> -
> reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_REG_OCSC);
> ufshcd_dump_regs(hba, reg, 44 * 4, "UFS_UFS_DBG_RD_REG_OCSC ");
>
> diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
> index 44466a395bb5..e567e4636357 100644
> --- a/drivers/ufs/host/ufs-qcom.h
> +++ b/drivers/ufs/host/ufs-qcom.h
> @@ -113,15 +113,6 @@ enum {
> MASK_CLK_NS_REG = 0xFFFC00,
> };
>
> -/* QCOM UFS debug print bit mask */
> -#define UFS_QCOM_DBG_PRINT_REGS_EN BIT(0)
> -#define UFS_QCOM_DBG_PRINT_ICE_REGS_EN BIT(1)
> -#define UFS_QCOM_DBG_PRINT_TEST_BUS_EN BIT(2)
> -
> -#define UFS_QCOM_DBG_PRINT_ALL \
> - (UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_ICE_REGS_EN | \
> - UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
> -
> /* QUniPro Vendor specific attributes */
> #define PA_VS_CONFIG_REG1 0x9000
> #define DME_VS_CORE_CLK_CTRL 0xD002
> @@ -212,8 +203,6 @@ struct ufs_qcom_host {
>
> u32 dev_ref_clk_en_mask;
>
> - /* Bitmask for enabling debug prints */
> - u32 dbg_print_en;
> struct ufs_qcom_testbus testbus;
>
> /* Reset control of HCI */
> --
> 2.38.1
>

--
மணிவண்ணன் சதாசிவம்