From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756660AbbJAIXw (ORCPT ); Thu, 1 Oct 2015 04:23:52 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:40747 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755789AbbJAIXl (ORCPT ); Thu, 1 Oct 2015 04:23:41 -0400 X-AuditID: cbfee68f-f796f6d0000014a4-ca-560ced8bdc46 From: Alim Akhtar To: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: JBottomley@odin.com, vinholikatti@gmail.com, amit.daniel@samsung.com, essuuj@gmail.com, devicetree@vger.kernel.org Subject: [PATCH v3 08/13] scsi: ufs: add add specific callback for hibern8 Date: Thu, 01 Oct 2015 13:39:25 +0530 Message-id: <1443686970-28104-9-git-send-email-alim.akhtar@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1443686970-28104-1-git-send-email-alim.akhtar@samsung.com> References: <1443686970-28104-1-git-send-email-alim.akhtar@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsWyRsSkTrfnLU+YwfEjHBYNV0Ms5h85x2qx /MISJov/62+zWFzeNYfNovv6DjaLHQurHNg9ds66y+5x+McPZo++LasYPT5vkgtgieKySUnN ySxLLdK3S+DKuPN/DlvBQrmKhYc7GBsYp0t2MXJwSAiYSCz6GtLFyAlkiklcuLeeDcQWEljB KHHmuQRMyaktHF2MXEDhWYwSW86tZIFwfjJKrDtyghGkgU1AW+Lu9C1MILaIgI3E+ZsPwGxm gQqJW2cmsIDYwgJeElcPTmMHsVkEVCXebpzOCmLzCrhLNPftYYE4QlGi+9kENpDFnAIeEt8W hULc4y7x4e5yRpC9EgLT2SVW/nrGCjFHQOLb5EMsEIfKSmw6wAwxRlLi4IobLBMYhRcwMqxi FE0tSC4oTkovMtYrTswtLs1L10vOz93ECAzp0/+e9e9gvHvA+hCjAAejEg+vRDpPmBBrYllx Ze4hRlOgDROZpUST84GRk1cSb2hsZmRhamJqbGRuaaYkzrtQ6mewkEB6YklqdmpqQWpRfFFp TmrxIUYmDk6pBsYo3v4Z/2KMnQ7zn2zIDdtx6vS5GPuYLz+MfKYK8s99uE7gWXDy74kFx9aG z1z7MoaZ23fB+rP/X2zK054nvMXA8sV+tznZ0iJVGwove1rbZ/oHc2epKl+ae+nd0Yx/dw57 nWCeej6uYM6lMwFWLyeWad3QFfnEJW0UNYN5RZMVY3FVct63ihlKLMUZiYZazEXFiQAERQdm ZAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRmVeSWpSXmKPExsVy+t9jQd3utzxhBuf3mls0XA2xmH/kHKvF 8gtLmCz+r7/NYnF51xw2i+7rO9gsdiyscmD32DnrLrvH4R8/mD36tqxi9Pi8SS6AJaqB0SYj NTEltUghNS85PyUzL91WyTs43jne1MzAUNfQ0sJcSSEvMTfVVsnFJ0DXLTMH6AAlhbLEnFKg UEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8ad/3PYChbKVSw83MHYwDhdsouRg0NC wETi1BaOLkZOIFNM4sK99WxdjFwcQgKzGCW2nFvJAuH8ZJRYd+QEI0gVm4C2xN3pW5hAbBEB G4nzNx+A2cwCFRK3zkxgAbGFBbwkrh6cxg5iswioSrzdOJ0VxOYVcJdo7tvDArFNUaL72QQ2 kCM4BTwkvi0KBQkLAZV8uLuccQIj7wJGhlWMEqkFyQXFSem5hnmp5XrFibnFpXnpesn5uZsY wbHzTGoH48Fd7ocYBTgYlXh4D6TwhAmxJpYVV+YeYpTgYFYS4T14DyjEm5JYWZValB9fVJqT WnyI0RToronMUqLJ+cC4ziuJNzQ2MTc1NrU0sTAxs1QS571xiCFMSCA9sSQ1OzW1ILUIpo+J g1OqgTFVVeQl87O3k+8tP/Lwe6BYM0e222YmpqsTy+qTRNoSTzkaOKy7Ifql8PvdB5ZqOs0r f5duObu493bcg7N/34ll3EpuvXDVp2/C9zLDollmqRxcoZHrgzSYmM5X9c7v5Xgv/THw4ZXE hvQ7oU3BaoJrozbynr7GHXg27ZXjbNXZL+yKT+VZxCqxFGckGmoxFxUnAgDIKhk6swIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 46f92fe..73a8d13 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 @@ -2396,7 +2405,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}; @@ -2405,7 +2414,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; @@ -2420,6 +2429,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); + + 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 75af314..845d1c2 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 *); + 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); -- 1.7.10.4