Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: SoftFail (protection.outlook.com: domain of transitioning
 cadence.com discourages use of 199.43.4.28 as permitted sender)
X-CrossPremisesHeadersFilteredBySendConnector: maileu3.global.cadence.com
Received: from maileu3.global.cadence.com (10.160.88.99) by
 maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id
 15.0.1367.3; Wed, 31 Jul 2019 10:36:47 +0200
Received: from lvlogina.cadence.com (10.165.176.102) by
 maileu3.global.cadence.com (10.160.88.99) with Microsoft SMTP Server (TLS) id
 15.0.1367.3 via Frontend Transport; Wed, 31 Jul 2019 10:36:47 +0200
Received: from lvlogina.cadence.com (localhost.localdomain [127.0.0.1])
        by lvlogina.cadence.com (8.14.4/8.14.4) with ESMTP id x6V8alfK028414;
        Wed, 31 Jul 2019 09:36:47 +0100
Received: (from aniljoy@localhost)
        by lvlogina.cadence.com (8.14.4/8.14.4/Submit) id x6V8aiNM028290;
        Wed, 31 Jul 2019 09:36:44 +0100
From:   Anil Varughese <aniljoy@cadence.com>
To:     <alim.akhtar@samsung.com>, <avri.altman@wdc.com>,
        <pedrom.sousa@synopsys.com>
CC:     <jejb@linux.ibm.com>, <martin.petersen@oracle.com>, <hare@suse.de>,
        <aniljoy@cadence.com>, <rafalc@cadence.com>, <mparab@cadence.com>,
        <jank@cadence.com>, <vigneshr@ti.com>,
        <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] scsi: ufs: Additional clock initialization in Cadence UFS
Date:   Wed, 31 Jul 2019 09:36:14 +0100
Message-ID: <20190731083614.25926-1-aniljoy@cadence.com>
X-Mailer: git-send-email 2.15.0
MIME-Version: 1.0
Content-Type: text/plain
X-OrganizationHeadersPreserved: maileu3.global.cadence.com
X-EOPAttributedMessage: 0
X-Forefront-Antispam-Report: CIP:199.43.4.28;IPV:CAL;SCL:-1;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(4636009)(136003)(39860400002)(346002)(376002)(396003)(2980300002)(36092001)(199004)(189003)(53936002)(81156014)(305945005)(81166006)(316002)(336012)(478600001)(16586007)(186003)(110136005)(54906003)(42186006)(87636003)(26826003)(26005)(76130400001)(50226002)(8936002)(70586007)(51416003)(8676002)(70206006)(5660300002)(126002)(486006)(476003)(2906002)(1076003)(14444005)(2616005)(356004)(6666004)(2201001)(426003)(47776003)(86362001)(50466002)(36756003)(48376002)(68736007)(69596002)(4326008)(2101003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR07MB4462;H:rmmaillnx1.cadence.com;FPR:;SPF:SoftFail;LANG:en;PTR:InfoDomainNonexistent;A:1;MX:1;
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 8992f172-e0fe-4a7f-44fe-08d715923d26
X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328);SRVR:SN6PR07MB4462;
X-MS-TrafficTypeDiagnostic: SN6PR07MB4462:
X-Microsoft-Antispam-PRVS: <SN6PR07MB44624637C89F8D5601F18A28A8DF0@SN6PR07MB4462.namprd07.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:6790;
X-Forefront-PRVS: 011579F31F
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Message-Info: 1IuNX/45ToGyEmDbdVNn6VVh+gJyEuee3Buk3a19RNPzcwXzf6d8yY2WLsGuSIl2Hn8B4Nv3k1LsmbJnljqgq22DkmDhK8DsJbEoIz+UvMPWtFa4mkOrEzaUan0A2sVRCUbkBgRXBt/dwuoAehuNwdhENAOmEnYHJAhzWXJRTfwg4nS8IR9Dqi1coH9VZkjPZByWzCf9gh48jcDehhLGlrcsL7MkxrMOSYfAZGJB1rhmGNywy9dLbiOgkcu1q5UuNMIUzepCuwcSPmzUOWKzTecWB+UtEzDIS+0w6zYd8kLlliL+SCIKE2+A9BAevUjM7ShekjFVEcYpox9aLfuQ29fd6b/JLt17AnzPa/S+6zO7PZoeFFrcpnHmszPCYOt48OpqwdR0Q2ybVckYFvtZYVxRJsQR8Smhus2LxRbyXko=
X-OriginatorOrg: cadence.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2019 08:36:52.7328
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 8992f172-e0fe-4a7f-44fe-08d715923d26
X-MS-Exchange-CrossTenant-Id: d36035c5-6ce6-4662-a3dc-e762e61ae4c9
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=d36035c5-6ce6-4662-a3dc-e762e61ae4c9;Ip=[199.43.4.28];Helo=[rmmaillnx1.cadence.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR07MB4462
X-Proofpoint-SPF-Result: pass
X-Proofpoint-SPF-Record: v=spf1 include:spf.smktg.jp include:_spf.salesforce.com
 include:mktomail.com include:spf-0014ca01.pphosted.com
 include:spf.protection.outlook.com include:auth.msgapp.com
 include:spf.mandrillapp.com ~all
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-31_04:,,
 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_check_notspam policy=outbound_check score=0
 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0
 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0
 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx
 scancount=1 engine=8.0.1-1906280000 definitions=main-1907310093
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Configure CDNS_UFS_REG_HCLKDIV in .hce_enable_notify()
because if UFSHCD resets the controller ip because of
phy or device related errors then CDNS_UFS_REG_HCLKDIV
is reset to default value and .setup_clock() is not
called later in the sequence whereas hce_enable_notify
will be called everytime controller is reenabled.

Signed-off-by: Anil Varughese <aniljoy@cadence.com>
---
 drivers/scsi/ufs/cdns-pltfrm.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/scsi/ufs/cdns-pltfrm.c b/drivers/scsi/ufs/cdns-pltfrm.c
index 86dbb723f..15ee54d28 100644
--- a/drivers/scsi/ufs/cdns-pltfrm.c
+++ b/drivers/scsi/ufs/cdns-pltfrm.c
@@ -78,6 +78,22 @@ static int cdns_ufs_setup_clocks(struct ufs_hba *hba, bool on,
 	return cdns_ufs_set_hclkdiv(hba);
 }
 
+/**
+ * Called before and after HCE enable bit is set.
+ * @hba: host controller instance
+ * @status: notify stage (pre, post change)
+ *
+ * Return zero for success and non-zero for failure
+ */
+static int cdns_ufs_hce_enable_notify(struct ufs_hba *hba,
+				      enum ufs_notify_change_status status)
+{
+	if (status != PRE_CHANGE)
+		return 0;
+
+	return cdns_ufs_set_hclkdiv(hba);
+}
+
 /**
  * cdns_ufs_init - performs additional ufs initialization
  * @hba: host controller instance
@@ -115,12 +131,14 @@ static int cdns_ufs_m31_16nm_phy_initialization(struct ufs_hba *hba)
 static const struct ufs_hba_variant_ops cdns_ufs_pltfm_hba_vops = {
 	.name = "cdns-ufs-pltfm",
 	.setup_clocks = cdns_ufs_setup_clocks,
+	.hce_enable_notify = cdns_ufs_hce_enable_notify,
 };
 
 static const struct ufs_hba_variant_ops cdns_ufs_m31_16nm_pltfm_hba_vops = {
 	.name = "cdns-ufs-pltfm",
 	.init = cdns_ufs_init,
 	.setup_clocks = cdns_ufs_setup_clocks,
+	.hce_enable_notify = cdns_ufs_hce_enable_notify,
 	.phy_initialization = cdns_ufs_m31_16nm_phy_initialization,
 };
 
-- 
2.15.0