scsi: ufs-qcom: Remove uses of UFS_BIT() macro

Use actual bit position instead of UFS_BIT() macro. This patch also
changes bit-17 to meaningful #define.

This change is as per discussion here [1]
[1] -> https://lkml.org/lkml/2017/8/28/786

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Cc: Subhash Jadavani <subhashj@codeaurora.org>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index c87d770b519a7c03b4ec4fb6778d3c7e86b743b9..6a548e74d70418e7a9168992dfe7fc16c0d4d06f 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -1458,7 +1458,7 @@ static void ufs_qcom_print_hw_debug_reg_all(struct ufs_hba *hba,
        print_fn(hba, reg, 44, "UFS_UFS_DBG_RD_REG_OCSC ", priv);
 
        reg = ufshcd_readl(hba, REG_UFS_CFG1);
-       reg |= UFS_BIT(17);
+       reg |= UTP_DBG_RAMS_EN;
        ufshcd_writel(hba, reg, REG_UFS_CFG1);
 
        reg = ufs_qcom_get_debug_reg_offset(host, UFS_UFS_DBG_RD_EDTL_RAM);
@@ -1471,7 +1471,7 @@ static void ufs_qcom_print_hw_debug_reg_all(struct ufs_hba *hba,
        print_fn(hba, reg, 64, "UFS_UFS_DBG_RD_PRDT_RAM ", priv);
 
        /* clear bit 17 - UTP_DBG_RAMS_EN */
-       ufshcd_rmwl(hba, UFS_BIT(17), 0, REG_UFS_CFG1);
+       ufshcd_rmwl(hba, UTP_DBG_RAMS_EN, 0, REG_UFS_CFG1);
 
        reg = ufs_qcom_get_debug_reg_offset(host, UFS_DBG_RD_REG_UAWM);
        print_fn(hba, reg, 4, "UFS_DBG_RD_REG_UAWM ", priv);

diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h
index 076f52813a4cb238dc06bddc5c3533c9433c81c2..295f4bef6a0e9f81c8240b00fd0aec2ebd612d19 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.h
+++ b/drivers/scsi/ufs/ufs-qcom.h
@@ -92,7 +92,8 @@ enum {
 #define UFS_CNTLR_3_x_x_VEN_REGS_OFFSET(x)     (0x400 + x)
 
 /* bit definitions for REG_UFS_CFG1 register */
-#define QUNIPRO_SEL    UFS_BIT(0)
+#define QUNIPRO_SEL            0x1
+#define UTP_DBG_RAMS_EN                0x20000
 #define TEST_BUS_EN            BIT(18)
 #define TEST_BUS_SEL           GENMASK(22, 19)
 #define UFS_REG_TEST_BUS_EN    BIT(30)
@@ -213,13 +214,13 @@ struct ufs_qcom_host {
         * Note: By default this capability will be kept enabled if host
         * controller supports the QUniPro mode.
         */
-       #define UFS_QCOM_CAP_QUNIPRO    UFS_BIT(0)
+       #define UFS_QCOM_CAP_QUNIPRO    0x1
 
        /*
         * Set this capability if host controller can retain the secure
         * configuration even after UFS controller core power collapse.
         */
-       #define UFS_QCOM_CAP_RETAIN_SEC_CFG_AFTER_PWR_COLLAPSE  UFS_BIT(1)
+       #define UFS_QCOM_CAP_RETAIN_SEC_CFG_AFTER_PWR_COLLAPSE  0x2
        u32 caps;
 
        struct phy *generic_phy;