From patchwork Mon Nov 9 05:26:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alim Akhtar X-Patchwork-Id: 7581111 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D574EC05C6 for ; Mon, 9 Nov 2015 05:31:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D5708203AA for ; Mon, 9 Nov 2015 05:31:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B08E020142 for ; Mon, 9 Nov 2015 05:31:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752663AbbKIFbU (ORCPT ); Mon, 9 Nov 2015 00:31:20 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:54921 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595AbbKIFbJ (ORCPT ); Mon, 9 Nov 2015 00:31:09 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NXJ030PO8NTN380@mailout2.samsung.com>; Mon, 09 Nov 2015 14:31:05 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.126]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id E1.CE.05385.89F20465; Mon, 9 Nov 2015 14:31:05 +0900 (KST) X-AuditID: cbfee691-f79d66d000001509-58-56402f9826e2 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id C9.EB.23663.76F20465; Mon, 9 Nov 2015 14:30:15 +0900 (KST) Received: from exypnos.sisodomain.com ([107.108.73.28]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NXJ002ZM8DXYXP0@mmp1.samsung.com>; Mon, 09 Nov 2015 14:30:15 +0900 (KST) From: Alim Akhtar To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: JBottomley@odin.com, vinholikatti@gmail.com, gautam.vivek@samsung.com, essuuj@gmail.com, devicetree@vger.kernel.org, kishon@ti.com Subject: [PATCH v5 08/11] scsi: ufs: add add specific callback for hibern8 Date: Mon, 09 Nov 2015 10:56:24 +0530 Message-id: <1447046787-480-9-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1447046787-480-1-git-send-email-alim.akhtar@samsung.com> References: <1447046787-480-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrPLMWRmVeSWpSXmKPExsWyRsSkTnemvkOYwfazLBbzj5xjtVh+YQmT RduVg+wW/9ffZrG48LSHzeLyrjlsFt3Xd7BZ7FhY5cDhsXPWXXaPwz9+MHv0bVnF6HH8xnYm j8+b5AJYo7hsUlJzMstSi/TtErgyjp65z1jwXrFixbEFjA2My2S6GDk5JARMJOa9msYKYYtJ XLi3nq2LkYtDSGAFo8SCps/sMEVN8/aygNhCAksZJQ5/N4Qo+skoMfHHSbBuNgFtibvTtzCB 2CICNhLnbz5gAiliFuhglOg8t4UNJCEs4CXxb8ESoAQHB4uAqsSv+cUgYV4BV4lpN5YyQyxT lOh+NgGsnFPATeLczAZmiMWuEl2vT7KAzJQQWMYusf7mAbBlLAICEt8mH2IBmSkhICux6QDU HEmJgytusExgFF7AyLCKUTS1ILmgOCm9yFSvODG3uDQvXS85P3cTIzDcT/97NnEH4/0D1ocY BTgYlXh4I2bahwmxJpYVV+YeYjQF2jCRWUo0OR8YVXkl8YbGZkYWpiamxkbmlmZK4rw60j+D hQTSE0tSs1NTC1KL4otKc1KLDzEycXBKNTCWCYsEZzM1hOjW/HhkcWhad0x7X2HP0xvWeTst fe5MvTJv/uZfnv/WH0kR+Z0lwf/jusVLJrtjQWJTVuycbbGTd3Nz2C7R314zOH0uSHZzp4ak vFRrv8DzjslS/WZpwZZTmpN/ibP/Vam/4/ft5ikh6V3ZjyY3JBS6zkyf6lFw/uemrQm7H51S YinOSDTUYi4qTgQAy3wLAXICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsVy+t9jAd10fYcwg9bL5hbzj5xjtVh+YQmT RduVg+wW/9ffZrG48LSHzeLyrjlsFt3Xd7BZ7FhY5cDhsXPWXXaPwz9+MHv0bVnF6HH8xnYm j8+b5AJYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTd MnOAblFSKEvMKQUKBSQWFyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYwZhw9c5+x4L1ixYpj CxgbGJfJdDFyckgImEg0zdvLAmGLSVy4t54NxBYSWMoocfi7YRcjF5D9k1Fi4o+TrCAJNgFt ibvTtzCB2CICNhLnbz5gAiliFuhglOg8twWsW1jAS+LfgiVACQ4OFgFViV/zi0HCvAKuEtNu LGWGWKYo0f1sAlg5p4CbxLmZDcwQi10lul6fZJnAyLuAkWEVo0RqQXJBcVJ6rmFearlecWJu cWleul5yfu4mRnBMPZPawXhwl/shRgEORiUeXobp9mFCrIllxZW5hxglOJiVRHjN2BzChHhT EiurUovy44tKc1KLDzGaAt01kVlKNDkfGO95JfGGxibmpsamliYWJmaWSuK8+p5GYUIC6Ykl qdmpqQWpRTB9TBycUg2MLmJt0SlrC4p+L1XcLyu3ij/Te6fyn4hVE6JKG+4nHP+YpvDzOgtr 3qxGMeYf5R9Wxl2PLbb8a3hib23h6zfbZnVk7Dlptu3BydVzz1mz3hGamyl4d09e6Y+JjruO 7Ou/vPr9cq2auh1LcjeF/v61ff7Nqpy2enFTx9mXU08G8F3gdi1l2XV2rhJLcUaioRZzUXEi AKAdxby/AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Seungwon Jeon Some host controller needs specific handling before/after (un)hibernation, This change adds specific callback function to support vendor's implementation. Signed-off-by: Seungwon Jeon Signed-off-by: Alim Akhtar --- drivers/scsi/ufs/ufshcd.c | 33 +++++++++++++++++++++++++++++---- drivers/scsi/ufs/ufshcd.h | 10 ++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index eeb7835c52ab..075b7bf13080 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -181,8 +181,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba); static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, bool skip_ref_clk); static int ufshcd_setup_clocks(struct ufs_hba *hba, bool on); -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba); -static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba); +static int ufshcd_uic_hibern8_ctrl(struct ufs_hba *hba, bool en); static inline void ufshcd_add_delay_before_dme_cmd(struct ufs_hba *hba); static int ufshcd_host_reset_and_restore(struct ufs_hba *hba); static irqreturn_t ufshcd_intr(int irq, void *__hba); @@ -215,6 +214,16 @@ static inline void ufshcd_disable_irq(struct ufs_hba *hba) } } +static inline int ufshcd_uic_hibern8_enter(struct ufs_hba *hba) +{ + return ufshcd_uic_hibern8_ctrl(hba, true); +} + +static inline int ufshcd_uic_hibern8_exit(struct ufs_hba *hba) +{ + return ufshcd_uic_hibern8_ctrl(hba, false); +} + /* * ufshcd_wait_for_register - wait for register value to change * @hba - per-adapter interface @@ -2394,7 +2403,7 @@ out: return ret; } -static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba) +static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba) { struct uic_command uic_cmd = {0}; @@ -2403,7 +2412,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba) return ufshcd_uic_pwr_ctrl(hba, &uic_cmd); } -static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba) +static int __ufshcd_uic_hibern8_exit(struct ufs_hba *hba) { struct uic_command uic_cmd = {0}; int ret; @@ -2418,6 +2427,22 @@ static int ufshcd_uic_hibern8_exit(struct ufs_hba *hba) return ret; } +static int ufshcd_uic_hibern8_ctrl(struct ufs_hba *hba, bool en) +{ + int ret; + + ufshcd_vops_hibern8_notify(hba, en, PRE_CHANGE); + ret = en ? __ufshcd_uic_hibern8_enter(hba) : + __ufshcd_uic_hibern8_exit(hba); + if (ret) + goto out; + + ufshcd_vops_hibern8_notify(hba, en, POST_CHANGE); + +out: + return ret; +} + /** * ufshcd_init_pwr_info - setting the POR (power on reset) * values in hba power info diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index b3dd08420100..9c69dd2f3672 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h @@ -262,6 +262,8 @@ struct ufs_pwr_mode_info { * @specify_nexus_t_xfer_req: * @specify_nexus_t_tm_req: called before command is issued to allow vendor * specific handling to be set for nexus type. + * @hibern8_notify: called before and after hibernate/unhibernate is carried out + * to allow vendor spesific implementation. * @suspend: called during host controller PM callback * @resume: called during host controller PM callback * @dbg_register_dump: used to dump controller debug information @@ -283,6 +285,7 @@ struct ufs_hba_variant_ops { enum ufs_notify_change_status status, struct ufs_pa_layer_attr *, struct ufs_pa_layer_attr *); + void (*hibern8_notify)(struct ufs_hba *, bool, bool); void (*specify_nexus_t_xfer_req)(struct ufs_hba *, int, struct scsi_cmnd *); void (*specify_nexus_t_tm_req)(struct ufs_hba *, int, u8); @@ -830,4 +833,11 @@ static inline void ufshcd_vops_specify_nexus_t_tm_req(struct ufs_hba *hba, if (hba->vops && hba->vops->specify_nexus_t_tm_req) hba->vops->specify_nexus_t_tm_req(hba, free_slot, tm_function); } + +static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba, + bool en, enum ufs_notify_change_status status) +{ + if (hba->vops && hba->vops->hibern8_notify) + hba->vops->hibern8_notify(hba, en, status); +} #endif /* End of Header */