* [PATCH 0/2] scsi: ufs: Add PCI driver for Intel Host controllers @ 2017-06-05 8:36 Adrian Hunter 2017-06-05 8:36 ` [PATCH 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-05 8:36 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 0 siblings, 2 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-05 8:36 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca Hi Here is a PCI driver for Intel UFS host controllers, with a small tidy-up precursor patch. Szymon Mielczarek (2): scsi: ufs: Tidy clocks list head usage scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers drivers/scsi/ufs/Kconfig | 11 +++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 - drivers/scsi/ufs/ufshcd-intel-pci.c | 183 ++++++++++++++++++++++++++++++++++++ drivers/scsi/ufs/ufshcd-pci.c | 2 - drivers/scsi/ufs/ufshcd-pltfrm.c | 2 - drivers/scsi/ufs/ufshcd.c | 12 ++- 7 files changed, 202 insertions(+), 11 deletions(-) create mode 100644 drivers/scsi/ufs/ufshcd-intel-pci.c Regards Adrian ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/2] scsi: ufs: Tidy clocks list head usage 2017-06-05 8:36 [PATCH 0/2] scsi: ufs: Add PCI driver for Intel Host controllers Adrian Hunter @ 2017-06-05 8:36 ` Adrian Hunter 2017-06-05 20:37 ` Subhash Jadavani 2017-06-06 0:57 ` Martin K. Petersen 2017-06-05 8:36 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 1 sibling, 2 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-05 8:36 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca From: Szymon Mielczarek <szymonx.mielczarek@intel.com> Move the initialization of clocks list head to ufshcd_alloc_host() so that every driver doesn't have to do it. Remove checks for the list head being NULL because that is not possible. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 -- drivers/scsi/ufs/ufshcd-pci.c | 2 -- drivers/scsi/ufs/ufshcd-pltfrm.c | 2 -- drivers/scsi/ufs/ufshcd.c | 12 +++++++----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/ufs/tc-dwc-g210-pci.c b/drivers/scsi/ufs/tc-dwc-g210-pci.c index c09a0fef0fe6..325d5e14fc0d 100644 --- a/drivers/scsi/ufs/tc-dwc-g210-pci.c +++ b/drivers/scsi/ufs/tc-dwc-g210-pci.c @@ -130,8 +130,6 @@ static void tc_dwc_g210_pci_remove(struct pci_dev *pdev) return err; } - INIT_LIST_HEAD(&hba->clk_list_head); - hba->vops = &tc_dwc_g210_pci_hba_vops; err = ufshcd_init(hba, mmio_base, pdev->irq); diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index 52b546fb509b..5dd4122cbd85 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c @@ -143,8 +143,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) return err; } - INIT_LIST_HEAD(&hba->clk_list_head); - err = ufshcd_init(hba, mmio_base, pdev->irq); if (err) { dev_err(&pdev->dev, "Initialization failed\n"); diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index 8e5e6c04c035..e82bde077296 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -58,8 +58,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) if (!np) goto out; - INIT_LIST_HEAD(&hba->clk_list_head); - cnt = of_property_count_strings(np, "clock-names"); if (!cnt || (cnt == -EINVAL)) { dev_info(dev, "%s: Unable to find clocks, assuming enabled\n", diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ffe8d8608818..88ccd63f83c1 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -314,7 +314,7 @@ static void ufshcd_print_clk_freqs(struct ufs_hba *hba) struct ufs_clk_info *clki; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) return; list_for_each_entry(clki, head, list) { @@ -869,7 +869,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up) ktime_t start = ktime_get(); bool clk_state_changed = false; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE); @@ -943,7 +943,7 @@ static bool ufshcd_is_devfreq_scaling_required(struct ufs_hba *hba, struct ufs_clk_info *clki; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) return false; list_for_each_entry(clki, head, list) { @@ -6752,7 +6752,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, ktime_t start = ktime_get(); bool clk_state_changed = false; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE); @@ -6818,7 +6818,7 @@ static int ufshcd_init_clocks(struct ufs_hba *hba) struct device *dev = hba->dev; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; list_for_each_entry(clki, head, list) { @@ -7811,6 +7811,8 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) hba->dev = dev; *hba_handle = hba; + INIT_LIST_HEAD(&hba->clk_list_head); + out_error: return err; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] scsi: ufs: Tidy clocks list head usage 2017-06-05 8:36 ` [PATCH 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter @ 2017-06-05 20:37 ` Subhash Jadavani 2017-06-06 0:57 ` Martin K. Petersen 1 sibling, 0 replies; 12+ messages in thread From: Subhash Jadavani @ 2017-06-05 20:37 UTC (permalink / raw) To: Adrian Hunter Cc: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley, linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca, linux-scsi-owner On 2017-06-05 01:36, Adrian Hunter wrote: > From: Szymon Mielczarek <szymonx.mielczarek@intel.com> > > Move the initialization of clocks list head to ufshcd_alloc_host() so > that > every driver doesn't have to do it. Remove checks for the list head > being > NULL because that is not possible. > > Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 -- > drivers/scsi/ufs/ufshcd-pci.c | 2 -- > drivers/scsi/ufs/ufshcd-pltfrm.c | 2 -- > drivers/scsi/ufs/ufshcd.c | 12 +++++++----- > 4 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/drivers/scsi/ufs/tc-dwc-g210-pci.c > b/drivers/scsi/ufs/tc-dwc-g210-pci.c > index c09a0fef0fe6..325d5e14fc0d 100644 > --- a/drivers/scsi/ufs/tc-dwc-g210-pci.c > +++ b/drivers/scsi/ufs/tc-dwc-g210-pci.c > @@ -130,8 +130,6 @@ static void tc_dwc_g210_pci_remove(struct pci_dev > *pdev) > return err; > } > > - INIT_LIST_HEAD(&hba->clk_list_head); > - > hba->vops = &tc_dwc_g210_pci_hba_vops; > > err = ufshcd_init(hba, mmio_base, pdev->irq); > diff --git a/drivers/scsi/ufs/ufshcd-pci.c > b/drivers/scsi/ufs/ufshcd-pci.c > index 52b546fb509b..5dd4122cbd85 100644 > --- a/drivers/scsi/ufs/ufshcd-pci.c > +++ b/drivers/scsi/ufs/ufshcd-pci.c > @@ -143,8 +143,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) > return err; > } > > - INIT_LIST_HEAD(&hba->clk_list_head); > - > err = ufshcd_init(hba, mmio_base, pdev->irq); > if (err) { > dev_err(&pdev->dev, "Initialization failed\n"); > diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c > b/drivers/scsi/ufs/ufshcd-pltfrm.c > index 8e5e6c04c035..e82bde077296 100644 > --- a/drivers/scsi/ufs/ufshcd-pltfrm.c > +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c > @@ -58,8 +58,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba > *hba) > if (!np) > goto out; > > - INIT_LIST_HEAD(&hba->clk_list_head); > - > cnt = of_property_count_strings(np, "clock-names"); > if (!cnt || (cnt == -EINVAL)) { > dev_info(dev, "%s: Unable to find clocks, assuming enabled\n", > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index ffe8d8608818..88ccd63f83c1 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -314,7 +314,7 @@ static void ufshcd_print_clk_freqs(struct ufs_hba > *hba) > struct ufs_clk_info *clki; > struct list_head *head = &hba->clk_list_head; > > - if (!head || list_empty(head)) > + if (list_empty(head)) > return; > > list_for_each_entry(clki, head, list) { > @@ -869,7 +869,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, > bool scale_up) > ktime_t start = ktime_get(); > bool clk_state_changed = false; > > - if (!head || list_empty(head)) > + if (list_empty(head)) > goto out; > > ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE); > @@ -943,7 +943,7 @@ static bool > ufshcd_is_devfreq_scaling_required(struct ufs_hba *hba, > struct ufs_clk_info *clki; > struct list_head *head = &hba->clk_list_head; > > - if (!head || list_empty(head)) > + if (list_empty(head)) > return false; > > list_for_each_entry(clki, head, list) { > @@ -6752,7 +6752,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba > *hba, bool on, > ktime_t start = ktime_get(); > bool clk_state_changed = false; > > - if (!head || list_empty(head)) > + if (list_empty(head)) > goto out; > > ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE); > @@ -6818,7 +6818,7 @@ static int ufshcd_init_clocks(struct ufs_hba > *hba) > struct device *dev = hba->dev; > struct list_head *head = &hba->clk_list_head; > > - if (!head || list_empty(head)) > + if (list_empty(head)) > goto out; > > list_for_each_entry(clki, head, list) { > @@ -7811,6 +7811,8 @@ int ufshcd_alloc_host(struct device *dev, struct > ufs_hba **hba_handle) > hba->dev = dev; > *hba_handle = hba; > > + INIT_LIST_HEAD(&hba->clk_list_head); > + > out_error: > return err; > } Looks good to me. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] scsi: ufs: Tidy clocks list head usage 2017-06-05 8:36 ` [PATCH 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-05 20:37 ` Subhash Jadavani @ 2017-06-06 0:57 ` Martin K. Petersen 1 sibling, 0 replies; 12+ messages in thread From: Martin K. Petersen @ 2017-06-06 0:57 UTC (permalink / raw) To: Adrian Hunter Cc: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley, linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca Adrian, > Move the initialization of clocks list head to ufshcd_alloc_host() so > that every driver doesn't have to do it. Remove checks for the list > head being NULL because that is not possible. Applied to 4.13/scsi-queue, thanks! -- Martin K. Petersen Oracle Linux Engineering ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-05 8:36 [PATCH 0/2] scsi: ufs: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-05 8:36 ` [PATCH 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter @ 2017-06-05 8:36 ` Adrian Hunter 2017-06-05 20:42 ` Subhash Jadavani 2017-06-06 7:07 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Christoph Hellwig 1 sibling, 2 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-05 8:36 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca From: Szymon Mielczarek <szymonx.mielczarek@intel.com> This patch adds a glue pci driver for Intel UFS Host controllers. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/scsi/ufs/Kconfig | 11 +++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufshcd-intel-pci.c | 183 ++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 drivers/scsi/ufs/ufshcd-intel-pci.c diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4e6ae2..702420bc0fac 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -69,6 +69,17 @@ config SCSI_UFS_DWC_TC_PCI If unsure, say N. +config SCSI_UFSHCD_INTEL_PCI + tristate "Intel PCI bus based UFS Controller support" + depends on SCSI_UFSHCD && PCI + ---help--- + This selects the Intel PCI UFS Host Controller Interface. Select this if + you have Intel UFS Host Controller with PCI Interface. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + config SCSI_UFSHCD_PLATFORM tristate "Platform bus based UFS Controller support" depends on SCSI_UFSHCD diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 6e77cb0bfee9..be817e1a6666 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -4,4 +4,5 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o +obj-$(CONFIG_SCSI_UFSHCD_INTEL_PCI) += ufshcd-intel-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufshcd-intel-pci.c b/drivers/scsi/ufs/ufshcd-intel-pci.c new file mode 100644 index 000000000000..c2d379f612aa --- /dev/null +++ b/drivers/scsi/ufs/ufshcd-intel-pci.c @@ -0,0 +1,183 @@ +/* + * Universal Flash Storage Intel Host controller PCI driver + * + * Copyright (c) 2017, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include "ufshcd.h" +#include <linux/pci.h> +#include <linux/pm_runtime.h> + +static int ufs_intel_disable_lcc(struct ufs_hba *hba) +{ + u32 attr = UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE); + u32 lcc_enable = 0; + + ufshcd_dme_get(hba, attr, &lcc_enable); + if (lcc_enable) + ufshcd_dme_set(hba, attr, 0); + + return 0; +} + +static int ufs_intel_link_startup_notify(struct ufs_hba *hba, + enum ufs_notify_change_status status) +{ + int err = 0; + + switch (status) { + case PRE_CHANGE: + err = ufs_intel_disable_lcc(hba); + break; + case POST_CHANGE: + break; + default: + break; + } + + return err; +} + +static struct ufs_hba_variant_ops ufs_intel_hba_vops = { + .name = "intel", + .link_startup_notify = ufs_intel_link_startup_notify, +}; + +#ifdef CONFIG_PM_SLEEP +static int ufs_intel_suspend(struct device *dev) +{ + return ufshcd_system_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_resume(struct device *dev) +{ + return ufshcd_system_resume(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM_SLEEP */ + +#ifdef CONFIG_PM +static int ufs_intel_runtime_suspend(struct device *dev) +{ + return ufshcd_runtime_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_resume(struct device *dev) +{ + return ufshcd_runtime_resume(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_idle(struct device *dev) +{ + return ufshcd_runtime_idle(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM */ + +static void ufs_intel_shutdown(struct pci_dev *pdev) +{ + ufshcd_shutdown((struct ufs_hba *)pci_get_drvdata(pdev)); +} + +static void ufs_intel_remove(struct pci_dev *pdev) +{ + struct ufs_hba *hba = pci_get_drvdata(pdev); + + pm_runtime_forbid(&pdev->dev); + pm_runtime_get_noresume(&pdev->dev); + ufshcd_remove(hba); + ufshcd_dealloc_host(hba); +} + +static int ufs_intel_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + struct ufs_hba *hba; + void __iomem *mmio_base; + int err; + + dev_info(&pdev->dev, "UFS controller found [%04x:%04x]\n", + (int)pdev->vendor, (int)pdev->device); + + err = pcim_enable_device(pdev); + if (err) + return err; + + pci_set_master(pdev); + + err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD); + if (err < 0) + return err; + + mmio_base = pcim_iomap_table(pdev)[0]; + + err = ufshcd_alloc_host(&pdev->dev, &hba); + if (err) + return err; + + hba->vops = &ufs_intel_hba_vops; + + err = ufshcd_init(hba, mmio_base, pdev->irq); + if (err) { + dev_err(&pdev->dev, "Initialization failed\n"); + goto out_dealloc; + } + + pci_set_drvdata(pdev, hba); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_allow(&pdev->dev); + + return 0; + +out_dealloc: + ufshcd_dealloc_host(hba); + return err; +} + +static const struct dev_pm_ops ufs_intel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(ufs_intel_suspend, + ufs_intel_resume) + SET_RUNTIME_PM_OPS(ufs_intel_runtime_suspend, + ufs_intel_runtime_resume, + ufs_intel_runtime_idle) +}; + +#define PCI_CLASS_STORAGE_UFSHCI 0x010901 + +#define UFSHCD_INTEL_PCI_UFSHCI_DEVICE() { \ + .vendor = PCI_VENDOR_ID_INTEL, \ + .device = PCI_ANY_ID, \ + .subvendor = PCI_ANY_ID, \ + .subdevice = PCI_ANY_ID, \ + .class = PCI_CLASS_STORAGE_UFSHCI, \ + .class_mask = ~0, \ +} + +static const struct pci_device_id ufs_intel_tbl[] = { + UFSHCD_INTEL_PCI_UFSHCI_DEVICE(), + { } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci, ufs_intel_tbl); + +static struct pci_driver ufs_intel_driver = { + .name = "ufshcd-intel-pci", + .id_table = ufs_intel_tbl, + .probe = ufs_intel_probe, + .remove = ufs_intel_remove, + .shutdown = ufs_intel_shutdown, + .driver = { + .pm = &ufs_intel_pm_ops + }, +}; + +module_pci_driver(ufs_intel_driver); + +MODULE_AUTHOR("Szymon Mielczarek <szymonx.mielczarek@intel.com>"); +MODULE_DESCRIPTION("Intel UFS host controller PCI glue driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-05 8:36 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter @ 2017-06-05 20:42 ` Subhash Jadavani 2017-06-06 6:48 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-06 7:07 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Christoph Hellwig 1 sibling, 1 reply; 12+ messages in thread From: Subhash Jadavani @ 2017-06-05 20:42 UTC (permalink / raw) To: Adrian Hunter Cc: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley, linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca, linux-scsi-owner On 2017-06-05 01:36, Adrian Hunter wrote: > From: Szymon Mielczarek <szymonx.mielczarek@intel.com> > > This patch adds a glue pci driver for Intel UFS Host controllers. > > Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/scsi/ufs/Kconfig | 11 +++ > drivers/scsi/ufs/Makefile | 1 + > drivers/scsi/ufs/ufshcd-intel-pci.c | 183 > ++++++++++++++++++++++++++++++++++++ > 3 files changed, 195 insertions(+) > create mode 100644 drivers/scsi/ufs/ufshcd-intel-pci.c > > diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig > index e27b4d4e6ae2..702420bc0fac 100644 > --- a/drivers/scsi/ufs/Kconfig > +++ b/drivers/scsi/ufs/Kconfig > @@ -69,6 +69,17 @@ config SCSI_UFS_DWC_TC_PCI > > If unsure, say N. > > +config SCSI_UFSHCD_INTEL_PCI > + tristate "Intel PCI bus based UFS Controller support" > + depends on SCSI_UFSHCD && PCI > + ---help--- > + This selects the Intel PCI UFS Host Controller Interface. Select this > if > + you have Intel UFS Host Controller with PCI Interface. > + > + If you have a controller with this interface, say Y or M here. > + > + If unsure, say N. > + > config SCSI_UFSHCD_PLATFORM > tristate "Platform bus based UFS Controller support" > depends on SCSI_UFSHCD > diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile > index 6e77cb0bfee9..be817e1a6666 100644 > --- a/drivers/scsi/ufs/Makefile > +++ b/drivers/scsi/ufs/Makefile > @@ -4,4 +4,5 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += > tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d > obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o > obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o > obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o > +obj-$(CONFIG_SCSI_UFSHCD_INTEL_PCI) += ufshcd-intel-pci.o > obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o > diff --git a/drivers/scsi/ufs/ufshcd-intel-pci.c > b/drivers/scsi/ufs/ufshcd-intel-pci.c > new file mode 100644 > index 000000000000..c2d379f612aa > --- /dev/null > +++ b/drivers/scsi/ufs/ufshcd-intel-pci.c > @@ -0,0 +1,183 @@ > +/* > + * Universal Flash Storage Intel Host controller PCI driver > + * > + * Copyright (c) 2017, Intel Corporation. > + * > + * This program is free software; you can redistribute it and/or > modify it > + * under the terms and conditions of the GNU General Public License, > + * version 2, as published by the Free Software Foundation. > + * > + * This program is distributed in the hope it will be useful, but > WITHOUT > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY > or > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public > License for > + * more details. > + */ > + > +#include "ufshcd.h" > +#include <linux/pci.h> > +#include <linux/pm_runtime.h> > + > +static int ufs_intel_disable_lcc(struct ufs_hba *hba) > +{ > + u32 attr = UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE); > + u32 lcc_enable = 0; > + > + ufshcd_dme_get(hba, attr, &lcc_enable); > + if (lcc_enable) > + ufshcd_dme_set(hba, attr, 0); > + > + return 0; > +} > + > +static int ufs_intel_link_startup_notify(struct ufs_hba *hba, > + enum ufs_notify_change_status status) > +{ > + int err = 0; > + > + switch (status) { > + case PRE_CHANGE: > + err = ufs_intel_disable_lcc(hba); > + break; > + case POST_CHANGE: > + break; > + default: > + break; > + } > + > + return err; > +} > + > +static struct ufs_hba_variant_ops ufs_intel_hba_vops = { > + .name = "intel", How about s/intel/intel-pci ? Rest looks good to me. > + .link_startup_notify = ufs_intel_link_startup_notify, > +}; > + > +#ifdef CONFIG_PM_SLEEP > +static int ufs_intel_suspend(struct device *dev) > +{ > + return ufshcd_system_suspend(dev_get_drvdata(dev)); > +} > + > +static int ufs_intel_resume(struct device *dev) > +{ > + return ufshcd_system_resume(dev_get_drvdata(dev)); > +} > +#endif /* !CONFIG_PM_SLEEP */ > + > +#ifdef CONFIG_PM > +static int ufs_intel_runtime_suspend(struct device *dev) > +{ > + return ufshcd_runtime_suspend(dev_get_drvdata(dev)); > +} > + > +static int ufs_intel_runtime_resume(struct device *dev) > +{ > + return ufshcd_runtime_resume(dev_get_drvdata(dev)); > +} > + > +static int ufs_intel_runtime_idle(struct device *dev) > +{ > + return ufshcd_runtime_idle(dev_get_drvdata(dev)); > +} > +#endif /* !CONFIG_PM */ > + > +static void ufs_intel_shutdown(struct pci_dev *pdev) > +{ > + ufshcd_shutdown((struct ufs_hba *)pci_get_drvdata(pdev)); > +} > + > +static void ufs_intel_remove(struct pci_dev *pdev) > +{ > + struct ufs_hba *hba = pci_get_drvdata(pdev); > + > + pm_runtime_forbid(&pdev->dev); > + pm_runtime_get_noresume(&pdev->dev); > + ufshcd_remove(hba); > + ufshcd_dealloc_host(hba); > +} > + > +static int ufs_intel_probe(struct pci_dev *pdev, const struct > pci_device_id *id) > +{ > + struct ufs_hba *hba; > + void __iomem *mmio_base; > + int err; > + > + dev_info(&pdev->dev, "UFS controller found [%04x:%04x]\n", > + (int)pdev->vendor, (int)pdev->device); > + > + err = pcim_enable_device(pdev); > + if (err) > + return err; > + > + pci_set_master(pdev); > + > + err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD); > + if (err < 0) > + return err; > + > + mmio_base = pcim_iomap_table(pdev)[0]; > + > + err = ufshcd_alloc_host(&pdev->dev, &hba); > + if (err) > + return err; > + > + hba->vops = &ufs_intel_hba_vops; > + > + err = ufshcd_init(hba, mmio_base, pdev->irq); > + if (err) { > + dev_err(&pdev->dev, "Initialization failed\n"); > + goto out_dealloc; > + } > + > + pci_set_drvdata(pdev, hba); > + pm_runtime_put_noidle(&pdev->dev); > + pm_runtime_allow(&pdev->dev); > + > + return 0; > + > +out_dealloc: > + ufshcd_dealloc_host(hba); > + return err; > +} > + > +static const struct dev_pm_ops ufs_intel_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(ufs_intel_suspend, > + ufs_intel_resume) > + SET_RUNTIME_PM_OPS(ufs_intel_runtime_suspend, > + ufs_intel_runtime_resume, > + ufs_intel_runtime_idle) > +}; > + > +#define PCI_CLASS_STORAGE_UFSHCI 0x010901 > + > +#define UFSHCD_INTEL_PCI_UFSHCI_DEVICE() { \ > + .vendor = PCI_VENDOR_ID_INTEL, \ > + .device = PCI_ANY_ID, \ > + .subvendor = PCI_ANY_ID, \ > + .subdevice = PCI_ANY_ID, \ > + .class = PCI_CLASS_STORAGE_UFSHCI, \ > + .class_mask = ~0, \ > +} > + > +static const struct pci_device_id ufs_intel_tbl[] = { > + UFSHCD_INTEL_PCI_UFSHCI_DEVICE(), > + { } /* terminate list */ > +}; > +MODULE_DEVICE_TABLE(pci, ufs_intel_tbl); > + > +static struct pci_driver ufs_intel_driver = { > + .name = "ufshcd-intel-pci", > + .id_table = ufs_intel_tbl, > + .probe = ufs_intel_probe, > + .remove = ufs_intel_remove, > + .shutdown = ufs_intel_shutdown, > + .driver = { > + .pm = &ufs_intel_pm_ops > + }, > +}; > + > +module_pci_driver(ufs_intel_driver); > + > +MODULE_AUTHOR("Szymon Mielczarek <szymonx.mielczarek@intel.com>"); > +MODULE_DESCRIPTION("Intel UFS host controller PCI glue driver"); > +MODULE_LICENSE("GPL v2"); -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage 2017-06-05 20:42 ` Subhash Jadavani @ 2017-06-06 6:48 ` Adrian Hunter 2017-06-06 6:48 ` [PATCH V2 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-06 6:50 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 0 siblings, 2 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-06 6:48 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca From: Szymon Mielczarek <szymonx.mielczarek@intel.com> Move the initialization of clocks list head to ufshcd_alloc_host so that every driver doesn't have to do it. Remove checks for the list head being NULL because that is not possible. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/scsi/ufs/tc-dwc-g210-pci.c | 2 -- drivers/scsi/ufs/ufshcd-pci.c | 2 -- drivers/scsi/ufs/ufshcd-pltfrm.c | 2 -- drivers/scsi/ufs/ufshcd.c | 12 +++++++----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/ufs/tc-dwc-g210-pci.c b/drivers/scsi/ufs/tc-dwc-g210-pci.c index c09a0fef0fe6..325d5e14fc0d 100644 --- a/drivers/scsi/ufs/tc-dwc-g210-pci.c +++ b/drivers/scsi/ufs/tc-dwc-g210-pci.c @@ -130,8 +130,6 @@ static void tc_dwc_g210_pci_remove(struct pci_dev *pdev) return err; } - INIT_LIST_HEAD(&hba->clk_list_head); - hba->vops = &tc_dwc_g210_pci_hba_vops; err = ufshcd_init(hba, mmio_base, pdev->irq); diff --git a/drivers/scsi/ufs/ufshcd-pci.c b/drivers/scsi/ufs/ufshcd-pci.c index 52b546fb509b..5dd4122cbd85 100644 --- a/drivers/scsi/ufs/ufshcd-pci.c +++ b/drivers/scsi/ufs/ufshcd-pci.c @@ -143,8 +143,6 @@ static void ufshcd_pci_remove(struct pci_dev *pdev) return err; } - INIT_LIST_HEAD(&hba->clk_list_head); - err = ufshcd_init(hba, mmio_base, pdev->irq); if (err) { dev_err(&pdev->dev, "Initialization failed\n"); diff --git a/drivers/scsi/ufs/ufshcd-pltfrm.c b/drivers/scsi/ufs/ufshcd-pltfrm.c index 8e5e6c04c035..e82bde077296 100644 --- a/drivers/scsi/ufs/ufshcd-pltfrm.c +++ b/drivers/scsi/ufs/ufshcd-pltfrm.c @@ -58,8 +58,6 @@ static int ufshcd_parse_clock_info(struct ufs_hba *hba) if (!np) goto out; - INIT_LIST_HEAD(&hba->clk_list_head); - cnt = of_property_count_strings(np, "clock-names"); if (!cnt || (cnt == -EINVAL)) { dev_info(dev, "%s: Unable to find clocks, assuming enabled\n", diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ffe8d8608818..88ccd63f83c1 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -314,7 +314,7 @@ static void ufshcd_print_clk_freqs(struct ufs_hba *hba) struct ufs_clk_info *clki; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) return; list_for_each_entry(clki, head, list) { @@ -869,7 +869,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up) ktime_t start = ktime_get(); bool clk_state_changed = false; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE); @@ -943,7 +943,7 @@ static bool ufshcd_is_devfreq_scaling_required(struct ufs_hba *hba, struct ufs_clk_info *clki; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) return false; list_for_each_entry(clki, head, list) { @@ -6752,7 +6752,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, ktime_t start = ktime_get(); bool clk_state_changed = false; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE); @@ -6818,7 +6818,7 @@ static int ufshcd_init_clocks(struct ufs_hba *hba) struct device *dev = hba->dev; struct list_head *head = &hba->clk_list_head; - if (!head || list_empty(head)) + if (list_empty(head)) goto out; list_for_each_entry(clki, head, list) { @@ -7811,6 +7811,8 @@ int ufshcd_alloc_host(struct device *dev, struct ufs_hba **hba_handle) hba->dev = dev; *hba_handle = hba; + INIT_LIST_HEAD(&hba->clk_list_head); + out_error: return err; } -- 1.9.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-06 6:48 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter @ 2017-06-06 6:48 ` Adrian Hunter 2017-06-06 6:50 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 1 sibling, 0 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-06 6:48 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca From: Szymon Mielczarek <szymonx.mielczarek@intel.com> This patch adds a glue pci driver for Intel UFS Host controllers. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- Changes in V2: Change variant name from intel to intel-pci drivers/scsi/ufs/Kconfig | 11 +++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufshcd-intel-pci.c | 183 ++++++++++++++++++++++++++++++++++++ 3 files changed, 195 insertions(+) create mode 100644 drivers/scsi/ufs/ufshcd-intel-pci.c diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4e6ae2..702420bc0fac 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -69,6 +69,17 @@ config SCSI_UFS_DWC_TC_PCI If unsure, say N. +config SCSI_UFSHCD_INTEL_PCI + tristate "Intel PCI bus based UFS Controller support" + depends on SCSI_UFSHCD && PCI + ---help--- + This selects the Intel PCI UFS Host Controller Interface. Select this if + you have Intel UFS Host Controller with PCI Interface. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + config SCSI_UFSHCD_PLATFORM tristate "Platform bus based UFS Controller support" depends on SCSI_UFSHCD diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 6e77cb0bfee9..be817e1a6666 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -4,4 +4,5 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o +obj-$(CONFIG_SCSI_UFSHCD_INTEL_PCI) += ufshcd-intel-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufshcd-intel-pci.c b/drivers/scsi/ufs/ufshcd-intel-pci.c new file mode 100644 index 000000000000..0b8dcce5ee3b --- /dev/null +++ b/drivers/scsi/ufs/ufshcd-intel-pci.c @@ -0,0 +1,183 @@ +/* + * Universal Flash Storage Intel Host controller PCI driver + * + * Copyright (c) 2017, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include "ufshcd.h" +#include <linux/pci.h> +#include <linux/pm_runtime.h> + +static int ufs_intel_disable_lcc(struct ufs_hba *hba) +{ + u32 attr = UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE); + u32 lcc_enable = 0; + + ufshcd_dme_get(hba, attr, &lcc_enable); + if (lcc_enable) + ufshcd_dme_set(hba, attr, 0); + + return 0; +} + +static int ufs_intel_link_startup_notify(struct ufs_hba *hba, + enum ufs_notify_change_status status) +{ + int err = 0; + + switch (status) { + case PRE_CHANGE: + err = ufs_intel_disable_lcc(hba); + break; + case POST_CHANGE: + break; + default: + break; + } + + return err; +} + +static struct ufs_hba_variant_ops ufs_intel_hba_vops = { + .name = "intel-pci", + .link_startup_notify = ufs_intel_link_startup_notify, +}; + +#ifdef CONFIG_PM_SLEEP +static int ufs_intel_suspend(struct device *dev) +{ + return ufshcd_system_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_resume(struct device *dev) +{ + return ufshcd_system_resume(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM_SLEEP */ + +#ifdef CONFIG_PM +static int ufs_intel_runtime_suspend(struct device *dev) +{ + return ufshcd_runtime_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_resume(struct device *dev) +{ + return ufshcd_runtime_resume(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_idle(struct device *dev) +{ + return ufshcd_runtime_idle(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM */ + +static void ufs_intel_shutdown(struct pci_dev *pdev) +{ + ufshcd_shutdown((struct ufs_hba *)pci_get_drvdata(pdev)); +} + +static void ufs_intel_remove(struct pci_dev *pdev) +{ + struct ufs_hba *hba = pci_get_drvdata(pdev); + + pm_runtime_forbid(&pdev->dev); + pm_runtime_get_noresume(&pdev->dev); + ufshcd_remove(hba); + ufshcd_dealloc_host(hba); +} + +static int ufs_intel_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + struct ufs_hba *hba; + void __iomem *mmio_base; + int err; + + dev_info(&pdev->dev, "UFS controller found [%04x:%04x]\n", + (int)pdev->vendor, (int)pdev->device); + + err = pcim_enable_device(pdev); + if (err) + return err; + + pci_set_master(pdev); + + err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD); + if (err < 0) + return err; + + mmio_base = pcim_iomap_table(pdev)[0]; + + err = ufshcd_alloc_host(&pdev->dev, &hba); + if (err) + return err; + + hba->vops = &ufs_intel_hba_vops; + + err = ufshcd_init(hba, mmio_base, pdev->irq); + if (err) { + dev_err(&pdev->dev, "Initialization failed\n"); + goto out_dealloc; + } + + pci_set_drvdata(pdev, hba); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_allow(&pdev->dev); + + return 0; + +out_dealloc: + ufshcd_dealloc_host(hba); + return err; +} + +static const struct dev_pm_ops ufs_intel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(ufs_intel_suspend, + ufs_intel_resume) + SET_RUNTIME_PM_OPS(ufs_intel_runtime_suspend, + ufs_intel_runtime_resume, + ufs_intel_runtime_idle) +}; + +#define PCI_CLASS_STORAGE_UFSHCI 0x010901 + +#define UFSHCD_INTEL_PCI_UFSHCI_DEVICE() { \ + .vendor = PCI_VENDOR_ID_INTEL, \ + .device = PCI_ANY_ID, \ + .subvendor = PCI_ANY_ID, \ + .subdevice = PCI_ANY_ID, \ + .class = PCI_CLASS_STORAGE_UFSHCI, \ + .class_mask = ~0, \ +} + +static const struct pci_device_id ufs_intel_tbl[] = { + UFSHCD_INTEL_PCI_UFSHCI_DEVICE(), + { } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci, ufs_intel_tbl); + +static struct pci_driver ufs_intel_driver = { + .name = "ufshcd-intel-pci", + .id_table = ufs_intel_tbl, + .probe = ufs_intel_probe, + .remove = ufs_intel_remove, + .shutdown = ufs_intel_shutdown, + .driver = { + .pm = &ufs_intel_pm_ops + }, +}; + +module_pci_driver(ufs_intel_driver); + +MODULE_AUTHOR("Szymon Mielczarek <szymonx.mielczarek@intel.com>"); +MODULE_DESCRIPTION("Intel UFS host controller PCI glue driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage 2017-06-06 6:48 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-06 6:48 ` [PATCH V2 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter @ 2017-06-06 6:50 ` Adrian Hunter 1 sibling, 0 replies; 12+ messages in thread From: Adrian Hunter @ 2017-06-06 6:50 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca Oops, sorry, didn't mean to send this one again, since it has been applied. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-05 8:36 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-05 20:42 ` Subhash Jadavani @ 2017-06-06 7:07 ` Christoph Hellwig 2017-06-06 9:08 ` [PATCH V3 " Adrian Hunter 1 sibling, 1 reply; 12+ messages in thread From: Christoph Hellwig @ 2017-06-06 7:07 UTC (permalink / raw) To: Adrian Hunter Cc: Vinayak Holikatti, Martin K. Petersen, James E.J. Bottomley, linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca > +#define PCI_CLASS_STORAGE_UFSHCI 0x010901 should me move to pci_ids.h > + > +#define UFSHCD_INTEL_PCI_UFSHCI_DEVICE() { \ > + .vendor = PCI_VENDOR_ID_INTEL, \ > + .device = PCI_ANY_ID, \ > + .subvendor = PCI_ANY_ID, \ > + .subdevice = PCI_ANY_ID, \ > + .class = PCI_CLASS_STORAGE_UFSHCI, \ > + .class_mask = ~0, \ > +} Please don't use a macro for this. And matching for any possible future intel device with the classcode looks a little sketchy to me to be honest. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-06 7:07 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Christoph Hellwig @ 2017-06-06 9:08 ` Adrian Hunter 2017-06-06 10:10 ` Christoph Hellwig 0 siblings, 1 reply; 12+ messages in thread From: Adrian Hunter @ 2017-06-06 9:08 UTC (permalink / raw) To: Vinayak Holikatti, Martin K. Petersen, Christoph Hellwig, James E.J. Bottomley Cc: linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca From: Szymon Mielczarek <szymonx.mielczarek@intel.com> This patch adds a glue pci driver for Intel UFS Host controllers. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek@intel.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- Changes in V3: Remove UFSHCI class code and match on PCI device ID Changes in V2: Change variant name from intel to intel-pci drivers/scsi/ufs/Kconfig | 11 +++ drivers/scsi/ufs/Makefile | 1 + drivers/scsi/ufs/ufshcd-intel-pci.c | 174 ++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 drivers/scsi/ufs/ufshcd-intel-pci.c diff --git a/drivers/scsi/ufs/Kconfig b/drivers/scsi/ufs/Kconfig index e27b4d4e6ae2..702420bc0fac 100644 --- a/drivers/scsi/ufs/Kconfig +++ b/drivers/scsi/ufs/Kconfig @@ -69,6 +69,17 @@ config SCSI_UFS_DWC_TC_PCI If unsure, say N. +config SCSI_UFSHCD_INTEL_PCI + tristate "Intel PCI bus based UFS Controller support" + depends on SCSI_UFSHCD && PCI + ---help--- + This selects the Intel PCI UFS Host Controller Interface. Select this if + you have Intel UFS Host Controller with PCI Interface. + + If you have a controller with this interface, say Y or M here. + + If unsure, say N. + config SCSI_UFSHCD_PLATFORM tristate "Platform bus based UFS Controller support" depends on SCSI_UFSHCD diff --git a/drivers/scsi/ufs/Makefile b/drivers/scsi/ufs/Makefile index 6e77cb0bfee9..be817e1a6666 100644 --- a/drivers/scsi/ufs/Makefile +++ b/drivers/scsi/ufs/Makefile @@ -4,4 +4,5 @@ obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-d obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o obj-$(CONFIG_SCSI_UFSHCD) += ufshcd.o obj-$(CONFIG_SCSI_UFSHCD_PCI) += ufshcd-pci.o +obj-$(CONFIG_SCSI_UFSHCD_INTEL_PCI) += ufshcd-intel-pci.o obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o diff --git a/drivers/scsi/ufs/ufshcd-intel-pci.c b/drivers/scsi/ufs/ufshcd-intel-pci.c new file mode 100644 index 000000000000..4112bba666b4 --- /dev/null +++ b/drivers/scsi/ufs/ufshcd-intel-pci.c @@ -0,0 +1,174 @@ +/* + * Universal Flash Storage Intel Host controller PCI driver + * + * Copyright (c) 2017, Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ + +#include "ufshcd.h" +#include <linux/pci.h> +#include <linux/pm_runtime.h> + +#define PCI_DEVICE_ID_INTEL_UFS_CNL 0x9dfa + +static int ufs_intel_disable_lcc(struct ufs_hba *hba) +{ + u32 attr = UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE); + u32 lcc_enable = 0; + + ufshcd_dme_get(hba, attr, &lcc_enable); + if (lcc_enable) + ufshcd_dme_set(hba, attr, 0); + + return 0; +} + +static int ufs_intel_link_startup_notify(struct ufs_hba *hba, + enum ufs_notify_change_status status) +{ + int err = 0; + + switch (status) { + case PRE_CHANGE: + err = ufs_intel_disable_lcc(hba); + break; + case POST_CHANGE: + break; + default: + break; + } + + return err; +} + +static struct ufs_hba_variant_ops ufs_intel_hba_vops = { + .name = "intel-pci", + .link_startup_notify = ufs_intel_link_startup_notify, +}; + +#ifdef CONFIG_PM_SLEEP +static int ufs_intel_suspend(struct device *dev) +{ + return ufshcd_system_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_resume(struct device *dev) +{ + return ufshcd_system_resume(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM_SLEEP */ + +#ifdef CONFIG_PM +static int ufs_intel_runtime_suspend(struct device *dev) +{ + return ufshcd_runtime_suspend(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_resume(struct device *dev) +{ + return ufshcd_runtime_resume(dev_get_drvdata(dev)); +} + +static int ufs_intel_runtime_idle(struct device *dev) +{ + return ufshcd_runtime_idle(dev_get_drvdata(dev)); +} +#endif /* !CONFIG_PM */ + +static void ufs_intel_shutdown(struct pci_dev *pdev) +{ + ufshcd_shutdown((struct ufs_hba *)pci_get_drvdata(pdev)); +} + +static void ufs_intel_remove(struct pci_dev *pdev) +{ + struct ufs_hba *hba = pci_get_drvdata(pdev); + + pm_runtime_forbid(&pdev->dev); + pm_runtime_get_noresume(&pdev->dev); + ufshcd_remove(hba); + ufshcd_dealloc_host(hba); +} + +static int ufs_intel_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + struct ufs_hba *hba; + void __iomem *mmio_base; + int err; + + dev_info(&pdev->dev, "UFS controller found [%04x:%04x]\n", + (int)pdev->vendor, (int)pdev->device); + + err = pcim_enable_device(pdev); + if (err) + return err; + + pci_set_master(pdev); + + err = pcim_iomap_regions(pdev, 1 << 0, UFSHCD); + if (err < 0) + return err; + + mmio_base = pcim_iomap_table(pdev)[0]; + + err = ufshcd_alloc_host(&pdev->dev, &hba); + if (err) + return err; + + hba->vops = &ufs_intel_hba_vops; + + err = ufshcd_init(hba, mmio_base, pdev->irq); + if (err) { + dev_err(&pdev->dev, "Initialization failed\n"); + goto out_dealloc; + } + + pci_set_drvdata(pdev, hba); + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_allow(&pdev->dev); + + return 0; + +out_dealloc: + ufshcd_dealloc_host(hba); + return err; +} + +static const struct dev_pm_ops ufs_intel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(ufs_intel_suspend, + ufs_intel_resume) + SET_RUNTIME_PM_OPS(ufs_intel_runtime_suspend, + ufs_intel_runtime_resume, + ufs_intel_runtime_idle) +}; + +static const struct pci_device_id ufs_intel_tbl[] = { + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_UFS_CNL)}, + { } /* terminate list */ +}; +MODULE_DEVICE_TABLE(pci, ufs_intel_tbl); + +static struct pci_driver ufs_intel_driver = { + .name = "ufshcd-intel-pci", + .id_table = ufs_intel_tbl, + .probe = ufs_intel_probe, + .remove = ufs_intel_remove, + .shutdown = ufs_intel_shutdown, + .driver = { + .pm = &ufs_intel_pm_ops + }, +}; + +module_pci_driver(ufs_intel_driver); + +MODULE_AUTHOR("Szymon Mielczarek <szymonx.mielczarek@intel.com>"); +MODULE_DESCRIPTION("Intel UFS host controller PCI glue driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V3 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers 2017-06-06 9:08 ` [PATCH V3 " Adrian Hunter @ 2017-06-06 10:10 ` Christoph Hellwig 0 siblings, 0 replies; 12+ messages in thread From: Christoph Hellwig @ 2017-06-06 10:10 UTC (permalink / raw) To: Adrian Hunter Cc: Vinayak Holikatti, Martin K. Petersen, Christoph Hellwig, James E.J. Bottomley, linux-scsi, linux-kernel, Szymon Mielczarek, Michal Potomski, Grzegorz Janca This looks much better. But the new file still looks almost like a copy and paste of tc-dwc-g210-pci.c. Wouldnt it make more sense to start with a common ufshcd-pci driver that sets up the ufs_hba_variant_opsA based on the PCI ID table? Also given that this almost entitrely a copy & paste job of tc-dwc-g210-pci.c. you should add the copyrights and following their license. ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-06-06 10:10 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-06-05 8:36 [PATCH 0/2] scsi: ufs: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-05 8:36 ` [PATCH 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-05 20:37 ` Subhash Jadavani 2017-06-06 0:57 ` Martin K. Petersen 2017-06-05 8:36 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-05 20:42 ` Subhash Jadavani 2017-06-06 6:48 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-06 6:48 ` [PATCH V2 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Adrian Hunter 2017-06-06 6:50 ` [PATCH V2 1/2] scsi: ufs: Tidy clocks list head usage Adrian Hunter 2017-06-06 7:07 ` [PATCH 2/2] scsi: ufshcd-intel-pci: Add PCI driver for Intel Host controllers Christoph Hellwig 2017-06-06 9:08 ` [PATCH V3 " Adrian Hunter 2017-06-06 10:10 ` Christoph Hellwig
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).