| Message ID | 20240130193214.713739-2-cassel@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | pci_epf_alloc_space() cleanups | expand |
On Tue, Jan 30, 2024 at 08:32:09PM +0100, Niklas Cassel wrote: > Refactor pci_epf_alloc_space() to take epc_features as a parameter. > This is a preparation patch needed for further cleanups. > > Signed-off-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/pci/endpoint/functions/pci-epf-ntb.c | 2 +- > drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++--- > drivers/pci/endpoint/functions/pci-epf-vntb.c | 4 ++-- > drivers/pci/endpoint/pci-epf-core.c | 6 ++++-- > include/linux/pci-epf.h | 4 +++- > 5 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c > index 0553946005c4..43cd309ce22f 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c > +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c > @@ -1067,7 +1067,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb, > else if (size < ctrl_size + spad_size) > return -EINVAL; > > - base = pci_epf_alloc_space(epf, size, barno, align, type); > + base = pci_epf_alloc_space(epf, size, barno, epc_features, type); > if (!base) { > dev_err(dev, "%s intf: Config/Status/SPAD alloc region fail\n", > pci_epc_interface_string(type)); > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > index 18c80002d3bd..15bfa7d83489 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -848,7 +848,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > } > > base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar, > - epc_features->align, PRIMARY_INTERFACE); > + epc_features, PRIMARY_INTERFACE); > if (!base) { > dev_err(dev, "Failed to allocated register space\n"); > return -ENOMEM; > @@ -866,8 +866,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > continue; > > base = pci_epf_alloc_space(epf, bar_size[bar], bar, > - epc_features->align, > - PRIMARY_INTERFACE); > + epc_features, PRIMARY_INTERFACE); > if (!base) > dev_err(dev, "Failed to allocate space for BAR%d\n", > bar); > diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c > index e75a2af77328..ba509d67188b 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c > +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c > @@ -446,7 +446,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) > else if (size < ctrl_size + spad_size) > return -EINVAL; > > - base = pci_epf_alloc_space(epf, size, barno, align, 0); > + base = pci_epf_alloc_space(epf, size, barno, epc_features, 0); > if (!base) { > dev_err(dev, "Config/Status/SPAD alloc region fail\n"); > return -ENOMEM; > @@ -550,7 +550,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb) > > barno = ntb->epf_ntb_bar[BAR_DB]; > > - mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0); > + mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, epc_features, 0); > if (!mw_addr) { > dev_err(dev, "Failed to allocate OB address\n"); > return -ENOMEM; > diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c > index 2c32de667937..e44f4078fe8b 100644 > --- a/drivers/pci/endpoint/pci-epf-core.c > +++ b/drivers/pci/endpoint/pci-epf-core.c > @@ -251,14 +251,16 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space); > * @epf: the EPF device to whom allocate the memory > * @size: the size of the memory that has to be allocated > * @bar: the BAR number corresponding to the allocated register space > - * @align: alignment size for the allocation region > + * @epc: the features provided by the EPC specific to this endpoint function > * @type: Identifies if the allocation is for primary EPC or secondary EPC > * > * Invoke to allocate memory for the PCI EPF register space. > */ > void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, > - size_t align, enum pci_epc_interface_type type) > + const struct pci_epc_features *epc_features, > + enum pci_epc_interface_type type) > { > + size_t align = epc_features->align; > struct pci_epf_bar *epf_bar; > dma_addr_t phys_addr; > struct pci_epc *epc; > diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h > index 77b146e0f672..adee6a1b35db 100644 > --- a/include/linux/pci-epf.h > +++ b/include/linux/pci-epf.h > @@ -15,6 +15,7 @@ > #include <linux/pci.h> > > struct pci_epf; > +struct pci_epc_features; > enum pci_epc_interface_type; > > enum pci_barno { > @@ -216,7 +217,8 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver, > struct module *owner); > void pci_epf_unregister_driver(struct pci_epf_driver *driver); > void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, > - size_t align, enum pci_epc_interface_type type); > + const struct pci_epc_features *epc_features, > + enum pci_epc_interface_type type); > void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar, > enum pci_epc_interface_type type); > int pci_epf_bind(struct pci_epf *epf); > -- > 2.43.0 >
On Tue, Jan 30, 2024 at 08:32:09PM +0100, Niklas Cassel wrote: > Refactor pci_epf_alloc_space() to take epc_features as a parameter. > This is a preparation patch needed for further cleanups. > > Signed-off-by: Niklas Cassel <cassel@kernel.org> One comment below. With that addressed, Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > drivers/pci/endpoint/functions/pci-epf-ntb.c | 2 +- > drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++--- > drivers/pci/endpoint/functions/pci-epf-vntb.c | 4 ++-- > drivers/pci/endpoint/pci-epf-core.c | 6 ++++-- > include/linux/pci-epf.h | 4 +++- > 5 files changed, 12 insertions(+), 9 deletions(-) > [...] > diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c > index 2c32de667937..e44f4078fe8b 100644 > --- a/drivers/pci/endpoint/pci-epf-core.c > +++ b/drivers/pci/endpoint/pci-epf-core.c > @@ -251,14 +251,16 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space); > * @epf: the EPF device to whom allocate the memory > * @size: the size of the memory that has to be allocated > * @bar: the BAR number corresponding to the allocated register space > - * @align: alignment size for the allocation region > + * @epc: the features provided by the EPC specific to this endpoint function > * @type: Identifies if the allocation is for primary EPC or secondary EPC > * > * Invoke to allocate memory for the PCI EPF register space. > */ > void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, > - size_t align, enum pci_epc_interface_type type) > + const struct pci_epc_features *epc_features, s/epc/epc_features - Mani
diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c index 0553946005c4..43cd309ce22f 100644 --- a/drivers/pci/endpoint/functions/pci-epf-ntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c @@ -1067,7 +1067,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb, else if (size < ctrl_size + spad_size) return -EINVAL; - base = pci_epf_alloc_space(epf, size, barno, align, type); + base = pci_epf_alloc_space(epf, size, barno, epc_features, type); if (!base) { dev_err(dev, "%s intf: Config/Status/SPAD alloc region fail\n", pci_epc_interface_string(type)); diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 18c80002d3bd..15bfa7d83489 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -848,7 +848,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar, - epc_features->align, PRIMARY_INTERFACE); + epc_features, PRIMARY_INTERFACE); if (!base) { dev_err(dev, "Failed to allocated register space\n"); return -ENOMEM; @@ -866,8 +866,7 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) continue; base = pci_epf_alloc_space(epf, bar_size[bar], bar, - epc_features->align, - PRIMARY_INTERFACE); + epc_features, PRIMARY_INTERFACE); if (!base) dev_err(dev, "Failed to allocate space for BAR%d\n", bar); diff --git a/drivers/pci/endpoint/functions/pci-epf-vntb.c b/drivers/pci/endpoint/functions/pci-epf-vntb.c index e75a2af77328..ba509d67188b 100644 --- a/drivers/pci/endpoint/functions/pci-epf-vntb.c +++ b/drivers/pci/endpoint/functions/pci-epf-vntb.c @@ -446,7 +446,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb) else if (size < ctrl_size + spad_size) return -EINVAL; - base = pci_epf_alloc_space(epf, size, barno, align, 0); + base = pci_epf_alloc_space(epf, size, barno, epc_features, 0); if (!base) { dev_err(dev, "Config/Status/SPAD alloc region fail\n"); return -ENOMEM; @@ -550,7 +550,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb) barno = ntb->epf_ntb_bar[BAR_DB]; - mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, align, 0); + mw_addr = pci_epf_alloc_space(ntb->epf, size, barno, epc_features, 0); if (!mw_addr) { dev_err(dev, "Failed to allocate OB address\n"); return -ENOMEM; diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c index 2c32de667937..e44f4078fe8b 100644 --- a/drivers/pci/endpoint/pci-epf-core.c +++ b/drivers/pci/endpoint/pci-epf-core.c @@ -251,14 +251,16 @@ EXPORT_SYMBOL_GPL(pci_epf_free_space); * @epf: the EPF device to whom allocate the memory * @size: the size of the memory that has to be allocated * @bar: the BAR number corresponding to the allocated register space - * @align: alignment size for the allocation region + * @epc: the features provided by the EPC specific to this endpoint function * @type: Identifies if the allocation is for primary EPC or secondary EPC * * Invoke to allocate memory for the PCI EPF register space. */ void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, - size_t align, enum pci_epc_interface_type type) + const struct pci_epc_features *epc_features, + enum pci_epc_interface_type type) { + size_t align = epc_features->align; struct pci_epf_bar *epf_bar; dma_addr_t phys_addr; struct pci_epc *epc; diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index 77b146e0f672..adee6a1b35db 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -15,6 +15,7 @@ #include <linux/pci.h> struct pci_epf; +struct pci_epc_features; enum pci_epc_interface_type; enum pci_barno { @@ -216,7 +217,8 @@ int __pci_epf_register_driver(struct pci_epf_driver *driver, struct module *owner); void pci_epf_unregister_driver(struct pci_epf_driver *driver); void *pci_epf_alloc_space(struct pci_epf *epf, size_t size, enum pci_barno bar, - size_t align, enum pci_epc_interface_type type); + const struct pci_epc_features *epc_features, + enum pci_epc_interface_type type); void pci_epf_free_space(struct pci_epf *epf, void *addr, enum pci_barno bar, enum pci_epc_interface_type type); int pci_epf_bind(struct pci_epf *epf);
Refactor pci_epf_alloc_space() to take epc_features as a parameter. This is a preparation patch needed for further cleanups. Signed-off-by: Niklas Cassel <cassel@kernel.org> --- drivers/pci/endpoint/functions/pci-epf-ntb.c | 2 +- drivers/pci/endpoint/functions/pci-epf-test.c | 5 ++--- drivers/pci/endpoint/functions/pci-epf-vntb.c | 4 ++-- drivers/pci/endpoint/pci-epf-core.c | 6 ++++-- include/linux/pci-epf.h | 4 +++- 5 files changed, 12 insertions(+), 9 deletions(-)