| Message ID | 20180328115018.31921-10-niklas.cassel@axis.com |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI endpoint 64-bit BAR fixes | expand |
Hi Niklas, On 28/03/2018 12:50, Niklas Cassel wrote: > Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar. > > This is needed so that epc->ops->clear_bar() can clear the BAR pair, > if the BAR is 64-bits wide. > > This also makes it possible for pci_epc_clear_bar() to sanity check > the flags. > > Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> > --- > drivers/pci/cadence/pcie-cadence-ep.c | 3 ++- > drivers/pci/dwc/pcie-designware-ep.c | 13 ++++++++++--- > drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++++- > drivers/pci/endpoint/pci-epc-core.c | 7 ++++--- > include/linux/pci-epc.h | 5 +++-- > 5 files changed, 23 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/cadence/pcie-cadence-ep.c b/drivers/pci/cadence/pcie-cadence-ep.c > index 2905e098678c..3d8283e450a9 100644 > --- a/drivers/pci/cadence/pcie-cadence-ep.c > +++ b/drivers/pci/cadence/pcie-cadence-ep.c > @@ -145,10 +145,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, > } > > static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, > - enum pci_barno bar) > + struct pci_epf_bar *epf_bar) > { > struct cdns_pcie_ep *ep = epc_get_drvdata(epc); > struct cdns_pcie *pcie = &ep->pcie; > + enum pci_barno bar = epf_bar->barno; > u32 reg, cfg, b, ctrl; > > if (bar < BAR_4) { > diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c > index 571b90f88d84..cc4d8381c1dc 100644 > --- a/drivers/pci/dwc/pcie-designware-ep.c > +++ b/drivers/pci/dwc/pcie-designware-ep.c > @@ -19,7 +19,8 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) > pci_epc_linkup(epc); > } > > -void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) > +static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar, > + int flags) > { > u32 reg; > > @@ -30,6 +31,11 @@ void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) > dw_pcie_dbi_ro_wr_dis(pci); > } > > +void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) > +{ > + __dw_pcie_ep_reset_bar(pci, bar, 0); > +} > + > static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no, > struct pci_epf_header *hdr) > { > @@ -104,13 +110,14 @@ static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, phys_addr_t phys_addr, > } > > static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no, > - enum pci_barno bar) > + struct pci_epf_bar *epf_bar) > { > struct dw_pcie_ep *ep = epc_get_drvdata(epc); > struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + enum pci_barno bar = epf_bar->barno; > u32 atu_index = ep->bar_to_atu[bar]; > > - dw_pcie_ep_reset_bar(pci, bar); > + __dw_pcie_ep_reset_bar(pci, bar, epf_bar->flags); > > dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND); > clear_bit(atu_index, ep->ib_window_map); > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > index d46e3ebabb8e..7cef85124325 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -344,14 +344,17 @@ static void pci_epf_test_unbind(struct pci_epf *epf) > { > struct pci_epf_test *epf_test = epf_get_drvdata(epf); > struct pci_epc *epc = epf->epc; > + struct pci_epf_bar *epf_bar; > int bar; > > cancel_delayed_work(&epf_test->cmd_handler); > pci_epc_stop(epc); > for (bar = BAR_0; bar <= BAR_5; bar++) { > + epf_bar = &epf->bar[bar]; > + > if (epf_test->reg[bar]) { > pci_epf_free_space(epf, epf_test->reg[bar], bar); > - pci_epc_clear_bar(epc, epf->func_no, bar); > + pci_epc_clear_bar(epc, epf->func_no, epf_bar); > } > } > } > diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c > index 8637822605ff..eccc942043cb 100644 > --- a/drivers/pci/endpoint/pci-epc-core.c > +++ b/drivers/pci/endpoint/pci-epc-core.c > @@ -276,11 +276,12 @@ EXPORT_SYMBOL_GPL(pci_epc_map_addr); > * pci_epc_clear_bar() - reset the BAR > * @epc: the EPC device for which the BAR has to be cleared > * @func_no: the endpoint function number in the EPC device > - * @bar: the BAR number that has to be reset > + * @epf_bar: the struct epf_bar that contains the BAR information > * > * Invoke to reset the BAR of the endpoint device. > */ > -void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar) > +void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, > + struct pci_epf_bar *epf_bar) > { > unsigned long flags; > > @@ -291,7 +292,7 @@ void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar) > return; > > spin_lock_irqsave(&epc->lock, flags); > - epc->ops->clear_bar(epc, func_no, bar); > + epc->ops->clear_bar(epc, func_no, epf_bar); > spin_unlock_irqrestore(&epc->lock, flags); > } > EXPORT_SYMBOL_GPL(pci_epc_clear_bar); > diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h > index 75bae8aabbf9..af657ca58b70 100644 > --- a/include/linux/pci-epc.h > +++ b/include/linux/pci-epc.h > @@ -41,7 +41,7 @@ struct pci_epc_ops { > int (*set_bar)(struct pci_epc *epc, u8 func_no, > struct pci_epf_bar *epf_bar); > void (*clear_bar)(struct pci_epc *epc, u8 func_no, > - enum pci_barno bar); > + struct pci_epf_bar *epf_bar); > int (*map_addr)(struct pci_epc *epc, u8 func_no, > phys_addr_t addr, u64 pci_addr, size_t size); > void (*unmap_addr)(struct pci_epc *epc, u8 func_no, > @@ -127,7 +127,8 @@ int pci_epc_write_header(struct pci_epc *epc, u8 func_no, > struct pci_epf_header *hdr); > int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, > struct pci_epf_bar *epf_bar); > -void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar); > +void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, > + struct pci_epf_bar *epf_bar); > int pci_epc_map_addr(struct pci_epc *epc, u8 func_no, > phys_addr_t phys_addr, > u64 pci_addr, size_t size); > Seems good to me. :) Reviewed-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Hi Niklas, On Wednesday 28 March 2018 05:20 PM, Niklas Cassel wrote: > Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar. > > This is needed so that epc->ops->clear_bar() can clear the BAR pair, > if the BAR is 64-bits wide. > > This also makes it possible for pci_epc_clear_bar() to sanity check > the flags. > > Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> > --- > drivers/pci/cadence/pcie-cadence-ep.c | 3 ++- > drivers/pci/dwc/pcie-designware-ep.c | 13 ++++++++++--- > drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++++- > drivers/pci/endpoint/pci-epc-core.c | 7 ++++--- > include/linux/pci-epc.h | 5 +++-- > 5 files changed, 23 insertions(+), 10 deletions(-) > > diff --git a/drivers/pci/cadence/pcie-cadence-ep.c b/drivers/pci/cadence/pcie-cadence-ep.c > index 2905e098678c..3d8283e450a9 100644 > --- a/drivers/pci/cadence/pcie-cadence-ep.c > +++ b/drivers/pci/cadence/pcie-cadence-ep.c > @@ -145,10 +145,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, > } > > static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, > - enum pci_barno bar) > + struct pci_epf_bar *epf_bar) > { > struct cdns_pcie_ep *ep = epc_get_drvdata(epc); > struct cdns_pcie *pcie = &ep->pcie; > + enum pci_barno bar = epf_bar->barno; > u32 reg, cfg, b, ctrl; > > if (bar < BAR_4) { > diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c > index 571b90f88d84..cc4d8381c1dc 100644 > --- a/drivers/pci/dwc/pcie-designware-ep.c > +++ b/drivers/pci/dwc/pcie-designware-ep.c > @@ -19,7 +19,8 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) > pci_epc_linkup(epc); > } > > -void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) > +static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar, > + int flags) Looks like the 'flags' are not used anywhere here? Thanks Kishon
On Thu, Mar 29, 2018 at 03:30:23PM +0530, Kishon Vijay Abraham I wrote: > Hi Niklas, > > On Wednesday 28 March 2018 05:20 PM, Niklas Cassel wrote: > > Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar. > > > > This is needed so that epc->ops->clear_bar() can clear the BAR pair, > > if the BAR is 64-bits wide. > > > > This also makes it possible for pci_epc_clear_bar() to sanity check > > the flags. > > > > Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> > > --- > > drivers/pci/cadence/pcie-cadence-ep.c | 3 ++- > > drivers/pci/dwc/pcie-designware-ep.c | 13 ++++++++++--- > > drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++++- > > drivers/pci/endpoint/pci-epc-core.c | 7 ++++--- > > include/linux/pci-epc.h | 5 +++-- > > 5 files changed, 23 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/pci/cadence/pcie-cadence-ep.c b/drivers/pci/cadence/pcie-cadence-ep.c > > index 2905e098678c..3d8283e450a9 100644 > > --- a/drivers/pci/cadence/pcie-cadence-ep.c > > +++ b/drivers/pci/cadence/pcie-cadence-ep.c > > @@ -145,10 +145,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, > > } > > > > static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, > > - enum pci_barno bar) > > + struct pci_epf_bar *epf_bar) > > { > > struct cdns_pcie_ep *ep = epc_get_drvdata(epc); > > struct cdns_pcie *pcie = &ep->pcie; > > + enum pci_barno bar = epf_bar->barno; > > u32 reg, cfg, b, ctrl; > > > > if (bar < BAR_4) { > > diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c > > index 571b90f88d84..cc4d8381c1dc 100644 > > --- a/drivers/pci/dwc/pcie-designware-ep.c > > +++ b/drivers/pci/dwc/pcie-designware-ep.c > > @@ -19,7 +19,8 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) > > pci_epc_linkup(epc); > > } > > > > -void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) > > +static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar, > > + int flags) > > Looks like the 'flags' are not used anywhere here? Hello Kishon, That is correct, this patch is simply refactoring, flags is first used in patch 11/12, since I didn't want to refactor + add new code in the same commit. Kind regards, Niklas
diff --git a/drivers/pci/cadence/pcie-cadence-ep.c b/drivers/pci/cadence/pcie-cadence-ep.c index 2905e098678c..3d8283e450a9 100644 --- a/drivers/pci/cadence/pcie-cadence-ep.c +++ b/drivers/pci/cadence/pcie-cadence-ep.c @@ -145,10 +145,11 @@ static int cdns_pcie_ep_set_bar(struct pci_epc *epc, u8 fn, } static void cdns_pcie_ep_clear_bar(struct pci_epc *epc, u8 fn, - enum pci_barno bar) + struct pci_epf_bar *epf_bar) { struct cdns_pcie_ep *ep = epc_get_drvdata(epc); struct cdns_pcie *pcie = &ep->pcie; + enum pci_barno bar = epf_bar->barno; u32 reg, cfg, b, ctrl; if (bar < BAR_4) { diff --git a/drivers/pci/dwc/pcie-designware-ep.c b/drivers/pci/dwc/pcie-designware-ep.c index 571b90f88d84..cc4d8381c1dc 100644 --- a/drivers/pci/dwc/pcie-designware-ep.c +++ b/drivers/pci/dwc/pcie-designware-ep.c @@ -19,7 +19,8 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep) pci_epc_linkup(epc); } -void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) +static void __dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar, + int flags) { u32 reg; @@ -30,6 +31,11 @@ void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) dw_pcie_dbi_ro_wr_dis(pci); } +void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar) +{ + __dw_pcie_ep_reset_bar(pci, bar, 0); +} + static int dw_pcie_ep_write_header(struct pci_epc *epc, u8 func_no, struct pci_epf_header *hdr) { @@ -104,13 +110,14 @@ static int dw_pcie_ep_outbound_atu(struct dw_pcie_ep *ep, phys_addr_t phys_addr, } static void dw_pcie_ep_clear_bar(struct pci_epc *epc, u8 func_no, - enum pci_barno bar) + struct pci_epf_bar *epf_bar) { struct dw_pcie_ep *ep = epc_get_drvdata(epc); struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + enum pci_barno bar = epf_bar->barno; u32 atu_index = ep->bar_to_atu[bar]; - dw_pcie_ep_reset_bar(pci, bar); + __dw_pcie_ep_reset_bar(pci, bar, epf_bar->flags); dw_pcie_disable_atu(pci, atu_index, DW_PCIE_REGION_INBOUND); clear_bit(atu_index, ep->ib_window_map); diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index d46e3ebabb8e..7cef85124325 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -344,14 +344,17 @@ static void pci_epf_test_unbind(struct pci_epf *epf) { struct pci_epf_test *epf_test = epf_get_drvdata(epf); struct pci_epc *epc = epf->epc; + struct pci_epf_bar *epf_bar; int bar; cancel_delayed_work(&epf_test->cmd_handler); pci_epc_stop(epc); for (bar = BAR_0; bar <= BAR_5; bar++) { + epf_bar = &epf->bar[bar]; + if (epf_test->reg[bar]) { pci_epf_free_space(epf, epf_test->reg[bar], bar); - pci_epc_clear_bar(epc, epf->func_no, bar); + pci_epc_clear_bar(epc, epf->func_no, epf_bar); } } } diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c index 8637822605ff..eccc942043cb 100644 --- a/drivers/pci/endpoint/pci-epc-core.c +++ b/drivers/pci/endpoint/pci-epc-core.c @@ -276,11 +276,12 @@ EXPORT_SYMBOL_GPL(pci_epc_map_addr); * pci_epc_clear_bar() - reset the BAR * @epc: the EPC device for which the BAR has to be cleared * @func_no: the endpoint function number in the EPC device - * @bar: the BAR number that has to be reset + * @epf_bar: the struct epf_bar that contains the BAR information * * Invoke to reset the BAR of the endpoint device. */ -void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar) +void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, + struct pci_epf_bar *epf_bar) { unsigned long flags; @@ -291,7 +292,7 @@ void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar) return; spin_lock_irqsave(&epc->lock, flags); - epc->ops->clear_bar(epc, func_no, bar); + epc->ops->clear_bar(epc, func_no, epf_bar); spin_unlock_irqrestore(&epc->lock, flags); } EXPORT_SYMBOL_GPL(pci_epc_clear_bar); diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h index 75bae8aabbf9..af657ca58b70 100644 --- a/include/linux/pci-epc.h +++ b/include/linux/pci-epc.h @@ -41,7 +41,7 @@ struct pci_epc_ops { int (*set_bar)(struct pci_epc *epc, u8 func_no, struct pci_epf_bar *epf_bar); void (*clear_bar)(struct pci_epc *epc, u8 func_no, - enum pci_barno bar); + struct pci_epf_bar *epf_bar); int (*map_addr)(struct pci_epc *epc, u8 func_no, phys_addr_t addr, u64 pci_addr, size_t size); void (*unmap_addr)(struct pci_epc *epc, u8 func_no, @@ -127,7 +127,8 @@ int pci_epc_write_header(struct pci_epc *epc, u8 func_no, struct pci_epf_header *hdr); int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, struct pci_epf_bar *epf_bar); -void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar); +void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, + struct pci_epf_bar *epf_bar); int pci_epc_map_addr(struct pci_epc *epc, u8 func_no, phys_addr_t phys_addr, u64 pci_addr, size_t size);
Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar. This is needed so that epc->ops->clear_bar() can clear the BAR pair, if the BAR is 64-bits wide. This also makes it possible for pci_epc_clear_bar() to sanity check the flags. Signed-off-by: Niklas Cassel <niklas.cassel@axis.com> --- drivers/pci/cadence/pcie-cadence-ep.c | 3 ++- drivers/pci/dwc/pcie-designware-ep.c | 13 ++++++++++--- drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++++- drivers/pci/endpoint/pci-epc-core.c | 7 ++++--- include/linux/pci-epc.h | 5 +++-- 5 files changed, 23 insertions(+), 10 deletions(-)