From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751677AbdI3GaD (ORCPT ); Sat, 30 Sep 2017 02:30:03 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:31388 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751191AbdI3GaB (ORCPT ); Sat, 30 Sep 2017 02:30:01 -0400 X-AuditID: b6c32a47-499ff70000001114-d0-59cf39e6611d 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 2/3] scsi: ufs-qcom: Remove uses of UFS_BIT() macro Date: Sat, 30 Sep 2017 11:52:05 +0530 Message-id: <1506752526-27014-2-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1506752526-27014-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRmVeSWpSXmKPExsWy7bCmme4zy/ORBr8WSFlc+vOF0eLyrjls Ft3Xd7BZLD/+j8nixuKdbBY7FlY5sHlc7utl8tg56y67x8ent1g8Pm+S82g/0M0UwBrFZZOS mpNZllqkb5fAlTFt3R3Ggg6Riou931kbGF8LdDFyckgImEgs+PiUtYuRi0NIYAejxPM/U6Gc 74wSO5t7GGGqvv1+ygiR2MAo8WDHDijnJ6PElGv/mUCq2AS0Je5O3wJmiwjYSJy/+QDMZhbI lHg6+RNQAweHsICzxNujkiBhFgFViZ9n+5lBwrwC7hKfmpggdslJ3DzXyQxicwp4SBxtfMwO skpCoJFN4vfHViaQegkBF4mZaxIh6oUlXh3fwg5hS0s8W7UR6uZyifar/5ghejsYJU5NOscC kbCXOHBlDgvEaXwSHYf/skPM5JXoaBOCMD0k5s2Sgah2lJj0cwM0TGYzSnQ+2sUygVFqASPD Kkax1ILi3PTUYqMCY73ixNzi0rx0veT83E2M4CjUct/BuO2czyFGAQ5GJR7eG17nIoVYE8uK K3MPMUpwMCuJ8G4wOx8pxJuSWFmVWpQfX1Sak1p8iFGag0VJnLdu27UIIYH0xJLU7NTUgtQi mCwTB6dUA+OstN2r13e//fOoatFys/6GRccPfTmYqZ0z3WVfaWL/thf6v57vPST8/qWc6r6Z Kgse+GY+yEgOu27JFfFb6/0WeSdGNb7ZhRPnRHw/dsRmx8Mrviwbtk4J6bSP37rpt9T6WeKK HiqBHxhnXo8+c5r394cvW10ZF9tMiJUMqbnS6CfpvUQgTvWAEktxRqKhFnNRcSIAerZKvL4C AAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphluLIzCtJLcpLzFFi42I5/e+xoO5Ty/ORBtOb1S0u/fnCaHF51xw2 i+7rO9gslh//x2RxY/FONosdC6sc2Dwu9/UyeeycdZfd4+PTWywenzfJebQf6GYKYI3isklJ zcksSy3St0vgypi27g5jQYdIxcXe76wNjK8Fuhg5OSQETCS+/X7K2MXIxSEksI5RYv7ViywQ zk9GiR/X77CCVLEJaEvcnb6FCcQWEbCROH/zAZjNLJApcXrHMeYuRg4OYQFnibdHJUHCLAKq Ej/P9oOFeQXcJT41MUHskpO4ea6TGcTmFPCQONr4mB3EFgIq6Wr+yjKBkWcBI8MqRsnUguLc 9NxiowKjvNRyveLE3OLSvHS95PzcTYzAsNl2WKt/B+PjJfGHGAU4GJV4eG94nYsUYk0sK67M PcQowcGsJMK7wex8pBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFe/vxjkUIC6YklqdmpqQWpRTBZ Jg5OqQbGTc8L9+ccquornbpts//q8xM3dqXJro66pVTq92zrvCVdV6z7Hxjd4JS70GOoKSN1 ZXlz/kbZYyfvBeVcS1olWrgreJbLL4GpZ3asU+o94WRm1xH2zO9VeMvZ/RLizT+PXme7z8YW +jDalPtx/BPvq2/NrrYaHV6/ULD2nMa8v+xrNsa+z/hbpcRSnJFoqMVcVJwIALBFx28XAgAA X-CMS-MailID: 20170930062957epcas2p3ccba5b5b7614eed0e63b7a8424531022 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: 20170930062957epcas2p3ccba5b5b7614eed0e63b7a8424531022 X-RootMTR: 20170930062957epcas2p3ccba5b5b7614eed0e63b7a8424531022 References: <1506752526-27014-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 actaul 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 --- This patch is only complied tested, appreciate testing on actual h/w 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