Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062AbbHZGVr (ORCPT ); Wed, 26 Aug 2015 02:21:47 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:37962 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751216AbbHZGVq (ORCPT ); Wed, 26 Aug 2015 02:21:46 -0400 MIME-Version: 1.0 In-Reply-To: <1440149281-26336-8-git-send-email-alim.akhtar@samsung.com> References: <1440149281-26336-1-git-send-email-alim.akhtar@samsung.com> <1440149281-26336-8-git-send-email-alim.akhtar@samsung.com> Date: Wed, 26 Aug 2015 11:51:44 +0530 X-Google-Sender-Auth: NM71DprkcFRfXD1EzJDgHRyaP1c Message-ID: Subject: Re: [PATCH 07/10] scsi: ufs: add add specific callback for hibern8 From: amit daniel kachhap To: Alim Akhtar Cc: linux-scsi@vger.kernel.org, "linux-kernel@vger.kernel.org" , vinholikatti@gmail.com, JBottomley@odin.com, Seungwon Jeon Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4978 Lines: 124 On Fri, Aug 21, 2015 at 2:57 PM, Alim Akhtar wrote: > 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 | 36 ++++++++++++++++++++++++++++++++---- > drivers/scsi/ufs/ufshcd.h | 3 +++ > 2 files changed, 35 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index bc27f5e..d425ea1 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 > @@ -2395,7 +2404,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}; > > @@ -2404,7 +2413,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; > @@ -2419,6 +2428,25 @@ 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; > + > + if (hba->vops && hba->vops->hibern8_notify) > + hba->vops->hibern8_notify(hba, en, PRE_CHANGE); Return of hibern8_notify is not checked. Otherwise make the return type void. > + > + ret = en ? __ufshcd_uic_hibern8_enter(hba) : > + __ufshcd_uic_hibern8_exit(hba); > + if (ret) > + goto out; > + > + if (hba->vops && hba->vops->hibern8_notify) > + hba->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 0b7dde0..045968e 100644 > --- a/drivers/scsi/ufs/ufshcd.h > +++ b/drivers/scsi/ufs/ufshcd.h > @@ -260,6 +260,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 > */ > @@ -276,6 +278,7 @@ struct ufs_hba_variant_ops { > int (*pwr_change_notify)(struct ufs_hba *, > bool, struct ufs_pa_layer_attr *, > struct ufs_pa_layer_attr *); > + int (*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); > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/