* [PATCH V2 0/2] PCI: dwc: Export symbols to support module build @ 2019-04-16 14:15 Vidya Sagar 2019-04-16 14:15 ` [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host Vidya Sagar 2019-04-16 14:15 ` [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation Vidya Sagar 0 siblings, 2 replies; 7+ messages in thread From: Vidya Sagar @ 2019-04-16 14:15 UTC (permalink / raw) To: jingoohan1, gustavo.pimentel, lorenzo.pieralisi, bhelgaas, Jisheng.Zhang, thierry.reding Cc: linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv, vidyas This patch set is based on Jisheng Zhang's <Jisheng.Zhang@synaptics.com> patch set to support implementing .remove() hook in host controller drivers of DesignWare based implementations. Jisheng's patches: https://patchwork.kernel.org/project/linux-pci/list/?series=98559 This patch set moves config space APIs which are inlined in headers to source files and exports them along with the other required APIs to support building host controller drivers as modules. Vidya Sagar (2): PCI: dwc: Add API support to de-initialize host PCI: dwc: Export APIs to support .remove() implementation .../pci/controller/dwc/pcie-designware-host.c | 11 +++++ drivers/pci/controller/dwc/pcie-designware.c | 38 ++++++++++++++++++ drivers/pci/controller/dwc/pcie-designware.h | 40 +++++-------------- 3 files changed, 60 insertions(+), 29 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host 2019-04-16 14:15 [PATCH V2 0/2] PCI: dwc: Export symbols to support module build Vidya Sagar @ 2019-04-16 14:15 ` Vidya Sagar 2019-05-02 14:58 ` Lorenzo Pieralisi 2019-04-16 14:15 ` [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation Vidya Sagar 1 sibling, 1 reply; 7+ messages in thread From: Vidya Sagar @ 2019-04-16 14:15 UTC (permalink / raw) To: jingoohan1, gustavo.pimentel, lorenzo.pieralisi, bhelgaas, Jisheng.Zhang, thierry.reding Cc: linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv, vidyas Add an API to group all the tasks to be done to de-initialize host which can then be called by any DesignWare core based driver implementations while adding .remove() support in their respective drivers. Signed-off-by: Vidya Sagar <vidyas@nvidia.com> Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> --- v2: * s/Designware/DesignWare drivers/pci/controller/dwc/pcie-designware-host.c | 7 +++++++ drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 3e4169e738a5..d7881490282d 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -516,6 +516,13 @@ int dw_pcie_host_init(struct pcie_port *pp) return ret; } +void dw_pcie_host_deinit(struct pcie_port *pp) +{ + pci_stop_root_bus(pp->root_bus); + pci_remove_root_bus(pp->root_bus); + dw_pcie_free_msi(pp); +} + static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, u32 devfn, int where, int size, u32 *val, bool write) diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index adff0c713665..ea8d1caf11c5 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -343,6 +343,7 @@ void dw_pcie_msi_init(struct pcie_port *pp); void dw_pcie_free_msi(struct pcie_port *pp); void dw_pcie_setup_rc(struct pcie_port *pp); int dw_pcie_host_init(struct pcie_port *pp); +void dw_pcie_host_deinit(struct pcie_port *pp); int dw_pcie_allocate_domains(struct pcie_port *pp); #else static inline irqreturn_t dw_handle_msi_irq(struct pcie_port *pp) @@ -367,6 +368,10 @@ static inline int dw_pcie_host_init(struct pcie_port *pp) return 0; } +static inline void dw_pcie_host_deinit(struct pcie_port *pp) +{ +} + static inline int dw_pcie_allocate_domains(struct pcie_port *pp) { return 0; -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host 2019-04-16 14:15 ` [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host Vidya Sagar @ 2019-05-02 14:58 ` Lorenzo Pieralisi 2019-05-02 17:02 ` Vidya Sagar 0 siblings, 1 reply; 7+ messages in thread From: Lorenzo Pieralisi @ 2019-05-02 14:58 UTC (permalink / raw) To: Vidya Sagar Cc: jingoohan1, gustavo.pimentel, bhelgaas, Jisheng.Zhang, thierry.reding, linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv On Tue, Apr 16, 2019 at 07:45:15PM +0530, Vidya Sagar wrote: > Add an API to group all the tasks to be done to de-initialize host which > can then be called by any DesignWare core based driver implementations > while adding .remove() support in their respective drivers. > > Signed-off-by: Vidya Sagar <vidyas@nvidia.com> > Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> > --- > v2: > * s/Designware/DesignWare > > drivers/pci/controller/dwc/pcie-designware-host.c | 7 +++++++ > drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ > 2 files changed, 12 insertions(+) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c > index 3e4169e738a5..d7881490282d 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-host.c > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c > @@ -516,6 +516,13 @@ int dw_pcie_host_init(struct pcie_port *pp) > return ret; > } > > +void dw_pcie_host_deinit(struct pcie_port *pp) > +{ > + pci_stop_root_bus(pp->root_bus); > + pci_remove_root_bus(pp->root_bus); > + dw_pcie_free_msi(pp); This must mirror the init path, so AFAICS it should not be done if pp->ops->msi_host_init != NULL Lorenzo > +} > + > static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, > u32 devfn, int where, int size, u32 *val, > bool write) > diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h > index adff0c713665..ea8d1caf11c5 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.h > +++ b/drivers/pci/controller/dwc/pcie-designware.h > @@ -343,6 +343,7 @@ void dw_pcie_msi_init(struct pcie_port *pp); > void dw_pcie_free_msi(struct pcie_port *pp); > void dw_pcie_setup_rc(struct pcie_port *pp); > int dw_pcie_host_init(struct pcie_port *pp); > +void dw_pcie_host_deinit(struct pcie_port *pp); > int dw_pcie_allocate_domains(struct pcie_port *pp); > #else > static inline irqreturn_t dw_handle_msi_irq(struct pcie_port *pp) > @@ -367,6 +368,10 @@ static inline int dw_pcie_host_init(struct pcie_port *pp) > return 0; > } > > +static inline void dw_pcie_host_deinit(struct pcie_port *pp) > +{ > +} > + > static inline int dw_pcie_allocate_domains(struct pcie_port *pp) > { > return 0; > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host 2019-05-02 14:58 ` Lorenzo Pieralisi @ 2019-05-02 17:02 ` Vidya Sagar 0 siblings, 0 replies; 7+ messages in thread From: Vidya Sagar @ 2019-05-02 17:02 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: jingoohan1, gustavo.pimentel, bhelgaas, Jisheng.Zhang, thierry.reding, linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv On 5/2/2019 8:28 PM, Lorenzo Pieralisi wrote: > On Tue, Apr 16, 2019 at 07:45:15PM +0530, Vidya Sagar wrote: >> Add an API to group all the tasks to be done to de-initialize host which >> can then be called by any DesignWare core based driver implementations >> while adding .remove() support in their respective drivers. >> >> Signed-off-by: Vidya Sagar <vidyas@nvidia.com> >> Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> >> --- >> v2: >> * s/Designware/DesignWare >> >> drivers/pci/controller/dwc/pcie-designware-host.c | 7 +++++++ >> drivers/pci/controller/dwc/pcie-designware.h | 5 +++++ >> 2 files changed, 12 insertions(+) >> >> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c >> index 3e4169e738a5..d7881490282d 100644 >> --- a/drivers/pci/controller/dwc/pcie-designware-host.c >> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c >> @@ -516,6 +516,13 @@ int dw_pcie_host_init(struct pcie_port *pp) >> return ret; >> } >> >> +void dw_pcie_host_deinit(struct pcie_port *pp) >> +{ >> + pci_stop_root_bus(pp->root_bus); >> + pci_remove_root_bus(pp->root_bus); >> + dw_pcie_free_msi(pp); > > This must mirror the init path, so AFAICS it should not be done > if pp->ops->msi_host_init != NULL Done. I'll add check "if (pci_msi_enabled() && !pp->ops->msi_host_init)" > > Lorenzo > >> +} >> + >> static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, >> u32 devfn, int where, int size, u32 *val, >> bool write) >> diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h >> index adff0c713665..ea8d1caf11c5 100644 >> --- a/drivers/pci/controller/dwc/pcie-designware.h >> +++ b/drivers/pci/controller/dwc/pcie-designware.h >> @@ -343,6 +343,7 @@ void dw_pcie_msi_init(struct pcie_port *pp); >> void dw_pcie_free_msi(struct pcie_port *pp); >> void dw_pcie_setup_rc(struct pcie_port *pp); >> int dw_pcie_host_init(struct pcie_port *pp); >> +void dw_pcie_host_deinit(struct pcie_port *pp); >> int dw_pcie_allocate_domains(struct pcie_port *pp); >> #else >> static inline irqreturn_t dw_handle_msi_irq(struct pcie_port *pp) >> @@ -367,6 +368,10 @@ static inline int dw_pcie_host_init(struct pcie_port *pp) >> return 0; >> } >> >> +static inline void dw_pcie_host_deinit(struct pcie_port *pp) >> +{ >> +} >> + >> static inline int dw_pcie_allocate_domains(struct pcie_port *pp) >> { >> return 0; >> -- >> 2.17.1 >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation 2019-04-16 14:15 [PATCH V2 0/2] PCI: dwc: Export symbols to support module build Vidya Sagar 2019-04-16 14:15 ` [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host Vidya Sagar @ 2019-04-16 14:15 ` Vidya Sagar 2019-05-02 14:51 ` Lorenzo Pieralisi 1 sibling, 1 reply; 7+ messages in thread From: Vidya Sagar @ 2019-04-16 14:15 UTC (permalink / raw) To: jingoohan1, gustavo.pimentel, lorenzo.pieralisi, bhelgaas, Jisheng.Zhang, thierry.reding Cc: linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv, vidyas Export all configuration space access APIs and also other APIs to support host controller drivers of DesignWare core based implementations while adding support for .remove() hook to build their respective drivers as modules Signed-off-by: Vidya Sagar <vidyas@nvidia.com> Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> --- v2: * s/Designware/DesignWare .../pci/controller/dwc/pcie-designware-host.c | 4 ++ drivers/pci/controller/dwc/pcie-designware.c | 38 +++++++++++++++++++ drivers/pci/controller/dwc/pcie-designware.h | 35 +++-------------- 3 files changed, 48 insertions(+), 29 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index d7881490282d..2a5332e5ccfa 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -333,6 +333,7 @@ void dw_pcie_msi_init(struct pcie_port *pp) dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, upper_32_bits(msi_target)); } +EXPORT_SYMBOL_GPL(dw_pcie_msi_init); int dw_pcie_host_init(struct pcie_port *pp) { @@ -515,6 +516,7 @@ int dw_pcie_host_init(struct pcie_port *pp) dw_pcie_free_msi(pp); return ret; } +EXPORT_SYMBOL_GPL(dw_pcie_host_init); void dw_pcie_host_deinit(struct pcie_port *pp) { @@ -522,6 +524,7 @@ void dw_pcie_host_deinit(struct pcie_port *pp) pci_remove_root_bus(pp->root_bus); dw_pcie_free_msi(pp); } +EXPORT_SYMBOL_GPL(dw_pcie_host_deinit); static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, u32 devfn, int where, int size, u32 *val, @@ -731,3 +734,4 @@ void dw_pcie_setup_rc(struct pcie_port *pp) val |= PORT_LOGIC_SPEED_CHANGE; dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val); } +EXPORT_SYMBOL_GPL(dw_pcie_setup_rc); diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 31f6331ca46f..f98e2f284ae1 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -40,6 +40,7 @@ int dw_pcie_read(void __iomem *addr, int size, u32 *val) return PCIBIOS_SUCCESSFUL; } +EXPORT_SYMBOL_GPL(dw_pcie_read); int dw_pcie_write(void __iomem *addr, int size, u32 val) { @@ -57,6 +58,7 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val) return PCIBIOS_SUCCESSFUL; } +EXPORT_SYMBOL_GPL(dw_pcie_write); u32 __dw_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, size_t size) @@ -89,6 +91,42 @@ void __dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, dev_err(pci->dev, "Write DBI address failed\n"); } +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) +{ + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); +} +EXPORT_SYMBOL_GPL(dw_pcie_writel_dbi); + +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) +{ + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); +} +EXPORT_SYMBOL_GPL(dw_pcie_readl_dbi); + +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) +{ + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); +} +EXPORT_SYMBOL_GPL(dw_pcie_writew_dbi); + +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) +{ + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); +} +EXPORT_SYMBOL_GPL(dw_pcie_readw_dbi); + +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) +{ + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); +} +EXPORT_SYMBOL_GPL(dw_pcie_writeb_dbi); + +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) +{ + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); +} +EXPORT_SYMBOL_GPL(dw_pcie_readb_dbi); + static u32 dw_pcie_readl_ob_unroll(struct dw_pcie *pci, u32 index, u32 reg) { u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index ea8d1caf11c5..86df36701a37 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -265,35 +265,12 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, int index, enum dw_pcie_region_type type); void dw_pcie_setup(struct dw_pcie *pci); -static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) -{ - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); -} - -static inline u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) -{ - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); -} - -static inline void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) -{ - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); -} - -static inline u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) -{ - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); -} - -static inline void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) -{ - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); -} - -static inline u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) -{ - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); -} +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val); +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg); +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val); +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg); +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val); +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg); static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val) { -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation 2019-04-16 14:15 ` [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation Vidya Sagar @ 2019-05-02 14:51 ` Lorenzo Pieralisi 2019-05-02 17:00 ` Vidya Sagar 0 siblings, 1 reply; 7+ messages in thread From: Lorenzo Pieralisi @ 2019-05-02 14:51 UTC (permalink / raw) To: Vidya Sagar Cc: jingoohan1, gustavo.pimentel, bhelgaas, Jisheng.Zhang, thierry.reding, linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv On Tue, Apr 16, 2019 at 07:45:16PM +0530, Vidya Sagar wrote: > Export all configuration space access APIs and also other APIs to > support host controller drivers of DesignWare core based > implementations while adding support for .remove() hook to build their > respective drivers as modules > > Signed-off-by: Vidya Sagar <vidyas@nvidia.com> > Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> > --- > v2: > * s/Designware/DesignWare > > .../pci/controller/dwc/pcie-designware-host.c | 4 ++ > drivers/pci/controller/dwc/pcie-designware.c | 38 +++++++++++++++++++ > drivers/pci/controller/dwc/pcie-designware.h | 35 +++-------------- > 3 files changed, 48 insertions(+), 29 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c > index d7881490282d..2a5332e5ccfa 100644 > --- a/drivers/pci/controller/dwc/pcie-designware-host.c > +++ b/drivers/pci/controller/dwc/pcie-designware-host.c > @@ -333,6 +333,7 @@ void dw_pcie_msi_init(struct pcie_port *pp) > dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, > upper_32_bits(msi_target)); > } > +EXPORT_SYMBOL_GPL(dw_pcie_msi_init); > > int dw_pcie_host_init(struct pcie_port *pp) > { > @@ -515,6 +516,7 @@ int dw_pcie_host_init(struct pcie_port *pp) > dw_pcie_free_msi(pp); > return ret; > } > +EXPORT_SYMBOL_GPL(dw_pcie_host_init); > > void dw_pcie_host_deinit(struct pcie_port *pp) > { > @@ -522,6 +524,7 @@ void dw_pcie_host_deinit(struct pcie_port *pp) > pci_remove_root_bus(pp->root_bus); > dw_pcie_free_msi(pp); > } > +EXPORT_SYMBOL_GPL(dw_pcie_host_deinit); > > static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, > u32 devfn, int where, int size, u32 *val, > @@ -731,3 +734,4 @@ void dw_pcie_setup_rc(struct pcie_port *pp) > val |= PORT_LOGIC_SPEED_CHANGE; > dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val); > } > +EXPORT_SYMBOL_GPL(dw_pcie_setup_rc); > diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c > index 31f6331ca46f..f98e2f284ae1 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.c > +++ b/drivers/pci/controller/dwc/pcie-designware.c > @@ -40,6 +40,7 @@ int dw_pcie_read(void __iomem *addr, int size, u32 *val) > > return PCIBIOS_SUCCESSFUL; > } > +EXPORT_SYMBOL_GPL(dw_pcie_read); > > int dw_pcie_write(void __iomem *addr, int size, u32 val) > { > @@ -57,6 +58,7 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val) > > return PCIBIOS_SUCCESSFUL; > } > +EXPORT_SYMBOL_GPL(dw_pcie_write); > > u32 __dw_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, > size_t size) > @@ -89,6 +91,42 @@ void __dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, > dev_err(pci->dev, "Write DBI address failed\n"); > } > > +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) > +{ > + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_writel_dbi); > + > +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) > +{ > + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_readl_dbi); > + > +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) > +{ > + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_writew_dbi); > + > +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) > +{ > + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_readw_dbi); > + > +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) > +{ > + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_writeb_dbi); > + > +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) > +{ > + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); > +} > +EXPORT_SYMBOL_GPL(dw_pcie_readb_dbi); > + > static u32 dw_pcie_readl_ob_unroll(struct dw_pcie *pci, u32 index, u32 reg) > { > u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); > diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h > index ea8d1caf11c5..86df36701a37 100644 > --- a/drivers/pci/controller/dwc/pcie-designware.h > +++ b/drivers/pci/controller/dwc/pcie-designware.h > @@ -265,35 +265,12 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, int index, > enum dw_pcie_region_type type); > void dw_pcie_setup(struct dw_pcie *pci); > > -static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) > -{ > - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); > -} > - > -static inline u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) > -{ > - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); > -} > - > -static inline void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) > -{ > - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); > -} > - > -static inline u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) > -{ > - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); > -} > - > -static inline void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) > -{ > - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); > -} > - > -static inline u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) > -{ > - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); > -} > +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val); > +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg); > +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val); > +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg); > +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val); > +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg); What's the point of exporting all these functions ? Export __dw_pcie_{write/read}_dbi() and be done with it. Thanks, Lorenzo > > static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val) > { > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation 2019-05-02 14:51 ` Lorenzo Pieralisi @ 2019-05-02 17:00 ` Vidya Sagar 0 siblings, 0 replies; 7+ messages in thread From: Vidya Sagar @ 2019-05-02 17:00 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: jingoohan1, gustavo.pimentel, bhelgaas, Jisheng.Zhang, thierry.reding, linux-pci, linux-kernel, kthota, mmaddireddy, sagar.tv On 5/2/2019 8:21 PM, Lorenzo Pieralisi wrote: > On Tue, Apr 16, 2019 at 07:45:16PM +0530, Vidya Sagar wrote: >> Export all configuration space access APIs and also other APIs to >> support host controller drivers of DesignWare core based >> implementations while adding support for .remove() hook to build their >> respective drivers as modules >> >> Signed-off-by: Vidya Sagar <vidyas@nvidia.com> >> Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com> >> --- >> v2: >> * s/Designware/DesignWare >> >> .../pci/controller/dwc/pcie-designware-host.c | 4 ++ >> drivers/pci/controller/dwc/pcie-designware.c | 38 +++++++++++++++++++ >> drivers/pci/controller/dwc/pcie-designware.h | 35 +++-------------- >> 3 files changed, 48 insertions(+), 29 deletions(-) >> >> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c >> index d7881490282d..2a5332e5ccfa 100644 >> --- a/drivers/pci/controller/dwc/pcie-designware-host.c >> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c >> @@ -333,6 +333,7 @@ void dw_pcie_msi_init(struct pcie_port *pp) >> dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_HI, 4, >> upper_32_bits(msi_target)); >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_msi_init); >> >> int dw_pcie_host_init(struct pcie_port *pp) >> { >> @@ -515,6 +516,7 @@ int dw_pcie_host_init(struct pcie_port *pp) >> dw_pcie_free_msi(pp); >> return ret; >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_host_init); >> >> void dw_pcie_host_deinit(struct pcie_port *pp) >> { >> @@ -522,6 +524,7 @@ void dw_pcie_host_deinit(struct pcie_port *pp) >> pci_remove_root_bus(pp->root_bus); >> dw_pcie_free_msi(pp); >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_host_deinit); >> >> static int dw_pcie_access_other_conf(struct pcie_port *pp, struct pci_bus *bus, >> u32 devfn, int where, int size, u32 *val, >> @@ -731,3 +734,4 @@ void dw_pcie_setup_rc(struct pcie_port *pp) >> val |= PORT_LOGIC_SPEED_CHANGE; >> dw_pcie_wr_own_conf(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, 4, val); >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_setup_rc); >> diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c >> index 31f6331ca46f..f98e2f284ae1 100644 >> --- a/drivers/pci/controller/dwc/pcie-designware.c >> +++ b/drivers/pci/controller/dwc/pcie-designware.c >> @@ -40,6 +40,7 @@ int dw_pcie_read(void __iomem *addr, int size, u32 *val) >> >> return PCIBIOS_SUCCESSFUL; >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_read); >> >> int dw_pcie_write(void __iomem *addr, int size, u32 val) >> { >> @@ -57,6 +58,7 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val) >> >> return PCIBIOS_SUCCESSFUL; >> } >> +EXPORT_SYMBOL_GPL(dw_pcie_write); >> >> u32 __dw_pcie_read_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, >> size_t size) >> @@ -89,6 +91,42 @@ void __dw_pcie_write_dbi(struct dw_pcie *pci, void __iomem *base, u32 reg, >> dev_err(pci->dev, "Write DBI address failed\n"); >> } >> >> +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) >> +{ >> + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_writel_dbi); >> + >> +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) >> +{ >> + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_readl_dbi); >> + >> +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) >> +{ >> + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_writew_dbi); >> + >> +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) >> +{ >> + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_readw_dbi); >> + >> +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) >> +{ >> + __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_writeb_dbi); >> + >> +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) >> +{ >> + return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); >> +} >> +EXPORT_SYMBOL_GPL(dw_pcie_readb_dbi); >> + >> static u32 dw_pcie_readl_ob_unroll(struct dw_pcie *pci, u32 index, u32 reg) >> { >> u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); >> diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h >> index ea8d1caf11c5..86df36701a37 100644 >> --- a/drivers/pci/controller/dwc/pcie-designware.h >> +++ b/drivers/pci/controller/dwc/pcie-designware.h >> @@ -265,35 +265,12 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, int index, >> enum dw_pcie_region_type type); >> void dw_pcie_setup(struct dw_pcie *pci); >> >> -static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val) >> -{ >> - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x4, val); >> -} >> - >> -static inline u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg) >> -{ >> - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x4); >> -} >> - >> -static inline void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val) >> -{ >> - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x2, val); >> -} >> - >> -static inline u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg) >> -{ >> - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x2); >> -} >> - >> -static inline void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val) >> -{ >> - __dw_pcie_write_dbi(pci, pci->dbi_base, reg, 0x1, val); >> -} >> - >> -static inline u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg) >> -{ >> - return __dw_pcie_read_dbi(pci, pci->dbi_base, reg, 0x1); >> -} >> +void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val); >> +u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg); >> +void dw_pcie_writew_dbi(struct dw_pcie *pci, u32 reg, u16 val); >> +u16 dw_pcie_readw_dbi(struct dw_pcie *pci, u32 reg); >> +void dw_pcie_writeb_dbi(struct dw_pcie *pci, u32 reg, u8 val); >> +u8 dw_pcie_readb_dbi(struct dw_pcie *pci, u32 reg); > > What's the point of exporting all these functions ? > > Export __dw_pcie_{write/read}_dbi() and be done with it. Yup. That would have been simpler. In retrospection, I don't remember why I had done it this way. Anyway, I'll export only __dw_pcie* APIs in next patch series. > > Thanks, > Lorenzo > >> >> static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val) >> { >> -- >> 2.17.1 >> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-05-02 17:02 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-04-16 14:15 [PATCH V2 0/2] PCI: dwc: Export symbols to support module build Vidya Sagar 2019-04-16 14:15 ` [PATCH V2 1/2] PCI: dwc: Add API support to de-initialize host Vidya Sagar 2019-05-02 14:58 ` Lorenzo Pieralisi 2019-05-02 17:02 ` Vidya Sagar 2019-04-16 14:15 ` [PATCH V2 2/2] PCI: dwc: Export APIs to support .remove() implementation Vidya Sagar 2019-05-02 14:51 ` Lorenzo Pieralisi 2019-05-02 17:00 ` Vidya Sagar
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).