From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752594AbdJCPas (ORCPT ); Tue, 3 Oct 2017 11:30:48 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:19555 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953AbdJCP3N (ORCPT ); Tue, 3 Oct 2017 11:29:13 -0400 X-AuditID: b6c32a46-acbff70000001153-6f-59d3acc68de1 From: Alim Akhtar To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: vinholikatti@gmail.com, martin.petersen@oracle.com, subhashj@codeaurora.org, Bart.VanAssche@wdc.com Subject: [PATCH v2 v2 2/4] scsi: ufs-qcom: Remove uses of UFS_BIT() macro Date: Tue, 03 Oct 2017 20:51:23 +0530 Message-id: <1507044085-16905-2-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1507044085-16905-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrHIsWRmVeSWpSXmKPExsWy7bCmme6xNZcjDX7ukrG49OcLo8XlXXPY LLqv72CzWH78H5PFjcU72Sx2LKxyYPO43NfL5LFz1l12j49Pb7F4fN4k59F+oJspgDWKyyYl NSezLLVI3y6BK6NvwwLmgr3CFVtXz2NsYNwo0MXIwSEhYCLxq0u3i5GLQ0hgB6PEnhVbmSGc 74wSxy7+Yuti5AQr+n7vJDtEYjejxNNDtxkhnJ+MEo86jrOAVLEJaEvcnb6FCcQWEbCROH/z AZjNLJAp8XTyJ0YQW1jAU2Ju+wt2EJtFQFXiwtZbYL28Au4SDdv2MkFsk5O4ea6TGcTmFPCQ uLRpJtgyCYG/rBKfVi1nhihykVg9ZwJUg7DEq+Nb2CFsaYlnqzYyQtjlEu1X/zFDNHcwSpya dI4FImEvceDKHBaI6/gkOg7/ZYcEBq9ER5sQRImHxPZ/v1ghbEeJ83M2QcNlNqPE66PPGCcw Si1gZFjFKJZaUJybnlpsVGCkV5yYW1yal66XnJ+7iREci1puOxiXnPM5xCjAwajEw9vQdzlS iDWxrLgy9xCjBAezkgjvuhVAId6UxMqq1KL8+KLSnNTiQ4zSHCxK4rx1265FCAmkJ5akZqem FqQWwWSZODilGhhPVvU6vjr/4LU6U4PU2YiTk064XmQQ9uP56/BDwEcu6u0u/0ZnRqeLokcf mBv3nDyz0WBukB3/97D0OsUvAovufJryedmHsiemc9m//I6zEjMuDE9g1dZ43enUnrQqyOl2 K9cJjnoFfpfchyUfzqpH7y+/tHpOlubKu39vTGxUnbqAddeXrgVKLMUZiYZazEXFiQAL7Eze wQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpjluLIzCtJLcpLzFFi42I5/e+xgO6xNZcjDT5/5rO49OcLo8XlXXPY LLqv72CzWH78H5PFjcU72Sx2LKxyYPO43NfL5LFz1l12j49Pb7F4fN4k59F+oJspgDWKyyYl NSezLLVI3y6BK6NvwwLmgr3CFVtXz2NsYNwo0MXIySEhYCLx/d5J9i5GLg4hgZ2MEgeO32aD cH4ySnz79ZYZpIpNQFvi7vQtTCC2iICNxPmbD8BsZoFMidM7joHVCAt4Ssxtf8EOYrMIqEpc 2HqLBcTmFXCXaNi2lwlim5zEzXOdYPWcAh4SlzbNZASxhUBqfi5mnsDIs4CRYRWjZGpBcW56 brFRgVFearlecWJucWleul5yfu4mRmDobDus1b+D8fGS+EOMAhyMSjy8NyZcjhRiTSwrrsw9 xCjBwawkwrtuBVCINyWxsiq1KD++qDQntfgQozQHi5I4L3/+sUghgfTEktTs1NSC1CKYLBMH p1QDo7DFjWuWP2XaWmf4OZvUtZYZVMq6LD27pe6M+aF13y7wHa/oNbn/cemKlBdb/9szVWnl b7aJNo6S3pwhw//i/2QBM93brNsvZudufCRp3MBbU8XhrZYvHVKf1lvbrxb17ZsSz0GbSieF qcrNP99WKWvVrD2SoFbXufmVdGRliOOdsLvnkq4rsRRnJBpqMRcVJwIAbB7dehkCAAA= X-CMS-MailID: 20171003152910epcas2p3a89515a352b8291d7cdeb5a97536d2a8 X-Msg-Generator: CA X-Sender-IP: 182.195.42.143 X-Local-Sender: =?UTF-8?B?7JWM66a8G1NTSVItRkRTIFNXG+yCvOyEseyghOyekBsuL1Nl?= =?UTF-8?B?bmlvciBDaGllZiBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QUxJTSBBS0hUQVIbU1NJUi1GRFMgU1cbU2Ftc3VuZyBFbGVj?= =?UTF-8?B?dHJvbmljcxsuL1NlbmlvciBDaGllZiBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG1NXQUhRG0MxMElEMDdJRDAxMDk5Nw==?= CMS-TYPE: 102P X-CMS-RootMailID: 20171003152910epcas2p3a89515a352b8291d7cdeb5a97536d2a8 X-RootMTR: 20171003152910epcas2p3a89515a352b8291d7cdeb5a97536d2a8 References: <1507044085-16905-1-git-send-email-alim.akhtar@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Subhash Jadavani --- drivers/scsi/ufs/ufs-qcom.c | 4 ++-- drivers/scsi/ufs/ufs-qcom.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c index c87d770..6a548e7 100644 --- 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 076f528..295f4be 100644 --- 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; -- 2.7.4