* [PATCH 0/5] ocxl: OpenCAPI Cleanup @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++---- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 86 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 107 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 0/5] ocxl: OpenCAPI Cleanup @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++---- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 86 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 107 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 4:57 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..16eb8a60d5c7 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, if (status == ATTACHED) { int rc; - struct link *link = ctx->afu->fn->link; + void *link = ctx->afu->fn->link; rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..16eb8a60d5c7 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, if (status == ATTACHED) { int rc; - struct link *link = ctx->afu->fn->link; + void *link = ctx->afu->fn->link; rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 7:15 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 7:15 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..16eb8a60d5c7 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > > if (status == ATTACHED) { > int rc; > - struct link *link = ctx->afu->fn->link; > + void *link = ctx->afu->fn->link; This doesn't look like a rename... > > rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 7:15 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 7:15 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Frederic Barrat, linuxppc-dev On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..16eb8a60d5c7 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > > if (status == ATTACHED) { > int rc; > - struct link *link = ctx->afu->fn->link; > + void *link = ctx->afu->fn->link; This doesn't look like a rename... > > rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 7:15 ` Andrew Donnellan @ 2019-02-27 7:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 7:34 UTC (permalink / raw) To: 'Andrew Donnellan', 'Alastair D'Silva' Cc: 'Greg Kurz', 'Frederic Barrat', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel > -----Original Message----- > From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > Sent: Wednesday, 27 February 2019 6:16 PM > To: Alastair D'Silva <alastair@au1.ibm.com>; alastair@d-silva.org > Cc: Greg Kurz <groug@kaod.org>; Frederic Barrat <fbarrat@linux.ibm.com>; > Arnd Bergmann <arnd@arndb.de>; Greg Kroah-Hartman > <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; linux- > kernel@vger.kernel.org > Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > > On 27/2/19 3:57 pm, Alastair D'Silva wrote: > > From: Alastair D'Silva <alastair@d-silva.org> > > > > The term 'link' is ambiguous (especially when the struct is used for a > > list), so rename it for clarity. > > > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > Reviewed-by: Greg Kurz <groug@kaod.org> > > --- > > drivers/misc/ocxl/file.c | 2 +- > > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > > 2 files changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > > e6a607488f8a..16eb8a60d5c7 100644 > > --- a/drivers/misc/ocxl/file.c > > +++ b/drivers/misc/ocxl/file.c > > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > > ocxl_context *ctx, > > > > if (status == ATTACHED) { > > int rc; > > - struct link *link = ctx->afu->fn->link; > > + void *link = ctx->afu->fn->link; > > This doesn't look like a rename... That corrects the type to what the member (and prototype for ocxl_link_update_pe) declare it as. The struct link there is bogus, it shouldn't even compile (since the intended struct link is defined in a different compilation unit), but instead picks up a different definition of 'struct link' from elsewhere. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 7:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 7:34 UTC (permalink / raw) To: 'Andrew Donnellan', 'Alastair D'Silva' Cc: 'Arnd Bergmann', 'Greg Kroah-Hartman', 'Greg Kurz', linux-kernel, 'Frederic Barrat', linuxppc-dev > -----Original Message----- > From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > Sent: Wednesday, 27 February 2019 6:16 PM > To: Alastair D'Silva <alastair@au1.ibm.com>; alastair@d-silva.org > Cc: Greg Kurz <groug@kaod.org>; Frederic Barrat <fbarrat@linux.ibm.com>; > Arnd Bergmann <arnd@arndb.de>; Greg Kroah-Hartman > <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; linux- > kernel@vger.kernel.org > Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > > On 27/2/19 3:57 pm, Alastair D'Silva wrote: > > From: Alastair D'Silva <alastair@d-silva.org> > > > > The term 'link' is ambiguous (especially when the struct is used for a > > list), so rename it for clarity. > > > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > Reviewed-by: Greg Kurz <groug@kaod.org> > > --- > > drivers/misc/ocxl/file.c | 2 +- > > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > > 2 files changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > > e6a607488f8a..16eb8a60d5c7 100644 > > --- a/drivers/misc/ocxl/file.c > > +++ b/drivers/misc/ocxl/file.c > > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > > ocxl_context *ctx, > > > > if (status == ATTACHED) { > > int rc; > > - struct link *link = ctx->afu->fn->link; > > + void *link = ctx->afu->fn->link; > > This doesn't look like a rename... That corrects the type to what the member (and prototype for ocxl_link_update_pe) declare it as. The struct link there is bogus, it shouldn't even compile (since the intended struct link is defined in a different compilation unit), but instead picks up a different definition of 'struct link' from elsewhere. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 7:34 ` Alastair D'Silva @ 2019-02-27 7:54 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 7:54 UTC (permalink / raw) To: Alastair D'Silva, 'Alastair D'Silva' Cc: 'Greg Kurz', 'Frederic Barrat', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>> e6a607488f8a..16eb8a60d5c7 100644 >>> --- a/drivers/misc/ocxl/file.c >>> +++ b/drivers/misc/ocxl/file.c >>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>> ocxl_context *ctx, >>> >>> if (status == ATTACHED) { >>> int rc; >>> - struct link *link = ctx->afu->fn->link; >>> + void *link = ctx->afu->fn->link; >> >> This doesn't look like a rename... > > That corrects the type to what the member (and prototype for ocxl_link_update_pe) declare it as. > > The struct link there is bogus, it shouldn't even compile (since the intended struct link is defined in a different compilation unit), but instead picks up a different definition of 'struct link' from elsewhere. > Given there's only a handful of struct links defined across the entire kernel, I'm going to guess that the definition it's picking up is in fact the ocxl one. I think the better solution here is to move struct ocxl_link into ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void *, and update the function signature for ocxl_link_update_pe() as well. -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 7:54 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 7:54 UTC (permalink / raw) To: Alastair D'Silva, 'Alastair D'Silva' Cc: 'Arnd Bergmann', 'Greg Kroah-Hartman', 'Greg Kurz', linux-kernel, 'Frederic Barrat', linuxppc-dev On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>> e6a607488f8a..16eb8a60d5c7 100644 >>> --- a/drivers/misc/ocxl/file.c >>> +++ b/drivers/misc/ocxl/file.c >>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>> ocxl_context *ctx, >>> >>> if (status == ATTACHED) { >>> int rc; >>> - struct link *link = ctx->afu->fn->link; >>> + void *link = ctx->afu->fn->link; >> >> This doesn't look like a rename... > > That corrects the type to what the member (and prototype for ocxl_link_update_pe) declare it as. > > The struct link there is bogus, it shouldn't even compile (since the intended struct link is defined in a different compilation unit), but instead picks up a different definition of 'struct link' from elsewhere. > Given there's only a handful of struct links defined across the entire kernel, I'm going to guess that the definition it's picking up is in fact the ocxl one. I think the better solution here is to move struct ocxl_link into ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void *, and update the function signature for ocxl_link_update_pe() as well. -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 7:54 ` Andrew Donnellan @ 2019-02-27 8:04 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 8:04 UTC (permalink / raw) To: 'Andrew Donnellan', 'Alastair D'Silva' Cc: 'Greg Kurz', 'Frederic Barrat', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel > -----Original Message----- > From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > Sent: Wednesday, 27 February 2019 6:55 PM > To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' > <alastair@au1.ibm.com> > Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' > <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- > Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > > On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git > a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > >>> e6a607488f8a..16eb8a60d5c7 100644 > >>> --- a/drivers/misc/ocxl/file.c > >>> +++ b/drivers/misc/ocxl/file.c > >>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > >>> ocxl_context *ctx, > >>> > >>> if (status == ATTACHED) { > >>> int rc; > >>> - struct link *link = ctx->afu->fn->link; > >>> + void *link = ctx->afu->fn->link; > >> > >> This doesn't look like a rename... > > > > That corrects the type to what the member (and prototype for > ocxl_link_update_pe) declare it as. > > > > The struct link there is bogus, it shouldn't even compile (since the intended > struct link is defined in a different compilation unit), but instead picks up a > different definition of 'struct link' from elsewhere. > > > > Given there's only a handful of struct links defined across the entire kernel, > I'm going to guess that the definition it's picking up is in fact the ocxl one. > Unlikely, since that's never in a header. It wasn't caught since it was assigned to/from a void*. > I think the better solution here is to move struct ocxl_link into > ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void > *, and update the function signature for ocxl_link_update_pe() as well. Not move it, but we could have an opaque declaration there. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 8:04 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 8:04 UTC (permalink / raw) To: 'Andrew Donnellan', 'Alastair D'Silva' Cc: 'Arnd Bergmann', 'Greg Kroah-Hartman', 'Greg Kurz', linux-kernel, 'Frederic Barrat', linuxppc-dev > -----Original Message----- > From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > Sent: Wednesday, 27 February 2019 6:55 PM > To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' > <alastair@au1.ibm.com> > Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' > <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- > Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > > On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git > a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > >>> e6a607488f8a..16eb8a60d5c7 100644 > >>> --- a/drivers/misc/ocxl/file.c > >>> +++ b/drivers/misc/ocxl/file.c > >>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > >>> ocxl_context *ctx, > >>> > >>> if (status == ATTACHED) { > >>> int rc; > >>> - struct link *link = ctx->afu->fn->link; > >>> + void *link = ctx->afu->fn->link; > >> > >> This doesn't look like a rename... > > > > That corrects the type to what the member (and prototype for > ocxl_link_update_pe) declare it as. > > > > The struct link there is bogus, it shouldn't even compile (since the intended > struct link is defined in a different compilation unit), but instead picks up a > different definition of 'struct link' from elsewhere. > > > > Given there's only a handful of struct links defined across the entire kernel, > I'm going to guess that the definition it's picking up is in fact the ocxl one. > Unlikely, since that's never in a header. It wasn't caught since it was assigned to/from a void*. > I think the better solution here is to move struct ocxl_link into > ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void > *, and update the function signature for ocxl_link_update_pe() as well. Not move it, but we could have an opaque declaration there. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 8:04 ` Alastair D'Silva @ 2019-02-27 8:18 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 8:18 UTC (permalink / raw) To: Alastair D'Silva, 'Alastair D'Silva' Cc: 'Greg Kurz', 'Frederic Barrat', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel On 27/2/19 7:04 pm, Alastair D'Silva wrote: >> -----Original Message----- >> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >> Sent: Wednesday, 27 February 2019 6:55 PM >> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' >> <alastair@au1.ibm.com> >> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' >> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- >> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; >> linux-kernel@vger.kernel.org >> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link >> >> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git >> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>>>> e6a607488f8a..16eb8a60d5c7 100644 >>>>> --- a/drivers/misc/ocxl/file.c >>>>> +++ b/drivers/misc/ocxl/file.c >>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>>>> ocxl_context *ctx, >>>>> >>>>> if (status == ATTACHED) { >>>>> int rc; >>>>> - struct link *link = ctx->afu->fn->link; >>>>> + void *link = ctx->afu->fn->link; >>>> >>>> This doesn't look like a rename... >>> >>> That corrects the type to what the member (and prototype for >> ocxl_link_update_pe) declare it as. >>> >>> The struct link there is bogus, it shouldn't even compile (since the intended >> struct link is defined in a different compilation unit), but instead picks up a >> different definition of 'struct link' from elsewhere. >>> >> >> Given there's only a handful of struct links defined across the entire kernel, >> I'm going to guess that the definition it's picking up is in fact the ocxl one. >> > > Unlikely, since that's never in a header. It wasn't caught since it was assigned to/from a void*. Ah, yeah that'd explain it... and it's a pointer so it never needs to know its size. I'm clearly not very good at C. > >> I think the better solution here is to move struct ocxl_link into >> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void >> *, and update the function signature for ocxl_link_update_pe() as well. > > Not move it, but we could have an opaque declaration there. > Putting it there would fit with all the other ocxl_* structs, but either way, we definitely need a declaration in there and get rid of the void*, t -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 8:18 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-27 8:18 UTC (permalink / raw) To: Alastair D'Silva, 'Alastair D'Silva' Cc: 'Arnd Bergmann', 'Greg Kroah-Hartman', 'Greg Kurz', linux-kernel, 'Frederic Barrat', linuxppc-dev On 27/2/19 7:04 pm, Alastair D'Silva wrote: >> -----Original Message----- >> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >> Sent: Wednesday, 27 February 2019 6:55 PM >> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' >> <alastair@au1.ibm.com> >> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' >> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- >> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; >> linux-kernel@vger.kernel.org >> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link >> >> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git >> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>>>> e6a607488f8a..16eb8a60d5c7 100644 >>>>> --- a/drivers/misc/ocxl/file.c >>>>> +++ b/drivers/misc/ocxl/file.c >>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>>>> ocxl_context *ctx, >>>>> >>>>> if (status == ATTACHED) { >>>>> int rc; >>>>> - struct link *link = ctx->afu->fn->link; >>>>> + void *link = ctx->afu->fn->link; >>>> >>>> This doesn't look like a rename... >>> >>> That corrects the type to what the member (and prototype for >> ocxl_link_update_pe) declare it as. >>> >>> The struct link there is bogus, it shouldn't even compile (since the intended >> struct link is defined in a different compilation unit), but instead picks up a >> different definition of 'struct link' from elsewhere. >>> >> >> Given there's only a handful of struct links defined across the entire kernel, >> I'm going to guess that the definition it's picking up is in fact the ocxl one. >> > > Unlikely, since that's never in a header. It wasn't caught since it was assigned to/from a void*. Ah, yeah that'd explain it... and it's a pointer so it never needs to know its size. I'm clearly not very good at C. > >> I think the better solution here is to move struct ocxl_link into >> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather than void >> *, and update the function signature for ocxl_link_update_pe() as well. > > Not move it, but we could have an opaque declaration there. > Putting it there would fit with all the other ocxl_* structs, but either way, we definitely need a declaration in there and get rid of the void*, t -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 8:18 ` Andrew Donnellan @ 2019-02-27 13:45 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:45 UTC (permalink / raw) To: Andrew Donnellan, Alastair D'Silva, 'Alastair D'Silva' Cc: 'Greg Kurz', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel Le 27/02/2019 à 09:18, Andrew Donnellan a écrit : > On 27/2/19 7:04 pm, Alastair D'Silva wrote: >>> -----Original Message----- >>> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >>> Sent: Wednesday, 27 February 2019 6:55 PM >>> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' >>> <alastair@au1.ibm.com> >>> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' >>> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- >>> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; >>> linux-kernel@vger.kernel.org >>> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link >>> >>> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git >>> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>>>>> e6a607488f8a..16eb8a60d5c7 100644 >>>>>> --- a/drivers/misc/ocxl/file.c >>>>>> +++ b/drivers/misc/ocxl/file.c >>>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>>>>> ocxl_context *ctx, >>>>>> >>>>>> if (status == ATTACHED) { >>>>>> int rc; >>>>>> - struct link *link = ctx->afu->fn->link; >>>>>> + void *link = ctx->afu->fn->link; >>>>> >>>>> This doesn't look like a rename... >>>> >>>> That corrects the type to what the member (and prototype for >>> ocxl_link_update_pe) declare it as. >>>> >>>> The struct link there is bogus, it shouldn't even compile (since the >>>> intended >>> struct link is defined in a different compilation unit), but instead >>> picks up a >>> different definition of 'struct link' from elsewhere. >>>> >>> >>> Given there's only a handful of struct links defined across the >>> entire kernel, >>> I'm going to guess that the definition it's picking up is in fact the >>> ocxl one. >>> >> >> Unlikely, since that's never in a header. It wasn't caught since it >> was assigned to/from a void*. > > Ah, yeah that'd explain it... and it's a pointer so it never needs to > know its size. I'm clearly not very good at C. > >> >>> I think the better solution here is to move struct ocxl_link into >>> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather >>> than void >>> *, and update the function signature for ocxl_link_update_pe() as well. >> Not move it, but we could have an opaque declaration there. >> > > Putting it there would fit with all the other ocxl_* structs, but either > way, we definitely need a declaration in there and get rid of the void*, t Mmm, it might turn out to be more invasive that planned... The point was only to have it as an opaque to the outside world, for APIs we'd like to deprecate at some point, so I wouldn't sweat too much over it. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 13:45 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:45 UTC (permalink / raw) To: Andrew Donnellan, Alastair D'Silva, 'Alastair D'Silva' Cc: 'Greg Kroah-Hartman', linuxppc-dev, 'Greg Kurz', 'Arnd Bergmann', linux-kernel Le 27/02/2019 à 09:18, Andrew Donnellan a écrit : > On 27/2/19 7:04 pm, Alastair D'Silva wrote: >>> -----Original Message----- >>> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >>> Sent: Wednesday, 27 February 2019 6:55 PM >>> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' >>> <alastair@au1.ibm.com> >>> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' >>> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- >>> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; >>> linux-kernel@vger.kernel.org >>> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link >>> >>> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git >>> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index >>>>>> e6a607488f8a..16eb8a60d5c7 100644 >>>>>> --- a/drivers/misc/ocxl/file.c >>>>>> +++ b/drivers/misc/ocxl/file.c >>>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct >>>>>> ocxl_context *ctx, >>>>>> >>>>>> if (status == ATTACHED) { >>>>>> int rc; >>>>>> - struct link *link = ctx->afu->fn->link; >>>>>> + void *link = ctx->afu->fn->link; >>>>> >>>>> This doesn't look like a rename... >>>> >>>> That corrects the type to what the member (and prototype for >>> ocxl_link_update_pe) declare it as. >>>> >>>> The struct link there is bogus, it shouldn't even compile (since the >>>> intended >>> struct link is defined in a different compilation unit), but instead >>> picks up a >>> different definition of 'struct link' from elsewhere. >>>> >>> >>> Given there's only a handful of struct links defined across the >>> entire kernel, >>> I'm going to guess that the definition it's picking up is in fact the >>> ocxl one. >>> >> >> Unlikely, since that's never in a header. It wasn't caught since it >> was assigned to/from a void*. > > Ah, yeah that'd explain it... and it's a pointer so it never needs to > know its size. I'm clearly not very good at C. > >> >>> I think the better solution here is to move struct ocxl_link into >>> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather >>> than void >>> *, and update the function signature for ocxl_link_update_pe() as well. >> Not move it, but we could have an opaque declaration there. >> > > Putting it there would fit with all the other ocxl_* structs, but either > way, we definitely need a declaration in there and get rid of the void*, t Mmm, it might turn out to be more invasive that planned... The point was only to have it as an opaque to the outside world, for APIs we'd like to deprecate at some point, so I wouldn't sweat too much over it. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 13:45 ` Frederic Barrat @ 2019-02-27 13:59 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-02-27 13:59 UTC (permalink / raw) To: Frederic Barrat Cc: Andrew Donnellan, Alastair D'Silva, 'Alastair D'Silva', 'Arnd Bergmann', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel On Wed, 27 Feb 2019 14:45:44 +0100 Frederic Barrat <fbarrat@linux.ibm.com> wrote: > Le 27/02/2019 à 09:18, Andrew Donnellan a écrit : > > On 27/2/19 7:04 pm, Alastair D'Silva wrote: > >>> -----Original Message----- > >>> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > >>> Sent: Wednesday, 27 February 2019 6:55 PM > >>> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' > >>> <alastair@au1.ibm.com> > >>> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' > >>> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- > >>> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; > >>> linux-kernel@vger.kernel.org > >>> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > >>> > >>> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git > >>> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > >>>>>> e6a607488f8a..16eb8a60d5c7 100644 > >>>>>> --- a/drivers/misc/ocxl/file.c > >>>>>> +++ b/drivers/misc/ocxl/file.c > >>>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > >>>>>> ocxl_context *ctx, > >>>>>> > >>>>>> if (status == ATTACHED) { > >>>>>> int rc; > >>>>>> - struct link *link = ctx->afu->fn->link; > >>>>>> + void *link = ctx->afu->fn->link; > >>>>> > >>>>> This doesn't look like a rename... > >>>> > >>>> That corrects the type to what the member (and prototype for > >>> ocxl_link_update_pe) declare it as. > >>>> > >>>> The struct link there is bogus, it shouldn't even compile (since the > >>>> intended > >>> struct link is defined in a different compilation unit), but instead > >>> picks up a > >>> different definition of 'struct link' from elsewhere. > >>>> > >>> > >>> Given there's only a handful of struct links defined across the > >>> entire kernel, > >>> I'm going to guess that the definition it's picking up is in fact the > >>> ocxl one. > >>> > >> > >> Unlikely, since that's never in a header. It wasn't caught since it > >> was assigned to/from a void*. > > > > Ah, yeah that'd explain it... and it's a pointer so it never needs to > > know its size. I'm clearly not very good at C. > > > >> > >>> I think the better solution here is to move struct ocxl_link into > >>> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather > >>> than void > >>> *, and update the function signature for ocxl_link_update_pe() as well. > >> Not move it, but we could have an opaque declaration there. > >> > > > > Putting it there would fit with all the other ocxl_* structs, but either > > way, we definitely need a declaration in there and get rid of the void*, t > > > Mmm, it might turn out to be more invasive that planned... > The point was only to have it as an opaque to the outside world, for > APIs we'd like to deprecate at some point, so I wouldn't sweat too much > over it. > I concur. And even if an API change turns out to be beneficial, it clearly belongs to some other patch/series. Hence my proposal to simply drop that controversial and unneeded link variable in afu_ioctl_enable_p9_wait(). > Fred > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 13:59 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-02-27 13:59 UTC (permalink / raw) To: Frederic Barrat Cc: 'Alastair D'Silva', 'Arnd Bergmann', 'Greg Kroah-Hartman', linux-kernel, Andrew Donnellan, Alastair D'Silva, linuxppc-dev On Wed, 27 Feb 2019 14:45:44 +0100 Frederic Barrat <fbarrat@linux.ibm.com> wrote: > Le 27/02/2019 à 09:18, Andrew Donnellan a écrit : > > On 27/2/19 7:04 pm, Alastair D'Silva wrote: > >>> -----Original Message----- > >>> From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > >>> Sent: Wednesday, 27 February 2019 6:55 PM > >>> To: Alastair D'Silva <alastair@d-silva.org>; 'Alastair D'Silva' > >>> <alastair@au1.ibm.com> > >>> Cc: 'Greg Kurz' <groug@kaod.org>; 'Frederic Barrat' > >>> <fbarrat@linux.ibm.com>; 'Arnd Bergmann' <arnd@arndb.de>; 'Greg Kroah- > >>> Hartman' <gregkh@linuxfoundation.org>; linuxppc-dev@lists.ozlabs.org; > >>> linux-kernel@vger.kernel.org > >>> Subject: Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link > >>> > >>> On 27/2/19 6:34 pm, Alastair D'Silva wrote:>>> diff --git > >>> a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index > >>>>>> e6a607488f8a..16eb8a60d5c7 100644 > >>>>>> --- a/drivers/misc/ocxl/file.c > >>>>>> +++ b/drivers/misc/ocxl/file.c > >>>>>> @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct > >>>>>> ocxl_context *ctx, > >>>>>> > >>>>>> if (status == ATTACHED) { > >>>>>> int rc; > >>>>>> - struct link *link = ctx->afu->fn->link; > >>>>>> + void *link = ctx->afu->fn->link; > >>>>> > >>>>> This doesn't look like a rename... > >>>> > >>>> That corrects the type to what the member (and prototype for > >>> ocxl_link_update_pe) declare it as. > >>>> > >>>> The struct link there is bogus, it shouldn't even compile (since the > >>>> intended > >>> struct link is defined in a different compilation unit), but instead > >>> picks up a > >>> different definition of 'struct link' from elsewhere. > >>>> > >>> > >>> Given there's only a handful of struct links defined across the > >>> entire kernel, > >>> I'm going to guess that the definition it's picking up is in fact the > >>> ocxl one. > >>> > >> > >> Unlikely, since that's never in a header. It wasn't caught since it > >> was assigned to/from a void*. > > > > Ah, yeah that'd explain it... and it's a pointer so it never needs to > > know its size. I'm clearly not very good at C. > > > >> > >>> I think the better solution here is to move struct ocxl_link into > >>> ocxl_internal.h, change ocxl_fn::link to be struct ocxl_link * rather > >>> than void > >>> *, and update the function signature for ocxl_link_update_pe() as well. > >> Not move it, but we could have an opaque declaration there. > >> > > > > Putting it there would fit with all the other ocxl_* structs, but either > > way, we definitely need a declaration in there and get rid of the void*, t > > > Mmm, it might turn out to be more invasive that planned... > The point was only to have it as an opaque to the outside world, for > APIs we'd like to deprecate at some point, so I wouldn't sweat too much > over it. > I concur. And even if an API change turns out to be beneficial, it clearly belongs to some other patch/series. Hence my proposal to simply drop that controversial and unneeded link variable in afu_ioctl_enable_p9_wait(). > Fred > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 13:53 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-02-27 13:53 UTC (permalink / raw) To: Alastair D'Silva Cc: alastair, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On Wed, 27 Feb 2019 15:57:37 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..16eb8a60d5c7 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > > if (status == ATTACHED) { > int rc; > - struct link *link = ctx->afu->fn->link; > + void *link = ctx->afu->fn->link; > Thinking about that again, the link variable only has one user. Irrespectively of the discussion on adding a struct ocxl_link forward declaration in the private header and changing the API, link isn't needed in the first place... > rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); ... and we could just do: rc = ocxl_link_update_pe(ctx->afu->fn->link, ctx->pasid, ctx->tidr); I guess it is acceptable to do this change "while here" since the patch is about dropping the ambiguous 'link' term. > if (rc) > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-02-27 13:53 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-02-27 13:53 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, alastair, Frederic Barrat, linuxppc-dev On Wed, 27 Feb 2019 15:57:37 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..16eb8a60d5c7 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -152,7 +152,7 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > > if (status == ATTACHED) { > int rc; > - struct link *link = ctx->afu->fn->link; > + void *link = ctx->afu->fn->link; > Thinking about that again, the link variable only has one user. Irrespectively of the discussion on adding a struct ocxl_link forward declaration in the private header and changing the API, link isn't needed in the first place... > rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); ... and we could just do: rc = ocxl_link_update_pe(ctx->afu->fn->link, ctx->pasid, ctx->tidr); I guess it is acceptable to do this change "while here" since the patch is about dropping the ambiguous 'link' term. > if (rc) > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 2/5] ocxl: Clean up printf formats 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 4:57 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..8d2f53812edd 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 2/5] ocxl: Clean up printf formats @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..8d2f53812edd 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 13:40 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:40 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- I don't really care either way, but it looks ok. Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..8d2f53812edd 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats @ 2019-02-27 13:40 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:40 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- I don't really care either way, but it looks ok. Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..8d2f53812edd 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-28 5:02 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:02 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Not hugely fussed either way, but today I learned about %#... Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..8d2f53812edd 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats @ 2019-02-28 5:02 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:02 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Greg Kroah-Hartman, linuxppc-dev, linux-kernel, Arnd Bergmann On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Not hugely fussed either way, but today I learned about %#... Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..8d2f53812edd 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats 2019-02-27 4:57 ` Alastair D'Silva @ 2019-03-02 1:13 ` Joe Perches -1 siblings, 0 replies; 156+ messages in thread From: Joe Perches @ 2019-03-02 1:13 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On Wed, 2019-02-27 at 15:57 +1100, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' <shrug> I think it's better not to change this unless the compilation unit already uses a mix of styles. Overall, the kernel uses "0x%<hex type>" over "%#<hex type>" by ~8:1 $ git grep -P '0x%\d*[hl]*x' | wc -l 27654 $ git grep -P '%#\d*[hl]*x' | wc -l 3454 > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c [] > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); [...] ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats @ 2019-03-02 1:13 ` Joe Perches 0 siblings, 0 replies; 156+ messages in thread From: Joe Perches @ 2019-03-02 1:13 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Wed, 2019-02-27 at 15:57 +1100, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' <shrug> I think it's better not to change this unless the compilation unit already uses a mix of styles. Overall, the kernel uses "0x%<hex type>" over "%#<hex type>" by ~8:1 $ git grep -P '0x%\d*[hl]*x' | wc -l 27654 $ git grep -P '%#\d*[hl]*x' | wc -l 3454 > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c [] > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); [...] ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 4:57 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 13:25 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:25 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Thanks! Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-02-27 13:25 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:25 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, linuxppc-dev Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Thanks! Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-28 5:03 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:03 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-02-28 5:03 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:03 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Frederic Barrat, linuxppc-dev On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 4:57 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 13:36 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:36 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-02-27 13:36 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:36 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-28 5:05 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-02-28 5:05 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Greg Kroah-Hartman, linuxppc-dev, linux-kernel, Arnd Bergmann On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 4:57 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- include/misc/ocxl.h | 23 ----------------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..cd5a1e3cc950 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); int ocxl_context_detach(struct ocxl_context *ctx); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-02-27 4:57 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-02-27 4:57 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- include/misc/ocxl.h | 23 ----------------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..cd5a1e3cc950 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); int ocxl_context_detach(struct ocxl_context *ctx); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-27 13:39 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:39 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- If you have a respin of the series, that patch also adds a comment around ocxl_context_attach(), which is for later. But in any case: Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..cd5a1e3cc950 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > int ocxl_context_detach(struct ocxl_context *ctx); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-02-27 13:39 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-02-27 13:39 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 27/02/2019 à 05:57, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- If you have a respin of the series, that patch also adds a comment around ocxl_context_attach(), which is for later. But in any case: Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..cd5a1e3cc950 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > int ocxl_context_detach(struct ocxl_context *ctx); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-02-27 4:57 ` Alastair D'Silva @ 2019-02-28 5:23 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:23 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..cd5a1e3cc950 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + This isn't actually exported, so if you spin a v2 do that separately from this patch or document the change. Otherwise Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > int ocxl_context_detach(struct ocxl_context *ctx); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-02-28 5:23 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-02-28 5:23 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Greg Kroah-Hartman, linuxppc-dev, linux-kernel, Arnd Bergmann On 27/2/19 3:57 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 26 +++++++++++++++++++++++++- > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 25 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..cd5a1e3cc950 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,10 +107,34 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + This isn't actually exported, so if you spin a v2 do that separately from this patch or document the change. Otherwise Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > int ocxl_context_detach(struct ocxl_context *ctx); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v2 0/5] ocxl: OpenCAPI Cleanup 2019-02-27 4:57 ` Alastair D'Silva @ 2019-03-13 4:06 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Alastair D'Silva, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++---- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 86 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 107 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v2 0/5] ocxl: OpenCAPI Cleanup @ 2019-03-13 4:06 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++---- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 86 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 107 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-13 4:06 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Alastair D'Silva, Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-03-13 4:06 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-15 6:58 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 6:58 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> (In future please include a changelog to explain what's changed from v1->v2) > --- > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 1/5] ocxl: Rename struct link to ocxl_link @ 2019-03-15 6:58 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 6:58 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> (In future please include a changelog to explain what's changed from v1->v2) > --- > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 2/5] ocxl: Clean up printf formats 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-13 4:06 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Alastair D'Silva, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..68bf2f173a1a 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 2/5] ocxl: Clean up printf formats @ 2019-03-13 4:06 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..68bf2f173a1a 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats 2019-03-13 4:06 ` Alastair D'Silva (?) @ 2019-03-13 8:24 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-13 8:24 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev On Wed, 13 Mar 2019 15:06:58 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..68bf2f173a1a 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-14 4:58 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 4:58 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..68bf2f173a1a 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 2/5] ocxl: Clean up printf formats @ 2019-03-14 4:58 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 4:58 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 6 +++--- > drivers/misc/ocxl/context.c | 2 +- > drivers/misc/ocxl/trace.h | 10 +++++----- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..0ee7856b033d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); > return 0; > } > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c10a940e3b38..3498a0199bde 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) > vm_fault_t ret; > > offset = vmf->pgoff << PAGE_SHIFT; > - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, > + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, > ctx->pasid, vmf->address, offset); > > if (offset < ctx->afu->irq_base_offset) > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..68bf2f173a1a 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, > __entry->tidr = tidr; > ), > > - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", > + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", > __entry->pid, > __entry->spa, > __entry->pasid, > @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, > __entry->rc = rc; > ), > > - TP_printk("pasid=0x%x rc=%d", > + TP_printk("pasid=%#x rc=%d", > __entry->pasid, > __entry->rc > ) > @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, > __entry->tfc = tfc; > ), > > - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", > + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", > __entry->spa, > __entry->pe, > __entry->dsisr, > @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", > __entry->pasid, > __entry->irq_id, > __entry->virq, > @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, > __entry->irq_id = irq_id; > ), > > - TP_printk("pasid=0x%x irq_id=%d", > + TP_printk("pasid=%#x irq_id=%d", > __entry->pasid, > __entry->irq_id > ) > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-13 4:06 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Alastair D'Silva, Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-03-13 4:06 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:06 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-14 4:59 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 4:59 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-03-14 4:59 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 4:59 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 13/3/19 3:06 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 0ee7856b033d..026ac2ac4f9c 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-13 4:07 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:07 UTC (permalink / raw) Cc: Alastair D'Silva, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-03-13 4:07 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:07 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-03-13 4:07 ` Alastair D'Silva (?) @ 2019-03-13 8:28 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-13 8:28 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev On Wed, 13 Mar 2019 15:07:00 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers 2019-03-13 4:07 ` Alastair D'Silva @ 2019-03-14 5:08 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 5:08 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 13/3/19 3:07 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-03-14 5:08 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-14 5:08 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 13/3/19 3:07 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-13 4:07 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:07 UTC (permalink / raw) Cc: Alastair D'Silva, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-03-13 4:07 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-13 4:07 UTC (permalink / raw) Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-13 4:07 ` Alastair D'Silva (?) @ 2019-03-13 9:10 ` Greg Kurz 2019-03-14 2:23 ` Alastair D'Silva -1 siblings, 1 reply; 156+ messages in thread From: Greg Kurz @ 2019-03-13 9:10 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Alastair D'Silva, Frederic Barrat, linuxppc-dev On Wed, 13 Mar 2019 15:07:01 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 23 insertions(+), 25 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** Two *s ? Also, this results in an ocxl_internal.h header file where only these three functions are documented... which looks a bit weird IMHO. Since these are ocxl internals, do we _really_ need to keep the comments ? > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-13 9:10 ` Greg Kurz @ 2019-03-14 2:23 ` Alastair D'Silva 2019-03-14 6:50 ` Greg Kurz 0 siblings, 1 reply; 156+ messages in thread From: Alastair D'Silva @ 2019-03-14 2:23 UTC (permalink / raw) To: Greg Kurz Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Wed, 2019-03-13 at 10:10 +0100, Greg Kurz wrote: > On Wed, 13 Mar 2019 15:07:01 +1100 > "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > > > From: Alastair D'Silva <alastair@d-silva.org> > > > > Remove some unused exported symbols. > > > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > --- > > drivers/misc/ocxl/config.c | 2 -- > > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > > include/misc/ocxl.h | 23 ----------------------- > > 3 files changed, 23 insertions(+), 25 deletions(-) > > > > diff --git a/drivers/misc/ocxl/config.c > > b/drivers/misc/ocxl/config.c > > index 026ac2ac4f9c..c90c2e4875bf 100644 > > --- a/drivers/misc/ocxl/config.c > > +++ b/drivers/misc/ocxl/config.c > > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev > > *dev, > > } > > return 1; > > } > > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > > > static int read_afu_name(struct pci_dev *dev, struct > > ocxl_fn_config *fn, > > struct ocxl_afu_config *afu) > > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev > > *dev, int *count) > > { > > return pnv_ocxl_get_pasid_count(dev, count); > > } > > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int > > pasid_base, > > u32 pasid_count_log) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h > > b/drivers/misc/ocxl/ocxl_internal.h > > index 321b29e77f45..06fd98c989c8 100644 > > --- a/drivers/misc/ocxl/ocxl_internal.h > > +++ b/drivers/misc/ocxl/ocxl_internal.h > > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, > > u32 start, u32 size); > > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > > > +/* > > + * Get the max PASID value that can be used by the function > > + */ > > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > + > > +/* > > + * Check if an AFU index is valid for the given function. > > + * > > + * AFU indexes can be sparse, so a driver should check all indexes > > up > > + * to the maximum found in the function description > > + */ > > +int ocxl_config_check_afu_index(struct pci_dev *dev, > > + struct ocxl_fn_config *fn, int > > afu_idx); > > + > > +/** > > Two *s ? > These are Sphinx formatted comments (similar, but not quite the same as Doxygen). > Also, this results in an ocxl_internal.h header file where only these > three functions are documented... which looks a bit weird IMHO. Since > these are ocxl internals, do we _really_ need to keep the comments ? I believe we should, it's a courtesy to the next person who has to work in the area. There are more documentation comments coming in further series. -- Alastair D'Silva Open Source Developer Linux Technology Centre, IBM Australia mob: 0423 762 819 ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-14 2:23 ` Alastair D'Silva @ 2019-03-14 6:50 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-14 6:50 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Thu, 14 Mar 2019 13:23:21 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > On Wed, 2019-03-13 at 10:10 +0100, Greg Kurz wrote: > > On Wed, 13 Mar 2019 15:07:01 +1100 > > "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > > > > > From: Alastair D'Silva <alastair@d-silva.org> > > > > > > Remove some unused exported symbols. > > > > > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > > --- > > > drivers/misc/ocxl/config.c | 2 -- > > > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > > > include/misc/ocxl.h | 23 ----------------------- > > > 3 files changed, 23 insertions(+), 25 deletions(-) > > > > > > diff --git a/drivers/misc/ocxl/config.c > > > b/drivers/misc/ocxl/config.c > > > index 026ac2ac4f9c..c90c2e4875bf 100644 > > > --- a/drivers/misc/ocxl/config.c > > > +++ b/drivers/misc/ocxl/config.c > > > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev > > > *dev, > > > } > > > return 1; > > > } > > > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > > > > > static int read_afu_name(struct pci_dev *dev, struct > > > ocxl_fn_config *fn, > > > struct ocxl_afu_config *afu) > > > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev > > > *dev, int *count) > > > { > > > return pnv_ocxl_get_pasid_count(dev, count); > > > } > > > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > > > > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int > > > pasid_base, > > > u32 pasid_count_log) > > > diff --git a/drivers/misc/ocxl/ocxl_internal.h > > > b/drivers/misc/ocxl/ocxl_internal.h > > > index 321b29e77f45..06fd98c989c8 100644 > > > --- a/drivers/misc/ocxl/ocxl_internal.h > > > +++ b/drivers/misc/ocxl/ocxl_internal.h > > > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, > > > u32 start, u32 size); > > > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > > > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > > > > > +/* > > > + * Get the max PASID value that can be used by the function > > > + */ > > > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > > + > > > +/* > > > + * Check if an AFU index is valid for the given function. > > > + * > > > + * AFU indexes can be sparse, so a driver should check all indexes > > > up > > > + * to the maximum found in the function description > > > + */ > > > +int ocxl_config_check_afu_index(struct pci_dev *dev, > > > + struct ocxl_fn_config *fn, int > > > afu_idx); > > > + > > > +/** > > > > Two *s ? > > > > These are Sphinx formatted comments (similar, but not quite the same as > Doxygen). > Oh... should the other comments be converted to this format for consistency ? > > Also, this results in an ocxl_internal.h header file where only these > > three functions are documented... which looks a bit weird IMHO. Since > > these are ocxl internals, do we _really_ need to keep the comments ? > > I believe we should, it's a courtesy to the next person who has to work > in the area. > > There are more documentation comments coming in further series. > Fair enough. Reviewed-by: Greg Kurz <groug@kaod.org> ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-13 4:07 ` Alastair D'Silva @ 2019-03-15 4:49 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 4:49 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 13/3/19 3:07 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> See comments on v1 > --- > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 23 insertions(+), 25 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-03-15 4:49 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 4:49 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 13/3/19 3:07 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> See comments on v1 > --- > drivers/misc/ocxl/config.c | 2 -- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 23 insertions(+), 25 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 026ac2ac4f9c..c90c2e4875bf 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols 2019-03-15 4:49 ` Andrew Donnellan @ 2019-03-15 5:07 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 5:07 UTC (permalink / raw) To: Alastair D'Silva Cc: Alastair D'Silva, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 15/3/19 3:49 pm, Andrew Donnellan wrote: > On 13/3/19 3:07 pm, Alastair D'Silva wrote: >> From: Alastair D'Silva <alastair@d-silva.org> >> >> Remove some unused exported symbols. >> >> Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > See comments on v1 Also a couple of sparse warnings at https://openpower.xyz/job/snowpatch/job/snowpatch-linux-sparse/4474//artifact/linux/actual_sparse_diff.txt > >> --- >> drivers/misc/ocxl/config.c | 2 -- >> drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ >> include/misc/ocxl.h | 23 ----------------------- >> 3 files changed, 23 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c >> index 026ac2ac4f9c..c90c2e4875bf 100644 >> --- a/drivers/misc/ocxl/config.c >> +++ b/drivers/misc/ocxl/config.c >> @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, >> } >> return 1; >> } >> -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); >> static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config >> *fn, >> struct ocxl_afu_config *afu) >> @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev >> *dev, int *count) >> { >> return pnv_ocxl_get_pasid_count(dev, count); >> } >> -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); >> void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int >> pasid_base, >> u32 pasid_count_log) >> diff --git a/drivers/misc/ocxl/ocxl_internal.h >> b/drivers/misc/ocxl/ocxl_internal.h >> index 321b29e77f45..06fd98c989c8 100644 >> --- a/drivers/misc/ocxl/ocxl_internal.h >> +++ b/drivers/misc/ocxl/ocxl_internal.h >> @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 >> start, u32 size); >> int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); >> void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); >> +/* >> + * Get the max PASID value that can be used by the function >> + */ >> +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); >> + >> +/* >> + * Check if an AFU index is valid for the given function. >> + * >> + * AFU indexes can be sparse, so a driver should check all indexes up >> + * to the maximum found in the function description >> + */ >> +int ocxl_config_check_afu_index(struct pci_dev *dev, >> + struct ocxl_fn_config *fn, int afu_idx); >> + >> +/** >> + * Update values within a Process Element >> + * >> + * link_handle: the link handle associated with the process element >> + * pasid: the PASID for the AFU context >> + * tid: the new thread id for the process element >> + */ >> +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); >> + >> struct ocxl_context *ocxl_context_alloc(void); >> int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, >> struct address_space *mapping); >> diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h >> index 4544573cc93c..9530d3be1b30 100644 >> --- a/include/misc/ocxl.h >> +++ b/include/misc/ocxl.h >> @@ -56,15 +56,6 @@ struct ocxl_fn_config { >> int ocxl_config_read_function(struct pci_dev *dev, >> struct ocxl_fn_config *fn); >> -/* >> - * Check if an AFU index is valid for the given function. >> - * >> - * AFU indexes can be sparse, so a driver should check all indexes up >> - * to the maximum found in the function description >> - */ >> -int ocxl_config_check_afu_index(struct pci_dev *dev, >> - struct ocxl_fn_config *fn, int afu_idx); >> - >> /* >> * Read the configuration space of a function for the AFU specified by >> * the index 'afu_idx'. Fills in a ocxl_afu_config structure >> @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, >> struct ocxl_afu_config *afu, >> u8 afu_idx); >> -/* >> - * Get the max PASID value that can be used by the function >> - */ >> -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); >> - >> /* >> * Tell an AFU, by writing in the configuration space, the PASIDs that >> * it can use. Range starts at 'pasid_base' and its size is a multiple >> @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int >> pasid, u32 pidr, u32 tidr, >> void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), >> void *xsl_err_data); >> -/** >> - * Update values within a Process Element >> - * >> - * link_handle: the link handle associated with the process element >> - * pasid: the PASID for the AFU context >> - * tid: the new thread id for the process element >> - */ >> -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); >> - >> /* >> * Remove a Process Element from the Shared Process Area for a link >> */ >> > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH 5/5] ocxl: Remove some unused exported symbols @ 2019-03-15 5:07 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-03-15 5:07 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Alastair D'Silva, Frederic Barrat, linuxppc-dev On 15/3/19 3:49 pm, Andrew Donnellan wrote: > On 13/3/19 3:07 pm, Alastair D'Silva wrote: >> From: Alastair D'Silva <alastair@d-silva.org> >> >> Remove some unused exported symbols. >> >> Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > > See comments on v1 Also a couple of sparse warnings at https://openpower.xyz/job/snowpatch/job/snowpatch-linux-sparse/4474//artifact/linux/actual_sparse_diff.txt > >> --- >> drivers/misc/ocxl/config.c | 2 -- >> drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ >> include/misc/ocxl.h | 23 ----------------------- >> 3 files changed, 23 insertions(+), 25 deletions(-) >> >> diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c >> index 026ac2ac4f9c..c90c2e4875bf 100644 >> --- a/drivers/misc/ocxl/config.c >> +++ b/drivers/misc/ocxl/config.c >> @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, >> } >> return 1; >> } >> -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); >> static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config >> *fn, >> struct ocxl_afu_config *afu) >> @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev >> *dev, int *count) >> { >> return pnv_ocxl_get_pasid_count(dev, count); >> } >> -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); >> void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int >> pasid_base, >> u32 pasid_count_log) >> diff --git a/drivers/misc/ocxl/ocxl_internal.h >> b/drivers/misc/ocxl/ocxl_internal.h >> index 321b29e77f45..06fd98c989c8 100644 >> --- a/drivers/misc/ocxl/ocxl_internal.h >> +++ b/drivers/misc/ocxl/ocxl_internal.h >> @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 >> start, u32 size); >> int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); >> void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); >> +/* >> + * Get the max PASID value that can be used by the function >> + */ >> +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); >> + >> +/* >> + * Check if an AFU index is valid for the given function. >> + * >> + * AFU indexes can be sparse, so a driver should check all indexes up >> + * to the maximum found in the function description >> + */ >> +int ocxl_config_check_afu_index(struct pci_dev *dev, >> + struct ocxl_fn_config *fn, int afu_idx); >> + >> +/** >> + * Update values within a Process Element >> + * >> + * link_handle: the link handle associated with the process element >> + * pasid: the PASID for the AFU context >> + * tid: the new thread id for the process element >> + */ >> +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); >> + >> struct ocxl_context *ocxl_context_alloc(void); >> int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, >> struct address_space *mapping); >> diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h >> index 4544573cc93c..9530d3be1b30 100644 >> --- a/include/misc/ocxl.h >> +++ b/include/misc/ocxl.h >> @@ -56,15 +56,6 @@ struct ocxl_fn_config { >> int ocxl_config_read_function(struct pci_dev *dev, >> struct ocxl_fn_config *fn); >> -/* >> - * Check if an AFU index is valid for the given function. >> - * >> - * AFU indexes can be sparse, so a driver should check all indexes up >> - * to the maximum found in the function description >> - */ >> -int ocxl_config_check_afu_index(struct pci_dev *dev, >> - struct ocxl_fn_config *fn, int afu_idx); >> - >> /* >> * Read the configuration space of a function for the AFU specified by >> * the index 'afu_idx'. Fills in a ocxl_afu_config structure >> @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, >> struct ocxl_afu_config *afu, >> u8 afu_idx); >> -/* >> - * Get the max PASID value that can be used by the function >> - */ >> -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); >> - >> /* >> * Tell an AFU, by writing in the configuration space, the PASIDs that >> * it can use. Range starts at 'pasid_base' and its size is a multiple >> @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int >> pasid, u32 pidr, u32 tidr, >> void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), >> void *xsl_err_data); >> -/** >> - * Update values within a Process Element >> - * >> - * link_handle: the link handle associated with the process element >> - * pasid: the PASID for the AFU context >> - * tid: the new thread id for the process element >> - */ >> -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); >> - >> /* >> * Remove a Process Element from the Shared Process Area for a link >> */ >> > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 0/5] ocxl: OpenCAPI Cleanup 2019-03-13 4:06 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V3: - Add missed header in 'ocxl: Remove some unused exported symbols'. This addresses the introduced sparse warnings V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++----- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 5 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 109 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 0/5] ocxl: OpenCAPI Cleanup @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V3: - Add missed header in 'ocxl: Remove some unused exported symbols'. This addresses the introduced sparse warnings V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (5): ocxl: Rename struct link to ocxl_link ocxl: Clean up printf formats ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 17 ++----- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/file.c | 5 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ drivers/misc/ocxl/trace.h | 10 ++-- include/misc/ocxl.h | 53 ++++++------------- 7 files changed, 99 insertions(+), 109 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 1/5] ocxl: Rename struct link to ocxl_link 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 1/5] ocxl: Rename struct link to ocxl_link @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 2/5] ocxl: Clean up printf formats 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..68bf2f173a1a 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 2/5] ocxl: Clean up printf formats @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Use %# instead of using a literal '0x' Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 6 +++--- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/trace.h | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..0ee7856b033d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); return 0; } diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..3498a0199bde 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -134,7 +134,7 @@ static vm_fault_t ocxl_mmap_fault(struct vm_fault *vmf) vm_fault_t ret; offset = vmf->pgoff << PAGE_SHIFT; - pr_debug("%s: pasid %d address 0x%lx offset 0x%llx\n", __func__, + pr_debug("%s: pasid %d address %#lx offset %#llx\n", __func__, ctx->pasid, vmf->address, offset); if (offset < ctx->afu->irq_base_offset) diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..68bf2f173a1a 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -28,7 +28,7 @@ DECLARE_EVENT_CLASS(ocxl_context, __entry->tidr = tidr; ), - TP_printk("linux pid=%d spa=0x%p pasid=0x%x pidr=0x%x tidr=0x%x", + TP_printk("linux pid=%d spa=%p pasid=%#x pidr=%#x tidr=%#x", __entry->pid, __entry->spa, __entry->pasid, @@ -61,7 +61,7 @@ TRACE_EVENT(ocxl_terminate_pasid, __entry->rc = rc; ), - TP_printk("pasid=0x%x rc=%d", + TP_printk("pasid=%#x rc=%d", __entry->pasid, __entry->rc ) @@ -87,7 +87,7 @@ DECLARE_EVENT_CLASS(ocxl_fault_handler, __entry->tfc = tfc; ), - TP_printk("spa=%p pe=0x%llx dsisr=0x%llx dar=0x%llx tfc=0x%llx", + TP_printk("spa=%p pe=%#llx dsisr=%#llx dar=%#llx tfc=%#llx", __entry->spa, __entry->pe, __entry->dsisr, @@ -127,7 +127,7 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=%#x irq_id=%d virq=%u hw_irq=%d irq_offset=%#llx", __entry->pasid, __entry->irq_id, __entry->virq, @@ -150,7 +150,7 @@ TRACE_EVENT(ocxl_afu_irq_free, __entry->irq_id = irq_id; ), - TP_printk("pasid=0x%x irq_id=%d", + TP_printk("pasid=%#x irq_id=%d", __entry->pasid, __entry->irq_id ) -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 2/5] ocxl: Clean up printf formats 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 17:24 ` Joe Perches -1 siblings, 0 replies; 156+ messages in thread From: Joe Perches @ 2019-03-20 17:24 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On Wed, 2019-03-20 at 16:34 +1100, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' I do not suggest this as reasonable. There are 10's of thousands of uses of 0x%x in the kernel and converting them to save a byte seems unnecessary. $ git grep -P '0x%[\*\d\.]*[xX]' | wc -l 26120 And the %#x style is by far the lesser used form $ git grep -P '%#[\*\d\.]*[xX]' | wc -l 2726 Also, the sized form of %#[size]x is frequently misused where the size does not account for the initial 0x output. > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c [] > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); etc... ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 2/5] ocxl: Clean up printf formats @ 2019-03-20 17:24 ` Joe Perches 0 siblings, 0 replies; 156+ messages in thread From: Joe Perches @ 2019-03-20 17:24 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Wed, 2019-03-20 at 16:34 +1100, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Use %# instead of using a literal '0x' I do not suggest this as reasonable. There are 10's of thousands of uses of 0x%x in the kernel and converting them to save a byte seems unnecessary. $ git grep -P '0x%[\*\d\.]*[xX]' | wc -l 26120 And the %#x style is by far the lesser used form $ git grep -P '%#[\*\d\.]*[xX]' | wc -l 2726 Also, the sized form of %#[size]x is frequently misused where the size does not account for the initial 0x output. > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c [] > @@ -178,9 +178,9 @@ static int read_dvsec_vendor(struct pci_dev *dev) > pci_read_config_dword(dev, pos + OCXL_DVSEC_VENDOR_DLX_VERS, &dlx); > > dev_dbg(&dev->dev, "Vendor specific DVSEC:\n"); > - dev_dbg(&dev->dev, " CFG version = 0x%x\n", cfg); > - dev_dbg(&dev->dev, " TLX version = 0x%x\n", tlx); > - dev_dbg(&dev->dev, " DLX version = 0x%x\n", dlx); > + dev_dbg(&dev->dev, " CFG version = %#x\n", cfg); > + dev_dbg(&dev->dev, " TLX version = %#x\n", tlx); > + dev_dbg(&dev->dev, " DLX version = %#x\n", dlx); etc... ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 3/5] ocxl: read_pasid never returns an error, so make it void 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 3/5] ocxl: read_pasid never returns an error, so make it void @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 0ee7856b033d..026ac2ac4f9c 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 4/5] ocxl: Remove superfluous 'extern' from headers 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 4/5] ocxl: Remove superfluous 'extern' from headers @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 5/5] ocxl: Remove some unused exported symbols 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-20 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 5/5] ocxl: Remove some unused exported symbols @ 2019-03-20 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-20 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 2 -- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 026ac2ac4f9c..c90c2e4875bf 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v4 0/4] ocxl: OpenCAPI Cleanup 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-25 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V4: - Drop printf format changes as they omit the format indicator for '0' V3: - Add missed header in 'ocxl: Remove some unused exported symbols'. This addresses the introduced sparse warnings V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (4): ocxl: Rename struct link to ocxl_link ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 13 ++--- drivers/misc/ocxl/file.c | 5 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ include/misc/ocxl.h | 53 ++++++------------- 5 files changed, 91 insertions(+), 101 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v4 0/4] ocxl: OpenCAPI Cleanup @ 2019-03-25 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Some minor cleanups for the OpenCAPI driver as a prerequisite for an ocxl driver refactoring to allow the driver core to be utilised by external drivers. Changelog: V4: - Drop printf format changes as they omit the format indicator for '0' V3: - Add missed header in 'ocxl: Remove some unused exported symbols'. This addresses the introduced sparse warnings V2: - remove intermediate assignment of 'link' var in 'Rename struct link to ocxl_link' - Don't shift definition of ocxl_context_attach in 'Remove some unused exported symbols' Alastair D'Silva (4): ocxl: Rename struct link to ocxl_link ocxl: read_pasid never returns an error, so make it void ocxl: Remove superfluous 'extern' from headers ocxl: Remove some unused exported symbols drivers/misc/ocxl/config.c | 13 ++--- drivers/misc/ocxl/file.c | 5 +- drivers/misc/ocxl/link.c | 36 ++++++------- drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ include/misc/ocxl.h | 53 ++++++------------- 5 files changed, 91 insertions(+), 101 deletions(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link @ 2019-03-25 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The term 'link' is ambiguous (especially when the struct is used for a list), so rename it for clarity. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/file.c | 5 ++--- drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6a607488f8a..009e09b7ded5 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, mutex_unlock(&ctx->status_mutex); if (status == ATTACHED) { - int rc; - struct link *link = ctx->afu->fn->link; + int rc = ocxl_link_update_pe(ctx->afu->fn->link, + ctx->pasid, ctx->tidr); - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); if (rc) return rc; } diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index d50b861d7e57..8d2690a1a9de 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -76,7 +76,7 @@ struct spa { * limited number of opencapi slots on a system and lookup is only * done when the device is probed */ -struct link { +struct ocxl_link { struct list_head list; struct kref ref; int domain; @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) static irqreturn_t xsl_fault_handler(int irq, void *data) { - struct link *link = (struct link *) data; + struct ocxl_link *link = (struct ocxl_link *) data; struct spa *spa = link->spa; u64 dsisr, dar, pe_handle; struct pe_data *pe_data; @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) &spa->reg_tfc, &spa->reg_pe_handle); } -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa = link->spa; int rc; @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) return rc; } -static void release_xsl_irq(struct link *link) +static void release_xsl_irq(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) unmap_irq_registers(spa); } -static int alloc_spa(struct pci_dev *dev, struct link *link) +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) { struct spa *spa; @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) return 0; } -static void free_spa(struct link *link) +static void free_spa(struct ocxl_link *link) { struct spa *spa = link->spa; @@ -364,12 +364,12 @@ static void free_spa(struct link *link) } } -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) { - struct link *link; + struct ocxl_link *link; int rc; - link = kzalloc(sizeof(struct link), GFP_KERNEL); + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); if (!link) return -ENOMEM; @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) return rc; } -static void free_link(struct link *link) +static void free_link(struct ocxl_link *link) { release_xsl_irq(link); free_spa(link); @@ -415,7 +415,7 @@ static void free_link(struct link *link) int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) { int rc = 0; - struct link *link; + struct ocxl_link *link; mutex_lock(&links_list_lock); list_for_each_entry(link, &links_list, list) { @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); static void release_xsl(struct kref *ref) { - struct link *link = container_of(ref, struct link, ref); + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); list_del(&link->list); /* call platform code before releasing data */ @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) void ocxl_link_release(struct pci_dev *dev, void *link_handle) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; mutex_lock(&links_list_lock); kref_put(&link->ref, release_xsl); @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc = 0; @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; int pe_handle, rc; @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) int ocxl_link_remove_pe(void *link_handle, int pasid) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; struct spa *spa = link->spa; struct ocxl_process_element *pe; struct pe_data *pe_data; @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; int rc, irq; u64 addr; @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); void ocxl_link_free_irq(void *link_handle, int hw_irq) { - struct link *link = (struct link *) link_handle; + struct ocxl_link *link = (struct ocxl_link *) link_handle; pnv_ocxl_free_xive_irq(hw_irq); atomic_inc(&link->irq_available); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-03 14:18 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:18 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link @ 2019-04-03 14:18 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:18 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, linuxppc-dev Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-05 7:05 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link @ 2019-04-05 7:05 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Frederic Barrat, linuxppc-dev On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/file.c | 5 ++--- > drivers/misc/ocxl/link.c | 36 ++++++++++++++++++------------------ > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6a607488f8a..009e09b7ded5 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -151,10 +151,9 @@ static long afu_ioctl_enable_p9_wait(struct ocxl_context *ctx, > mutex_unlock(&ctx->status_mutex); > > if (status == ATTACHED) { > - int rc; > - struct link *link = ctx->afu->fn->link; > + int rc = ocxl_link_update_pe(ctx->afu->fn->link, > + ctx->pasid, ctx->tidr); > > - rc = ocxl_link_update_pe(link, ctx->pasid, ctx->tidr); > if (rc) > return rc; > } > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index d50b861d7e57..8d2690a1a9de 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -76,7 +76,7 @@ struct spa { > * limited number of opencapi slots on a system and lookup is only > * done when the device is probed > */ > -struct link { > +struct ocxl_link { > struct list_head list; > struct kref ref; > int domain; > @@ -179,7 +179,7 @@ static void xsl_fault_handler_bh(struct work_struct *fault_work) > > static irqreturn_t xsl_fault_handler(int irq, void *data) > { > - struct link *link = (struct link *) data; > + struct ocxl_link *link = (struct ocxl_link *) data; > struct spa *spa = link->spa; > u64 dsisr, dar, pe_handle; > struct pe_data *pe_data; > @@ -256,7 +256,7 @@ static int map_irq_registers(struct pci_dev *dev, struct spa *spa) > &spa->reg_tfc, &spa->reg_pe_handle); > } > > -static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > +static int setup_xsl_irq(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa = link->spa; > int rc; > @@ -311,7 +311,7 @@ static int setup_xsl_irq(struct pci_dev *dev, struct link *link) > return rc; > } > > -static void release_xsl_irq(struct link *link) > +static void release_xsl_irq(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -323,7 +323,7 @@ static void release_xsl_irq(struct link *link) > unmap_irq_registers(spa); > } > > -static int alloc_spa(struct pci_dev *dev, struct link *link) > +static int alloc_spa(struct pci_dev *dev, struct ocxl_link *link) > { > struct spa *spa; > > @@ -350,7 +350,7 @@ static int alloc_spa(struct pci_dev *dev, struct link *link) > return 0; > } > > -static void free_spa(struct link *link) > +static void free_spa(struct ocxl_link *link) > { > struct spa *spa = link->spa; > > @@ -364,12 +364,12 @@ static void free_spa(struct link *link) > } > } > > -static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > +static int alloc_link(struct pci_dev *dev, int PE_mask, struct ocxl_link **out_link) > { > - struct link *link; > + struct ocxl_link *link; > int rc; > > - link = kzalloc(sizeof(struct link), GFP_KERNEL); > + link = kzalloc(sizeof(struct ocxl_link), GFP_KERNEL); > if (!link) > return -ENOMEM; > > @@ -405,7 +405,7 @@ static int alloc_link(struct pci_dev *dev, int PE_mask, struct link **out_link) > return rc; > } > > -static void free_link(struct link *link) > +static void free_link(struct ocxl_link *link) > { > release_xsl_irq(link); > free_spa(link); > @@ -415,7 +415,7 @@ static void free_link(struct link *link) > int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle) > { > int rc = 0; > - struct link *link; > + struct ocxl_link *link; > > mutex_lock(&links_list_lock); > list_for_each_entry(link, &links_list, list) { > @@ -442,7 +442,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_setup); > > static void release_xsl(struct kref *ref) > { > - struct link *link = container_of(ref, struct link, ref); > + struct ocxl_link *link = container_of(ref, struct ocxl_link, ref); > > list_del(&link->list); > /* call platform code before releasing data */ > @@ -452,7 +452,7 @@ static void release_xsl(struct kref *ref) > > void ocxl_link_release(struct pci_dev *dev, void *link_handle) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > mutex_lock(&links_list_lock); > kref_put(&link->ref, release_xsl); > @@ -488,7 +488,7 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc = 0; > @@ -558,7 +558,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_add_pe); > > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > int pe_handle, rc; > @@ -594,7 +594,7 @@ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid) > > int ocxl_link_remove_pe(void *link_handle, int pasid) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > struct spa *spa = link->spa; > struct ocxl_process_element *pe; > struct pe_data *pe_data; > @@ -666,7 +666,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_remove_pe); > > int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *trigger_addr) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > int rc, irq; > u64 addr; > > @@ -687,7 +687,7 @@ EXPORT_SYMBOL_GPL(ocxl_link_irq_alloc); > > void ocxl_link_free_irq(void *link_handle, int hw_irq) > { > - struct link *link = (struct link *) link_handle; > + struct ocxl_link *link = (struct ocxl_link *) link_handle; > > pnv_ocxl_free_xive_irq(hw_irq); > atomic_inc(&link->irq_available); > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link 2019-03-25 5:34 ` Alastair D'Silva ` (2 preceding siblings ...) (?) @ 2019-05-03 6:59 ` Michael Ellerman -1 siblings, 0 replies; 156+ messages in thread From: Michael Ellerman @ 2019-05-03 6:59 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Mon, 2019-03-25 at 05:34:52 UTC, "Alastair D'Silva" wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The term 'link' is ambiguous (especially when the struct is used for a > list), so rename it for clarity. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/9c4ae0645682b97437072693f0edbee1 cheers ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..4dc11897237d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void @ 2019-03-25 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> No need for a return value in read_pasid as it only returns 0. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/config.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 8f2c5d8bd2ee..4dc11897237d 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) return 0; } -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) { u16 val; int pos; @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) out: dev_dbg(&dev->dev, "PASID capability:\n"); dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); - return 0; } static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) { int rc; - rc = read_pasid(dev, fn); - if (rc) { - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); - return -ENODEV; - } + read_pasid(dev, fn); rc = read_dvsec_tl(dev, fn); if (rc) { -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-03 14:20 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:20 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..4dc11897237d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void @ 2019-04-03 14:20 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:20 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, linuxppc-dev Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..4dc11897237d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-05 7:05 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..4dc11897237d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void @ 2019-04-05 7:05 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:05 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Frederic Barrat, linuxppc-dev On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > No need for a return value in read_pasid as it only returns 0. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 8f2c5d8bd2ee..4dc11897237d 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -68,7 +68,7 @@ static int find_dvsec_afu_ctrl(struct pci_dev *dev, u8 afu_idx) > return 0; > } > > -static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > +static void read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > u16 val; > int pos; > @@ -89,7 +89,6 @@ static int read_pasid(struct pci_dev *dev, struct ocxl_fn_config *fn) > out: > dev_dbg(&dev->dev, "PASID capability:\n"); > dev_dbg(&dev->dev, " Max PASID log = %d\n", fn->max_pasid_log); > - return 0; > } > > static int read_dvsec_tl(struct pci_dev *dev, struct ocxl_fn_config *fn) > @@ -205,11 +204,7 @@ int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn) > { > int rc; > > - rc = read_pasid(dev, fn); > - if (rc) { > - dev_err(&dev->dev, "Invalid PASID configuration: %d\n", rc); > - return -ENODEV; > - } > + read_pasid(dev, fn); > > rc = read_dvsec_tl(dev, fn); > if (rc) { > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers @ 2019-03-25 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The 'extern' keyword adds no value here. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- include/misc/ocxl.h | 36 ++++++++++----------- 2 files changed, 44 insertions(+), 46 deletions(-) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index a32f2151029f..321b29e77f45 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -16,7 +16,6 @@ extern struct pci_driver ocxl_pci_driver; - struct ocxl_fn { struct device dev; int bar_used[3]; @@ -92,41 +91,40 @@ struct ocxl_process_element { __be32 software_state; }; +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); +void ocxl_afu_put(struct ocxl_afu *afu); -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -extern void ocxl_afu_put(struct ocxl_afu *afu); - -extern int ocxl_create_cdev(struct ocxl_afu *afu); -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); -extern int ocxl_register_afu(struct ocxl_afu *afu); -extern void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_create_cdev(struct ocxl_afu *afu); +void ocxl_destroy_cdev(struct ocxl_afu *afu); +int ocxl_register_afu(struct ocxl_afu *afu); +void ocxl_unregister_afu(struct ocxl_afu *afu); -extern int ocxl_file_init(void); -extern void ocxl_file_exit(void); +int ocxl_file_init(void); +void ocxl_file_exit(void); -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); -extern struct ocxl_context *ocxl_context_alloc(void); -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, +struct ocxl_context *ocxl_context_alloc(void); +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); -extern int ocxl_context_mmap(struct ocxl_context *ctx, +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); +int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -extern int ocxl_context_detach(struct ocxl_context *ctx); -extern void ocxl_context_detach_all(struct ocxl_afu *afu); -extern void ocxl_context_free(struct ocxl_context *ctx); +int ocxl_context_detach(struct ocxl_context *ctx); +void ocxl_context_detach_all(struct ocxl_afu *afu); +void ocxl_context_free(struct ocxl_context *ctx); -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9ff6ddc28e22..4544573cc93c 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -53,7 +53,7 @@ struct ocxl_fn_config { * Read the configuration space of a function and fill in a * ocxl_fn_config structure with all the function details */ -extern int ocxl_config_read_function(struct pci_dev *dev, +int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); /* @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, * AFU indexes can be sparse, so a driver should check all indexes up * to the maximum found in the function description */ -extern int ocxl_config_check_afu_index(struct pci_dev *dev, +int ocxl_config_check_afu_index(struct pci_dev *dev, struct ocxl_fn_config *fn, int afu_idx); /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure */ -extern int ocxl_config_read_afu(struct pci_dev *dev, +int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu, u8 afu_idx); @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, /* * Get the max PASID value that can be used by the function */ -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); /* * Tell an AFU, by writing in the configuration space, the PASIDs that @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); * 'afu_control_offset' is the offset of the AFU control DVSEC which * can be found in the function configuration */ -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, +void ocxl_config_set_afu_pasid(struct pci_dev *dev, int afu_control_offset, int pasid_base, u32 pasid_count_log); @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, * 'supported' is the total number of actags desired by all the AFUs * of the function. */ -extern int ocxl_config_get_actag_info(struct pci_dev *dev, +int ocxl_config_get_actag_info(struct pci_dev *dev, u16 *base, u16 *enabled, u16 *supported); /* @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, * 'func_offset' is the offset of the Function DVSEC that can found in * the function configuration */ -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, u32 actag_base, u32 actag_count); /* @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, +void ocxl_config_set_afu_actag(struct pci_dev *dev, int afu_control_offset, int actag_base, int actag_count); @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern void ocxl_config_set_afu_state(struct pci_dev *dev, +void ocxl_config_set_afu_state(struct pci_dev *dev, int afu_control_offset, int enable); /* @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, * between the host and device, and set the Transaction Layer on both * accordingly. */ -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); /* * Request an AFU to terminate a PASID. @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); * 'afu_control_offset' is the offset of the AFU control DVSEC for the * desired AFU. It can be found in the AFU configuration */ -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, +int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); /* @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, * Returns a 'link handle' that should be used for further calls for * the link */ -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, void **link_handle); /* * Remove the association between the function and its link. */ -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); +void ocxl_link_release(struct pci_dev *dev, void *link_handle); /* * Add a Process Element to the Shared Process Area for a link. @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); * 'xsl_err_data' is an argument passed to the above callback, if * defined */ -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, u64 amr, struct mm_struct *mm, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, * pasid: the PASID for the AFU context * tid: the new thread id for the process element */ -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); /* * Remove a Process Element from the Shared Process Area for a link */ -extern int ocxl_link_remove_pe(void *link_handle, int pasid); +int ocxl_link_remove_pe(void *link_handle, int pasid); /* * Allocate an AFU interrupt associated to the link. @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); * interrupt. It is an MMIO address which needs to be remapped (one * page). */ -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, u64 *obj_handle); /* * Free a previously allocated AFU interrupt */ -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); +void ocxl_link_free_irq(void *link_handle, int hw_irq); #endif /* _MISC_OCXL_H_ */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 16:55 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:55 UTC (permalink / raw) To: Alastair D'Silva Cc: alastair, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Mon, 25 Mar 2019 16:34:54 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers @ 2019-03-25 16:55 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:55 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, alastair, Frederic Barrat, linuxppc-dev On Mon, 25 Mar 2019 16:34:54 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-03 14:20 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:20 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers @ 2019-04-03 14:20 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:20 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-05 7:09 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:09 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers @ 2019-04-05 7:09 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:09 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Greg Kroah-Hartman, linuxppc-dev, linux-kernel, Arnd Bergmann On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The 'extern' keyword adds no value here. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > drivers/misc/ocxl/ocxl_internal.h | 54 +++++++++++++++---------------- > include/misc/ocxl.h | 36 ++++++++++----------- > 2 files changed, 44 insertions(+), 46 deletions(-) > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index a32f2151029f..321b29e77f45 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -16,7 +16,6 @@ > > extern struct pci_driver ocxl_pci_driver; > > - > struct ocxl_fn { > struct device dev; > int bar_used[3]; > @@ -92,41 +91,40 @@ struct ocxl_process_element { > __be32 software_state; > }; > > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > +void ocxl_afu_put(struct ocxl_afu *afu); > > -extern struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); > -extern void ocxl_afu_put(struct ocxl_afu *afu); > - > -extern int ocxl_create_cdev(struct ocxl_afu *afu); > -extern void ocxl_destroy_cdev(struct ocxl_afu *afu); > -extern int ocxl_register_afu(struct ocxl_afu *afu); > -extern void ocxl_unregister_afu(struct ocxl_afu *afu); > +int ocxl_create_cdev(struct ocxl_afu *afu); > +void ocxl_destroy_cdev(struct ocxl_afu *afu); > +int ocxl_register_afu(struct ocxl_afu *afu); > +void ocxl_unregister_afu(struct ocxl_afu *afu); > > -extern int ocxl_file_init(void); > -extern void ocxl_file_exit(void); > +int ocxl_file_init(void); > +void ocxl_file_exit(void); > > -extern int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > -extern int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > -extern void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_pasid_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > +int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > +void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > -extern struct ocxl_context *ocxl_context_alloc(void); > -extern int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > +struct ocxl_context *ocxl_context_alloc(void); > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > -extern int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > -extern int ocxl_context_mmap(struct ocxl_context *ctx, > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > +int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -extern int ocxl_context_detach(struct ocxl_context *ctx); > -extern void ocxl_context_detach_all(struct ocxl_afu *afu); > -extern void ocxl_context_free(struct ocxl_context *ctx); > +int ocxl_context_detach(struct ocxl_context *ctx); > +void ocxl_context_detach_all(struct ocxl_afu *afu); > +void ocxl_context_free(struct ocxl_context *ctx); > > -extern int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > -extern void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > +int ocxl_sysfs_add_afu(struct ocxl_afu *afu); > +void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); > > -extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -extern int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > -extern void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -extern int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > -extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 9ff6ddc28e22..4544573cc93c 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -53,7 +53,7 @@ struct ocxl_fn_config { > * Read the configuration space of a function and fill in a > * ocxl_fn_config structure with all the function details > */ > -extern int ocxl_config_read_function(struct pci_dev *dev, > +int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > /* > @@ -62,14 +62,14 @@ extern int ocxl_config_read_function(struct pci_dev *dev, > * AFU indexes can be sparse, so a driver should check all indexes up > * to the maximum found in the function description > */ > -extern int ocxl_config_check_afu_index(struct pci_dev *dev, > +int ocxl_config_check_afu_index(struct pci_dev *dev, > struct ocxl_fn_config *fn, int afu_idx); > > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > */ > -extern int ocxl_config_read_afu(struct pci_dev *dev, > +int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu, > u8 afu_idx); > @@ -77,7 +77,7 @@ extern int ocxl_config_read_afu(struct pci_dev *dev, > /* > * Get the max PASID value that can be used by the function > */ > -extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > @@ -87,7 +87,7 @@ extern int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > * 'afu_control_offset' is the offset of the AFU control DVSEC which > * can be found in the function configuration > */ > -extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > +void ocxl_config_set_afu_pasid(struct pci_dev *dev, > int afu_control_offset, > int pasid_base, u32 pasid_count_log); > > @@ -98,7 +98,7 @@ extern void ocxl_config_set_afu_pasid(struct pci_dev *dev, > * 'supported' is the total number of actags desired by all the AFUs > * of the function. > */ > -extern int ocxl_config_get_actag_info(struct pci_dev *dev, > +int ocxl_config_get_actag_info(struct pci_dev *dev, > u16 *base, u16 *enabled, u16 *supported); > > /* > @@ -108,7 +108,7 @@ extern int ocxl_config_get_actag_info(struct pci_dev *dev, > * 'func_offset' is the offset of the Function DVSEC that can found in > * the function configuration > */ > -extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > +void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > u32 actag_base, u32 actag_count); > > /* > @@ -118,7 +118,7 @@ extern void ocxl_config_set_actag(struct pci_dev *dev, int func_offset, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > +void ocxl_config_set_afu_actag(struct pci_dev *dev, > int afu_control_offset, > int actag_base, int actag_count); > > @@ -128,7 +128,7 @@ extern void ocxl_config_set_afu_actag(struct pci_dev *dev, > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern void ocxl_config_set_afu_state(struct pci_dev *dev, > +void ocxl_config_set_afu_state(struct pci_dev *dev, > int afu_control_offset, int enable); > > /* > @@ -139,7 +139,7 @@ extern void ocxl_config_set_afu_state(struct pci_dev *dev, > * between the host and device, and set the Transaction Layer on both > * accordingly. > */ > -extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > +int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > > /* > * Request an AFU to terminate a PASID. > @@ -152,7 +152,7 @@ extern int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); > * 'afu_control_offset' is the offset of the AFU control DVSEC for the > * desired AFU. It can be found in the AFU configuration > */ > -extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > +int ocxl_config_terminate_pasid(struct pci_dev *dev, > int afu_control_offset, int pasid); > > /* > @@ -165,13 +165,13 @@ extern int ocxl_config_terminate_pasid(struct pci_dev *dev, > * Returns a 'link handle' that should be used for further calls for > * the link > */ > -extern int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > +int ocxl_link_setup(struct pci_dev *dev, int PE_mask, > void **link_handle); > > /* > * Remove the association between the function and its link. > */ > -extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > +void ocxl_link_release(struct pci_dev *dev, void *link_handle); > > /* > * Add a Process Element to the Shared Process Area for a link. > @@ -183,7 +183,7 @@ extern void ocxl_link_release(struct pci_dev *dev, void *link_handle); > * 'xsl_err_data' is an argument passed to the above callback, if > * defined > */ > -extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > +int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > u64 amr, struct mm_struct *mm, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > @@ -195,12 +195,12 @@ extern int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > * pasid: the PASID for the AFU context > * tid: the new thread id for the process element > */ > -extern int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -extern int ocxl_link_remove_pe(void *link_handle, int pasid); > +int ocxl_link_remove_pe(void *link_handle, int pasid); > > /* > * Allocate an AFU interrupt associated to the link. > @@ -212,12 +212,12 @@ extern int ocxl_link_remove_pe(void *link_handle, int pasid); > * interrupt. It is an MMIO address which needs to be remapped (one > * page). > */ > -extern int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > +int ocxl_link_irq_alloc(void *link_handle, int *hw_irq, > u64 *obj_handle); > > /* > * Free a previously allocated AFU interrupt > */ > -extern void ocxl_link_free_irq(void *link_handle, int hw_irq); > +void ocxl_link_free_irq(void *link_handle, int hw_irq); > > #endif /* _MISC_OCXL_H_ */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v4 4/4] ocxl: Remove some unused exported symbols 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 5:34 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 4 +--- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 4dc11897237d..5e65acb8e134 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -2,8 +2,8 @@ // Copyright 2017 IBM Corp. #include <linux/pci.h> #include <asm/pnv-ocxl.h> -#include <misc/ocxl.h> #include <misc/ocxl-config.h> +#include "ocxl_internal.h" #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v4 4/4] ocxl: Remove some unused exported symbols @ 2019-03-25 5:34 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:34 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Remove some unused exported symbols. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/config.c | 4 +--- drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ include/misc/ocxl.h | 23 ----------------------- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c index 4dc11897237d..5e65acb8e134 100644 --- a/drivers/misc/ocxl/config.c +++ b/drivers/misc/ocxl/config.c @@ -2,8 +2,8 @@ // Copyright 2017 IBM Corp. #include <linux/pci.h> #include <asm/pnv-ocxl.h> -#include <misc/ocxl.h> #include <misc/ocxl-config.h> +#include "ocxl_internal.h" #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, } return 1; } -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, struct ocxl_afu_config *afu) @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) { return pnv_ocxl_get_pasid_count(dev, count); } -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, u32 pasid_count_log) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 321b29e77f45..06fd98c989c8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); +/* + * Get the max PASID value that can be used by the function + */ +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); + +/* + * Check if an AFU index is valid for the given function. + * + * AFU indexes can be sparse, so a driver should check all indexes up + * to the maximum found in the function description + */ +int ocxl_config_check_afu_index(struct pci_dev *dev, + struct ocxl_fn_config *fn, int afu_idx); + +/** + * Update values within a Process Element + * + * link_handle: the link handle associated with the process element + * pasid: the PASID for the AFU context + * tid: the new thread id for the process element + */ +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); + struct ocxl_context *ocxl_context_alloc(void); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 4544573cc93c..9530d3be1b30 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -56,15 +56,6 @@ struct ocxl_fn_config { int ocxl_config_read_function(struct pci_dev *dev, struct ocxl_fn_config *fn); -/* - * Check if an AFU index is valid for the given function. - * - * AFU indexes can be sparse, so a driver should check all indexes up - * to the maximum found in the function description - */ -int ocxl_config_check_afu_index(struct pci_dev *dev, - struct ocxl_fn_config *fn, int afu_idx); - /* * Read the configuration space of a function for the AFU specified by * the index 'afu_idx'. Fills in a ocxl_afu_config structure @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, struct ocxl_afu_config *afu, u8 afu_idx); -/* - * Get the max PASID value that can be used by the function - */ -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); - /* * Tell an AFU, by writing in the configuration space, the PASIDs that * it can use. Range starts at 'pasid_base' and its size is a multiple @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), void *xsl_err_data); -/** - * Update values within a Process Element - * - * link_handle: the link handle associated with the process element - * pasid: the PASID for the AFU context - * tid: the new thread id for the process element - */ -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); - /* * Remove a Process Element from the Shared Process Area for a link */ -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 16:57 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:57 UTC (permalink / raw) To: Alastair D'Silva Cc: alastair, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev On Mon, 25 Mar 2019 16:34:55 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols @ 2019-03-25 16:57 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:57 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, alastair, Frederic Barrat, linuxppc-dev On Mon, 25 Mar 2019 16:34:55 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-03 14:23 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:23 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols @ 2019-04-03 14:23 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-04-03 14:23 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:34, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols 2019-03-25 5:34 ` Alastair D'Silva @ 2019-04-05 7:28 ` Andrew Donnellan -1 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:28 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Arnd Bergmann, Greg Kroah-Hartman, linuxppc-dev, linux-kernel On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 4/4] ocxl: Remove some unused exported symbols @ 2019-04-05 7:28 ` Andrew Donnellan 0 siblings, 0 replies; 156+ messages in thread From: Andrew Donnellan @ 2019-04-05 7:28 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Frederic Barrat, Greg Kroah-Hartman, linuxppc-dev, linux-kernel, Arnd Bergmann On 25/3/19 4:34 pm, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Remove some unused exported symbols. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > drivers/misc/ocxl/config.c | 4 +--- > drivers/misc/ocxl/ocxl_internal.h | 23 +++++++++++++++++++++++ > include/misc/ocxl.h | 23 ----------------------- > 3 files changed, 24 insertions(+), 26 deletions(-) > > diff --git a/drivers/misc/ocxl/config.c b/drivers/misc/ocxl/config.c > index 4dc11897237d..5e65acb8e134 100644 > --- a/drivers/misc/ocxl/config.c > +++ b/drivers/misc/ocxl/config.c > @@ -2,8 +2,8 @@ > // Copyright 2017 IBM Corp. > #include <linux/pci.h> > #include <asm/pnv-ocxl.h> > -#include <misc/ocxl.h> > #include <misc/ocxl-config.h> > +#include "ocxl_internal.h" > > #define EXTRACT_BIT(val, bit) (!!(val & BIT(bit))) > #define EXTRACT_BITS(val, s, e) ((val & GENMASK(e, s)) >> s) > @@ -299,7 +299,6 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > } > return 1; > } > -EXPORT_SYMBOL_GPL(ocxl_config_check_afu_index); > > static int read_afu_name(struct pci_dev *dev, struct ocxl_fn_config *fn, > struct ocxl_afu_config *afu) > @@ -535,7 +534,6 @@ int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count) > { > return pnv_ocxl_get_pasid_count(dev, count); > } > -EXPORT_SYMBOL_GPL(ocxl_config_get_pasid_info); > > void ocxl_config_set_afu_pasid(struct pci_dev *dev, int pos, int pasid_base, > u32 pasid_count_log) > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 321b29e77f45..06fd98c989c8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -107,6 +107,29 @@ void ocxl_pasid_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > int ocxl_actag_afu_alloc(struct ocxl_fn *fn, u32 size); > void ocxl_actag_afu_free(struct ocxl_fn *fn, u32 start, u32 size); > > +/* > + * Get the max PASID value that can be used by the function > + */ > +int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > + > +/* > + * Check if an AFU index is valid for the given function. > + * > + * AFU indexes can be sparse, so a driver should check all indexes up > + * to the maximum found in the function description > + */ > +int ocxl_config_check_afu_index(struct pci_dev *dev, > + struct ocxl_fn_config *fn, int afu_idx); > + > +/** > + * Update values within a Process Element > + * > + * link_handle: the link handle associated with the process element > + * pasid: the PASID for the AFU context > + * tid: the new thread id for the process element > + */ > +int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > + > struct ocxl_context *ocxl_context_alloc(void); > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 4544573cc93c..9530d3be1b30 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -56,15 +56,6 @@ struct ocxl_fn_config { > int ocxl_config_read_function(struct pci_dev *dev, > struct ocxl_fn_config *fn); > > -/* > - * Check if an AFU index is valid for the given function. > - * > - * AFU indexes can be sparse, so a driver should check all indexes up > - * to the maximum found in the function description > - */ > -int ocxl_config_check_afu_index(struct pci_dev *dev, > - struct ocxl_fn_config *fn, int afu_idx); > - > /* > * Read the configuration space of a function for the AFU specified by > * the index 'afu_idx'. Fills in a ocxl_afu_config structure > @@ -74,11 +65,6 @@ int ocxl_config_read_afu(struct pci_dev *dev, > struct ocxl_afu_config *afu, > u8 afu_idx); > > -/* > - * Get the max PASID value that can be used by the function > - */ > -int ocxl_config_get_pasid_info(struct pci_dev *dev, int *count); > - > /* > * Tell an AFU, by writing in the configuration space, the PASIDs that > * it can use. Range starts at 'pasid_base' and its size is a multiple > @@ -188,15 +174,6 @@ int ocxl_link_add_pe(void *link_handle, int pasid, u32 pidr, u32 tidr, > void (*xsl_err_cb)(void *data, u64 addr, u64 dsisr), > void *xsl_err_data); > > -/** > - * Update values within a Process Element > - * > - * link_handle: the link handle associated with the process element > - * pasid: the PASID for the AFU context > - * tid: the new thread id for the process element > - */ > -int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > - > /* > * Remove a Process Element from the Shared Process Area for a link > */ > -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup 2019-03-25 5:34 ` Alastair D'Silva @ 2019-03-25 16:49 ` Greg Kurz -1 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:49 UTC (permalink / raw) To: Alastair D'Silva Cc: alastair, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev Hi Alastair, I forgot to mention it during v3 but please don't link new version of a patchset to the previous one with --in-reply-to. This is to ensure I can see them in my email client without having to scroll back many days in the past (which likely means a fair number of e-mails on linuxppc-dev). Cheers, -- Greg On Mon, 25 Mar 2019 16:34:51 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Some minor cleanups for the OpenCAPI driver as a prerequisite > for an ocxl driver refactoring to allow the driver core to > be utilised by external drivers. > > Changelog: > V4: > - Drop printf format changes as they omit the format indicator for '0' > V3: > - Add missed header in 'ocxl: Remove some unused exported symbols'. > This addresses the introduced sparse warnings > V2: > - remove intermediate assignment of 'link' var in > 'Rename struct link to ocxl_link' > - Don't shift definition of ocxl_context_attach in > 'Remove some unused exported symbols' > > > Alastair D'Silva (4): > ocxl: Rename struct link to ocxl_link > ocxl: read_pasid never returns an error, so make it void > ocxl: Remove superfluous 'extern' from headers > ocxl: Remove some unused exported symbols > > drivers/misc/ocxl/config.c | 13 ++--- > drivers/misc/ocxl/file.c | 5 +- > drivers/misc/ocxl/link.c | 36 ++++++------- > drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ > include/misc/ocxl.h | 53 ++++++------------- > 5 files changed, 91 insertions(+), 101 deletions(-) > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup @ 2019-03-25 16:49 ` Greg Kurz 0 siblings, 0 replies; 156+ messages in thread From: Greg Kurz @ 2019-03-25 16:49 UTC (permalink / raw) To: Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, alastair, Frederic Barrat, linuxppc-dev Hi Alastair, I forgot to mention it during v3 but please don't link new version of a patchset to the previous one with --in-reply-to. This is to ensure I can see them in my email client without having to scroll back many days in the past (which likely means a fair number of e-mails on linuxppc-dev). Cheers, -- Greg On Mon, 25 Mar 2019 16:34:51 +1100 "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > Some minor cleanups for the OpenCAPI driver as a prerequisite > for an ocxl driver refactoring to allow the driver core to > be utilised by external drivers. > > Changelog: > V4: > - Drop printf format changes as they omit the format indicator for '0' > V3: > - Add missed header in 'ocxl: Remove some unused exported symbols'. > This addresses the introduced sparse warnings > V2: > - remove intermediate assignment of 'link' var in > 'Rename struct link to ocxl_link' > - Don't shift definition of ocxl_context_attach in > 'Remove some unused exported symbols' > > > Alastair D'Silva (4): > ocxl: Rename struct link to ocxl_link > ocxl: read_pasid never returns an error, so make it void > ocxl: Remove superfluous 'extern' from headers > ocxl: Remove some unused exported symbols > > drivers/misc/ocxl/config.c | 13 ++--- > drivers/misc/ocxl/file.c | 5 +- > drivers/misc/ocxl/link.c | 36 ++++++------- > drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ > include/misc/ocxl.h | 53 ++++++------------- > 5 files changed, 91 insertions(+), 101 deletions(-) > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup 2019-03-25 16:49 ` Greg Kurz @ 2019-03-25 17:34 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 17:34 UTC (permalink / raw) To: Greg Kurz, Alastair D'Silva Cc: alastair, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, linuxppc-dev Le 25/03/2019 à 17:49, Greg Kurz a écrit : > Hi Alastair, > > I forgot to mention it during v3 but please don't link new version > of a patchset to the previous one with --in-reply-to. This is to > ensure I can see them in my email client without having to scroll > back many days in the past (which likely means a fair number of > e-mails on linuxppc-dev). I'm also seeing the other series (ocxl refactoring) somehow under the same thread. I haven't checked why, and there may be some mail client bug in the way, I just mention it in case you see a reason for it in the way you submit the patch set. Fred > > Cheers, > > -- > Greg > > On Mon, 25 Mar 2019 16:34:51 +1100 > "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > >> From: Alastair D'Silva <alastair@d-silva.org> >> >> Some minor cleanups for the OpenCAPI driver as a prerequisite >> for an ocxl driver refactoring to allow the driver core to >> be utilised by external drivers. >> >> Changelog: >> V4: >> - Drop printf format changes as they omit the format indicator for '0' >> V3: >> - Add missed header in 'ocxl: Remove some unused exported symbols'. >> This addresses the introduced sparse warnings >> V2: >> - remove intermediate assignment of 'link' var in >> 'Rename struct link to ocxl_link' >> - Don't shift definition of ocxl_context_attach in >> 'Remove some unused exported symbols' >> >> >> Alastair D'Silva (4): >> ocxl: Rename struct link to ocxl_link >> ocxl: read_pasid never returns an error, so make it void >> ocxl: Remove superfluous 'extern' from headers >> ocxl: Remove some unused exported symbols >> >> drivers/misc/ocxl/config.c | 13 ++--- >> drivers/misc/ocxl/file.c | 5 +- >> drivers/misc/ocxl/link.c | 36 ++++++------- >> drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ >> include/misc/ocxl.h | 53 ++++++------------- >> 5 files changed, 91 insertions(+), 101 deletions(-) >> > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup @ 2019-03-25 17:34 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 17:34 UTC (permalink / raw) To: Greg Kurz, Alastair D'Silva Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, alastair, linuxppc-dev Le 25/03/2019 à 17:49, Greg Kurz a écrit : > Hi Alastair, > > I forgot to mention it during v3 but please don't link new version > of a patchset to the previous one with --in-reply-to. This is to > ensure I can see them in my email client without having to scroll > back many days in the past (which likely means a fair number of > e-mails on linuxppc-dev). I'm also seeing the other series (ocxl refactoring) somehow under the same thread. I haven't checked why, and there may be some mail client bug in the way, I just mention it in case you see a reason for it in the way you submit the patch set. Fred > > Cheers, > > -- > Greg > > On Mon, 25 Mar 2019 16:34:51 +1100 > "Alastair D'Silva" <alastair@au1.ibm.com> wrote: > >> From: Alastair D'Silva <alastair@d-silva.org> >> >> Some minor cleanups for the OpenCAPI driver as a prerequisite >> for an ocxl driver refactoring to allow the driver core to >> be utilised by external drivers. >> >> Changelog: >> V4: >> - Drop printf format changes as they omit the format indicator for '0' >> V3: >> - Add missed header in 'ocxl: Remove some unused exported symbols'. >> This addresses the introduced sparse warnings >> V2: >> - remove intermediate assignment of 'link' var in >> 'Rename struct link to ocxl_link' >> - Don't shift definition of ocxl_context_attach in >> 'Remove some unused exported symbols' >> >> >> Alastair D'Silva (4): >> ocxl: Rename struct link to ocxl_link >> ocxl: read_pasid never returns an error, so make it void >> ocxl: Remove superfluous 'extern' from headers >> ocxl: Remove some unused exported symbols >> >> drivers/misc/ocxl/config.c | 13 ++--- >> drivers/misc/ocxl/file.c | 5 +- >> drivers/misc/ocxl/link.c | 36 ++++++------- >> drivers/misc/ocxl/ocxl_internal.h | 85 +++++++++++++++++++------------ >> include/misc/ocxl.h | 53 ++++++------------- >> 5 files changed, 91 insertions(+), 101 deletions(-) >> > ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup 2019-03-25 17:34 ` Frederic Barrat @ 2019-03-25 21:45 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 21:45 UTC (permalink / raw) To: 'Frederic Barrat', 'Greg Kurz', 'Alastair D'Silva' Cc: 'Arnd Bergmann', 'Greg Kroah-Hartman', linux-kernel, 'Andrew Donnellan', linuxppc-dev > -----Original Message----- > From: Frederic Barrat <fbarrat@linux.ibm.com> > Sent: Tuesday, 26 March 2019 4:34 AM > To: Greg Kurz <groug@kaod.org>; Alastair D'Silva <alastair@au1.ibm.com> > Cc: alastair@d-silva.org; Arnd Bergmann <arnd@arndb.de>; Greg Kroah- > Hartman <gregkh@linuxfoundation.org>; linux-kernel@vger.kernel.org; > Andrew Donnellan <andrew.donnellan@au1.ibm.com>; linuxppc- > dev@lists.ozlabs.org > Subject: Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup > > > > Le 25/03/2019 à 17:49, Greg Kurz a écrit : > > Hi Alastair, > > > > I forgot to mention it during v3 but please don't link new version of > > a patchset to the previous one with --in-reply-to. This is to ensure I > > can see them in my email client without having to scroll back many > > days in the past (which likely means a fair number of e-mails on > > linuxppc-dev). > > > I'm also seeing the other series (ocxl refactoring) somehow under the same > thread. I haven't checked why, and there may be some mail client bug in the > way, I just mention it in case you see a reason for it in the way you submit > the patch set. > I probably grabbed the wrong message-id. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* RE: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup @ 2019-03-25 21:45 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 21:45 UTC (permalink / raw) To: 'Frederic Barrat', 'Greg Kurz', 'Alastair D'Silva' Cc: 'Andrew Donnellan', 'Greg Kroah-Hartman', linuxppc-dev, linux-kernel, 'Arnd Bergmann' > -----Original Message----- > From: Frederic Barrat <fbarrat@linux.ibm.com> > Sent: Tuesday, 26 March 2019 4:34 AM > To: Greg Kurz <groug@kaod.org>; Alastair D'Silva <alastair@au1.ibm.com> > Cc: alastair@d-silva.org; Arnd Bergmann <arnd@arndb.de>; Greg Kroah- > Hartman <gregkh@linuxfoundation.org>; linux-kernel@vger.kernel.org; > Andrew Donnellan <andrew.donnellan@au1.ibm.com>; linuxppc- > dev@lists.ozlabs.org > Subject: Re: [PATCH v4 0/4] ocxl: OpenCAPI Cleanup > > > > Le 25/03/2019 à 17:49, Greg Kurz a écrit : > > Hi Alastair, > > > > I forgot to mention it during v3 but please don't link new version of > > a patchset to the previous one with --in-reply-to. This is to ensure I > > can see them in my email client without having to scroll back many > > days in the past (which likely means a fair number of e-mails on > > linuxppc-dev). > > > I'm also seeing the other series (ocxl refactoring) somehow under the same > thread. I haven't checked why, and there may be some mail client bug in the > way, I just mention it in case you see a reason for it in the way you submit > the patch set. > I probably grabbed the wrong message-id. -- Alastair D'Silva mob: 0423 762 819 skype: alastair_dsilva msn: alastair@d-silva.org blog: http://alastair.d-silva.org Twitter: @EvilDeece ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 0/7] Refactor OCXL driver to allow external drivers to use it 2019-03-20 5:34 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Changelog: V3: - For: 'ocxl: Create a clear delineation between ocxl backend & frontend' - Integrate Frederick Barrat's suggestions - Further cleanup on error paths - Remove release handler for AFU private data - Make ocxl_file_make_(in)visibile static & call from ocxl_file_(un)register V2: - Reorder patches as some required structs that were only available later - Add dev.release implementation for ocxl_file_info to address warning on driver unload (ocxl: Create a clear delineation...) - Set output var irq_id in ocxl_afu_irq_alloc (ocxl: afu_irq only deals...) - Bump copyright year (ocxl: Provide global MMIO accessors..., ocxl: Split pci.c) Alastair D'Silva (7): ocxl: Split pci.c ocxl: Don't pass pci_dev around ocxl: Create a clear delineation between ocxl backend & frontend ocxl: Allow external drivers to use OpenCAPI contexts ocxl: afu_irq only deals with IRQ IDs, not offsets ocxl: move event_fd handling to frontend ocxl: Provide global MMIO accessors for external drivers drivers/misc/ocxl/Makefile | 3 +- drivers/misc/ocxl/afu_irq.c | 104 +++--- drivers/misc/ocxl/context.c | 18 +- drivers/misc/ocxl/core.c | 574 ++++++++++++++++++++++++++++++ drivers/misc/ocxl/file.c | 172 ++++++--- drivers/misc/ocxl/mmio.c | 234 ++++++++++++ drivers/misc/ocxl/ocxl_internal.h | 46 ++- drivers/misc/ocxl/pci.c | 565 ++--------------------------- drivers/misc/ocxl/sysfs.c | 59 +-- drivers/misc/ocxl/trace.h | 12 +- include/misc/ocxl.h | 320 ++++++++++++++++- 11 files changed, 1406 insertions(+), 701 deletions(-) create mode 100644 drivers/misc/ocxl/core.c create mode 100644 drivers/misc/ocxl/mmio.c -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 0/7] Refactor OCXL driver to allow external drivers to use it @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Changelog: V3: - For: 'ocxl: Create a clear delineation between ocxl backend & frontend' - Integrate Frederick Barrat's suggestions - Further cleanup on error paths - Remove release handler for AFU private data - Make ocxl_file_make_(in)visibile static & call from ocxl_file_(un)register V2: - Reorder patches as some required structs that were only available later - Add dev.release implementation for ocxl_file_info to address warning on driver unload (ocxl: Create a clear delineation...) - Set output var irq_id in ocxl_afu_irq_alloc (ocxl: afu_irq only deals...) - Bump copyright year (ocxl: Provide global MMIO accessors..., ocxl: Split pci.c) Alastair D'Silva (7): ocxl: Split pci.c ocxl: Don't pass pci_dev around ocxl: Create a clear delineation between ocxl backend & frontend ocxl: Allow external drivers to use OpenCAPI contexts ocxl: afu_irq only deals with IRQ IDs, not offsets ocxl: move event_fd handling to frontend ocxl: Provide global MMIO accessors for external drivers drivers/misc/ocxl/Makefile | 3 +- drivers/misc/ocxl/afu_irq.c | 104 +++--- drivers/misc/ocxl/context.c | 18 +- drivers/misc/ocxl/core.c | 574 ++++++++++++++++++++++++++++++ drivers/misc/ocxl/file.c | 172 ++++++--- drivers/misc/ocxl/mmio.c | 234 ++++++++++++ drivers/misc/ocxl/ocxl_internal.h | 46 ++- drivers/misc/ocxl/pci.c | 565 ++--------------------------- drivers/misc/ocxl/sysfs.c | 59 +-- drivers/misc/ocxl/trace.h | 12 +- include/misc/ocxl.h | 320 ++++++++++++++++- 11 files changed, 1406 insertions(+), 701 deletions(-) create mode 100644 drivers/misc/ocxl/core.c create mode 100644 drivers/misc/ocxl/mmio.c -- 2.20.1 ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 1/7] ocxl: Split pci.c 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> In preparation for making core code available for external drivers, move the core code out of pci.c and into core.c Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/Makefile | 1 + drivers/misc/ocxl/core.c | 517 +++++++++++++++++++++++++++++ drivers/misc/ocxl/ocxl_internal.h | 5 + drivers/misc/ocxl/pci.c | 519 +----------------------------- 4 files changed, 524 insertions(+), 518 deletions(-) create mode 100644 drivers/misc/ocxl/core.c diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile index 5229dcda8297..bc4e39bfda7b 100644 --- a/drivers/misc/ocxl/Makefile +++ b/drivers/misc/ocxl/Makefile @@ -3,6 +3,7 @@ ccflags-$(CONFIG_PPC_WERROR) += -Werror ocxl-y += main.o pci.o config.o file.o pasid.o ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o +ocxl-y += core.o obj-$(CONFIG_OCXL) += ocxl.o # For tracepoints to include our trace.h from tracepoint infrastructure: diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c new file mode 100644 index 000000000000..1a4411b72d35 --- /dev/null +++ b/drivers/misc/ocxl/core.c @@ -0,0 +1,517 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2019 IBM Corp. +#include <linux/idr.h> +#include "ocxl_internal.h" + +static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) +{ + return (get_device(&fn->dev) == NULL) ? NULL : fn; +} + +static void ocxl_fn_put(struct ocxl_fn *fn) +{ + put_device(&fn->dev); +} + +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) +{ + return (get_device(&afu->dev) == NULL) ? NULL : afu; +} + +void ocxl_afu_put(struct ocxl_afu *afu) +{ + put_device(&afu->dev); +} + +static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) +{ + struct ocxl_afu *afu; + + afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); + if (!afu) + return NULL; + + mutex_init(&afu->contexts_lock); + mutex_init(&afu->afu_control_lock); + idr_init(&afu->contexts_idr); + afu->fn = fn; + ocxl_fn_get(fn); + return afu; +} + +static void free_afu(struct ocxl_afu *afu) +{ + idr_destroy(&afu->contexts_idr); + ocxl_fn_put(afu->fn); + kfree(afu); +} + +static void free_afu_dev(struct device *dev) +{ + struct ocxl_afu *afu = to_ocxl_afu(dev); + + ocxl_unregister_afu(afu); + free_afu(afu); +} + +static int set_afu_device(struct ocxl_afu *afu, const char *location) +{ + struct ocxl_fn *fn = afu->fn; + int rc; + + afu->dev.parent = &fn->dev; + afu->dev.release = free_afu_dev; + rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, + afu->config.idx); + return rc; +} + +static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) +{ + struct ocxl_fn *fn = afu->fn; + int actag_count, actag_offset; + + /* + * if there were not enough actags for the function, each afu + * reduces its count as well + */ + actag_count = afu->config.actag_supported * + fn->actag_enabled / fn->actag_supported; + actag_offset = ocxl_actag_afu_alloc(fn, actag_count); + if (actag_offset < 0) { + dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", + actag_count, actag_offset); + return actag_offset; + } + afu->actag_base = fn->actag_base + actag_offset; + afu->actag_enabled = actag_count; + + ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, + afu->actag_base, afu->actag_enabled); + dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", + afu->actag_base, afu->actag_enabled); + return 0; +} + +static void reclaim_afu_actag(struct ocxl_afu *afu) +{ + struct ocxl_fn *fn = afu->fn; + int start_offset, size; + + start_offset = afu->actag_base - fn->actag_base; + size = afu->actag_enabled; + ocxl_actag_afu_free(afu->fn, start_offset, size); +} + +static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) +{ + struct ocxl_fn *fn = afu->fn; + int pasid_count, pasid_offset; + + /* + * We only support the case where the function configuration + * requested enough PASIDs to cover all AFUs. + */ + pasid_count = 1 << afu->config.pasid_supported_log; + pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); + if (pasid_offset < 0) { + dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", + pasid_count, pasid_offset); + return pasid_offset; + } + afu->pasid_base = fn->pasid_base + pasid_offset; + afu->pasid_count = 0; + afu->pasid_max = pasid_count; + + ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, + afu->pasid_base, + afu->config.pasid_supported_log); + dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", + afu->pasid_base, pasid_count); + return 0; +} + +static void reclaim_afu_pasid(struct ocxl_afu *afu) +{ + struct ocxl_fn *fn = afu->fn; + int start_offset, size; + + start_offset = afu->pasid_base - fn->pasid_base; + size = 1 << afu->config.pasid_supported_log; + ocxl_pasid_afu_free(afu->fn, start_offset, size); +} + +static int reserve_fn_bar(struct ocxl_fn *fn, int bar) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int rc, idx; + + if (bar != 0 && bar != 2 && bar != 4) + return -EINVAL; + + idx = bar >> 1; + if (fn->bar_used[idx]++ == 0) { + rc = pci_request_region(dev, bar, "ocxl"); + if (rc) + return rc; + } + return 0; +} + +static void release_fn_bar(struct ocxl_fn *fn, int bar) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int idx; + + if (bar != 0 && bar != 2 && bar != 4) + return; + + idx = bar >> 1; + if (--fn->bar_used[idx] == 0) + pci_release_region(dev, bar); + WARN_ON(fn->bar_used[idx] < 0); +} + +static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) +{ + int rc; + + rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); + if (rc) + return rc; + + rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); + if (rc) { + release_fn_bar(afu->fn, afu->config.global_mmio_bar); + return rc; + } + + afu->global_mmio_start = + pci_resource_start(dev, afu->config.global_mmio_bar) + + afu->config.global_mmio_offset; + afu->pp_mmio_start = + pci_resource_start(dev, afu->config.pp_mmio_bar) + + afu->config.pp_mmio_offset; + + afu->global_mmio_ptr = ioremap(afu->global_mmio_start, + afu->config.global_mmio_size); + if (!afu->global_mmio_ptr) { + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); + release_fn_bar(afu->fn, afu->config.global_mmio_bar); + dev_err(&dev->dev, "Error mapping global mmio area\n"); + return -ENOMEM; + } + + /* + * Leave an empty page between the per-process mmio area and + * the AFU interrupt mappings + */ + afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; + return 0; +} + +static void unmap_mmio_areas(struct ocxl_afu *afu) +{ + if (afu->global_mmio_ptr) { + iounmap(afu->global_mmio_ptr); + afu->global_mmio_ptr = NULL; + } + afu->global_mmio_start = 0; + afu->pp_mmio_start = 0; + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); + release_fn_bar(afu->fn, afu->config.global_mmio_bar); +} + +static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) +{ + int rc; + + rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); + if (rc) + return rc; + + rc = set_afu_device(afu, dev_name(&dev->dev)); + if (rc) + return rc; + + rc = assign_afu_actag(afu, dev); + if (rc) + return rc; + + rc = assign_afu_pasid(afu, dev); + if (rc) { + reclaim_afu_actag(afu); + return rc; + } + + rc = map_mmio_areas(afu, dev); + if (rc) { + reclaim_afu_pasid(afu); + reclaim_afu_actag(afu); + return rc; + } + return 0; +} + +static void deconfigure_afu(struct ocxl_afu *afu) +{ + unmap_mmio_areas(afu); + reclaim_afu_pasid(afu); + reclaim_afu_actag(afu); +} + +static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) +{ + int rc; + + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); + /* + * Char device creation is the last step, as processes can + * call our driver immediately, so all our inits must be finished. + */ + rc = ocxl_create_cdev(afu); + if (rc) + return rc; + return 0; +} + +static void deactivate_afu(struct ocxl_afu *afu) +{ + struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); + + ocxl_destroy_cdev(afu); + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); +} + +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) +{ + int rc; + struct ocxl_afu *afu; + + afu = alloc_afu(fn); + if (!afu) + return -ENOMEM; + + rc = configure_afu(afu, afu_idx, dev); + if (rc) { + free_afu(afu); + return rc; + } + + rc = ocxl_register_afu(afu); + if (rc) + goto err; + + rc = ocxl_sysfs_add_afu(afu); + if (rc) + goto err; + + rc = activate_afu(dev, afu); + if (rc) + goto err_sys; + + list_add_tail(&afu->list, &fn->afu_list); + return 0; + +err_sys: + ocxl_sysfs_remove_afu(afu); +err: + deconfigure_afu(afu); + device_unregister(&afu->dev); + return rc; +} + +void remove_afu(struct ocxl_afu *afu) +{ + list_del(&afu->list); + ocxl_context_detach_all(afu); + deactivate_afu(afu); + ocxl_sysfs_remove_afu(afu); + deconfigure_afu(afu); + device_unregister(&afu->dev); +} + +static struct ocxl_fn *alloc_function(struct pci_dev *dev) +{ + struct ocxl_fn *fn; + + fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); + if (!fn) + return NULL; + + INIT_LIST_HEAD(&fn->afu_list); + INIT_LIST_HEAD(&fn->pasid_list); + INIT_LIST_HEAD(&fn->actag_list); + return fn; +} + +static void free_function(struct ocxl_fn *fn) +{ + WARN_ON(!list_empty(&fn->afu_list)); + WARN_ON(!list_empty(&fn->pasid_list)); + kfree(fn); +} + +static void free_function_dev(struct device *dev) +{ + struct ocxl_fn *fn = to_ocxl_function(dev); + + free_function(fn); +} + +static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) +{ + int rc; + + fn->dev.parent = &dev->dev; + fn->dev.release = free_function_dev; + rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); + if (rc) + return rc; + pci_set_drvdata(dev, fn); + return 0; +} + +static int assign_function_actag(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + u16 base, enabled, supported; + int rc; + + rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); + if (rc) + return rc; + + fn->actag_base = base; + fn->actag_enabled = enabled; + fn->actag_supported = supported; + + ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, + fn->actag_base, fn->actag_enabled); + dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", + fn->actag_base, fn->actag_enabled); + return 0; +} + +static int set_function_pasid(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int rc, desired_count, max_count; + + /* A function may not require any PASID */ + if (fn->config.max_pasid_log < 0) + return 0; + + rc = ocxl_config_get_pasid_info(dev, &max_count); + if (rc) + return rc; + + desired_count = 1 << fn->config.max_pasid_log; + + if (desired_count > max_count) { + dev_err(&fn->dev, + "Function requires more PASIDs than is available (%d vs. %d)\n", + desired_count, max_count); + return -ENOSPC; + } + + fn->pasid_base = 0; + return 0; +} + +static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) +{ + int rc; + + rc = pci_enable_device(dev); + if (rc) { + dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); + return rc; + } + + /* + * Once it has been confirmed to work on our hardware, we + * should reset the function, to force the adapter to restart + * from scratch. + * A function reset would also reset all its AFUs. + * + * Some hints for implementation: + * + * - there's not status bit to know when the reset is done. We + * should try reading the config space to know when it's + * done. + * - probably something like: + * Reset + * wait 100ms + * issue config read + * allow device up to 1 sec to return success on config + * read before declaring it broken + * + * Some shared logic on the card (CFG, TLX) won't be reset, so + * there's no guarantee that it will be enough. + */ + rc = ocxl_config_read_function(dev, &fn->config); + if (rc) + return rc; + + rc = set_function_device(fn, dev); + if (rc) + return rc; + + rc = assign_function_actag(fn); + if (rc) + return rc; + + rc = set_function_pasid(fn); + if (rc) + return rc; + + rc = ocxl_link_setup(dev, 0, &fn->link); + if (rc) + return rc; + + rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); + if (rc) { + ocxl_link_release(dev, fn->link); + return rc; + } + return 0; +} + +static void deconfigure_function(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + + ocxl_link_release(dev, fn->link); + pci_disable_device(dev); +} + +struct ocxl_fn *init_function(struct pci_dev *dev) +{ + struct ocxl_fn *fn; + int rc; + + fn = alloc_function(dev); + if (!fn) + return ERR_PTR(-ENOMEM); + + rc = configure_function(fn, dev); + if (rc) { + free_function(fn); + return ERR_PTR(rc); + } + + rc = device_register(&fn->dev); + if (rc) { + deconfigure_function(fn); + put_device(&fn->dev); + return ERR_PTR(rc); + } + return fn; +} + +void remove_function(struct ocxl_fn *fn) +{ + deconfigure_function(fn); + device_unregister(&fn->dev); +} diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 06fd98c989c8..81086534dab5 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -150,4 +150,9 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +struct ocxl_fn *init_function(struct pci_dev *dev); +void remove_function(struct ocxl_fn *fn); +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); +void remove_afu(struct ocxl_afu *afu); + #endif /* _OCXL_INTERNAL_H_ */ diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c index 21f425472a82..4ed7cb1a667f 100644 --- a/drivers/misc/ocxl/pci.c +++ b/drivers/misc/ocxl/pci.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -// Copyright 2017 IBM Corp. +// Copyright 2019 IBM Corp. #include <linux/module.h> -#include <linux/pci.h> -#include <linux/idr.h> -#include <asm/pnv-ocxl.h> #include "ocxl_internal.h" /* @@ -17,520 +14,6 @@ static const struct pci_device_id ocxl_pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); - -static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) -{ - return (get_device(&fn->dev) == NULL) ? NULL : fn; -} - -static void ocxl_fn_put(struct ocxl_fn *fn) -{ - put_device(&fn->dev); -} - -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) -{ - return (get_device(&afu->dev) == NULL) ? NULL : afu; -} - -void ocxl_afu_put(struct ocxl_afu *afu) -{ - put_device(&afu->dev); -} - -static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) -{ - struct ocxl_afu *afu; - - afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); - if (!afu) - return NULL; - - mutex_init(&afu->contexts_lock); - mutex_init(&afu->afu_control_lock); - idr_init(&afu->contexts_idr); - afu->fn = fn; - ocxl_fn_get(fn); - return afu; -} - -static void free_afu(struct ocxl_afu *afu) -{ - idr_destroy(&afu->contexts_idr); - ocxl_fn_put(afu->fn); - kfree(afu); -} - -static void free_afu_dev(struct device *dev) -{ - struct ocxl_afu *afu = to_ocxl_afu(dev); - - ocxl_unregister_afu(afu); - free_afu(afu); -} - -static int set_afu_device(struct ocxl_afu *afu, const char *location) -{ - struct ocxl_fn *fn = afu->fn; - int rc; - - afu->dev.parent = &fn->dev; - afu->dev.release = free_afu_dev; - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, - afu->config.idx); - return rc; -} - -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) -{ - struct ocxl_fn *fn = afu->fn; - int actag_count, actag_offset; - - /* - * if there were not enough actags for the function, each afu - * reduces its count as well - */ - actag_count = afu->config.actag_supported * - fn->actag_enabled / fn->actag_supported; - actag_offset = ocxl_actag_afu_alloc(fn, actag_count); - if (actag_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", - actag_count, actag_offset); - return actag_offset; - } - afu->actag_base = fn->actag_base + actag_offset; - afu->actag_enabled = actag_count; - - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, - afu->actag_base, afu->actag_enabled); - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", - afu->actag_base, afu->actag_enabled); - return 0; -} - -static void reclaim_afu_actag(struct ocxl_afu *afu) -{ - struct ocxl_fn *fn = afu->fn; - int start_offset, size; - - start_offset = afu->actag_base - fn->actag_base; - size = afu->actag_enabled; - ocxl_actag_afu_free(afu->fn, start_offset, size); -} - -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) -{ - struct ocxl_fn *fn = afu->fn; - int pasid_count, pasid_offset; - - /* - * We only support the case where the function configuration - * requested enough PASIDs to cover all AFUs. - */ - pasid_count = 1 << afu->config.pasid_supported_log; - pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); - if (pasid_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", - pasid_count, pasid_offset); - return pasid_offset; - } - afu->pasid_base = fn->pasid_base + pasid_offset; - afu->pasid_count = 0; - afu->pasid_max = pasid_count; - - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, - afu->pasid_base, - afu->config.pasid_supported_log); - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", - afu->pasid_base, pasid_count); - return 0; -} - -static void reclaim_afu_pasid(struct ocxl_afu *afu) -{ - struct ocxl_fn *fn = afu->fn; - int start_offset, size; - - start_offset = afu->pasid_base - fn->pasid_base; - size = 1 << afu->config.pasid_supported_log; - ocxl_pasid_afu_free(afu->fn, start_offset, size); -} - -static int reserve_fn_bar(struct ocxl_fn *fn, int bar) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int rc, idx; - - if (bar != 0 && bar != 2 && bar != 4) - return -EINVAL; - - idx = bar >> 1; - if (fn->bar_used[idx]++ == 0) { - rc = pci_request_region(dev, bar, "ocxl"); - if (rc) - return rc; - } - return 0; -} - -static void release_fn_bar(struct ocxl_fn *fn, int bar) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int idx; - - if (bar != 0 && bar != 2 && bar != 4) - return; - - idx = bar >> 1; - if (--fn->bar_used[idx] == 0) - pci_release_region(dev, bar); - WARN_ON(fn->bar_used[idx] < 0); -} - -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) -{ - int rc; - - rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); - if (rc) - return rc; - - rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); - if (rc) { - release_fn_bar(afu->fn, afu->config.global_mmio_bar); - return rc; - } - - afu->global_mmio_start = - pci_resource_start(dev, afu->config.global_mmio_bar) + - afu->config.global_mmio_offset; - afu->pp_mmio_start = - pci_resource_start(dev, afu->config.pp_mmio_bar) + - afu->config.pp_mmio_offset; - - afu->global_mmio_ptr = ioremap(afu->global_mmio_start, - afu->config.global_mmio_size); - if (!afu->global_mmio_ptr) { - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); - release_fn_bar(afu->fn, afu->config.global_mmio_bar); - dev_err(&dev->dev, "Error mapping global mmio area\n"); - return -ENOMEM; - } - - /* - * Leave an empty page between the per-process mmio area and - * the AFU interrupt mappings - */ - afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; - return 0; -} - -static void unmap_mmio_areas(struct ocxl_afu *afu) -{ - if (afu->global_mmio_ptr) { - iounmap(afu->global_mmio_ptr); - afu->global_mmio_ptr = NULL; - } - afu->global_mmio_start = 0; - afu->pp_mmio_start = 0; - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); - release_fn_bar(afu->fn, afu->config.global_mmio_bar); -} - -static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) -{ - int rc; - - rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); - if (rc) - return rc; - - rc = set_afu_device(afu, dev_name(&dev->dev)); - if (rc) - return rc; - - rc = assign_afu_actag(afu, dev); - if (rc) - return rc; - - rc = assign_afu_pasid(afu, dev); - if (rc) { - reclaim_afu_actag(afu); - return rc; - } - - rc = map_mmio_areas(afu, dev); - if (rc) { - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); - return rc; - } - return 0; -} - -static void deconfigure_afu(struct ocxl_afu *afu) -{ - unmap_mmio_areas(afu); - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); -} - -static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) -{ - int rc; - - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); - /* - * Char device creation is the last step, as processes can - * call our driver immediately, so all our inits must be finished. - */ - rc = ocxl_create_cdev(afu); - if (rc) - return rc; - return 0; -} - -static void deactivate_afu(struct ocxl_afu *afu) -{ - struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); - - ocxl_destroy_cdev(afu); - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); -} - -static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) -{ - int rc; - struct ocxl_afu *afu; - - afu = alloc_afu(fn); - if (!afu) - return -ENOMEM; - - rc = configure_afu(afu, afu_idx, dev); - if (rc) { - free_afu(afu); - return rc; - } - - rc = ocxl_register_afu(afu); - if (rc) - goto err; - - rc = ocxl_sysfs_add_afu(afu); - if (rc) - goto err; - - rc = activate_afu(dev, afu); - if (rc) - goto err_sys; - - list_add_tail(&afu->list, &fn->afu_list); - return 0; - -err_sys: - ocxl_sysfs_remove_afu(afu); -err: - deconfigure_afu(afu); - device_unregister(&afu->dev); - return rc; -} - -static void remove_afu(struct ocxl_afu *afu) -{ - list_del(&afu->list); - ocxl_context_detach_all(afu); - deactivate_afu(afu); - ocxl_sysfs_remove_afu(afu); - deconfigure_afu(afu); - device_unregister(&afu->dev); -} - -static struct ocxl_fn *alloc_function(struct pci_dev *dev) -{ - struct ocxl_fn *fn; - - fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); - if (!fn) - return NULL; - - INIT_LIST_HEAD(&fn->afu_list); - INIT_LIST_HEAD(&fn->pasid_list); - INIT_LIST_HEAD(&fn->actag_list); - return fn; -} - -static void free_function(struct ocxl_fn *fn) -{ - WARN_ON(!list_empty(&fn->afu_list)); - WARN_ON(!list_empty(&fn->pasid_list)); - kfree(fn); -} - -static void free_function_dev(struct device *dev) -{ - struct ocxl_fn *fn = to_ocxl_function(dev); - - free_function(fn); -} - -static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) -{ - int rc; - - fn->dev.parent = &dev->dev; - fn->dev.release = free_function_dev; - rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); - if (rc) - return rc; - pci_set_drvdata(dev, fn); - return 0; -} - -static int assign_function_actag(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - u16 base, enabled, supported; - int rc; - - rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); - if (rc) - return rc; - - fn->actag_base = base; - fn->actag_enabled = enabled; - fn->actag_supported = supported; - - ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, - fn->actag_base, fn->actag_enabled); - dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", - fn->actag_base, fn->actag_enabled); - return 0; -} - -static int set_function_pasid(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int rc, desired_count, max_count; - - /* A function may not require any PASID */ - if (fn->config.max_pasid_log < 0) - return 0; - - rc = ocxl_config_get_pasid_info(dev, &max_count); - if (rc) - return rc; - - desired_count = 1 << fn->config.max_pasid_log; - - if (desired_count > max_count) { - dev_err(&fn->dev, - "Function requires more PASIDs than is available (%d vs. %d)\n", - desired_count, max_count); - return -ENOSPC; - } - - fn->pasid_base = 0; - return 0; -} - -static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) -{ - int rc; - - rc = pci_enable_device(dev); - if (rc) { - dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); - return rc; - } - - /* - * Once it has been confirmed to work on our hardware, we - * should reset the function, to force the adapter to restart - * from scratch. - * A function reset would also reset all its AFUs. - * - * Some hints for implementation: - * - * - there's not status bit to know when the reset is done. We - * should try reading the config space to know when it's - * done. - * - probably something like: - * Reset - * wait 100ms - * issue config read - * allow device up to 1 sec to return success on config - * read before declaring it broken - * - * Some shared logic on the card (CFG, TLX) won't be reset, so - * there's no guarantee that it will be enough. - */ - rc = ocxl_config_read_function(dev, &fn->config); - if (rc) - return rc; - - rc = set_function_device(fn, dev); - if (rc) - return rc; - - rc = assign_function_actag(fn); - if (rc) - return rc; - - rc = set_function_pasid(fn); - if (rc) - return rc; - - rc = ocxl_link_setup(dev, 0, &fn->link); - if (rc) - return rc; - - rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); - if (rc) { - ocxl_link_release(dev, fn->link); - return rc; - } - return 0; -} - -static void deconfigure_function(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - - ocxl_link_release(dev, fn->link); - pci_disable_device(dev); -} - -static struct ocxl_fn *init_function(struct pci_dev *dev) -{ - struct ocxl_fn *fn; - int rc; - - fn = alloc_function(dev); - if (!fn) - return ERR_PTR(-ENOMEM); - - rc = configure_function(fn, dev); - if (rc) { - free_function(fn); - return ERR_PTR(rc); - } - - rc = device_register(&fn->dev); - if (rc) { - deconfigure_function(fn); - put_device(&fn->dev); - return ERR_PTR(rc); - } - return fn; -} - -static void remove_function(struct ocxl_fn *fn) -{ - deconfigure_function(fn); - device_unregister(&fn->dev); -} - static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) { int rc, afu_count = 0; -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 1/7] ocxl: Split pci.c @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> In preparation for making core code available for external drivers, move the core code out of pci.c and into core.c Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/Makefile | 1 + drivers/misc/ocxl/core.c | 517 +++++++++++++++++++++++++++++ drivers/misc/ocxl/ocxl_internal.h | 5 + drivers/misc/ocxl/pci.c | 519 +----------------------------- 4 files changed, 524 insertions(+), 518 deletions(-) create mode 100644 drivers/misc/ocxl/core.c diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile index 5229dcda8297..bc4e39bfda7b 100644 --- a/drivers/misc/ocxl/Makefile +++ b/drivers/misc/ocxl/Makefile @@ -3,6 +3,7 @@ ccflags-$(CONFIG_PPC_WERROR) += -Werror ocxl-y += main.o pci.o config.o file.o pasid.o ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o +ocxl-y += core.o obj-$(CONFIG_OCXL) += ocxl.o # For tracepoints to include our trace.h from tracepoint infrastructure: diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c new file mode 100644 index 000000000000..1a4411b72d35 --- /dev/null +++ b/drivers/misc/ocxl/core.c @@ -0,0 +1,517 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2019 IBM Corp. +#include <linux/idr.h> +#include "ocxl_internal.h" + +static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) +{ + return (get_device(&fn->dev) == NULL) ? NULL : fn; +} + +static void ocxl_fn_put(struct ocxl_fn *fn) +{ + put_device(&fn->dev); +} + +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) +{ + return (get_device(&afu->dev) == NULL) ? NULL : afu; +} + +void ocxl_afu_put(struct ocxl_afu *afu) +{ + put_device(&afu->dev); +} + +static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) +{ + struct ocxl_afu *afu; + + afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); + if (!afu) + return NULL; + + mutex_init(&afu->contexts_lock); + mutex_init(&afu->afu_control_lock); + idr_init(&afu->contexts_idr); + afu->fn = fn; + ocxl_fn_get(fn); + return afu; +} + +static void free_afu(struct ocxl_afu *afu) +{ + idr_destroy(&afu->contexts_idr); + ocxl_fn_put(afu->fn); + kfree(afu); +} + +static void free_afu_dev(struct device *dev) +{ + struct ocxl_afu *afu = to_ocxl_afu(dev); + + ocxl_unregister_afu(afu); + free_afu(afu); +} + +static int set_afu_device(struct ocxl_afu *afu, const char *location) +{ + struct ocxl_fn *fn = afu->fn; + int rc; + + afu->dev.parent = &fn->dev; + afu->dev.release = free_afu_dev; + rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, + afu->config.idx); + return rc; +} + +static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) +{ + struct ocxl_fn *fn = afu->fn; + int actag_count, actag_offset; + + /* + * if there were not enough actags for the function, each afu + * reduces its count as well + */ + actag_count = afu->config.actag_supported * + fn->actag_enabled / fn->actag_supported; + actag_offset = ocxl_actag_afu_alloc(fn, actag_count); + if (actag_offset < 0) { + dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", + actag_count, actag_offset); + return actag_offset; + } + afu->actag_base = fn->actag_base + actag_offset; + afu->actag_enabled = actag_count; + + ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, + afu->actag_base, afu->actag_enabled); + dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", + afu->actag_base, afu->actag_enabled); + return 0; +} + +static void reclaim_afu_actag(struct ocxl_afu *afu) +{ + struct ocxl_fn *fn = afu->fn; + int start_offset, size; + + start_offset = afu->actag_base - fn->actag_base; + size = afu->actag_enabled; + ocxl_actag_afu_free(afu->fn, start_offset, size); +} + +static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) +{ + struct ocxl_fn *fn = afu->fn; + int pasid_count, pasid_offset; + + /* + * We only support the case where the function configuration + * requested enough PASIDs to cover all AFUs. + */ + pasid_count = 1 << afu->config.pasid_supported_log; + pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); + if (pasid_offset < 0) { + dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", + pasid_count, pasid_offset); + return pasid_offset; + } + afu->pasid_base = fn->pasid_base + pasid_offset; + afu->pasid_count = 0; + afu->pasid_max = pasid_count; + + ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, + afu->pasid_base, + afu->config.pasid_supported_log); + dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", + afu->pasid_base, pasid_count); + return 0; +} + +static void reclaim_afu_pasid(struct ocxl_afu *afu) +{ + struct ocxl_fn *fn = afu->fn; + int start_offset, size; + + start_offset = afu->pasid_base - fn->pasid_base; + size = 1 << afu->config.pasid_supported_log; + ocxl_pasid_afu_free(afu->fn, start_offset, size); +} + +static int reserve_fn_bar(struct ocxl_fn *fn, int bar) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int rc, idx; + + if (bar != 0 && bar != 2 && bar != 4) + return -EINVAL; + + idx = bar >> 1; + if (fn->bar_used[idx]++ == 0) { + rc = pci_request_region(dev, bar, "ocxl"); + if (rc) + return rc; + } + return 0; +} + +static void release_fn_bar(struct ocxl_fn *fn, int bar) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int idx; + + if (bar != 0 && bar != 2 && bar != 4) + return; + + idx = bar >> 1; + if (--fn->bar_used[idx] == 0) + pci_release_region(dev, bar); + WARN_ON(fn->bar_used[idx] < 0); +} + +static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) +{ + int rc; + + rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); + if (rc) + return rc; + + rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); + if (rc) { + release_fn_bar(afu->fn, afu->config.global_mmio_bar); + return rc; + } + + afu->global_mmio_start = + pci_resource_start(dev, afu->config.global_mmio_bar) + + afu->config.global_mmio_offset; + afu->pp_mmio_start = + pci_resource_start(dev, afu->config.pp_mmio_bar) + + afu->config.pp_mmio_offset; + + afu->global_mmio_ptr = ioremap(afu->global_mmio_start, + afu->config.global_mmio_size); + if (!afu->global_mmio_ptr) { + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); + release_fn_bar(afu->fn, afu->config.global_mmio_bar); + dev_err(&dev->dev, "Error mapping global mmio area\n"); + return -ENOMEM; + } + + /* + * Leave an empty page between the per-process mmio area and + * the AFU interrupt mappings + */ + afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; + return 0; +} + +static void unmap_mmio_areas(struct ocxl_afu *afu) +{ + if (afu->global_mmio_ptr) { + iounmap(afu->global_mmio_ptr); + afu->global_mmio_ptr = NULL; + } + afu->global_mmio_start = 0; + afu->pp_mmio_start = 0; + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); + release_fn_bar(afu->fn, afu->config.global_mmio_bar); +} + +static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) +{ + int rc; + + rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); + if (rc) + return rc; + + rc = set_afu_device(afu, dev_name(&dev->dev)); + if (rc) + return rc; + + rc = assign_afu_actag(afu, dev); + if (rc) + return rc; + + rc = assign_afu_pasid(afu, dev); + if (rc) { + reclaim_afu_actag(afu); + return rc; + } + + rc = map_mmio_areas(afu, dev); + if (rc) { + reclaim_afu_pasid(afu); + reclaim_afu_actag(afu); + return rc; + } + return 0; +} + +static void deconfigure_afu(struct ocxl_afu *afu) +{ + unmap_mmio_areas(afu); + reclaim_afu_pasid(afu); + reclaim_afu_actag(afu); +} + +static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) +{ + int rc; + + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); + /* + * Char device creation is the last step, as processes can + * call our driver immediately, so all our inits must be finished. + */ + rc = ocxl_create_cdev(afu); + if (rc) + return rc; + return 0; +} + +static void deactivate_afu(struct ocxl_afu *afu) +{ + struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); + + ocxl_destroy_cdev(afu); + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); +} + +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) +{ + int rc; + struct ocxl_afu *afu; + + afu = alloc_afu(fn); + if (!afu) + return -ENOMEM; + + rc = configure_afu(afu, afu_idx, dev); + if (rc) { + free_afu(afu); + return rc; + } + + rc = ocxl_register_afu(afu); + if (rc) + goto err; + + rc = ocxl_sysfs_add_afu(afu); + if (rc) + goto err; + + rc = activate_afu(dev, afu); + if (rc) + goto err_sys; + + list_add_tail(&afu->list, &fn->afu_list); + return 0; + +err_sys: + ocxl_sysfs_remove_afu(afu); +err: + deconfigure_afu(afu); + device_unregister(&afu->dev); + return rc; +} + +void remove_afu(struct ocxl_afu *afu) +{ + list_del(&afu->list); + ocxl_context_detach_all(afu); + deactivate_afu(afu); + ocxl_sysfs_remove_afu(afu); + deconfigure_afu(afu); + device_unregister(&afu->dev); +} + +static struct ocxl_fn *alloc_function(struct pci_dev *dev) +{ + struct ocxl_fn *fn; + + fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); + if (!fn) + return NULL; + + INIT_LIST_HEAD(&fn->afu_list); + INIT_LIST_HEAD(&fn->pasid_list); + INIT_LIST_HEAD(&fn->actag_list); + return fn; +} + +static void free_function(struct ocxl_fn *fn) +{ + WARN_ON(!list_empty(&fn->afu_list)); + WARN_ON(!list_empty(&fn->pasid_list)); + kfree(fn); +} + +static void free_function_dev(struct device *dev) +{ + struct ocxl_fn *fn = to_ocxl_function(dev); + + free_function(fn); +} + +static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) +{ + int rc; + + fn->dev.parent = &dev->dev; + fn->dev.release = free_function_dev; + rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); + if (rc) + return rc; + pci_set_drvdata(dev, fn); + return 0; +} + +static int assign_function_actag(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + u16 base, enabled, supported; + int rc; + + rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); + if (rc) + return rc; + + fn->actag_base = base; + fn->actag_enabled = enabled; + fn->actag_supported = supported; + + ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, + fn->actag_base, fn->actag_enabled); + dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", + fn->actag_base, fn->actag_enabled); + return 0; +} + +static int set_function_pasid(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + int rc, desired_count, max_count; + + /* A function may not require any PASID */ + if (fn->config.max_pasid_log < 0) + return 0; + + rc = ocxl_config_get_pasid_info(dev, &max_count); + if (rc) + return rc; + + desired_count = 1 << fn->config.max_pasid_log; + + if (desired_count > max_count) { + dev_err(&fn->dev, + "Function requires more PASIDs than is available (%d vs. %d)\n", + desired_count, max_count); + return -ENOSPC; + } + + fn->pasid_base = 0; + return 0; +} + +static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) +{ + int rc; + + rc = pci_enable_device(dev); + if (rc) { + dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); + return rc; + } + + /* + * Once it has been confirmed to work on our hardware, we + * should reset the function, to force the adapter to restart + * from scratch. + * A function reset would also reset all its AFUs. + * + * Some hints for implementation: + * + * - there's not status bit to know when the reset is done. We + * should try reading the config space to know when it's + * done. + * - probably something like: + * Reset + * wait 100ms + * issue config read + * allow device up to 1 sec to return success on config + * read before declaring it broken + * + * Some shared logic on the card (CFG, TLX) won't be reset, so + * there's no guarantee that it will be enough. + */ + rc = ocxl_config_read_function(dev, &fn->config); + if (rc) + return rc; + + rc = set_function_device(fn, dev); + if (rc) + return rc; + + rc = assign_function_actag(fn); + if (rc) + return rc; + + rc = set_function_pasid(fn); + if (rc) + return rc; + + rc = ocxl_link_setup(dev, 0, &fn->link); + if (rc) + return rc; + + rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); + if (rc) { + ocxl_link_release(dev, fn->link); + return rc; + } + return 0; +} + +static void deconfigure_function(struct ocxl_fn *fn) +{ + struct pci_dev *dev = to_pci_dev(fn->dev.parent); + + ocxl_link_release(dev, fn->link); + pci_disable_device(dev); +} + +struct ocxl_fn *init_function(struct pci_dev *dev) +{ + struct ocxl_fn *fn; + int rc; + + fn = alloc_function(dev); + if (!fn) + return ERR_PTR(-ENOMEM); + + rc = configure_function(fn, dev); + if (rc) { + free_function(fn); + return ERR_PTR(rc); + } + + rc = device_register(&fn->dev); + if (rc) { + deconfigure_function(fn); + put_device(&fn->dev); + return ERR_PTR(rc); + } + return fn; +} + +void remove_function(struct ocxl_fn *fn) +{ + deconfigure_function(fn); + device_unregister(&fn->dev); +} diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 06fd98c989c8..81086534dab5 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -150,4 +150,9 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +struct ocxl_fn *init_function(struct pci_dev *dev); +void remove_function(struct ocxl_fn *fn); +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); +void remove_afu(struct ocxl_afu *afu); + #endif /* _OCXL_INTERNAL_H_ */ diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c index 21f425472a82..4ed7cb1a667f 100644 --- a/drivers/misc/ocxl/pci.c +++ b/drivers/misc/ocxl/pci.c @@ -1,9 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ -// Copyright 2017 IBM Corp. +// Copyright 2019 IBM Corp. #include <linux/module.h> -#include <linux/pci.h> -#include <linux/idr.h> -#include <asm/pnv-ocxl.h> #include "ocxl_internal.h" /* @@ -17,520 +14,6 @@ static const struct pci_device_id ocxl_pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); - -static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) -{ - return (get_device(&fn->dev) == NULL) ? NULL : fn; -} - -static void ocxl_fn_put(struct ocxl_fn *fn) -{ - put_device(&fn->dev); -} - -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) -{ - return (get_device(&afu->dev) == NULL) ? NULL : afu; -} - -void ocxl_afu_put(struct ocxl_afu *afu) -{ - put_device(&afu->dev); -} - -static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) -{ - struct ocxl_afu *afu; - - afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); - if (!afu) - return NULL; - - mutex_init(&afu->contexts_lock); - mutex_init(&afu->afu_control_lock); - idr_init(&afu->contexts_idr); - afu->fn = fn; - ocxl_fn_get(fn); - return afu; -} - -static void free_afu(struct ocxl_afu *afu) -{ - idr_destroy(&afu->contexts_idr); - ocxl_fn_put(afu->fn); - kfree(afu); -} - -static void free_afu_dev(struct device *dev) -{ - struct ocxl_afu *afu = to_ocxl_afu(dev); - - ocxl_unregister_afu(afu); - free_afu(afu); -} - -static int set_afu_device(struct ocxl_afu *afu, const char *location) -{ - struct ocxl_fn *fn = afu->fn; - int rc; - - afu->dev.parent = &fn->dev; - afu->dev.release = free_afu_dev; - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, - afu->config.idx); - return rc; -} - -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) -{ - struct ocxl_fn *fn = afu->fn; - int actag_count, actag_offset; - - /* - * if there were not enough actags for the function, each afu - * reduces its count as well - */ - actag_count = afu->config.actag_supported * - fn->actag_enabled / fn->actag_supported; - actag_offset = ocxl_actag_afu_alloc(fn, actag_count); - if (actag_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", - actag_count, actag_offset); - return actag_offset; - } - afu->actag_base = fn->actag_base + actag_offset; - afu->actag_enabled = actag_count; - - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, - afu->actag_base, afu->actag_enabled); - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", - afu->actag_base, afu->actag_enabled); - return 0; -} - -static void reclaim_afu_actag(struct ocxl_afu *afu) -{ - struct ocxl_fn *fn = afu->fn; - int start_offset, size; - - start_offset = afu->actag_base - fn->actag_base; - size = afu->actag_enabled; - ocxl_actag_afu_free(afu->fn, start_offset, size); -} - -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) -{ - struct ocxl_fn *fn = afu->fn; - int pasid_count, pasid_offset; - - /* - * We only support the case where the function configuration - * requested enough PASIDs to cover all AFUs. - */ - pasid_count = 1 << afu->config.pasid_supported_log; - pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); - if (pasid_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", - pasid_count, pasid_offset); - return pasid_offset; - } - afu->pasid_base = fn->pasid_base + pasid_offset; - afu->pasid_count = 0; - afu->pasid_max = pasid_count; - - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, - afu->pasid_base, - afu->config.pasid_supported_log); - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", - afu->pasid_base, pasid_count); - return 0; -} - -static void reclaim_afu_pasid(struct ocxl_afu *afu) -{ - struct ocxl_fn *fn = afu->fn; - int start_offset, size; - - start_offset = afu->pasid_base - fn->pasid_base; - size = 1 << afu->config.pasid_supported_log; - ocxl_pasid_afu_free(afu->fn, start_offset, size); -} - -static int reserve_fn_bar(struct ocxl_fn *fn, int bar) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int rc, idx; - - if (bar != 0 && bar != 2 && bar != 4) - return -EINVAL; - - idx = bar >> 1; - if (fn->bar_used[idx]++ == 0) { - rc = pci_request_region(dev, bar, "ocxl"); - if (rc) - return rc; - } - return 0; -} - -static void release_fn_bar(struct ocxl_fn *fn, int bar) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int idx; - - if (bar != 0 && bar != 2 && bar != 4) - return; - - idx = bar >> 1; - if (--fn->bar_used[idx] == 0) - pci_release_region(dev, bar); - WARN_ON(fn->bar_used[idx] < 0); -} - -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) -{ - int rc; - - rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); - if (rc) - return rc; - - rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); - if (rc) { - release_fn_bar(afu->fn, afu->config.global_mmio_bar); - return rc; - } - - afu->global_mmio_start = - pci_resource_start(dev, afu->config.global_mmio_bar) + - afu->config.global_mmio_offset; - afu->pp_mmio_start = - pci_resource_start(dev, afu->config.pp_mmio_bar) + - afu->config.pp_mmio_offset; - - afu->global_mmio_ptr = ioremap(afu->global_mmio_start, - afu->config.global_mmio_size); - if (!afu->global_mmio_ptr) { - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); - release_fn_bar(afu->fn, afu->config.global_mmio_bar); - dev_err(&dev->dev, "Error mapping global mmio area\n"); - return -ENOMEM; - } - - /* - * Leave an empty page between the per-process mmio area and - * the AFU interrupt mappings - */ - afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; - return 0; -} - -static void unmap_mmio_areas(struct ocxl_afu *afu) -{ - if (afu->global_mmio_ptr) { - iounmap(afu->global_mmio_ptr); - afu->global_mmio_ptr = NULL; - } - afu->global_mmio_start = 0; - afu->pp_mmio_start = 0; - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); - release_fn_bar(afu->fn, afu->config.global_mmio_bar); -} - -static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) -{ - int rc; - - rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); - if (rc) - return rc; - - rc = set_afu_device(afu, dev_name(&dev->dev)); - if (rc) - return rc; - - rc = assign_afu_actag(afu, dev); - if (rc) - return rc; - - rc = assign_afu_pasid(afu, dev); - if (rc) { - reclaim_afu_actag(afu); - return rc; - } - - rc = map_mmio_areas(afu, dev); - if (rc) { - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); - return rc; - } - return 0; -} - -static void deconfigure_afu(struct ocxl_afu *afu) -{ - unmap_mmio_areas(afu); - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); -} - -static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) -{ - int rc; - - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); - /* - * Char device creation is the last step, as processes can - * call our driver immediately, so all our inits must be finished. - */ - rc = ocxl_create_cdev(afu); - if (rc) - return rc; - return 0; -} - -static void deactivate_afu(struct ocxl_afu *afu) -{ - struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); - - ocxl_destroy_cdev(afu); - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); -} - -static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) -{ - int rc; - struct ocxl_afu *afu; - - afu = alloc_afu(fn); - if (!afu) - return -ENOMEM; - - rc = configure_afu(afu, afu_idx, dev); - if (rc) { - free_afu(afu); - return rc; - } - - rc = ocxl_register_afu(afu); - if (rc) - goto err; - - rc = ocxl_sysfs_add_afu(afu); - if (rc) - goto err; - - rc = activate_afu(dev, afu); - if (rc) - goto err_sys; - - list_add_tail(&afu->list, &fn->afu_list); - return 0; - -err_sys: - ocxl_sysfs_remove_afu(afu); -err: - deconfigure_afu(afu); - device_unregister(&afu->dev); - return rc; -} - -static void remove_afu(struct ocxl_afu *afu) -{ - list_del(&afu->list); - ocxl_context_detach_all(afu); - deactivate_afu(afu); - ocxl_sysfs_remove_afu(afu); - deconfigure_afu(afu); - device_unregister(&afu->dev); -} - -static struct ocxl_fn *alloc_function(struct pci_dev *dev) -{ - struct ocxl_fn *fn; - - fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); - if (!fn) - return NULL; - - INIT_LIST_HEAD(&fn->afu_list); - INIT_LIST_HEAD(&fn->pasid_list); - INIT_LIST_HEAD(&fn->actag_list); - return fn; -} - -static void free_function(struct ocxl_fn *fn) -{ - WARN_ON(!list_empty(&fn->afu_list)); - WARN_ON(!list_empty(&fn->pasid_list)); - kfree(fn); -} - -static void free_function_dev(struct device *dev) -{ - struct ocxl_fn *fn = to_ocxl_function(dev); - - free_function(fn); -} - -static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) -{ - int rc; - - fn->dev.parent = &dev->dev; - fn->dev.release = free_function_dev; - rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); - if (rc) - return rc; - pci_set_drvdata(dev, fn); - return 0; -} - -static int assign_function_actag(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - u16 base, enabled, supported; - int rc; - - rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); - if (rc) - return rc; - - fn->actag_base = base; - fn->actag_enabled = enabled; - fn->actag_supported = supported; - - ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, - fn->actag_base, fn->actag_enabled); - dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", - fn->actag_base, fn->actag_enabled); - return 0; -} - -static int set_function_pasid(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - int rc, desired_count, max_count; - - /* A function may not require any PASID */ - if (fn->config.max_pasid_log < 0) - return 0; - - rc = ocxl_config_get_pasid_info(dev, &max_count); - if (rc) - return rc; - - desired_count = 1 << fn->config.max_pasid_log; - - if (desired_count > max_count) { - dev_err(&fn->dev, - "Function requires more PASIDs than is available (%d vs. %d)\n", - desired_count, max_count); - return -ENOSPC; - } - - fn->pasid_base = 0; - return 0; -} - -static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) -{ - int rc; - - rc = pci_enable_device(dev); - if (rc) { - dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); - return rc; - } - - /* - * Once it has been confirmed to work on our hardware, we - * should reset the function, to force the adapter to restart - * from scratch. - * A function reset would also reset all its AFUs. - * - * Some hints for implementation: - * - * - there's not status bit to know when the reset is done. We - * should try reading the config space to know when it's - * done. - * - probably something like: - * Reset - * wait 100ms - * issue config read - * allow device up to 1 sec to return success on config - * read before declaring it broken - * - * Some shared logic on the card (CFG, TLX) won't be reset, so - * there's no guarantee that it will be enough. - */ - rc = ocxl_config_read_function(dev, &fn->config); - if (rc) - return rc; - - rc = set_function_device(fn, dev); - if (rc) - return rc; - - rc = assign_function_actag(fn); - if (rc) - return rc; - - rc = set_function_pasid(fn); - if (rc) - return rc; - - rc = ocxl_link_setup(dev, 0, &fn->link); - if (rc) - return rc; - - rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); - if (rc) { - ocxl_link_release(dev, fn->link); - return rc; - } - return 0; -} - -static void deconfigure_function(struct ocxl_fn *fn) -{ - struct pci_dev *dev = to_pci_dev(fn->dev.parent); - - ocxl_link_release(dev, fn->link); - pci_disable_device(dev); -} - -static struct ocxl_fn *init_function(struct pci_dev *dev) -{ - struct ocxl_fn *fn; - int rc; - - fn = alloc_function(dev); - if (!fn) - return ERR_PTR(-ENOMEM); - - rc = configure_function(fn, dev); - if (rc) { - free_function(fn); - return ERR_PTR(rc); - } - - rc = device_register(&fn->dev); - if (rc) { - deconfigure_function(fn); - put_device(&fn->dev); - return ERR_PTR(rc); - } - return fn; -} - -static void remove_function(struct ocxl_fn *fn) -{ - deconfigure_function(fn); - device_unregister(&fn->dev); -} - static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) { int rc, afu_count = 0; -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 1/7] ocxl: Split pci.c 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 10:01 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 10:01 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > In preparation for making core code available for external drivers, > move the core code out of pci.c and into core.c > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/Makefile | 1 + > drivers/misc/ocxl/core.c | 517 +++++++++++++++++++++++++++++ > drivers/misc/ocxl/ocxl_internal.h | 5 + > drivers/misc/ocxl/pci.c | 519 +----------------------------- > 4 files changed, 524 insertions(+), 518 deletions(-) > create mode 100644 drivers/misc/ocxl/core.c > > diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile > index 5229dcda8297..bc4e39bfda7b 100644 > --- a/drivers/misc/ocxl/Makefile > +++ b/drivers/misc/ocxl/Makefile > @@ -3,6 +3,7 @@ ccflags-$(CONFIG_PPC_WERROR) += -Werror > > ocxl-y += main.o pci.o config.o file.o pasid.o > ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o > +ocxl-y += core.o > obj-$(CONFIG_OCXL) += ocxl.o > > # For tracepoints to include our trace.h from tracepoint infrastructure: > diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c > new file mode 100644 > index 000000000000..1a4411b72d35 > --- /dev/null > +++ b/drivers/misc/ocxl/core.c > @@ -0,0 +1,517 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2019 IBM Corp. > +#include <linux/idr.h> > +#include "ocxl_internal.h" > + > +static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) > +{ > + return (get_device(&fn->dev) == NULL) ? NULL : fn; > +} > + > +static void ocxl_fn_put(struct ocxl_fn *fn) > +{ > + put_device(&fn->dev); > +} > + > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) > +{ > + return (get_device(&afu->dev) == NULL) ? NULL : afu; > +} > + > +void ocxl_afu_put(struct ocxl_afu *afu) > +{ > + put_device(&afu->dev); > +} > + > +static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) > +{ > + struct ocxl_afu *afu; > + > + afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); > + if (!afu) > + return NULL; > + > + mutex_init(&afu->contexts_lock); > + mutex_init(&afu->afu_control_lock); > + idr_init(&afu->contexts_idr); > + afu->fn = fn; > + ocxl_fn_get(fn); > + return afu; > +} > + > +static void free_afu(struct ocxl_afu *afu) > +{ > + idr_destroy(&afu->contexts_idr); > + ocxl_fn_put(afu->fn); > + kfree(afu); > +} > + > +static void free_afu_dev(struct device *dev) > +{ > + struct ocxl_afu *afu = to_ocxl_afu(dev); > + > + ocxl_unregister_afu(afu); > + free_afu(afu); > +} > + > +static int set_afu_device(struct ocxl_afu *afu, const char *location) > +{ > + struct ocxl_fn *fn = afu->fn; > + int rc; > + > + afu->dev.parent = &fn->dev; > + afu->dev.release = free_afu_dev; > + rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, > + afu->config.idx); > + return rc; > +} > + > +static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + struct ocxl_fn *fn = afu->fn; > + int actag_count, actag_offset; > + > + /* > + * if there were not enough actags for the function, each afu > + * reduces its count as well > + */ > + actag_count = afu->config.actag_supported * > + fn->actag_enabled / fn->actag_supported; > + actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > + if (actag_offset < 0) { > + dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > + actag_count, actag_offset); > + return actag_offset; > + } > + afu->actag_base = fn->actag_base + actag_offset; > + afu->actag_enabled = actag_count; > + > + ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > + afu->actag_base, afu->actag_enabled); > + dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > + afu->actag_base, afu->actag_enabled); > + return 0; > +} > + > +static void reclaim_afu_actag(struct ocxl_afu *afu) > +{ > + struct ocxl_fn *fn = afu->fn; > + int start_offset, size; > + > + start_offset = afu->actag_base - fn->actag_base; > + size = afu->actag_enabled; > + ocxl_actag_afu_free(afu->fn, start_offset, size); > +} > + > +static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + struct ocxl_fn *fn = afu->fn; > + int pasid_count, pasid_offset; > + > + /* > + * We only support the case where the function configuration > + * requested enough PASIDs to cover all AFUs. > + */ > + pasid_count = 1 << afu->config.pasid_supported_log; > + pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > + if (pasid_offset < 0) { > + dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > + pasid_count, pasid_offset); > + return pasid_offset; > + } > + afu->pasid_base = fn->pasid_base + pasid_offset; > + afu->pasid_count = 0; > + afu->pasid_max = pasid_count; > + > + ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > + afu->pasid_base, > + afu->config.pasid_supported_log); > + dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > + afu->pasid_base, pasid_count); > + return 0; > +} > + > +static void reclaim_afu_pasid(struct ocxl_afu *afu) > +{ > + struct ocxl_fn *fn = afu->fn; > + int start_offset, size; > + > + start_offset = afu->pasid_base - fn->pasid_base; > + size = 1 << afu->config.pasid_supported_log; > + ocxl_pasid_afu_free(afu->fn, start_offset, size); > +} > + > +static int reserve_fn_bar(struct ocxl_fn *fn, int bar) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int rc, idx; > + > + if (bar != 0 && bar != 2 && bar != 4) > + return -EINVAL; > + > + idx = bar >> 1; > + if (fn->bar_used[idx]++ == 0) { > + rc = pci_request_region(dev, bar, "ocxl"); > + if (rc) > + return rc; > + } > + return 0; > +} > + > +static void release_fn_bar(struct ocxl_fn *fn, int bar) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int idx; > + > + if (bar != 0 && bar != 2 && bar != 4) > + return; > + > + idx = bar >> 1; > + if (--fn->bar_used[idx] == 0) > + pci_release_region(dev, bar); > + WARN_ON(fn->bar_used[idx] < 0); > +} > + > +static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + int rc; > + > + rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > + if (rc) > + return rc; > + > + rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + if (rc) { > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > + return rc; > + } > + > + afu->global_mmio_start = > + pci_resource_start(dev, afu->config.global_mmio_bar) + > + afu->config.global_mmio_offset; > + afu->pp_mmio_start = > + pci_resource_start(dev, afu->config.pp_mmio_bar) + > + afu->config.pp_mmio_offset; > + > + afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > + afu->config.global_mmio_size); > + if (!afu->global_mmio_ptr) { > + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > + dev_err(&dev->dev, "Error mapping global mmio area\n"); > + return -ENOMEM; > + } > + > + /* > + * Leave an empty page between the per-process mmio area and > + * the AFU interrupt mappings > + */ > + afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; > + return 0; > +} > + > +static void unmap_mmio_areas(struct ocxl_afu *afu) > +{ > + if (afu->global_mmio_ptr) { > + iounmap(afu->global_mmio_ptr); > + afu->global_mmio_ptr = NULL; > + } > + afu->global_mmio_start = 0; > + afu->pp_mmio_start = 0; > + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > +} > + > +static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > +{ > + int rc; > + > + rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); > + if (rc) > + return rc; > + > + rc = set_afu_device(afu, dev_name(&dev->dev)); > + if (rc) > + return rc; > + > + rc = assign_afu_actag(afu, dev); > + if (rc) > + return rc; > + > + rc = assign_afu_pasid(afu, dev); > + if (rc) { > + reclaim_afu_actag(afu); > + return rc; > + } > + > + rc = map_mmio_areas(afu, dev); > + if (rc) { > + reclaim_afu_pasid(afu); > + reclaim_afu_actag(afu); > + return rc; > + } > + return 0; > +} > + > +static void deconfigure_afu(struct ocxl_afu *afu) > +{ > + unmap_mmio_areas(afu); > + reclaim_afu_pasid(afu); > + reclaim_afu_actag(afu); > +} > + > +static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) > +{ > + int rc; > + > + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); > + /* > + * Char device creation is the last step, as processes can > + * call our driver immediately, so all our inits must be finished. > + */ > + rc = ocxl_create_cdev(afu); > + if (rc) > + return rc; > + return 0; > +} > + > +static void deactivate_afu(struct ocxl_afu *afu) > +{ > + struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); > + > + ocxl_destroy_cdev(afu); > + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); > +} > + > +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) > +{ > + int rc; > + struct ocxl_afu *afu; > + > + afu = alloc_afu(fn); > + if (!afu) > + return -ENOMEM; > + > + rc = configure_afu(afu, afu_idx, dev); > + if (rc) { > + free_afu(afu); > + return rc; > + } > + > + rc = ocxl_register_afu(afu); > + if (rc) > + goto err; > + > + rc = ocxl_sysfs_add_afu(afu); > + if (rc) > + goto err; > + > + rc = activate_afu(dev, afu); > + if (rc) > + goto err_sys; > + > + list_add_tail(&afu->list, &fn->afu_list); > + return 0; > + > +err_sys: > + ocxl_sysfs_remove_afu(afu); > +err: > + deconfigure_afu(afu); > + device_unregister(&afu->dev); > + return rc; > +} > + > +void remove_afu(struct ocxl_afu *afu) > +{ > + list_del(&afu->list); > + ocxl_context_detach_all(afu); > + deactivate_afu(afu); > + ocxl_sysfs_remove_afu(afu); > + deconfigure_afu(afu); > + device_unregister(&afu->dev); > +} > + > +static struct ocxl_fn *alloc_function(struct pci_dev *dev) > +{ > + struct ocxl_fn *fn; > + > + fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); > + if (!fn) > + return NULL; > + > + INIT_LIST_HEAD(&fn->afu_list); > + INIT_LIST_HEAD(&fn->pasid_list); > + INIT_LIST_HEAD(&fn->actag_list); > + return fn; > +} > + > +static void free_function(struct ocxl_fn *fn) > +{ > + WARN_ON(!list_empty(&fn->afu_list)); > + WARN_ON(!list_empty(&fn->pasid_list)); > + kfree(fn); > +} > + > +static void free_function_dev(struct device *dev) > +{ > + struct ocxl_fn *fn = to_ocxl_function(dev); > + > + free_function(fn); > +} > + > +static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) > +{ > + int rc; > + > + fn->dev.parent = &dev->dev; > + fn->dev.release = free_function_dev; > + rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); > + if (rc) > + return rc; > + pci_set_drvdata(dev, fn); > + return 0; > +} > + > +static int assign_function_actag(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + u16 base, enabled, supported; > + int rc; > + > + rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); > + if (rc) > + return rc; > + > + fn->actag_base = base; > + fn->actag_enabled = enabled; > + fn->actag_supported = supported; > + > + ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, > + fn->actag_base, fn->actag_enabled); > + dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", > + fn->actag_base, fn->actag_enabled); > + return 0; > +} > + > +static int set_function_pasid(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int rc, desired_count, max_count; > + > + /* A function may not require any PASID */ > + if (fn->config.max_pasid_log < 0) > + return 0; > + > + rc = ocxl_config_get_pasid_info(dev, &max_count); > + if (rc) > + return rc; > + > + desired_count = 1 << fn->config.max_pasid_log; > + > + if (desired_count > max_count) { > + dev_err(&fn->dev, > + "Function requires more PASIDs than is available (%d vs. %d)\n", > + desired_count, max_count); > + return -ENOSPC; > + } > + > + fn->pasid_base = 0; > + return 0; > +} > + > +static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) > +{ > + int rc; > + > + rc = pci_enable_device(dev); > + if (rc) { > + dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); > + return rc; > + } > + > + /* > + * Once it has been confirmed to work on our hardware, we > + * should reset the function, to force the adapter to restart > + * from scratch. > + * A function reset would also reset all its AFUs. > + * > + * Some hints for implementation: > + * > + * - there's not status bit to know when the reset is done. We > + * should try reading the config space to know when it's > + * done. > + * - probably something like: > + * Reset > + * wait 100ms > + * issue config read > + * allow device up to 1 sec to return success on config > + * read before declaring it broken > + * > + * Some shared logic on the card (CFG, TLX) won't be reset, so > + * there's no guarantee that it will be enough. > + */ > + rc = ocxl_config_read_function(dev, &fn->config); > + if (rc) > + return rc; > + > + rc = set_function_device(fn, dev); > + if (rc) > + return rc; > + > + rc = assign_function_actag(fn); > + if (rc) > + return rc; > + > + rc = set_function_pasid(fn); > + if (rc) > + return rc; > + > + rc = ocxl_link_setup(dev, 0, &fn->link); > + if (rc) > + return rc; > + > + rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); > + if (rc) { > + ocxl_link_release(dev, fn->link); > + return rc; > + } > + return 0; > +} > + > +static void deconfigure_function(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + > + ocxl_link_release(dev, fn->link); > + pci_disable_device(dev); > +} > + > +struct ocxl_fn *init_function(struct pci_dev *dev) > +{ > + struct ocxl_fn *fn; > + int rc; > + > + fn = alloc_function(dev); > + if (!fn) > + return ERR_PTR(-ENOMEM); > + > + rc = configure_function(fn, dev); > + if (rc) { > + free_function(fn); > + return ERR_PTR(rc); > + } > + > + rc = device_register(&fn->dev); > + if (rc) { > + deconfigure_function(fn); > + put_device(&fn->dev); > + return ERR_PTR(rc); > + } > + return fn; > +} > + > +void remove_function(struct ocxl_fn *fn) > +{ > + deconfigure_function(fn); > + device_unregister(&fn->dev); > +} > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 06fd98c989c8..81086534dab5 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -150,4 +150,9 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > +struct ocxl_fn *init_function(struct pci_dev *dev); > +void remove_function(struct ocxl_fn *fn); > +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); > +void remove_afu(struct ocxl_afu *afu); > + > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c > index 21f425472a82..4ed7cb1a667f 100644 > --- a/drivers/misc/ocxl/pci.c > +++ b/drivers/misc/ocxl/pci.c > @@ -1,9 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > -// Copyright 2017 IBM Corp. > +// Copyright 2019 IBM Corp. > #include <linux/module.h> > -#include <linux/pci.h> > -#include <linux/idr.h> > -#include <asm/pnv-ocxl.h> > #include "ocxl_internal.h" > > /* > @@ -17,520 +14,6 @@ static const struct pci_device_id ocxl_pci_tbl[] = { > }; > MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); > > - > -static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) > -{ > - return (get_device(&fn->dev) == NULL) ? NULL : fn; > -} > - > -static void ocxl_fn_put(struct ocxl_fn *fn) > -{ > - put_device(&fn->dev); > -} > - > -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) > -{ > - return (get_device(&afu->dev) == NULL) ? NULL : afu; > -} > - > -void ocxl_afu_put(struct ocxl_afu *afu) > -{ > - put_device(&afu->dev); > -} > - > -static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) > -{ > - struct ocxl_afu *afu; > - > - afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); > - if (!afu) > - return NULL; > - > - mutex_init(&afu->contexts_lock); > - mutex_init(&afu->afu_control_lock); > - idr_init(&afu->contexts_idr); > - afu->fn = fn; > - ocxl_fn_get(fn); > - return afu; > -} > - > -static void free_afu(struct ocxl_afu *afu) > -{ > - idr_destroy(&afu->contexts_idr); > - ocxl_fn_put(afu->fn); > - kfree(afu); > -} > - > -static void free_afu_dev(struct device *dev) > -{ > - struct ocxl_afu *afu = to_ocxl_afu(dev); > - > - ocxl_unregister_afu(afu); > - free_afu(afu); > -} > - > -static int set_afu_device(struct ocxl_afu *afu, const char *location) > -{ > - struct ocxl_fn *fn = afu->fn; > - int rc; > - > - afu->dev.parent = &fn->dev; > - afu->dev.release = free_afu_dev; > - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, > - afu->config.idx); > - return rc; > -} > - > -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - struct ocxl_fn *fn = afu->fn; > - int actag_count, actag_offset; > - > - /* > - * if there were not enough actags for the function, each afu > - * reduces its count as well > - */ > - actag_count = afu->config.actag_supported * > - fn->actag_enabled / fn->actag_supported; > - actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > - if (actag_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > - actag_count, actag_offset); > - return actag_offset; > - } > - afu->actag_base = fn->actag_base + actag_offset; > - afu->actag_enabled = actag_count; > - > - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > - afu->actag_base, afu->actag_enabled); > - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > - afu->actag_base, afu->actag_enabled); > - return 0; > -} > - > -static void reclaim_afu_actag(struct ocxl_afu *afu) > -{ > - struct ocxl_fn *fn = afu->fn; > - int start_offset, size; > - > - start_offset = afu->actag_base - fn->actag_base; > - size = afu->actag_enabled; > - ocxl_actag_afu_free(afu->fn, start_offset, size); > -} > - > -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - struct ocxl_fn *fn = afu->fn; > - int pasid_count, pasid_offset; > - > - /* > - * We only support the case where the function configuration > - * requested enough PASIDs to cover all AFUs. > - */ > - pasid_count = 1 << afu->config.pasid_supported_log; > - pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > - if (pasid_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > - pasid_count, pasid_offset); > - return pasid_offset; > - } > - afu->pasid_base = fn->pasid_base + pasid_offset; > - afu->pasid_count = 0; > - afu->pasid_max = pasid_count; > - > - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > - afu->pasid_base, > - afu->config.pasid_supported_log); > - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > - afu->pasid_base, pasid_count); > - return 0; > -} > - > -static void reclaim_afu_pasid(struct ocxl_afu *afu) > -{ > - struct ocxl_fn *fn = afu->fn; > - int start_offset, size; > - > - start_offset = afu->pasid_base - fn->pasid_base; > - size = 1 << afu->config.pasid_supported_log; > - ocxl_pasid_afu_free(afu->fn, start_offset, size); > -} > - > -static int reserve_fn_bar(struct ocxl_fn *fn, int bar) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int rc, idx; > - > - if (bar != 0 && bar != 2 && bar != 4) > - return -EINVAL; > - > - idx = bar >> 1; > - if (fn->bar_used[idx]++ == 0) { > - rc = pci_request_region(dev, bar, "ocxl"); > - if (rc) > - return rc; > - } > - return 0; > -} > - > -static void release_fn_bar(struct ocxl_fn *fn, int bar) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int idx; > - > - if (bar != 0 && bar != 2 && bar != 4) > - return; > - > - idx = bar >> 1; > - if (--fn->bar_used[idx] == 0) > - pci_release_region(dev, bar); > - WARN_ON(fn->bar_used[idx] < 0); > -} > - > -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - int rc; > - > - rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > - if (rc) > - return rc; > - > - rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - if (rc) { > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - return rc; > - } > - > - afu->global_mmio_start = > - pci_resource_start(dev, afu->config.global_mmio_bar) + > - afu->config.global_mmio_offset; > - afu->pp_mmio_start = > - pci_resource_start(dev, afu->config.pp_mmio_bar) + > - afu->config.pp_mmio_offset; > - > - afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > - afu->config.global_mmio_size); > - if (!afu->global_mmio_ptr) { > - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - dev_err(&dev->dev, "Error mapping global mmio area\n"); > - return -ENOMEM; > - } > - > - /* > - * Leave an empty page between the per-process mmio area and > - * the AFU interrupt mappings > - */ > - afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; > - return 0; > -} > - > -static void unmap_mmio_areas(struct ocxl_afu *afu) > -{ > - if (afu->global_mmio_ptr) { > - iounmap(afu->global_mmio_ptr); > - afu->global_mmio_ptr = NULL; > - } > - afu->global_mmio_start = 0; > - afu->pp_mmio_start = 0; > - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > -} > - > -static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > -{ > - int rc; > - > - rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); > - if (rc) > - return rc; > - > - rc = set_afu_device(afu, dev_name(&dev->dev)); > - if (rc) > - return rc; > - > - rc = assign_afu_actag(afu, dev); > - if (rc) > - return rc; > - > - rc = assign_afu_pasid(afu, dev); > - if (rc) { > - reclaim_afu_actag(afu); > - return rc; > - } > - > - rc = map_mmio_areas(afu, dev); > - if (rc) { > - reclaim_afu_pasid(afu); > - reclaim_afu_actag(afu); > - return rc; > - } > - return 0; > -} > - > -static void deconfigure_afu(struct ocxl_afu *afu) > -{ > - unmap_mmio_areas(afu); > - reclaim_afu_pasid(afu); > - reclaim_afu_actag(afu); > -} > - > -static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) > -{ > - int rc; > - > - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); > - /* > - * Char device creation is the last step, as processes can > - * call our driver immediately, so all our inits must be finished. > - */ > - rc = ocxl_create_cdev(afu); > - if (rc) > - return rc; > - return 0; > -} > - > -static void deactivate_afu(struct ocxl_afu *afu) > -{ > - struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); > - > - ocxl_destroy_cdev(afu); > - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); > -} > - > -static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) > -{ > - int rc; > - struct ocxl_afu *afu; > - > - afu = alloc_afu(fn); > - if (!afu) > - return -ENOMEM; > - > - rc = configure_afu(afu, afu_idx, dev); > - if (rc) { > - free_afu(afu); > - return rc; > - } > - > - rc = ocxl_register_afu(afu); > - if (rc) > - goto err; > - > - rc = ocxl_sysfs_add_afu(afu); > - if (rc) > - goto err; > - > - rc = activate_afu(dev, afu); > - if (rc) > - goto err_sys; > - > - list_add_tail(&afu->list, &fn->afu_list); > - return 0; > - > -err_sys: > - ocxl_sysfs_remove_afu(afu); > -err: > - deconfigure_afu(afu); > - device_unregister(&afu->dev); > - return rc; > -} > - > -static void remove_afu(struct ocxl_afu *afu) > -{ > - list_del(&afu->list); > - ocxl_context_detach_all(afu); > - deactivate_afu(afu); > - ocxl_sysfs_remove_afu(afu); > - deconfigure_afu(afu); > - device_unregister(&afu->dev); > -} > - > -static struct ocxl_fn *alloc_function(struct pci_dev *dev) > -{ > - struct ocxl_fn *fn; > - > - fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); > - if (!fn) > - return NULL; > - > - INIT_LIST_HEAD(&fn->afu_list); > - INIT_LIST_HEAD(&fn->pasid_list); > - INIT_LIST_HEAD(&fn->actag_list); > - return fn; > -} > - > -static void free_function(struct ocxl_fn *fn) > -{ > - WARN_ON(!list_empty(&fn->afu_list)); > - WARN_ON(!list_empty(&fn->pasid_list)); > - kfree(fn); > -} > - > -static void free_function_dev(struct device *dev) > -{ > - struct ocxl_fn *fn = to_ocxl_function(dev); > - > - free_function(fn); > -} > - > -static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) > -{ > - int rc; > - > - fn->dev.parent = &dev->dev; > - fn->dev.release = free_function_dev; > - rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); > - if (rc) > - return rc; > - pci_set_drvdata(dev, fn); > - return 0; > -} > - > -static int assign_function_actag(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - u16 base, enabled, supported; > - int rc; > - > - rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); > - if (rc) > - return rc; > - > - fn->actag_base = base; > - fn->actag_enabled = enabled; > - fn->actag_supported = supported; > - > - ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, > - fn->actag_base, fn->actag_enabled); > - dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", > - fn->actag_base, fn->actag_enabled); > - return 0; > -} > - > -static int set_function_pasid(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int rc, desired_count, max_count; > - > - /* A function may not require any PASID */ > - if (fn->config.max_pasid_log < 0) > - return 0; > - > - rc = ocxl_config_get_pasid_info(dev, &max_count); > - if (rc) > - return rc; > - > - desired_count = 1 << fn->config.max_pasid_log; > - > - if (desired_count > max_count) { > - dev_err(&fn->dev, > - "Function requires more PASIDs than is available (%d vs. %d)\n", > - desired_count, max_count); > - return -ENOSPC; > - } > - > - fn->pasid_base = 0; > - return 0; > -} > - > -static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) > -{ > - int rc; > - > - rc = pci_enable_device(dev); > - if (rc) { > - dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); > - return rc; > - } > - > - /* > - * Once it has been confirmed to work on our hardware, we > - * should reset the function, to force the adapter to restart > - * from scratch. > - * A function reset would also reset all its AFUs. > - * > - * Some hints for implementation: > - * > - * - there's not status bit to know when the reset is done. We > - * should try reading the config space to know when it's > - * done. > - * - probably something like: > - * Reset > - * wait 100ms > - * issue config read > - * allow device up to 1 sec to return success on config > - * read before declaring it broken > - * > - * Some shared logic on the card (CFG, TLX) won't be reset, so > - * there's no guarantee that it will be enough. > - */ > - rc = ocxl_config_read_function(dev, &fn->config); > - if (rc) > - return rc; > - > - rc = set_function_device(fn, dev); > - if (rc) > - return rc; > - > - rc = assign_function_actag(fn); > - if (rc) > - return rc; > - > - rc = set_function_pasid(fn); > - if (rc) > - return rc; > - > - rc = ocxl_link_setup(dev, 0, &fn->link); > - if (rc) > - return rc; > - > - rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); > - if (rc) { > - ocxl_link_release(dev, fn->link); > - return rc; > - } > - return 0; > -} > - > -static void deconfigure_function(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - > - ocxl_link_release(dev, fn->link); > - pci_disable_device(dev); > -} > - > -static struct ocxl_fn *init_function(struct pci_dev *dev) > -{ > - struct ocxl_fn *fn; > - int rc; > - > - fn = alloc_function(dev); > - if (!fn) > - return ERR_PTR(-ENOMEM); > - > - rc = configure_function(fn, dev); > - if (rc) { > - free_function(fn); > - return ERR_PTR(rc); > - } > - > - rc = device_register(&fn->dev); > - if (rc) { > - deconfigure_function(fn); > - put_device(&fn->dev); > - return ERR_PTR(rc); > - } > - return fn; > -} > - > -static void remove_function(struct ocxl_fn *fn) > -{ > - deconfigure_function(fn); > - device_unregister(&fn->dev); > -} > - > static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) > { > int rc, afu_count = 0; > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 1/7] ocxl: Split pci.c @ 2019-03-25 10:01 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 10:01 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > In preparation for making core code available for external drivers, > move the core code out of pci.c and into core.c > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/Makefile | 1 + > drivers/misc/ocxl/core.c | 517 +++++++++++++++++++++++++++++ > drivers/misc/ocxl/ocxl_internal.h | 5 + > drivers/misc/ocxl/pci.c | 519 +----------------------------- > 4 files changed, 524 insertions(+), 518 deletions(-) > create mode 100644 drivers/misc/ocxl/core.c > > diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile > index 5229dcda8297..bc4e39bfda7b 100644 > --- a/drivers/misc/ocxl/Makefile > +++ b/drivers/misc/ocxl/Makefile > @@ -3,6 +3,7 @@ ccflags-$(CONFIG_PPC_WERROR) += -Werror > > ocxl-y += main.o pci.o config.o file.o pasid.o > ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o > +ocxl-y += core.o > obj-$(CONFIG_OCXL) += ocxl.o > > # For tracepoints to include our trace.h from tracepoint infrastructure: > diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c > new file mode 100644 > index 000000000000..1a4411b72d35 > --- /dev/null > +++ b/drivers/misc/ocxl/core.c > @@ -0,0 +1,517 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2019 IBM Corp. > +#include <linux/idr.h> > +#include "ocxl_internal.h" > + > +static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) > +{ > + return (get_device(&fn->dev) == NULL) ? NULL : fn; > +} > + > +static void ocxl_fn_put(struct ocxl_fn *fn) > +{ > + put_device(&fn->dev); > +} > + > +struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) > +{ > + return (get_device(&afu->dev) == NULL) ? NULL : afu; > +} > + > +void ocxl_afu_put(struct ocxl_afu *afu) > +{ > + put_device(&afu->dev); > +} > + > +static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) > +{ > + struct ocxl_afu *afu; > + > + afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); > + if (!afu) > + return NULL; > + > + mutex_init(&afu->contexts_lock); > + mutex_init(&afu->afu_control_lock); > + idr_init(&afu->contexts_idr); > + afu->fn = fn; > + ocxl_fn_get(fn); > + return afu; > +} > + > +static void free_afu(struct ocxl_afu *afu) > +{ > + idr_destroy(&afu->contexts_idr); > + ocxl_fn_put(afu->fn); > + kfree(afu); > +} > + > +static void free_afu_dev(struct device *dev) > +{ > + struct ocxl_afu *afu = to_ocxl_afu(dev); > + > + ocxl_unregister_afu(afu); > + free_afu(afu); > +} > + > +static int set_afu_device(struct ocxl_afu *afu, const char *location) > +{ > + struct ocxl_fn *fn = afu->fn; > + int rc; > + > + afu->dev.parent = &fn->dev; > + afu->dev.release = free_afu_dev; > + rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, > + afu->config.idx); > + return rc; > +} > + > +static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + struct ocxl_fn *fn = afu->fn; > + int actag_count, actag_offset; > + > + /* > + * if there were not enough actags for the function, each afu > + * reduces its count as well > + */ > + actag_count = afu->config.actag_supported * > + fn->actag_enabled / fn->actag_supported; > + actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > + if (actag_offset < 0) { > + dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > + actag_count, actag_offset); > + return actag_offset; > + } > + afu->actag_base = fn->actag_base + actag_offset; > + afu->actag_enabled = actag_count; > + > + ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > + afu->actag_base, afu->actag_enabled); > + dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > + afu->actag_base, afu->actag_enabled); > + return 0; > +} > + > +static void reclaim_afu_actag(struct ocxl_afu *afu) > +{ > + struct ocxl_fn *fn = afu->fn; > + int start_offset, size; > + > + start_offset = afu->actag_base - fn->actag_base; > + size = afu->actag_enabled; > + ocxl_actag_afu_free(afu->fn, start_offset, size); > +} > + > +static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + struct ocxl_fn *fn = afu->fn; > + int pasid_count, pasid_offset; > + > + /* > + * We only support the case where the function configuration > + * requested enough PASIDs to cover all AFUs. > + */ > + pasid_count = 1 << afu->config.pasid_supported_log; > + pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > + if (pasid_offset < 0) { > + dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > + pasid_count, pasid_offset); > + return pasid_offset; > + } > + afu->pasid_base = fn->pasid_base + pasid_offset; > + afu->pasid_count = 0; > + afu->pasid_max = pasid_count; > + > + ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > + afu->pasid_base, > + afu->config.pasid_supported_log); > + dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > + afu->pasid_base, pasid_count); > + return 0; > +} > + > +static void reclaim_afu_pasid(struct ocxl_afu *afu) > +{ > + struct ocxl_fn *fn = afu->fn; > + int start_offset, size; > + > + start_offset = afu->pasid_base - fn->pasid_base; > + size = 1 << afu->config.pasid_supported_log; > + ocxl_pasid_afu_free(afu->fn, start_offset, size); > +} > + > +static int reserve_fn_bar(struct ocxl_fn *fn, int bar) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int rc, idx; > + > + if (bar != 0 && bar != 2 && bar != 4) > + return -EINVAL; > + > + idx = bar >> 1; > + if (fn->bar_used[idx]++ == 0) { > + rc = pci_request_region(dev, bar, "ocxl"); > + if (rc) > + return rc; > + } > + return 0; > +} > + > +static void release_fn_bar(struct ocxl_fn *fn, int bar) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int idx; > + > + if (bar != 0 && bar != 2 && bar != 4) > + return; > + > + idx = bar >> 1; > + if (--fn->bar_used[idx] == 0) > + pci_release_region(dev, bar); > + WARN_ON(fn->bar_used[idx] < 0); > +} > + > +static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > +{ > + int rc; > + > + rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > + if (rc) > + return rc; > + > + rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + if (rc) { > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > + return rc; > + } > + > + afu->global_mmio_start = > + pci_resource_start(dev, afu->config.global_mmio_bar) + > + afu->config.global_mmio_offset; > + afu->pp_mmio_start = > + pci_resource_start(dev, afu->config.pp_mmio_bar) + > + afu->config.pp_mmio_offset; > + > + afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > + afu->config.global_mmio_size); > + if (!afu->global_mmio_ptr) { > + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > + dev_err(&dev->dev, "Error mapping global mmio area\n"); > + return -ENOMEM; > + } > + > + /* > + * Leave an empty page between the per-process mmio area and > + * the AFU interrupt mappings > + */ > + afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; > + return 0; > +} > + > +static void unmap_mmio_areas(struct ocxl_afu *afu) > +{ > + if (afu->global_mmio_ptr) { > + iounmap(afu->global_mmio_ptr); > + afu->global_mmio_ptr = NULL; > + } > + afu->global_mmio_start = 0; > + afu->pp_mmio_start = 0; > + release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > + release_fn_bar(afu->fn, afu->config.global_mmio_bar); > +} > + > +static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > +{ > + int rc; > + > + rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); > + if (rc) > + return rc; > + > + rc = set_afu_device(afu, dev_name(&dev->dev)); > + if (rc) > + return rc; > + > + rc = assign_afu_actag(afu, dev); > + if (rc) > + return rc; > + > + rc = assign_afu_pasid(afu, dev); > + if (rc) { > + reclaim_afu_actag(afu); > + return rc; > + } > + > + rc = map_mmio_areas(afu, dev); > + if (rc) { > + reclaim_afu_pasid(afu); > + reclaim_afu_actag(afu); > + return rc; > + } > + return 0; > +} > + > +static void deconfigure_afu(struct ocxl_afu *afu) > +{ > + unmap_mmio_areas(afu); > + reclaim_afu_pasid(afu); > + reclaim_afu_actag(afu); > +} > + > +static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) > +{ > + int rc; > + > + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); > + /* > + * Char device creation is the last step, as processes can > + * call our driver immediately, so all our inits must be finished. > + */ > + rc = ocxl_create_cdev(afu); > + if (rc) > + return rc; > + return 0; > +} > + > +static void deactivate_afu(struct ocxl_afu *afu) > +{ > + struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); > + > + ocxl_destroy_cdev(afu); > + ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); > +} > + > +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) > +{ > + int rc; > + struct ocxl_afu *afu; > + > + afu = alloc_afu(fn); > + if (!afu) > + return -ENOMEM; > + > + rc = configure_afu(afu, afu_idx, dev); > + if (rc) { > + free_afu(afu); > + return rc; > + } > + > + rc = ocxl_register_afu(afu); > + if (rc) > + goto err; > + > + rc = ocxl_sysfs_add_afu(afu); > + if (rc) > + goto err; > + > + rc = activate_afu(dev, afu); > + if (rc) > + goto err_sys; > + > + list_add_tail(&afu->list, &fn->afu_list); > + return 0; > + > +err_sys: > + ocxl_sysfs_remove_afu(afu); > +err: > + deconfigure_afu(afu); > + device_unregister(&afu->dev); > + return rc; > +} > + > +void remove_afu(struct ocxl_afu *afu) > +{ > + list_del(&afu->list); > + ocxl_context_detach_all(afu); > + deactivate_afu(afu); > + ocxl_sysfs_remove_afu(afu); > + deconfigure_afu(afu); > + device_unregister(&afu->dev); > +} > + > +static struct ocxl_fn *alloc_function(struct pci_dev *dev) > +{ > + struct ocxl_fn *fn; > + > + fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); > + if (!fn) > + return NULL; > + > + INIT_LIST_HEAD(&fn->afu_list); > + INIT_LIST_HEAD(&fn->pasid_list); > + INIT_LIST_HEAD(&fn->actag_list); > + return fn; > +} > + > +static void free_function(struct ocxl_fn *fn) > +{ > + WARN_ON(!list_empty(&fn->afu_list)); > + WARN_ON(!list_empty(&fn->pasid_list)); > + kfree(fn); > +} > + > +static void free_function_dev(struct device *dev) > +{ > + struct ocxl_fn *fn = to_ocxl_function(dev); > + > + free_function(fn); > +} > + > +static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) > +{ > + int rc; > + > + fn->dev.parent = &dev->dev; > + fn->dev.release = free_function_dev; > + rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); > + if (rc) > + return rc; > + pci_set_drvdata(dev, fn); > + return 0; > +} > + > +static int assign_function_actag(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + u16 base, enabled, supported; > + int rc; > + > + rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); > + if (rc) > + return rc; > + > + fn->actag_base = base; > + fn->actag_enabled = enabled; > + fn->actag_supported = supported; > + > + ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, > + fn->actag_base, fn->actag_enabled); > + dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", > + fn->actag_base, fn->actag_enabled); > + return 0; > +} > + > +static int set_function_pasid(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + int rc, desired_count, max_count; > + > + /* A function may not require any PASID */ > + if (fn->config.max_pasid_log < 0) > + return 0; > + > + rc = ocxl_config_get_pasid_info(dev, &max_count); > + if (rc) > + return rc; > + > + desired_count = 1 << fn->config.max_pasid_log; > + > + if (desired_count > max_count) { > + dev_err(&fn->dev, > + "Function requires more PASIDs than is available (%d vs. %d)\n", > + desired_count, max_count); > + return -ENOSPC; > + } > + > + fn->pasid_base = 0; > + return 0; > +} > + > +static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) > +{ > + int rc; > + > + rc = pci_enable_device(dev); > + if (rc) { > + dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); > + return rc; > + } > + > + /* > + * Once it has been confirmed to work on our hardware, we > + * should reset the function, to force the adapter to restart > + * from scratch. > + * A function reset would also reset all its AFUs. > + * > + * Some hints for implementation: > + * > + * - there's not status bit to know when the reset is done. We > + * should try reading the config space to know when it's > + * done. > + * - probably something like: > + * Reset > + * wait 100ms > + * issue config read > + * allow device up to 1 sec to return success on config > + * read before declaring it broken > + * > + * Some shared logic on the card (CFG, TLX) won't be reset, so > + * there's no guarantee that it will be enough. > + */ > + rc = ocxl_config_read_function(dev, &fn->config); > + if (rc) > + return rc; > + > + rc = set_function_device(fn, dev); > + if (rc) > + return rc; > + > + rc = assign_function_actag(fn); > + if (rc) > + return rc; > + > + rc = set_function_pasid(fn); > + if (rc) > + return rc; > + > + rc = ocxl_link_setup(dev, 0, &fn->link); > + if (rc) > + return rc; > + > + rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); > + if (rc) { > + ocxl_link_release(dev, fn->link); > + return rc; > + } > + return 0; > +} > + > +static void deconfigure_function(struct ocxl_fn *fn) > +{ > + struct pci_dev *dev = to_pci_dev(fn->dev.parent); > + > + ocxl_link_release(dev, fn->link); > + pci_disable_device(dev); > +} > + > +struct ocxl_fn *init_function(struct pci_dev *dev) > +{ > + struct ocxl_fn *fn; > + int rc; > + > + fn = alloc_function(dev); > + if (!fn) > + return ERR_PTR(-ENOMEM); > + > + rc = configure_function(fn, dev); > + if (rc) { > + free_function(fn); > + return ERR_PTR(rc); > + } > + > + rc = device_register(&fn->dev); > + if (rc) { > + deconfigure_function(fn); > + put_device(&fn->dev); > + return ERR_PTR(rc); > + } > + return fn; > +} > + > +void remove_function(struct ocxl_fn *fn) > +{ > + deconfigure_function(fn); > + device_unregister(&fn->dev); > +} > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 06fd98c989c8..81086534dab5 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -150,4 +150,9 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > int eventfd); > u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > > +struct ocxl_fn *init_function(struct pci_dev *dev); > +void remove_function(struct ocxl_fn *fn); > +int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); > +void remove_afu(struct ocxl_afu *afu); > + > #endif /* _OCXL_INTERNAL_H_ */ > diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c > index 21f425472a82..4ed7cb1a667f 100644 > --- a/drivers/misc/ocxl/pci.c > +++ b/drivers/misc/ocxl/pci.c > @@ -1,9 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > -// Copyright 2017 IBM Corp. > +// Copyright 2019 IBM Corp. > #include <linux/module.h> > -#include <linux/pci.h> > -#include <linux/idr.h> > -#include <asm/pnv-ocxl.h> > #include "ocxl_internal.h" > > /* > @@ -17,520 +14,6 @@ static const struct pci_device_id ocxl_pci_tbl[] = { > }; > MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); > > - > -static struct ocxl_fn *ocxl_fn_get(struct ocxl_fn *fn) > -{ > - return (get_device(&fn->dev) == NULL) ? NULL : fn; > -} > - > -static void ocxl_fn_put(struct ocxl_fn *fn) > -{ > - put_device(&fn->dev); > -} > - > -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) > -{ > - return (get_device(&afu->dev) == NULL) ? NULL : afu; > -} > - > -void ocxl_afu_put(struct ocxl_afu *afu) > -{ > - put_device(&afu->dev); > -} > - > -static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) > -{ > - struct ocxl_afu *afu; > - > - afu = kzalloc(sizeof(struct ocxl_afu), GFP_KERNEL); > - if (!afu) > - return NULL; > - > - mutex_init(&afu->contexts_lock); > - mutex_init(&afu->afu_control_lock); > - idr_init(&afu->contexts_idr); > - afu->fn = fn; > - ocxl_fn_get(fn); > - return afu; > -} > - > -static void free_afu(struct ocxl_afu *afu) > -{ > - idr_destroy(&afu->contexts_idr); > - ocxl_fn_put(afu->fn); > - kfree(afu); > -} > - > -static void free_afu_dev(struct device *dev) > -{ > - struct ocxl_afu *afu = to_ocxl_afu(dev); > - > - ocxl_unregister_afu(afu); > - free_afu(afu); > -} > - > -static int set_afu_device(struct ocxl_afu *afu, const char *location) > -{ > - struct ocxl_fn *fn = afu->fn; > - int rc; > - > - afu->dev.parent = &fn->dev; > - afu->dev.release = free_afu_dev; > - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, > - afu->config.idx); > - return rc; > -} > - > -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - struct ocxl_fn *fn = afu->fn; > - int actag_count, actag_offset; > - > - /* > - * if there were not enough actags for the function, each afu > - * reduces its count as well > - */ > - actag_count = afu->config.actag_supported * > - fn->actag_enabled / fn->actag_supported; > - actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > - if (actag_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > - actag_count, actag_offset); > - return actag_offset; > - } > - afu->actag_base = fn->actag_base + actag_offset; > - afu->actag_enabled = actag_count; > - > - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > - afu->actag_base, afu->actag_enabled); > - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > - afu->actag_base, afu->actag_enabled); > - return 0; > -} > - > -static void reclaim_afu_actag(struct ocxl_afu *afu) > -{ > - struct ocxl_fn *fn = afu->fn; > - int start_offset, size; > - > - start_offset = afu->actag_base - fn->actag_base; > - size = afu->actag_enabled; > - ocxl_actag_afu_free(afu->fn, start_offset, size); > -} > - > -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - struct ocxl_fn *fn = afu->fn; > - int pasid_count, pasid_offset; > - > - /* > - * We only support the case where the function configuration > - * requested enough PASIDs to cover all AFUs. > - */ > - pasid_count = 1 << afu->config.pasid_supported_log; > - pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > - if (pasid_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > - pasid_count, pasid_offset); > - return pasid_offset; > - } > - afu->pasid_base = fn->pasid_base + pasid_offset; > - afu->pasid_count = 0; > - afu->pasid_max = pasid_count; > - > - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > - afu->pasid_base, > - afu->config.pasid_supported_log); > - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > - afu->pasid_base, pasid_count); > - return 0; > -} > - > -static void reclaim_afu_pasid(struct ocxl_afu *afu) > -{ > - struct ocxl_fn *fn = afu->fn; > - int start_offset, size; > - > - start_offset = afu->pasid_base - fn->pasid_base; > - size = 1 << afu->config.pasid_supported_log; > - ocxl_pasid_afu_free(afu->fn, start_offset, size); > -} > - > -static int reserve_fn_bar(struct ocxl_fn *fn, int bar) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int rc, idx; > - > - if (bar != 0 && bar != 2 && bar != 4) > - return -EINVAL; > - > - idx = bar >> 1; > - if (fn->bar_used[idx]++ == 0) { > - rc = pci_request_region(dev, bar, "ocxl"); > - if (rc) > - return rc; > - } > - return 0; > -} > - > -static void release_fn_bar(struct ocxl_fn *fn, int bar) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int idx; > - > - if (bar != 0 && bar != 2 && bar != 4) > - return; > - > - idx = bar >> 1; > - if (--fn->bar_used[idx] == 0) > - pci_release_region(dev, bar); > - WARN_ON(fn->bar_used[idx] < 0); > -} > - > -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > -{ > - int rc; > - > - rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > - if (rc) > - return rc; > - > - rc = reserve_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - if (rc) { > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - return rc; > - } > - > - afu->global_mmio_start = > - pci_resource_start(dev, afu->config.global_mmio_bar) + > - afu->config.global_mmio_offset; > - afu->pp_mmio_start = > - pci_resource_start(dev, afu->config.pp_mmio_bar) + > - afu->config.pp_mmio_offset; > - > - afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > - afu->config.global_mmio_size); > - if (!afu->global_mmio_ptr) { > - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - dev_err(&dev->dev, "Error mapping global mmio area\n"); > - return -ENOMEM; > - } > - > - /* > - * Leave an empty page between the per-process mmio area and > - * the AFU interrupt mappings > - */ > - afu->irq_base_offset = afu->config.pp_mmio_stride + PAGE_SIZE; > - return 0; > -} > - > -static void unmap_mmio_areas(struct ocxl_afu *afu) > -{ > - if (afu->global_mmio_ptr) { > - iounmap(afu->global_mmio_ptr); > - afu->global_mmio_ptr = NULL; > - } > - afu->global_mmio_start = 0; > - afu->pp_mmio_start = 0; > - release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > - release_fn_bar(afu->fn, afu->config.global_mmio_bar); > -} > - > -static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > -{ > - int rc; > - > - rc = ocxl_config_read_afu(dev, &afu->fn->config, &afu->config, afu_idx); > - if (rc) > - return rc; > - > - rc = set_afu_device(afu, dev_name(&dev->dev)); > - if (rc) > - return rc; > - > - rc = assign_afu_actag(afu, dev); > - if (rc) > - return rc; > - > - rc = assign_afu_pasid(afu, dev); > - if (rc) { > - reclaim_afu_actag(afu); > - return rc; > - } > - > - rc = map_mmio_areas(afu, dev); > - if (rc) { > - reclaim_afu_pasid(afu); > - reclaim_afu_actag(afu); > - return rc; > - } > - return 0; > -} > - > -static void deconfigure_afu(struct ocxl_afu *afu) > -{ > - unmap_mmio_areas(afu); > - reclaim_afu_pasid(afu); > - reclaim_afu_actag(afu); > -} > - > -static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) > -{ > - int rc; > - > - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); > - /* > - * Char device creation is the last step, as processes can > - * call our driver immediately, so all our inits must be finished. > - */ > - rc = ocxl_create_cdev(afu); > - if (rc) > - return rc; > - return 0; > -} > - > -static void deactivate_afu(struct ocxl_afu *afu) > -{ > - struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); > - > - ocxl_destroy_cdev(afu); > - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); > -} > - > -static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) > -{ > - int rc; > - struct ocxl_afu *afu; > - > - afu = alloc_afu(fn); > - if (!afu) > - return -ENOMEM; > - > - rc = configure_afu(afu, afu_idx, dev); > - if (rc) { > - free_afu(afu); > - return rc; > - } > - > - rc = ocxl_register_afu(afu); > - if (rc) > - goto err; > - > - rc = ocxl_sysfs_add_afu(afu); > - if (rc) > - goto err; > - > - rc = activate_afu(dev, afu); > - if (rc) > - goto err_sys; > - > - list_add_tail(&afu->list, &fn->afu_list); > - return 0; > - > -err_sys: > - ocxl_sysfs_remove_afu(afu); > -err: > - deconfigure_afu(afu); > - device_unregister(&afu->dev); > - return rc; > -} > - > -static void remove_afu(struct ocxl_afu *afu) > -{ > - list_del(&afu->list); > - ocxl_context_detach_all(afu); > - deactivate_afu(afu); > - ocxl_sysfs_remove_afu(afu); > - deconfigure_afu(afu); > - device_unregister(&afu->dev); > -} > - > -static struct ocxl_fn *alloc_function(struct pci_dev *dev) > -{ > - struct ocxl_fn *fn; > - > - fn = kzalloc(sizeof(struct ocxl_fn), GFP_KERNEL); > - if (!fn) > - return NULL; > - > - INIT_LIST_HEAD(&fn->afu_list); > - INIT_LIST_HEAD(&fn->pasid_list); > - INIT_LIST_HEAD(&fn->actag_list); > - return fn; > -} > - > -static void free_function(struct ocxl_fn *fn) > -{ > - WARN_ON(!list_empty(&fn->afu_list)); > - WARN_ON(!list_empty(&fn->pasid_list)); > - kfree(fn); > -} > - > -static void free_function_dev(struct device *dev) > -{ > - struct ocxl_fn *fn = to_ocxl_function(dev); > - > - free_function(fn); > -} > - > -static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) > -{ > - int rc; > - > - fn->dev.parent = &dev->dev; > - fn->dev.release = free_function_dev; > - rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); > - if (rc) > - return rc; > - pci_set_drvdata(dev, fn); > - return 0; > -} > - > -static int assign_function_actag(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - u16 base, enabled, supported; > - int rc; > - > - rc = ocxl_config_get_actag_info(dev, &base, &enabled, &supported); > - if (rc) > - return rc; > - > - fn->actag_base = base; > - fn->actag_enabled = enabled; > - fn->actag_supported = supported; > - > - ocxl_config_set_actag(dev, fn->config.dvsec_function_pos, > - fn->actag_base, fn->actag_enabled); > - dev_dbg(&fn->dev, "actag range starting at %d, enabled %d\n", > - fn->actag_base, fn->actag_enabled); > - return 0; > -} > - > -static int set_function_pasid(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - int rc, desired_count, max_count; > - > - /* A function may not require any PASID */ > - if (fn->config.max_pasid_log < 0) > - return 0; > - > - rc = ocxl_config_get_pasid_info(dev, &max_count); > - if (rc) > - return rc; > - > - desired_count = 1 << fn->config.max_pasid_log; > - > - if (desired_count > max_count) { > - dev_err(&fn->dev, > - "Function requires more PASIDs than is available (%d vs. %d)\n", > - desired_count, max_count); > - return -ENOSPC; > - } > - > - fn->pasid_base = 0; > - return 0; > -} > - > -static int configure_function(struct ocxl_fn *fn, struct pci_dev *dev) > -{ > - int rc; > - > - rc = pci_enable_device(dev); > - if (rc) { > - dev_err(&dev->dev, "pci_enable_device failed: %d\n", rc); > - return rc; > - } > - > - /* > - * Once it has been confirmed to work on our hardware, we > - * should reset the function, to force the adapter to restart > - * from scratch. > - * A function reset would also reset all its AFUs. > - * > - * Some hints for implementation: > - * > - * - there's not status bit to know when the reset is done. We > - * should try reading the config space to know when it's > - * done. > - * - probably something like: > - * Reset > - * wait 100ms > - * issue config read > - * allow device up to 1 sec to return success on config > - * read before declaring it broken > - * > - * Some shared logic on the card (CFG, TLX) won't be reset, so > - * there's no guarantee that it will be enough. > - */ > - rc = ocxl_config_read_function(dev, &fn->config); > - if (rc) > - return rc; > - > - rc = set_function_device(fn, dev); > - if (rc) > - return rc; > - > - rc = assign_function_actag(fn); > - if (rc) > - return rc; > - > - rc = set_function_pasid(fn); > - if (rc) > - return rc; > - > - rc = ocxl_link_setup(dev, 0, &fn->link); > - if (rc) > - return rc; > - > - rc = ocxl_config_set_TL(dev, fn->config.dvsec_tl_pos); > - if (rc) { > - ocxl_link_release(dev, fn->link); > - return rc; > - } > - return 0; > -} > - > -static void deconfigure_function(struct ocxl_fn *fn) > -{ > - struct pci_dev *dev = to_pci_dev(fn->dev.parent); > - > - ocxl_link_release(dev, fn->link); > - pci_disable_device(dev); > -} > - > -static struct ocxl_fn *init_function(struct pci_dev *dev) > -{ > - struct ocxl_fn *fn; > - int rc; > - > - fn = alloc_function(dev); > - if (!fn) > - return ERR_PTR(-ENOMEM); > - > - rc = configure_function(fn, dev); > - if (rc) { > - free_function(fn); > - return ERR_PTR(rc); > - } > - > - rc = device_register(&fn->dev); > - if (rc) { > - deconfigure_function(fn); > - put_device(&fn->dev); > - return ERR_PTR(rc); > - } > - return fn; > -} > - > -static void remove_function(struct ocxl_fn *fn) > -{ > - deconfigure_function(fn); > - device_unregister(&fn->dev); > -} > - > static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) > { > int rc, afu_count = 0; > ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 2/7] ocxl: Don't pass pci_dev around 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> This data is already available in a struct Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/core.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c index 1a4411b72d35..2f2fe12eac1e 100644 --- a/drivers/misc/ocxl/core.c +++ b/drivers/misc/ocxl/core.c @@ -66,10 +66,11 @@ static int set_afu_device(struct ocxl_afu *afu, const char *location) return rc; } -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) +static int assign_afu_actag(struct ocxl_afu *afu) { struct ocxl_fn *fn = afu->fn; int actag_count, actag_offset; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); /* * if there were not enough actags for the function, each afu @@ -79,16 +80,16 @@ static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) fn->actag_enabled / fn->actag_supported; actag_offset = ocxl_actag_afu_alloc(fn, actag_count); if (actag_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", + dev_err(&pci_dev->dev, "Can't allocate %d actags for AFU: %d\n", actag_count, actag_offset); return actag_offset; } afu->actag_base = fn->actag_base + actag_offset; afu->actag_enabled = actag_count; - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, + ocxl_config_set_afu_actag(pci_dev, afu->config.dvsec_afu_control_pos, afu->actag_base, afu->actag_enabled); - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", + dev_dbg(&pci_dev->dev, "actag base=%d enabled=%d\n", afu->actag_base, afu->actag_enabled); return 0; } @@ -103,10 +104,11 @@ static void reclaim_afu_actag(struct ocxl_afu *afu) ocxl_actag_afu_free(afu->fn, start_offset, size); } -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) +static int assign_afu_pasid(struct ocxl_afu *afu) { struct ocxl_fn *fn = afu->fn; int pasid_count, pasid_offset; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); /* * We only support the case where the function configuration @@ -115,7 +117,7 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) pasid_count = 1 << afu->config.pasid_supported_log; pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); if (pasid_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", + dev_err(&pci_dev->dev, "Can't allocate %d PASIDs for AFU: %d\n", pasid_count, pasid_offset); return pasid_offset; } @@ -123,10 +125,10 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) afu->pasid_count = 0; afu->pasid_max = pasid_count; - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, + ocxl_config_set_afu_pasid(pci_dev, afu->config.dvsec_afu_control_pos, afu->pasid_base, afu->config.pasid_supported_log); - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", + dev_dbg(&pci_dev->dev, "PASID base=%d, enabled=%d\n", afu->pasid_base, pasid_count); return 0; } @@ -172,9 +174,10 @@ static void release_fn_bar(struct ocxl_fn *fn, int bar) WARN_ON(fn->bar_used[idx] < 0); } -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) +static int map_mmio_areas(struct ocxl_afu *afu) { int rc; + struct pci_dev *pci_dev = to_pci_dev(afu->fn->dev.parent); rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); if (rc) @@ -187,10 +190,10 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) } afu->global_mmio_start = - pci_resource_start(dev, afu->config.global_mmio_bar) + + pci_resource_start(pci_dev, afu->config.global_mmio_bar) + afu->config.global_mmio_offset; afu->pp_mmio_start = - pci_resource_start(dev, afu->config.pp_mmio_bar) + + pci_resource_start(pci_dev, afu->config.pp_mmio_bar) + afu->config.pp_mmio_offset; afu->global_mmio_ptr = ioremap(afu->global_mmio_start, @@ -198,7 +201,7 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) if (!afu->global_mmio_ptr) { release_fn_bar(afu->fn, afu->config.pp_mmio_bar); release_fn_bar(afu->fn, afu->config.global_mmio_bar); - dev_err(&dev->dev, "Error mapping global mmio area\n"); + dev_err(&pci_dev->dev, "Error mapping global mmio area\n"); return -ENOMEM; } @@ -234,17 +237,17 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) if (rc) return rc; - rc = assign_afu_actag(afu, dev); + rc = assign_afu_actag(afu); if (rc) return rc; - rc = assign_afu_pasid(afu, dev); + rc = assign_afu_pasid(afu); if (rc) { reclaim_afu_actag(afu); return rc; } - rc = map_mmio_areas(afu, dev); + rc = map_mmio_areas(afu); if (rc) { reclaim_afu_pasid(afu); reclaim_afu_actag(afu); @@ -331,7 +334,7 @@ void remove_afu(struct ocxl_afu *afu) device_unregister(&afu->dev); } -static struct ocxl_fn *alloc_function(struct pci_dev *dev) +static struct ocxl_fn *alloc_function(void) { struct ocxl_fn *fn; @@ -342,6 +345,7 @@ static struct ocxl_fn *alloc_function(struct pci_dev *dev) INIT_LIST_HEAD(&fn->afu_list); INIT_LIST_HEAD(&fn->pasid_list); INIT_LIST_HEAD(&fn->actag_list); + return fn; } @@ -491,7 +495,7 @@ struct ocxl_fn *init_function(struct pci_dev *dev) struct ocxl_fn *fn; int rc; - fn = alloc_function(dev); + fn = alloc_function(); if (!fn) return ERR_PTR(-ENOMEM); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 2/7] ocxl: Don't pass pci_dev around @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> This data is already available in a struct Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/core.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c index 1a4411b72d35..2f2fe12eac1e 100644 --- a/drivers/misc/ocxl/core.c +++ b/drivers/misc/ocxl/core.c @@ -66,10 +66,11 @@ static int set_afu_device(struct ocxl_afu *afu, const char *location) return rc; } -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) +static int assign_afu_actag(struct ocxl_afu *afu) { struct ocxl_fn *fn = afu->fn; int actag_count, actag_offset; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); /* * if there were not enough actags for the function, each afu @@ -79,16 +80,16 @@ static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) fn->actag_enabled / fn->actag_supported; actag_offset = ocxl_actag_afu_alloc(fn, actag_count); if (actag_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", + dev_err(&pci_dev->dev, "Can't allocate %d actags for AFU: %d\n", actag_count, actag_offset); return actag_offset; } afu->actag_base = fn->actag_base + actag_offset; afu->actag_enabled = actag_count; - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, + ocxl_config_set_afu_actag(pci_dev, afu->config.dvsec_afu_control_pos, afu->actag_base, afu->actag_enabled); - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", + dev_dbg(&pci_dev->dev, "actag base=%d enabled=%d\n", afu->actag_base, afu->actag_enabled); return 0; } @@ -103,10 +104,11 @@ static void reclaim_afu_actag(struct ocxl_afu *afu) ocxl_actag_afu_free(afu->fn, start_offset, size); } -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) +static int assign_afu_pasid(struct ocxl_afu *afu) { struct ocxl_fn *fn = afu->fn; int pasid_count, pasid_offset; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); /* * We only support the case where the function configuration @@ -115,7 +117,7 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) pasid_count = 1 << afu->config.pasid_supported_log; pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); if (pasid_offset < 0) { - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", + dev_err(&pci_dev->dev, "Can't allocate %d PASIDs for AFU: %d\n", pasid_count, pasid_offset); return pasid_offset; } @@ -123,10 +125,10 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) afu->pasid_count = 0; afu->pasid_max = pasid_count; - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, + ocxl_config_set_afu_pasid(pci_dev, afu->config.dvsec_afu_control_pos, afu->pasid_base, afu->config.pasid_supported_log); - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", + dev_dbg(&pci_dev->dev, "PASID base=%d, enabled=%d\n", afu->pasid_base, pasid_count); return 0; } @@ -172,9 +174,10 @@ static void release_fn_bar(struct ocxl_fn *fn, int bar) WARN_ON(fn->bar_used[idx] < 0); } -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) +static int map_mmio_areas(struct ocxl_afu *afu) { int rc; + struct pci_dev *pci_dev = to_pci_dev(afu->fn->dev.parent); rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); if (rc) @@ -187,10 +190,10 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) } afu->global_mmio_start = - pci_resource_start(dev, afu->config.global_mmio_bar) + + pci_resource_start(pci_dev, afu->config.global_mmio_bar) + afu->config.global_mmio_offset; afu->pp_mmio_start = - pci_resource_start(dev, afu->config.pp_mmio_bar) + + pci_resource_start(pci_dev, afu->config.pp_mmio_bar) + afu->config.pp_mmio_offset; afu->global_mmio_ptr = ioremap(afu->global_mmio_start, @@ -198,7 +201,7 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) if (!afu->global_mmio_ptr) { release_fn_bar(afu->fn, afu->config.pp_mmio_bar); release_fn_bar(afu->fn, afu->config.global_mmio_bar); - dev_err(&dev->dev, "Error mapping global mmio area\n"); + dev_err(&pci_dev->dev, "Error mapping global mmio area\n"); return -ENOMEM; } @@ -234,17 +237,17 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) if (rc) return rc; - rc = assign_afu_actag(afu, dev); + rc = assign_afu_actag(afu); if (rc) return rc; - rc = assign_afu_pasid(afu, dev); + rc = assign_afu_pasid(afu); if (rc) { reclaim_afu_actag(afu); return rc; } - rc = map_mmio_areas(afu, dev); + rc = map_mmio_areas(afu); if (rc) { reclaim_afu_pasid(afu); reclaim_afu_actag(afu); @@ -331,7 +334,7 @@ void remove_afu(struct ocxl_afu *afu) device_unregister(&afu->dev); } -static struct ocxl_fn *alloc_function(struct pci_dev *dev) +static struct ocxl_fn *alloc_function(void) { struct ocxl_fn *fn; @@ -342,6 +345,7 @@ static struct ocxl_fn *alloc_function(struct pci_dev *dev) INIT_LIST_HEAD(&fn->afu_list); INIT_LIST_HEAD(&fn->pasid_list); INIT_LIST_HEAD(&fn->actag_list); + return fn; } @@ -491,7 +495,7 @@ struct ocxl_fn *init_function(struct pci_dev *dev) struct ocxl_fn *fn; int rc; - fn = alloc_function(dev); + fn = alloc_function(); if (!fn) return ERR_PTR(-ENOMEM); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 2/7] ocxl: Don't pass pci_dev around 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 10:04 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 10:04 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > This data is already available in a struct > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/core.c | 38 +++++++++++++++++++++----------------- > 1 file changed, 21 insertions(+), 17 deletions(-) > > diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c > index 1a4411b72d35..2f2fe12eac1e 100644 > --- a/drivers/misc/ocxl/core.c > +++ b/drivers/misc/ocxl/core.c > @@ -66,10 +66,11 @@ static int set_afu_device(struct ocxl_afu *afu, const char *location) > return rc; > } > > -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > +static int assign_afu_actag(struct ocxl_afu *afu) > { > struct ocxl_fn *fn = afu->fn; > int actag_count, actag_offset; > + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); > > /* > * if there were not enough actags for the function, each afu > @@ -79,16 +80,16 @@ static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > fn->actag_enabled / fn->actag_supported; > actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > if (actag_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > + dev_err(&pci_dev->dev, "Can't allocate %d actags for AFU: %d\n", > actag_count, actag_offset); > return actag_offset; > } > afu->actag_base = fn->actag_base + actag_offset; > afu->actag_enabled = actag_count; > > - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > + ocxl_config_set_afu_actag(pci_dev, afu->config.dvsec_afu_control_pos, > afu->actag_base, afu->actag_enabled); > - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > + dev_dbg(&pci_dev->dev, "actag base=%d enabled=%d\n", > afu->actag_base, afu->actag_enabled); > return 0; > } > @@ -103,10 +104,11 @@ static void reclaim_afu_actag(struct ocxl_afu *afu) > ocxl_actag_afu_free(afu->fn, start_offset, size); > } > > -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > +static int assign_afu_pasid(struct ocxl_afu *afu) > { > struct ocxl_fn *fn = afu->fn; > int pasid_count, pasid_offset; > + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); > > /* > * We only support the case where the function configuration > @@ -115,7 +117,7 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > pasid_count = 1 << afu->config.pasid_supported_log; > pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > if (pasid_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > + dev_err(&pci_dev->dev, "Can't allocate %d PASIDs for AFU: %d\n", > pasid_count, pasid_offset); > return pasid_offset; > } > @@ -123,10 +125,10 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > afu->pasid_count = 0; > afu->pasid_max = pasid_count; > > - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > + ocxl_config_set_afu_pasid(pci_dev, afu->config.dvsec_afu_control_pos, > afu->pasid_base, > afu->config.pasid_supported_log); > - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > + dev_dbg(&pci_dev->dev, "PASID base=%d, enabled=%d\n", > afu->pasid_base, pasid_count); > return 0; > } > @@ -172,9 +174,10 @@ static void release_fn_bar(struct ocxl_fn *fn, int bar) > WARN_ON(fn->bar_used[idx] < 0); > } > > -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > +static int map_mmio_areas(struct ocxl_afu *afu) > { > int rc; > + struct pci_dev *pci_dev = to_pci_dev(afu->fn->dev.parent); > > rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > if (rc) > @@ -187,10 +190,10 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > } > > afu->global_mmio_start = > - pci_resource_start(dev, afu->config.global_mmio_bar) + > + pci_resource_start(pci_dev, afu->config.global_mmio_bar) + > afu->config.global_mmio_offset; > afu->pp_mmio_start = > - pci_resource_start(dev, afu->config.pp_mmio_bar) + > + pci_resource_start(pci_dev, afu->config.pp_mmio_bar) + > afu->config.pp_mmio_offset; > > afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > @@ -198,7 +201,7 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > if (!afu->global_mmio_ptr) { > release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - dev_err(&dev->dev, "Error mapping global mmio area\n"); > + dev_err(&pci_dev->dev, "Error mapping global mmio area\n"); > return -ENOMEM; > } > > @@ -234,17 +237,17 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > if (rc) > return rc; > > - rc = assign_afu_actag(afu, dev); > + rc = assign_afu_actag(afu); > if (rc) > return rc; > > - rc = assign_afu_pasid(afu, dev); > + rc = assign_afu_pasid(afu); > if (rc) { > reclaim_afu_actag(afu); > return rc; > } > > - rc = map_mmio_areas(afu, dev); > + rc = map_mmio_areas(afu); > if (rc) { > reclaim_afu_pasid(afu); > reclaim_afu_actag(afu); > @@ -331,7 +334,7 @@ void remove_afu(struct ocxl_afu *afu) > device_unregister(&afu->dev); > } > > -static struct ocxl_fn *alloc_function(struct pci_dev *dev) > +static struct ocxl_fn *alloc_function(void) > { > struct ocxl_fn *fn; > > @@ -342,6 +345,7 @@ static struct ocxl_fn *alloc_function(struct pci_dev *dev) > INIT_LIST_HEAD(&fn->afu_list); > INIT_LIST_HEAD(&fn->pasid_list); > INIT_LIST_HEAD(&fn->actag_list); > + > return fn; > } > > @@ -491,7 +495,7 @@ struct ocxl_fn *init_function(struct pci_dev *dev) > struct ocxl_fn *fn; > int rc; > > - fn = alloc_function(dev); > + fn = alloc_function(); > if (!fn) > return ERR_PTR(-ENOMEM); > > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 2/7] ocxl: Don't pass pci_dev around @ 2019-03-25 10:04 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 10:04 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > This data is already available in a struct > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/core.c | 38 +++++++++++++++++++++----------------- > 1 file changed, 21 insertions(+), 17 deletions(-) > > diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c > index 1a4411b72d35..2f2fe12eac1e 100644 > --- a/drivers/misc/ocxl/core.c > +++ b/drivers/misc/ocxl/core.c > @@ -66,10 +66,11 @@ static int set_afu_device(struct ocxl_afu *afu, const char *location) > return rc; > } > > -static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > +static int assign_afu_actag(struct ocxl_afu *afu) > { > struct ocxl_fn *fn = afu->fn; > int actag_count, actag_offset; > + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); > > /* > * if there were not enough actags for the function, each afu > @@ -79,16 +80,16 @@ static int assign_afu_actag(struct ocxl_afu *afu, struct pci_dev *dev) > fn->actag_enabled / fn->actag_supported; > actag_offset = ocxl_actag_afu_alloc(fn, actag_count); > if (actag_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d actags for AFU: %d\n", > + dev_err(&pci_dev->dev, "Can't allocate %d actags for AFU: %d\n", > actag_count, actag_offset); > return actag_offset; > } > afu->actag_base = fn->actag_base + actag_offset; > afu->actag_enabled = actag_count; > > - ocxl_config_set_afu_actag(dev, afu->config.dvsec_afu_control_pos, > + ocxl_config_set_afu_actag(pci_dev, afu->config.dvsec_afu_control_pos, > afu->actag_base, afu->actag_enabled); > - dev_dbg(&afu->dev, "actag base=%d enabled=%d\n", > + dev_dbg(&pci_dev->dev, "actag base=%d enabled=%d\n", > afu->actag_base, afu->actag_enabled); > return 0; > } > @@ -103,10 +104,11 @@ static void reclaim_afu_actag(struct ocxl_afu *afu) > ocxl_actag_afu_free(afu->fn, start_offset, size); > } > > -static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > +static int assign_afu_pasid(struct ocxl_afu *afu) > { > struct ocxl_fn *fn = afu->fn; > int pasid_count, pasid_offset; > + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); > > /* > * We only support the case where the function configuration > @@ -115,7 +117,7 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > pasid_count = 1 << afu->config.pasid_supported_log; > pasid_offset = ocxl_pasid_afu_alloc(fn, pasid_count); > if (pasid_offset < 0) { > - dev_err(&afu->dev, "Can't allocate %d PASIDs for AFU: %d\n", > + dev_err(&pci_dev->dev, "Can't allocate %d PASIDs for AFU: %d\n", > pasid_count, pasid_offset); > return pasid_offset; > } > @@ -123,10 +125,10 @@ static int assign_afu_pasid(struct ocxl_afu *afu, struct pci_dev *dev) > afu->pasid_count = 0; > afu->pasid_max = pasid_count; > > - ocxl_config_set_afu_pasid(dev, afu->config.dvsec_afu_control_pos, > + ocxl_config_set_afu_pasid(pci_dev, afu->config.dvsec_afu_control_pos, > afu->pasid_base, > afu->config.pasid_supported_log); > - dev_dbg(&afu->dev, "PASID base=%d, enabled=%d\n", > + dev_dbg(&pci_dev->dev, "PASID base=%d, enabled=%d\n", > afu->pasid_base, pasid_count); > return 0; > } > @@ -172,9 +174,10 @@ static void release_fn_bar(struct ocxl_fn *fn, int bar) > WARN_ON(fn->bar_used[idx] < 0); > } > > -static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > +static int map_mmio_areas(struct ocxl_afu *afu) > { > int rc; > + struct pci_dev *pci_dev = to_pci_dev(afu->fn->dev.parent); > > rc = reserve_fn_bar(afu->fn, afu->config.global_mmio_bar); > if (rc) > @@ -187,10 +190,10 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > } > > afu->global_mmio_start = > - pci_resource_start(dev, afu->config.global_mmio_bar) + > + pci_resource_start(pci_dev, afu->config.global_mmio_bar) + > afu->config.global_mmio_offset; > afu->pp_mmio_start = > - pci_resource_start(dev, afu->config.pp_mmio_bar) + > + pci_resource_start(pci_dev, afu->config.pp_mmio_bar) + > afu->config.pp_mmio_offset; > > afu->global_mmio_ptr = ioremap(afu->global_mmio_start, > @@ -198,7 +201,7 @@ static int map_mmio_areas(struct ocxl_afu *afu, struct pci_dev *dev) > if (!afu->global_mmio_ptr) { > release_fn_bar(afu->fn, afu->config.pp_mmio_bar); > release_fn_bar(afu->fn, afu->config.global_mmio_bar); > - dev_err(&dev->dev, "Error mapping global mmio area\n"); > + dev_err(&pci_dev->dev, "Error mapping global mmio area\n"); > return -ENOMEM; > } > > @@ -234,17 +237,17 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) > if (rc) > return rc; > > - rc = assign_afu_actag(afu, dev); > + rc = assign_afu_actag(afu); > if (rc) > return rc; > > - rc = assign_afu_pasid(afu, dev); > + rc = assign_afu_pasid(afu); > if (rc) { > reclaim_afu_actag(afu); > return rc; > } > > - rc = map_mmio_areas(afu, dev); > + rc = map_mmio_areas(afu); > if (rc) { > reclaim_afu_pasid(afu); > reclaim_afu_actag(afu); > @@ -331,7 +334,7 @@ void remove_afu(struct ocxl_afu *afu) > device_unregister(&afu->dev); > } > > -static struct ocxl_fn *alloc_function(struct pci_dev *dev) > +static struct ocxl_fn *alloc_function(void) > { > struct ocxl_fn *fn; > > @@ -342,6 +345,7 @@ static struct ocxl_fn *alloc_function(struct pci_dev *dev) > INIT_LIST_HEAD(&fn->afu_list); > INIT_LIST_HEAD(&fn->pasid_list); > INIT_LIST_HEAD(&fn->actag_list); > + > return fn; > } > > @@ -491,7 +495,7 @@ struct ocxl_fn *init_function(struct pci_dev *dev) > struct ocxl_fn *fn; > int rc; > > - fn = alloc_function(dev); > + fn = alloc_function(); > if (!fn) > return ERR_PTR(-ENOMEM); > > ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The OCXL driver contains both frontend code for interacting with userspace, as well as backend code for interacting with the hardware. This patch separates the backend code from the frontend so that it can be used by other device drivers that communicate via OpenCAPI. Relocate dev, cdev & sysfs files to the frontend code to allow external drivers to maintain their own devices. Reference counting on the device in the backend is replaced with kref counting. Move file & sysfs layer initialisation from core.c (backend) to pci.c (frontend). Create an ocxl_function oriented interface for initing devices & enumerating AFUs. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/core.c | 201 +++++++++++++++++++----------- drivers/misc/ocxl/file.c | 137 ++++++++++++++------ drivers/misc/ocxl/ocxl_internal.h | 36 +++--- drivers/misc/ocxl/pci.c | 56 ++++----- drivers/misc/ocxl/sysfs.c | 59 +++++---- include/misc/ocxl.h | 119 ++++++++++++++++-- 7 files changed, 421 insertions(+), 189 deletions(-) diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..c73a859d2224 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -238,7 +238,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) } rc = ocxl_link_remove_pe(ctx->afu->fn->link, ctx->pasid); if (rc) { - dev_warn(&ctx->afu->dev, + dev_warn(&dev->dev, "Couldn't remove PE entry cleanly: %d\n", rc); } return 0; diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c index 2f2fe12eac1e..b7a09b21ab36 100644 --- a/drivers/misc/ocxl/core.c +++ b/drivers/misc/ocxl/core.c @@ -13,16 +13,6 @@ static void ocxl_fn_put(struct ocxl_fn *fn) put_device(&fn->dev); } -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) -{ - return (get_device(&afu->dev) == NULL) ? NULL : afu; -} - -void ocxl_afu_put(struct ocxl_afu *afu) -{ - put_device(&afu->dev); -} - static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) { struct ocxl_afu *afu; @@ -31,6 +21,7 @@ static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) if (!afu) return NULL; + kref_init(&afu->kref); mutex_init(&afu->contexts_lock); mutex_init(&afu->afu_control_lock); idr_init(&afu->contexts_idr); @@ -39,32 +30,26 @@ static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) return afu; } -static void free_afu(struct ocxl_afu *afu) +static void free_afu(struct kref *kref) { + struct ocxl_afu *afu = container_of(kref, struct ocxl_afu, kref); + idr_destroy(&afu->contexts_idr); ocxl_fn_put(afu->fn); kfree(afu); } -static void free_afu_dev(struct device *dev) +void ocxl_afu_get(struct ocxl_afu *afu) { - struct ocxl_afu *afu = to_ocxl_afu(dev); - - ocxl_unregister_afu(afu); - free_afu(afu); + kref_get(&afu->kref); } +EXPORT_SYMBOL_GPL(ocxl_afu_get); -static int set_afu_device(struct ocxl_afu *afu, const char *location) +void ocxl_afu_put(struct ocxl_afu *afu) { - struct ocxl_fn *fn = afu->fn; - int rc; - - afu->dev.parent = &fn->dev; - afu->dev.release = free_afu_dev; - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, - afu->config.idx); - return rc; + kref_put(&afu->kref, free_afu); } +EXPORT_SYMBOL_GPL(ocxl_afu_put); static int assign_afu_actag(struct ocxl_afu *afu) { @@ -233,27 +218,25 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) if (rc) return rc; - rc = set_afu_device(afu, dev_name(&dev->dev)); - if (rc) - return rc; - rc = assign_afu_actag(afu); if (rc) return rc; rc = assign_afu_pasid(afu); - if (rc) { - reclaim_afu_actag(afu); - return rc; - } + if (rc) + goto err_free_actag; rc = map_mmio_areas(afu); - if (rc) { - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); - return rc; - } + if (rc) + goto err_free_pasid; + return 0; + +err_free_pasid: + reclaim_afu_pasid(afu); +err_free_actag: + reclaim_afu_actag(afu); + return rc; } static void deconfigure_afu(struct ocxl_afu *afu) @@ -265,16 +248,8 @@ static void deconfigure_afu(struct ocxl_afu *afu) static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) { - int rc; - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); - /* - * Char device creation is the last step, as processes can - * call our driver immediately, so all our inits must be finished. - */ - rc = ocxl_create_cdev(afu); - if (rc) - return rc; + return 0; } @@ -282,11 +257,10 @@ static void deactivate_afu(struct ocxl_afu *afu) { struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); - ocxl_destroy_cdev(afu); ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); } -int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) +static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) { int rc; struct ocxl_afu *afu; @@ -297,41 +271,29 @@ int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) rc = configure_afu(afu, afu_idx, dev); if (rc) { - free_afu(afu); + ocxl_afu_put(afu); return rc; } - rc = ocxl_register_afu(afu); - if (rc) - goto err; - - rc = ocxl_sysfs_add_afu(afu); - if (rc) - goto err; - rc = activate_afu(dev, afu); - if (rc) - goto err_sys; + if (rc) { + deconfigure_afu(afu); + ocxl_afu_put(afu); + return rc; + } list_add_tail(&afu->list, &fn->afu_list); - return 0; -err_sys: - ocxl_sysfs_remove_afu(afu); -err: - deconfigure_afu(afu); - device_unregister(&afu->dev); - return rc; + return 0; } -void remove_afu(struct ocxl_afu *afu) +static void remove_afu(struct ocxl_afu *afu) { list_del(&afu->list); ocxl_context_detach_all(afu); deactivate_afu(afu); - ocxl_sysfs_remove_afu(afu); deconfigure_afu(afu); - device_unregister(&afu->dev); + ocxl_afu_put(afu); // matches the implicit get in alloc_afu } static struct ocxl_fn *alloc_function(void) @@ -358,7 +320,7 @@ static void free_function(struct ocxl_fn *fn) static void free_function_dev(struct device *dev) { - struct ocxl_fn *fn = to_ocxl_function(dev); + struct ocxl_fn *fn = container_of(dev, struct ocxl_fn, dev); free_function(fn); } @@ -372,7 +334,6 @@ static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); if (rc) return rc; - pci_set_drvdata(dev, fn); return 0; } @@ -490,7 +451,7 @@ static void deconfigure_function(struct ocxl_fn *fn) pci_disable_device(dev); } -struct ocxl_fn *init_function(struct pci_dev *dev) +static struct ocxl_fn *init_function(struct pci_dev *dev) { struct ocxl_fn *fn; int rc; @@ -514,8 +475,100 @@ struct ocxl_fn *init_function(struct pci_dev *dev) return fn; } -void remove_function(struct ocxl_fn *fn) +// Device detection & initialisation + +struct ocxl_fn *ocxl_function_open(struct pci_dev *dev) +{ + int rc, afu_count = 0; + u8 afu; + struct ocxl_fn *fn; + + if (!radix_enabled()) { + dev_err(&dev->dev, "Unsupported memory model (hash)\n"); + return ERR_PTR(-ENODEV); + } + + fn = init_function(dev); + if (IS_ERR(fn)) { + dev_err(&dev->dev, "function init failed: %li\n", + PTR_ERR(fn)); + return fn; + } + + for (afu = 0; afu <= fn->config.max_afu_index; afu++) { + rc = ocxl_config_check_afu_index(dev, &fn->config, afu); + if (rc > 0) { + rc = init_afu(dev, fn, afu); + if (rc) { + dev_err(&dev->dev, + "Can't initialize AFU index %d\n", afu); + continue; + } + afu_count++; + } + } + dev_info(&dev->dev, "%d AFU(s) configured\n", afu_count); + return fn; +} +EXPORT_SYMBOL_GPL(ocxl_function_open); + +struct list_head *ocxl_function_afu_list(struct ocxl_fn *fn) +{ + return &fn->afu_list; +} +EXPORT_SYMBOL_GPL(ocxl_function_afu_list); + +struct ocxl_afu *ocxl_function_fetch_afu(struct ocxl_fn *fn, u8 afu_idx) +{ + struct ocxl_afu *afu; + + list_for_each_entry(afu, &fn->afu_list, list) { + if (afu->config.idx == afu_idx) + return afu; + } + + return NULL; +} +EXPORT_SYMBOL_GPL(ocxl_function_fetch_afu); + +const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn) { + return &fn->config; +} +EXPORT_SYMBOL_GPL(ocxl_function_config); + +void ocxl_function_close(struct ocxl_fn *fn) +{ + struct ocxl_afu *afu, *tmp; + + list_for_each_entry_safe(afu, tmp, &fn->afu_list, list) { + remove_afu(afu); + } + deconfigure_function(fn); device_unregister(&fn->dev); } +EXPORT_SYMBOL_GPL(ocxl_function_close); + +// AFU Metadata + +struct ocxl_afu_config *ocxl_afu_config(struct ocxl_afu *afu) +{ + return &afu->config; +} +EXPORT_SYMBOL_GPL(ocxl_afu_config); + +void ocxl_afu_set_private(struct ocxl_afu *afu, void *private) +{ + afu->private = private; +} +EXPORT_SYMBOL_GPL(ocxl_afu_set_private); + +void *ocxl_afu_get_private(struct ocxl_afu *afu) +{ + if (afu) + return afu->private; + + return NULL; +} +EXPORT_SYMBOL_GPL(ocxl_afu_get_private); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 009e09b7ded5..e6e6121cd9a3 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -17,12 +17,10 @@ static struct class *ocxl_class; static struct mutex minors_idr_lock; static struct idr minors_idr; -static struct ocxl_afu *find_and_get_afu(dev_t devno) +static struct ocxl_file_info *find_file_info(dev_t devno) { - struct ocxl_afu *afu; - int afu_minor; + struct ocxl_file_info *info; - afu_minor = MINOR(devno); /* * We don't declare an RCU critical section here, as our AFU * is protected by a reference counter on the device. By the time the @@ -30,56 +28,52 @@ static struct ocxl_afu *find_and_get_afu(dev_t devno) * the device is already at 0, so no user API will access that AFU and * this function can't return it. */ - afu = idr_find(&minors_idr, afu_minor); - if (afu) - ocxl_afu_get(afu); - return afu; + info = idr_find(&minors_idr, MINOR(devno)); + return info; } -static int allocate_afu_minor(struct ocxl_afu *afu) +static int allocate_minor(struct ocxl_file_info *info) { int minor; mutex_lock(&minors_idr_lock); - minor = idr_alloc(&minors_idr, afu, 0, OCXL_NUM_MINORS, GFP_KERNEL); + minor = idr_alloc(&minors_idr, info, 0, OCXL_NUM_MINORS, GFP_KERNEL); mutex_unlock(&minors_idr_lock); return minor; } -static void free_afu_minor(struct ocxl_afu *afu) +static void free_minor(struct ocxl_file_info *info) { mutex_lock(&minors_idr_lock); - idr_remove(&minors_idr, MINOR(afu->dev.devt)); + idr_remove(&minors_idr, MINOR(info->dev.devt)); mutex_unlock(&minors_idr_lock); } static int afu_open(struct inode *inode, struct file *file) { - struct ocxl_afu *afu; + struct ocxl_file_info *info; struct ocxl_context *ctx; int rc; pr_debug("%s for device %x\n", __func__, inode->i_rdev); - afu = find_and_get_afu(inode->i_rdev); - if (!afu) + info = find_file_info(inode->i_rdev); + if (!info) return -ENODEV; ctx = ocxl_context_alloc(); if (!ctx) { rc = -ENOMEM; - goto put_afu; + goto err; } - rc = ocxl_context_init(ctx, afu, inode->i_mapping); + rc = ocxl_context_init(ctx, info->afu, inode->i_mapping); if (rc) - goto put_afu; + goto err; file->private_data = ctx; - ocxl_afu_put(afu); return 0; -put_afu: - ocxl_afu_put(afu); +err: return rc; } @@ -204,11 +198,16 @@ static long afu_ioctl(struct file *file, unsigned int cmd, struct ocxl_ioctl_irq_fd irq_fd; u64 irq_offset; long rc; + bool closed; pr_debug("%s for context %d, command %s\n", __func__, ctx->pasid, CMD_STR(cmd)); - if (ctx->status == CLOSED) + mutex_lock(&ctx->status_mutex); + closed = (ctx->status == CLOSED); + mutex_unlock(&ctx->status_mutex); + + if (closed) return -EIO; switch (cmd) { @@ -468,39 +467,105 @@ static const struct file_operations ocxl_afu_fops = { .release = afu_release, }; -int ocxl_create_cdev(struct ocxl_afu *afu) +// Free the info struct +static void info_release(struct device *dev) +{ + struct ocxl_file_info *info = container_of(dev, struct ocxl_file_info, dev); + + free_minor(info); + ocxl_afu_put(info->afu); + kfree(info); +} + +static int ocxl_file_make_visible(struct ocxl_afu *afu) { int rc; + struct ocxl_file_info *info = ocxl_afu_get_private(afu); - cdev_init(&afu->cdev, &ocxl_afu_fops); - rc = cdev_add(&afu->cdev, afu->dev.devt, 1); + cdev_init(&info->cdev, &ocxl_afu_fops); + rc = cdev_add(&info->cdev, info->dev.devt, 1); if (rc) { - dev_err(&afu->dev, "Unable to add afu char device: %d\n", rc); + dev_err(&info->dev, "Unable to add afu char device: %d\n", rc); return rc; } + return 0; } -void ocxl_destroy_cdev(struct ocxl_afu *afu) +void ocxl_file_make_invisible(struct ocxl_afu *afu) { - cdev_del(&afu->cdev); + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (info) + cdev_del(&info->cdev); } -int ocxl_register_afu(struct ocxl_afu *afu) +int ocxl_file_register_afu(struct ocxl_afu *afu) { int minor; + int rc; + struct ocxl_file_info *info; + struct ocxl_fn *fn = afu->fn; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (info == NULL) + return -ENOMEM; - minor = allocate_afu_minor(afu); - if (minor < 0) + minor = allocate_minor(info); + if (minor < 0) { + kfree(info); return minor; - afu->dev.devt = MKDEV(MAJOR(ocxl_dev), minor); - afu->dev.class = ocxl_class; - return device_register(&afu->dev); + } + + info->dev.parent = &fn->dev; + info->dev.devt = MKDEV(MAJOR(ocxl_dev), minor); + info->dev.class = ocxl_class; + info->dev.release = info_release; + + info->afu = afu; + ocxl_afu_get(afu); + + rc = dev_set_name(&info->dev, "%s.%s.%hhu", + afu->config.name, dev_name(&pci_dev->dev), afu->config.idx); + if (rc) + goto err_put; + + rc = device_register(&info->dev); + if (rc) + goto err_put; + + ocxl_afu_set_private(afu, info); + + rc = ocxl_sysfs_register_afu(afu); + if (rc) + goto err_unregister; + + rc = ocxl_file_make_visible(afu); + if (rc) + goto err_unregister; + + return 0; + +err_unregister: + ocxl_sysfs_unregister_afu(afu); // safe to call even if register failed + device_unregister(&info->dev); +err_put: + ocxl_afu_put(afu); + free_minor(info); + kfree(info); + return rc; } -void ocxl_unregister_afu(struct ocxl_afu *afu) +void ocxl_file_unregister_afu(struct ocxl_afu *afu) { - free_afu_minor(afu); + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (!info) + return; + + ocxl_sysfs_unregister_afu(afu); + device_unregister(&info->dev); } static char *ocxl_devnode(struct device *dev, umode_t *mode) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 81086534dab5..e04e547df29e 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -11,9 +11,6 @@ #define MAX_IRQ_PER_LINK 2000 #define MAX_IRQ_PER_CONTEXT MAX_IRQ_PER_LINK -#define to_ocxl_function(d) container_of(d, struct ocxl_fn, dev) -#define to_ocxl_afu(d) container_of(d, struct ocxl_afu, dev) - extern struct pci_driver ocxl_pci_driver; struct ocxl_fn { @@ -30,11 +27,17 @@ struct ocxl_fn { void *link; }; +struct ocxl_file_info { + struct ocxl_afu *afu; + struct device dev; + struct cdev cdev; + struct bin_attribute attr_global_mmio; +}; + struct ocxl_afu { + struct kref kref; struct ocxl_fn *fn; struct list_head list; - struct device dev; - struct cdev cdev; struct ocxl_afu_config config; int pasid_base; int pasid_count; /* opened contexts */ @@ -48,7 +51,7 @@ struct ocxl_afu { u64 irq_base_offset; void __iomem *global_mmio_ptr; u64 pp_mmio_start; - struct bin_attribute attr_global_mmio; + void *private; }; enum ocxl_context_status { @@ -91,13 +94,10 @@ struct ocxl_process_element { __be32 software_state; }; -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -void ocxl_afu_put(struct ocxl_afu *afu); - int ocxl_create_cdev(struct ocxl_afu *afu); void ocxl_destroy_cdev(struct ocxl_afu *afu); -int ocxl_register_afu(struct ocxl_afu *afu); -void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_file_register_afu(struct ocxl_afu *afu); +void ocxl_file_unregister_afu(struct ocxl_afu *afu); int ocxl_file_init(void); void ocxl_file_exit(void); @@ -140,8 +140,8 @@ int ocxl_context_detach(struct ocxl_context *ctx); void ocxl_context_detach_all(struct ocxl_afu *afu); void ocxl_context_free(struct ocxl_context *ctx); -int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_register_afu(struct ocxl_afu *afu); +void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); @@ -150,9 +150,11 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); -struct ocxl_fn *init_function(struct pci_dev *dev); -void remove_function(struct ocxl_fn *fn); -int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); -void remove_afu(struct ocxl_afu *afu); +/** + * Free an AFU + * + * afu: The AFU to free + */ +void ocxl_free_afu(struct ocxl_afu *afu); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c index 4ed7cb1a667f..f2a3ef4b9bdd 100644 --- a/drivers/misc/ocxl/pci.c +++ b/drivers/misc/ocxl/pci.c @@ -16,47 +16,45 @@ MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) { - int rc, afu_count = 0; - u8 afu; + int rc; + struct ocxl_afu *afu, *tmp; struct ocxl_fn *fn; + struct list_head *afu_list; - if (!radix_enabled()) { - dev_err(&dev->dev, "Unsupported memory model (hash)\n"); - return -ENODEV; - } - - fn = init_function(dev); - if (IS_ERR(fn)) { - dev_err(&dev->dev, "function init failed: %li\n", - PTR_ERR(fn)); + fn = ocxl_function_open(dev); + if (IS_ERR(fn)) return PTR_ERR(fn); - } - for (afu = 0; afu <= fn->config.max_afu_index; afu++) { - rc = ocxl_config_check_afu_index(dev, &fn->config, afu); - if (rc > 0) { - rc = init_afu(dev, fn, afu); - if (rc) { - dev_err(&dev->dev, - "Can't initialize AFU index %d\n", afu); - continue; - } - afu_count++; + pci_set_drvdata(dev, fn); + + afu_list = ocxl_function_afu_list(fn); + + list_for_each_entry_safe(afu, tmp, afu_list, list) { + // Cleanup handled within ocxl_file_register_afu() + rc = ocxl_file_register_afu(afu); + if (rc) { + dev_err(&dev->dev, "Failed to register AFU '%s' index %d", + afu->config.name, afu->config.idx); } } - dev_info(&dev->dev, "%d AFU(s) configured\n", afu_count); + return 0; } -static void ocxl_remove(struct pci_dev *dev) +void ocxl_remove(struct pci_dev *dev) { - struct ocxl_afu *afu, *tmp; - struct ocxl_fn *fn = pci_get_drvdata(dev); + struct ocxl_fn *fn; + struct ocxl_afu *afu; + struct list_head *afu_list; - list_for_each_entry_safe(afu, tmp, &fn->afu_list, list) { - remove_afu(afu); + fn = pci_get_drvdata(dev); + afu_list = ocxl_function_afu_list(fn); + + list_for_each_entry(afu, afu_list, list) { + ocxl_file_unregister_afu(afu); } - remove_function(fn); + + ocxl_function_close(fn); } struct pci_driver ocxl_pci_driver = { diff --git a/drivers/misc/ocxl/sysfs.c b/drivers/misc/ocxl/sysfs.c index 0ab1fd1b2682..e4a4d0e2b53c 100644 --- a/drivers/misc/ocxl/sysfs.c +++ b/drivers/misc/ocxl/sysfs.c @@ -3,11 +3,18 @@ #include <linux/sysfs.h> #include "ocxl_internal.h" +static inline struct ocxl_afu *to_afu(struct device *device) +{ + struct ocxl_file_info *info = container_of(device, struct ocxl_file_info, dev); + + return info->afu; +} + static ssize_t global_mmio_size_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d\n", afu->config.global_mmio_size); @@ -17,7 +24,7 @@ static ssize_t pp_mmio_size_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d\n", afu->config.pp_mmio_stride); @@ -27,7 +34,7 @@ static ssize_t afu_version_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%hhu:%hhu\n", afu->config.version_major, @@ -38,7 +45,7 @@ static ssize_t contexts_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d/%d\n", afu->pasid_count, afu->pasid_max); @@ -55,7 +62,7 @@ static ssize_t global_mmio_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) { - struct ocxl_afu *afu = to_ocxl_afu(kobj_to_dev(kobj)); + struct ocxl_afu *afu = to_afu(kobj_to_dev(kobj)); if (count == 0 || off < 0 || off >= afu->config.global_mmio_size) @@ -86,7 +93,7 @@ static int global_mmio_mmap(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, struct vm_area_struct *vma) { - struct ocxl_afu *afu = to_ocxl_afu(kobj_to_dev(kobj)); + struct ocxl_afu *afu = to_afu(kobj_to_dev(kobj)); if ((vma_pages(vma) + vma->vm_pgoff) > (afu->config.global_mmio_size >> PAGE_SHIFT)) @@ -99,27 +106,29 @@ static int global_mmio_mmap(struct file *filp, struct kobject *kobj, return 0; } -int ocxl_sysfs_add_afu(struct ocxl_afu *afu) +int ocxl_sysfs_register_afu(struct ocxl_afu *afu) { int i, rc; + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (!info) + return -EFAULT; // ocxl_file_register_afu() must be called first for (i = 0; i < ARRAY_SIZE(afu_attrs); i++) { - rc = device_create_file(&afu->dev, &afu_attrs[i]); + rc = device_create_file(&info->dev, &afu_attrs[i]); if (rc) goto err; } - sysfs_attr_init(&afu->attr_global_mmio.attr); - afu->attr_global_mmio.attr.name = "global_mmio_area"; - afu->attr_global_mmio.attr.mode = 0600; - afu->attr_global_mmio.size = afu->config.global_mmio_size; - afu->attr_global_mmio.read = global_mmio_read; - afu->attr_global_mmio.mmap = global_mmio_mmap; - rc = device_create_bin_file(&afu->dev, &afu->attr_global_mmio); + sysfs_attr_init(&info->attr_global_mmio.attr); + info->attr_global_mmio.attr.name = "global_mmio_area"; + info->attr_global_mmio.attr.mode = 0600; + info->attr_global_mmio.size = afu->config.global_mmio_size; + info->attr_global_mmio.read = global_mmio_read; + info->attr_global_mmio.mmap = global_mmio_mmap; + rc = device_create_bin_file(&info->dev, &info->attr_global_mmio); if (rc) { - dev_err(&afu->dev, - "Unable to create global mmio attr for afu: %d\n", - rc); + dev_err(&info->dev, "Unable to create global mmio attr for afu: %d\n", rc); goto err; } @@ -127,15 +136,21 @@ int ocxl_sysfs_add_afu(struct ocxl_afu *afu) err: for (i--; i >= 0; i--) - device_remove_file(&afu->dev, &afu_attrs[i]); + device_remove_file(&info->dev, &afu_attrs[i]); + return rc; } -void ocxl_sysfs_remove_afu(struct ocxl_afu *afu) +void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu) { + struct ocxl_file_info *info = ocxl_afu_get_private(afu); int i; + /* + * device_remove_bin_file is safe to call if the file is not added as + * the files are removed by name, and early exit if not found + */ for (i = 0; i < ARRAY_SIZE(afu_attrs); i++) - device_remove_file(&afu->dev, &afu_attrs[i]); - device_remove_bin_file(&afu->dev, &afu->attr_global_mmio); + device_remove_file(&info->dev, &afu_attrs[i]); + device_remove_bin_file(&info->dev, &info->attr_global_mmio); } diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9530d3be1b30..8bafd748e380 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -16,11 +16,7 @@ #define OCXL_AFU_NAME_SZ (24+1) /* add 1 for NULL termination */ -/* - * The following 2 structures are a fairly generic way of representing - * the configuration data for a function and AFU, as read from the - * configuration space. - */ + struct ocxl_afu_config { u8 idx; int dvsec_afu_control_pos; /* offset of AFU control DVSEC */ @@ -49,12 +45,108 @@ struct ocxl_fn_config { s8 max_afu_index; }; -/* - * Read the configuration space of a function and fill in a - * ocxl_fn_config structure with all the function details +// These are opaque outside the ocxl driver +struct ocxl_afu; +struct ocxl_fn; + +// Device detection & initialisation + +/** + * Open an OpenCAPI function on an OpenCAPI device + * + * @dev: The PCI device that contains the function + * + * Returns an opaque pointer to the function, or an error pointer (check with IS_ERR) */ -int ocxl_config_read_function(struct pci_dev *dev, - struct ocxl_fn_config *fn); +struct ocxl_fn *ocxl_function_open(struct pci_dev *dev); + +/** + * Get the list of AFUs associated with a PCI function device + * + * Returns a list of struct ocxl_afu * + * + * @fn: The OpenCAPI function containing the AFUs + */ +struct list_head *ocxl_function_afu_list(struct ocxl_fn *fn); + +/** + * Fetch an AFU instance from an OpenCAPI function + * + * @fn: The OpenCAPI function to get the AFU from + * @afu_idx: The index of the AFU to get + * + * If successful, the AFU should be released with ocxl_afu_put() + * + * Returns a pointer to the AFU, or NULL on error + */ +struct ocxl_afu *ocxl_function_fetch_afu(struct ocxl_fn *fn, u8 afu_idx); + +/** + * Take a reference to an AFU + * + * @afu: The AFU to increment the reference count on + */ +void ocxl_afu_get(struct ocxl_afu *afu); + +/** + * Release a reference to an AFU + * + * @afu: The AFU to decrement the reference count on + */ +void ocxl_afu_put(struct ocxl_afu *afu); + + +/** + * Get the configuration information for an OpenCAPI function + * + * @fn: The OpenCAPI function to get the config for + * + * Returns the function config, or NULL on error + */ +const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); + +/** + * Close an OpenCAPI function + * + * This will free any AFUs previously retrieved from the function, and + * detach and associated contexts. The contexts must by freed by the caller. + * + * @fn: The OpenCAPI function to close + * + */ +void ocxl_function_close(struct ocxl_fn *fn); + +// AFU Metadata + +/** + * Get a pointer to the config for an AFU + * + * @afu: a pointer to the AFU to get the config for + * + * Returns a pointer to the AFU config + */ +struct ocxl_afu_config *ocxl_afu_config(struct ocxl_afu *afu); + +/** + * Assign opaque hardware specific information to an OpenCAPI AFU. + * + * @dev: The PCI device associated with the OpenCAPI device + * @private: the opaque hardware specific information to assign to the driver + */ +void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); + +/** + * Fetch the hardware specific information associated with an external OpenCAPI + * AFU. This may be consumed by an external OpenCAPI driver. + * + * @afu: The AFU + * + * Returns the opaque pointer associated with the device, or NULL if not set + */ +void *ocxl_afu_get_private(struct ocxl_afu *dev); + + +// Functions left here are for compatibility with the cxlflash driver /* * Read the configuration space of a function for the AFU specified by @@ -141,6 +233,13 @@ int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); +/* + * Read the configuration space of a function and fill in a + * ocxl_fn_config structure with all the function details + */ +int ocxl_config_read_function(struct pci_dev *dev, + struct ocxl_fn_config *fn); + /* * Set up the opencapi link for the function. * -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The OCXL driver contains both frontend code for interacting with userspace, as well as backend code for interacting with the hardware. This patch separates the backend code from the frontend so that it can be used by other device drivers that communicate via OpenCAPI. Relocate dev, cdev & sysfs files to the frontend code to allow external drivers to maintain their own devices. Reference counting on the device in the backend is replaced with kref counting. Move file & sysfs layer initialisation from core.c (backend) to pci.c (frontend). Create an ocxl_function oriented interface for initing devices & enumerating AFUs. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/context.c | 2 +- drivers/misc/ocxl/core.c | 201 +++++++++++++++++++----------- drivers/misc/ocxl/file.c | 137 ++++++++++++++------ drivers/misc/ocxl/ocxl_internal.h | 36 +++--- drivers/misc/ocxl/pci.c | 56 ++++----- drivers/misc/ocxl/sysfs.c | 59 +++++---- include/misc/ocxl.h | 119 ++++++++++++++++-- 7 files changed, 421 insertions(+), 189 deletions(-) diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c10a940e3b38..c73a859d2224 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -238,7 +238,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) } rc = ocxl_link_remove_pe(ctx->afu->fn->link, ctx->pasid); if (rc) { - dev_warn(&ctx->afu->dev, + dev_warn(&dev->dev, "Couldn't remove PE entry cleanly: %d\n", rc); } return 0; diff --git a/drivers/misc/ocxl/core.c b/drivers/misc/ocxl/core.c index 2f2fe12eac1e..b7a09b21ab36 100644 --- a/drivers/misc/ocxl/core.c +++ b/drivers/misc/ocxl/core.c @@ -13,16 +13,6 @@ static void ocxl_fn_put(struct ocxl_fn *fn) put_device(&fn->dev); } -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu) -{ - return (get_device(&afu->dev) == NULL) ? NULL : afu; -} - -void ocxl_afu_put(struct ocxl_afu *afu) -{ - put_device(&afu->dev); -} - static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) { struct ocxl_afu *afu; @@ -31,6 +21,7 @@ static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) if (!afu) return NULL; + kref_init(&afu->kref); mutex_init(&afu->contexts_lock); mutex_init(&afu->afu_control_lock); idr_init(&afu->contexts_idr); @@ -39,32 +30,26 @@ static struct ocxl_afu *alloc_afu(struct ocxl_fn *fn) return afu; } -static void free_afu(struct ocxl_afu *afu) +static void free_afu(struct kref *kref) { + struct ocxl_afu *afu = container_of(kref, struct ocxl_afu, kref); + idr_destroy(&afu->contexts_idr); ocxl_fn_put(afu->fn); kfree(afu); } -static void free_afu_dev(struct device *dev) +void ocxl_afu_get(struct ocxl_afu *afu) { - struct ocxl_afu *afu = to_ocxl_afu(dev); - - ocxl_unregister_afu(afu); - free_afu(afu); + kref_get(&afu->kref); } +EXPORT_SYMBOL_GPL(ocxl_afu_get); -static int set_afu_device(struct ocxl_afu *afu, const char *location) +void ocxl_afu_put(struct ocxl_afu *afu) { - struct ocxl_fn *fn = afu->fn; - int rc; - - afu->dev.parent = &fn->dev; - afu->dev.release = free_afu_dev; - rc = dev_set_name(&afu->dev, "%s.%s.%hhu", afu->config.name, location, - afu->config.idx); - return rc; + kref_put(&afu->kref, free_afu); } +EXPORT_SYMBOL_GPL(ocxl_afu_put); static int assign_afu_actag(struct ocxl_afu *afu) { @@ -233,27 +218,25 @@ static int configure_afu(struct ocxl_afu *afu, u8 afu_idx, struct pci_dev *dev) if (rc) return rc; - rc = set_afu_device(afu, dev_name(&dev->dev)); - if (rc) - return rc; - rc = assign_afu_actag(afu); if (rc) return rc; rc = assign_afu_pasid(afu); - if (rc) { - reclaim_afu_actag(afu); - return rc; - } + if (rc) + goto err_free_actag; rc = map_mmio_areas(afu); - if (rc) { - reclaim_afu_pasid(afu); - reclaim_afu_actag(afu); - return rc; - } + if (rc) + goto err_free_pasid; + return 0; + +err_free_pasid: + reclaim_afu_pasid(afu); +err_free_actag: + reclaim_afu_actag(afu); + return rc; } static void deconfigure_afu(struct ocxl_afu *afu) @@ -265,16 +248,8 @@ static void deconfigure_afu(struct ocxl_afu *afu) static int activate_afu(struct pci_dev *dev, struct ocxl_afu *afu) { - int rc; - ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 1); - /* - * Char device creation is the last step, as processes can - * call our driver immediately, so all our inits must be finished. - */ - rc = ocxl_create_cdev(afu); - if (rc) - return rc; + return 0; } @@ -282,11 +257,10 @@ static void deactivate_afu(struct ocxl_afu *afu) { struct pci_dev *dev = to_pci_dev(afu->fn->dev.parent); - ocxl_destroy_cdev(afu); ocxl_config_set_afu_state(dev, afu->config.dvsec_afu_control_pos, 0); } -int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) +static int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) { int rc; struct ocxl_afu *afu; @@ -297,41 +271,29 @@ int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx) rc = configure_afu(afu, afu_idx, dev); if (rc) { - free_afu(afu); + ocxl_afu_put(afu); return rc; } - rc = ocxl_register_afu(afu); - if (rc) - goto err; - - rc = ocxl_sysfs_add_afu(afu); - if (rc) - goto err; - rc = activate_afu(dev, afu); - if (rc) - goto err_sys; + if (rc) { + deconfigure_afu(afu); + ocxl_afu_put(afu); + return rc; + } list_add_tail(&afu->list, &fn->afu_list); - return 0; -err_sys: - ocxl_sysfs_remove_afu(afu); -err: - deconfigure_afu(afu); - device_unregister(&afu->dev); - return rc; + return 0; } -void remove_afu(struct ocxl_afu *afu) +static void remove_afu(struct ocxl_afu *afu) { list_del(&afu->list); ocxl_context_detach_all(afu); deactivate_afu(afu); - ocxl_sysfs_remove_afu(afu); deconfigure_afu(afu); - device_unregister(&afu->dev); + ocxl_afu_put(afu); // matches the implicit get in alloc_afu } static struct ocxl_fn *alloc_function(void) @@ -358,7 +320,7 @@ static void free_function(struct ocxl_fn *fn) static void free_function_dev(struct device *dev) { - struct ocxl_fn *fn = to_ocxl_function(dev); + struct ocxl_fn *fn = container_of(dev, struct ocxl_fn, dev); free_function(fn); } @@ -372,7 +334,6 @@ static int set_function_device(struct ocxl_fn *fn, struct pci_dev *dev) rc = dev_set_name(&fn->dev, "ocxlfn.%s", dev_name(&dev->dev)); if (rc) return rc; - pci_set_drvdata(dev, fn); return 0; } @@ -490,7 +451,7 @@ static void deconfigure_function(struct ocxl_fn *fn) pci_disable_device(dev); } -struct ocxl_fn *init_function(struct pci_dev *dev) +static struct ocxl_fn *init_function(struct pci_dev *dev) { struct ocxl_fn *fn; int rc; @@ -514,8 +475,100 @@ struct ocxl_fn *init_function(struct pci_dev *dev) return fn; } -void remove_function(struct ocxl_fn *fn) +// Device detection & initialisation + +struct ocxl_fn *ocxl_function_open(struct pci_dev *dev) +{ + int rc, afu_count = 0; + u8 afu; + struct ocxl_fn *fn; + + if (!radix_enabled()) { + dev_err(&dev->dev, "Unsupported memory model (hash)\n"); + return ERR_PTR(-ENODEV); + } + + fn = init_function(dev); + if (IS_ERR(fn)) { + dev_err(&dev->dev, "function init failed: %li\n", + PTR_ERR(fn)); + return fn; + } + + for (afu = 0; afu <= fn->config.max_afu_index; afu++) { + rc = ocxl_config_check_afu_index(dev, &fn->config, afu); + if (rc > 0) { + rc = init_afu(dev, fn, afu); + if (rc) { + dev_err(&dev->dev, + "Can't initialize AFU index %d\n", afu); + continue; + } + afu_count++; + } + } + dev_info(&dev->dev, "%d AFU(s) configured\n", afu_count); + return fn; +} +EXPORT_SYMBOL_GPL(ocxl_function_open); + +struct list_head *ocxl_function_afu_list(struct ocxl_fn *fn) +{ + return &fn->afu_list; +} +EXPORT_SYMBOL_GPL(ocxl_function_afu_list); + +struct ocxl_afu *ocxl_function_fetch_afu(struct ocxl_fn *fn, u8 afu_idx) +{ + struct ocxl_afu *afu; + + list_for_each_entry(afu, &fn->afu_list, list) { + if (afu->config.idx == afu_idx) + return afu; + } + + return NULL; +} +EXPORT_SYMBOL_GPL(ocxl_function_fetch_afu); + +const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn) { + return &fn->config; +} +EXPORT_SYMBOL_GPL(ocxl_function_config); + +void ocxl_function_close(struct ocxl_fn *fn) +{ + struct ocxl_afu *afu, *tmp; + + list_for_each_entry_safe(afu, tmp, &fn->afu_list, list) { + remove_afu(afu); + } + deconfigure_function(fn); device_unregister(&fn->dev); } +EXPORT_SYMBOL_GPL(ocxl_function_close); + +// AFU Metadata + +struct ocxl_afu_config *ocxl_afu_config(struct ocxl_afu *afu) +{ + return &afu->config; +} +EXPORT_SYMBOL_GPL(ocxl_afu_config); + +void ocxl_afu_set_private(struct ocxl_afu *afu, void *private) +{ + afu->private = private; +} +EXPORT_SYMBOL_GPL(ocxl_afu_set_private); + +void *ocxl_afu_get_private(struct ocxl_afu *afu) +{ + if (afu) + return afu->private; + + return NULL; +} +EXPORT_SYMBOL_GPL(ocxl_afu_get_private); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 009e09b7ded5..e6e6121cd9a3 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -17,12 +17,10 @@ static struct class *ocxl_class; static struct mutex minors_idr_lock; static struct idr minors_idr; -static struct ocxl_afu *find_and_get_afu(dev_t devno) +static struct ocxl_file_info *find_file_info(dev_t devno) { - struct ocxl_afu *afu; - int afu_minor; + struct ocxl_file_info *info; - afu_minor = MINOR(devno); /* * We don't declare an RCU critical section here, as our AFU * is protected by a reference counter on the device. By the time the @@ -30,56 +28,52 @@ static struct ocxl_afu *find_and_get_afu(dev_t devno) * the device is already at 0, so no user API will access that AFU and * this function can't return it. */ - afu = idr_find(&minors_idr, afu_minor); - if (afu) - ocxl_afu_get(afu); - return afu; + info = idr_find(&minors_idr, MINOR(devno)); + return info; } -static int allocate_afu_minor(struct ocxl_afu *afu) +static int allocate_minor(struct ocxl_file_info *info) { int minor; mutex_lock(&minors_idr_lock); - minor = idr_alloc(&minors_idr, afu, 0, OCXL_NUM_MINORS, GFP_KERNEL); + minor = idr_alloc(&minors_idr, info, 0, OCXL_NUM_MINORS, GFP_KERNEL); mutex_unlock(&minors_idr_lock); return minor; } -static void free_afu_minor(struct ocxl_afu *afu) +static void free_minor(struct ocxl_file_info *info) { mutex_lock(&minors_idr_lock); - idr_remove(&minors_idr, MINOR(afu->dev.devt)); + idr_remove(&minors_idr, MINOR(info->dev.devt)); mutex_unlock(&minors_idr_lock); } static int afu_open(struct inode *inode, struct file *file) { - struct ocxl_afu *afu; + struct ocxl_file_info *info; struct ocxl_context *ctx; int rc; pr_debug("%s for device %x\n", __func__, inode->i_rdev); - afu = find_and_get_afu(inode->i_rdev); - if (!afu) + info = find_file_info(inode->i_rdev); + if (!info) return -ENODEV; ctx = ocxl_context_alloc(); if (!ctx) { rc = -ENOMEM; - goto put_afu; + goto err; } - rc = ocxl_context_init(ctx, afu, inode->i_mapping); + rc = ocxl_context_init(ctx, info->afu, inode->i_mapping); if (rc) - goto put_afu; + goto err; file->private_data = ctx; - ocxl_afu_put(afu); return 0; -put_afu: - ocxl_afu_put(afu); +err: return rc; } @@ -204,11 +198,16 @@ static long afu_ioctl(struct file *file, unsigned int cmd, struct ocxl_ioctl_irq_fd irq_fd; u64 irq_offset; long rc; + bool closed; pr_debug("%s for context %d, command %s\n", __func__, ctx->pasid, CMD_STR(cmd)); - if (ctx->status == CLOSED) + mutex_lock(&ctx->status_mutex); + closed = (ctx->status == CLOSED); + mutex_unlock(&ctx->status_mutex); + + if (closed) return -EIO; switch (cmd) { @@ -468,39 +467,105 @@ static const struct file_operations ocxl_afu_fops = { .release = afu_release, }; -int ocxl_create_cdev(struct ocxl_afu *afu) +// Free the info struct +static void info_release(struct device *dev) +{ + struct ocxl_file_info *info = container_of(dev, struct ocxl_file_info, dev); + + free_minor(info); + ocxl_afu_put(info->afu); + kfree(info); +} + +static int ocxl_file_make_visible(struct ocxl_afu *afu) { int rc; + struct ocxl_file_info *info = ocxl_afu_get_private(afu); - cdev_init(&afu->cdev, &ocxl_afu_fops); - rc = cdev_add(&afu->cdev, afu->dev.devt, 1); + cdev_init(&info->cdev, &ocxl_afu_fops); + rc = cdev_add(&info->cdev, info->dev.devt, 1); if (rc) { - dev_err(&afu->dev, "Unable to add afu char device: %d\n", rc); + dev_err(&info->dev, "Unable to add afu char device: %d\n", rc); return rc; } + return 0; } -void ocxl_destroy_cdev(struct ocxl_afu *afu) +void ocxl_file_make_invisible(struct ocxl_afu *afu) { - cdev_del(&afu->cdev); + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (info) + cdev_del(&info->cdev); } -int ocxl_register_afu(struct ocxl_afu *afu) +int ocxl_file_register_afu(struct ocxl_afu *afu) { int minor; + int rc; + struct ocxl_file_info *info; + struct ocxl_fn *fn = afu->fn; + struct pci_dev *pci_dev = to_pci_dev(fn->dev.parent); + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (info == NULL) + return -ENOMEM; - minor = allocate_afu_minor(afu); - if (minor < 0) + minor = allocate_minor(info); + if (minor < 0) { + kfree(info); return minor; - afu->dev.devt = MKDEV(MAJOR(ocxl_dev), minor); - afu->dev.class = ocxl_class; - return device_register(&afu->dev); + } + + info->dev.parent = &fn->dev; + info->dev.devt = MKDEV(MAJOR(ocxl_dev), minor); + info->dev.class = ocxl_class; + info->dev.release = info_release; + + info->afu = afu; + ocxl_afu_get(afu); + + rc = dev_set_name(&info->dev, "%s.%s.%hhu", + afu->config.name, dev_name(&pci_dev->dev), afu->config.idx); + if (rc) + goto err_put; + + rc = device_register(&info->dev); + if (rc) + goto err_put; + + ocxl_afu_set_private(afu, info); + + rc = ocxl_sysfs_register_afu(afu); + if (rc) + goto err_unregister; + + rc = ocxl_file_make_visible(afu); + if (rc) + goto err_unregister; + + return 0; + +err_unregister: + ocxl_sysfs_unregister_afu(afu); // safe to call even if register failed + device_unregister(&info->dev); +err_put: + ocxl_afu_put(afu); + free_minor(info); + kfree(info); + return rc; } -void ocxl_unregister_afu(struct ocxl_afu *afu) +void ocxl_file_unregister_afu(struct ocxl_afu *afu) { - free_afu_minor(afu); + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (!info) + return; + + ocxl_sysfs_unregister_afu(afu); + device_unregister(&info->dev); } static char *ocxl_devnode(struct device *dev, umode_t *mode) diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 81086534dab5..e04e547df29e 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -11,9 +11,6 @@ #define MAX_IRQ_PER_LINK 2000 #define MAX_IRQ_PER_CONTEXT MAX_IRQ_PER_LINK -#define to_ocxl_function(d) container_of(d, struct ocxl_fn, dev) -#define to_ocxl_afu(d) container_of(d, struct ocxl_afu, dev) - extern struct pci_driver ocxl_pci_driver; struct ocxl_fn { @@ -30,11 +27,17 @@ struct ocxl_fn { void *link; }; +struct ocxl_file_info { + struct ocxl_afu *afu; + struct device dev; + struct cdev cdev; + struct bin_attribute attr_global_mmio; +}; + struct ocxl_afu { + struct kref kref; struct ocxl_fn *fn; struct list_head list; - struct device dev; - struct cdev cdev; struct ocxl_afu_config config; int pasid_base; int pasid_count; /* opened contexts */ @@ -48,7 +51,7 @@ struct ocxl_afu { u64 irq_base_offset; void __iomem *global_mmio_ptr; u64 pp_mmio_start; - struct bin_attribute attr_global_mmio; + void *private; }; enum ocxl_context_status { @@ -91,13 +94,10 @@ struct ocxl_process_element { __be32 software_state; }; -struct ocxl_afu *ocxl_afu_get(struct ocxl_afu *afu); -void ocxl_afu_put(struct ocxl_afu *afu); - int ocxl_create_cdev(struct ocxl_afu *afu); void ocxl_destroy_cdev(struct ocxl_afu *afu); -int ocxl_register_afu(struct ocxl_afu *afu); -void ocxl_unregister_afu(struct ocxl_afu *afu); +int ocxl_file_register_afu(struct ocxl_afu *afu); +void ocxl_file_unregister_afu(struct ocxl_afu *afu); int ocxl_file_init(void); void ocxl_file_exit(void); @@ -140,8 +140,8 @@ int ocxl_context_detach(struct ocxl_context *ctx); void ocxl_context_detach_all(struct ocxl_afu *afu); void ocxl_context_free(struct ocxl_context *ctx); -int ocxl_sysfs_add_afu(struct ocxl_afu *afu); -void ocxl_sysfs_remove_afu(struct ocxl_afu *afu); +int ocxl_sysfs_register_afu(struct ocxl_afu *afu); +void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); @@ -150,9 +150,11 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd); u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); -struct ocxl_fn *init_function(struct pci_dev *dev); -void remove_function(struct ocxl_fn *fn); -int init_afu(struct pci_dev *dev, struct ocxl_fn *fn, u8 afu_idx); -void remove_afu(struct ocxl_afu *afu); +/** + * Free an AFU + * + * afu: The AFU to free + */ +void ocxl_free_afu(struct ocxl_afu *afu); #endif /* _OCXL_INTERNAL_H_ */ diff --git a/drivers/misc/ocxl/pci.c b/drivers/misc/ocxl/pci.c index 4ed7cb1a667f..f2a3ef4b9bdd 100644 --- a/drivers/misc/ocxl/pci.c +++ b/drivers/misc/ocxl/pci.c @@ -16,47 +16,45 @@ MODULE_DEVICE_TABLE(pci, ocxl_pci_tbl); static int ocxl_probe(struct pci_dev *dev, const struct pci_device_id *id) { - int rc, afu_count = 0; - u8 afu; + int rc; + struct ocxl_afu *afu, *tmp; struct ocxl_fn *fn; + struct list_head *afu_list; - if (!radix_enabled()) { - dev_err(&dev->dev, "Unsupported memory model (hash)\n"); - return -ENODEV; - } - - fn = init_function(dev); - if (IS_ERR(fn)) { - dev_err(&dev->dev, "function init failed: %li\n", - PTR_ERR(fn)); + fn = ocxl_function_open(dev); + if (IS_ERR(fn)) return PTR_ERR(fn); - } - for (afu = 0; afu <= fn->config.max_afu_index; afu++) { - rc = ocxl_config_check_afu_index(dev, &fn->config, afu); - if (rc > 0) { - rc = init_afu(dev, fn, afu); - if (rc) { - dev_err(&dev->dev, - "Can't initialize AFU index %d\n", afu); - continue; - } - afu_count++; + pci_set_drvdata(dev, fn); + + afu_list = ocxl_function_afu_list(fn); + + list_for_each_entry_safe(afu, tmp, afu_list, list) { + // Cleanup handled within ocxl_file_register_afu() + rc = ocxl_file_register_afu(afu); + if (rc) { + dev_err(&dev->dev, "Failed to register AFU '%s' index %d", + afu->config.name, afu->config.idx); } } - dev_info(&dev->dev, "%d AFU(s) configured\n", afu_count); + return 0; } -static void ocxl_remove(struct pci_dev *dev) +void ocxl_remove(struct pci_dev *dev) { - struct ocxl_afu *afu, *tmp; - struct ocxl_fn *fn = pci_get_drvdata(dev); + struct ocxl_fn *fn; + struct ocxl_afu *afu; + struct list_head *afu_list; - list_for_each_entry_safe(afu, tmp, &fn->afu_list, list) { - remove_afu(afu); + fn = pci_get_drvdata(dev); + afu_list = ocxl_function_afu_list(fn); + + list_for_each_entry(afu, afu_list, list) { + ocxl_file_unregister_afu(afu); } - remove_function(fn); + + ocxl_function_close(fn); } struct pci_driver ocxl_pci_driver = { diff --git a/drivers/misc/ocxl/sysfs.c b/drivers/misc/ocxl/sysfs.c index 0ab1fd1b2682..e4a4d0e2b53c 100644 --- a/drivers/misc/ocxl/sysfs.c +++ b/drivers/misc/ocxl/sysfs.c @@ -3,11 +3,18 @@ #include <linux/sysfs.h> #include "ocxl_internal.h" +static inline struct ocxl_afu *to_afu(struct device *device) +{ + struct ocxl_file_info *info = container_of(device, struct ocxl_file_info, dev); + + return info->afu; +} + static ssize_t global_mmio_size_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d\n", afu->config.global_mmio_size); @@ -17,7 +24,7 @@ static ssize_t pp_mmio_size_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d\n", afu->config.pp_mmio_stride); @@ -27,7 +34,7 @@ static ssize_t afu_version_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%hhu:%hhu\n", afu->config.version_major, @@ -38,7 +45,7 @@ static ssize_t contexts_show(struct device *device, struct device_attribute *attr, char *buf) { - struct ocxl_afu *afu = to_ocxl_afu(device); + struct ocxl_afu *afu = to_afu(device); return scnprintf(buf, PAGE_SIZE, "%d/%d\n", afu->pasid_count, afu->pasid_max); @@ -55,7 +62,7 @@ static ssize_t global_mmio_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t count) { - struct ocxl_afu *afu = to_ocxl_afu(kobj_to_dev(kobj)); + struct ocxl_afu *afu = to_afu(kobj_to_dev(kobj)); if (count == 0 || off < 0 || off >= afu->config.global_mmio_size) @@ -86,7 +93,7 @@ static int global_mmio_mmap(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, struct vm_area_struct *vma) { - struct ocxl_afu *afu = to_ocxl_afu(kobj_to_dev(kobj)); + struct ocxl_afu *afu = to_afu(kobj_to_dev(kobj)); if ((vma_pages(vma) + vma->vm_pgoff) > (afu->config.global_mmio_size >> PAGE_SHIFT)) @@ -99,27 +106,29 @@ static int global_mmio_mmap(struct file *filp, struct kobject *kobj, return 0; } -int ocxl_sysfs_add_afu(struct ocxl_afu *afu) +int ocxl_sysfs_register_afu(struct ocxl_afu *afu) { int i, rc; + struct ocxl_file_info *info = ocxl_afu_get_private(afu); + + if (!info) + return -EFAULT; // ocxl_file_register_afu() must be called first for (i = 0; i < ARRAY_SIZE(afu_attrs); i++) { - rc = device_create_file(&afu->dev, &afu_attrs[i]); + rc = device_create_file(&info->dev, &afu_attrs[i]); if (rc) goto err; } - sysfs_attr_init(&afu->attr_global_mmio.attr); - afu->attr_global_mmio.attr.name = "global_mmio_area"; - afu->attr_global_mmio.attr.mode = 0600; - afu->attr_global_mmio.size = afu->config.global_mmio_size; - afu->attr_global_mmio.read = global_mmio_read; - afu->attr_global_mmio.mmap = global_mmio_mmap; - rc = device_create_bin_file(&afu->dev, &afu->attr_global_mmio); + sysfs_attr_init(&info->attr_global_mmio.attr); + info->attr_global_mmio.attr.name = "global_mmio_area"; + info->attr_global_mmio.attr.mode = 0600; + info->attr_global_mmio.size = afu->config.global_mmio_size; + info->attr_global_mmio.read = global_mmio_read; + info->attr_global_mmio.mmap = global_mmio_mmap; + rc = device_create_bin_file(&info->dev, &info->attr_global_mmio); if (rc) { - dev_err(&afu->dev, - "Unable to create global mmio attr for afu: %d\n", - rc); + dev_err(&info->dev, "Unable to create global mmio attr for afu: %d\n", rc); goto err; } @@ -127,15 +136,21 @@ int ocxl_sysfs_add_afu(struct ocxl_afu *afu) err: for (i--; i >= 0; i--) - device_remove_file(&afu->dev, &afu_attrs[i]); + device_remove_file(&info->dev, &afu_attrs[i]); + return rc; } -void ocxl_sysfs_remove_afu(struct ocxl_afu *afu) +void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu) { + struct ocxl_file_info *info = ocxl_afu_get_private(afu); int i; + /* + * device_remove_bin_file is safe to call if the file is not added as + * the files are removed by name, and early exit if not found + */ for (i = 0; i < ARRAY_SIZE(afu_attrs); i++) - device_remove_file(&afu->dev, &afu_attrs[i]); - device_remove_bin_file(&afu->dev, &afu->attr_global_mmio); + device_remove_file(&info->dev, &afu_attrs[i]); + device_remove_bin_file(&info->dev, &info->attr_global_mmio); } diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 9530d3be1b30..8bafd748e380 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -16,11 +16,7 @@ #define OCXL_AFU_NAME_SZ (24+1) /* add 1 for NULL termination */ -/* - * The following 2 structures are a fairly generic way of representing - * the configuration data for a function and AFU, as read from the - * configuration space. - */ + struct ocxl_afu_config { u8 idx; int dvsec_afu_control_pos; /* offset of AFU control DVSEC */ @@ -49,12 +45,108 @@ struct ocxl_fn_config { s8 max_afu_index; }; -/* - * Read the configuration space of a function and fill in a - * ocxl_fn_config structure with all the function details +// These are opaque outside the ocxl driver +struct ocxl_afu; +struct ocxl_fn; + +// Device detection & initialisation + +/** + * Open an OpenCAPI function on an OpenCAPI device + * + * @dev: The PCI device that contains the function + * + * Returns an opaque pointer to the function, or an error pointer (check with IS_ERR) */ -int ocxl_config_read_function(struct pci_dev *dev, - struct ocxl_fn_config *fn); +struct ocxl_fn *ocxl_function_open(struct pci_dev *dev); + +/** + * Get the list of AFUs associated with a PCI function device + * + * Returns a list of struct ocxl_afu * + * + * @fn: The OpenCAPI function containing the AFUs + */ +struct list_head *ocxl_function_afu_list(struct ocxl_fn *fn); + +/** + * Fetch an AFU instance from an OpenCAPI function + * + * @fn: The OpenCAPI function to get the AFU from + * @afu_idx: The index of the AFU to get + * + * If successful, the AFU should be released with ocxl_afu_put() + * + * Returns a pointer to the AFU, or NULL on error + */ +struct ocxl_afu *ocxl_function_fetch_afu(struct ocxl_fn *fn, u8 afu_idx); + +/** + * Take a reference to an AFU + * + * @afu: The AFU to increment the reference count on + */ +void ocxl_afu_get(struct ocxl_afu *afu); + +/** + * Release a reference to an AFU + * + * @afu: The AFU to decrement the reference count on + */ +void ocxl_afu_put(struct ocxl_afu *afu); + + +/** + * Get the configuration information for an OpenCAPI function + * + * @fn: The OpenCAPI function to get the config for + * + * Returns the function config, or NULL on error + */ +const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); + +/** + * Close an OpenCAPI function + * + * This will free any AFUs previously retrieved from the function, and + * detach and associated contexts. The contexts must by freed by the caller. + * + * @fn: The OpenCAPI function to close + * + */ +void ocxl_function_close(struct ocxl_fn *fn); + +// AFU Metadata + +/** + * Get a pointer to the config for an AFU + * + * @afu: a pointer to the AFU to get the config for + * + * Returns a pointer to the AFU config + */ +struct ocxl_afu_config *ocxl_afu_config(struct ocxl_afu *afu); + +/** + * Assign opaque hardware specific information to an OpenCAPI AFU. + * + * @dev: The PCI device associated with the OpenCAPI device + * @private: the opaque hardware specific information to assign to the driver + */ +void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); + +/** + * Fetch the hardware specific information associated with an external OpenCAPI + * AFU. This may be consumed by an external OpenCAPI driver. + * + * @afu: The AFU + * + * Returns the opaque pointer associated with the device, or NULL if not set + */ +void *ocxl_afu_get_private(struct ocxl_afu *dev); + + +// Functions left here are for compatibility with the cxlflash driver /* * Read the configuration space of a function for the AFU specified by @@ -141,6 +233,13 @@ int ocxl_config_set_TL(struct pci_dev *dev, int tl_dvsec); int ocxl_config_terminate_pasid(struct pci_dev *dev, int afu_control_offset, int pasid); +/* + * Read the configuration space of a function and fill in a + * ocxl_fn_config structure with all the function details + */ +int ocxl_config_read_function(struct pci_dev *dev, + struct ocxl_fn_config *fn); + /* * Set up the opencapi link for the function. * -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 15:11 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:11 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev This is a huge patch, there are probably ways to split it in smaller pieces to make the review easier. However, considering how much time we've already invested discussing and reviewing it, it's with by me to keep it as is. The ref-counting and device management look good to me now. A few details below. > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -17,12 +17,10 @@ static struct class *ocxl_class; > static struct mutex minors_idr_lock; > static struct idr minors_idr; > > -static struct ocxl_afu *find_and_get_afu(dev_t devno) > +static struct ocxl_file_info *find_file_info(dev_t devno) > { > - struct ocxl_afu *afu; > - int afu_minor; > + struct ocxl_file_info *info; > > - afu_minor = MINOR(devno); > /* > * We don't declare an RCU critical section here, as our AFU > * is protected by a reference counter on the device. By the time the > @@ -30,56 +28,52 @@ static struct ocxl_afu *find_and_get_afu(dev_t devno) > * the device is already at 0, so no user API will access that AFU and > * this function can't return it. > */ The comment is still true, but needs tuning. Something like: "We don't declare an RCU critical section here, as our info structure is protected by a reference counter on the device. By the time the info reference is removed from the idr, the ref count of the device is already at 0, so no user API will access the corresponding AFU and this function can't return it." > - afu = idr_find(&minors_idr, afu_minor); > - if (afu) > - ocxl_afu_get(afu); > - return afu; > + info = idr_find(&minors_idr, MINOR(devno)); > + return info; > } > > -static int allocate_afu_minor(struct ocxl_afu *afu) > +static int allocate_minor(struct ocxl_file_info *info) > { > int minor; > > mutex_lock(&minors_idr_lock); > - minor = idr_alloc(&minors_idr, afu, 0, OCXL_NUM_MINORS, GFP_KERNEL); > + minor = idr_alloc(&minors_idr, info, 0, OCXL_NUM_MINORS, GFP_KERNEL); > mutex_unlock(&minors_idr_lock); > return minor; > } > > -static void free_afu_minor(struct ocxl_afu *afu) > +static void free_minor(struct ocxl_file_info *info) > { > mutex_lock(&minors_idr_lock); > - idr_remove(&minors_idr, MINOR(afu->dev.devt)); > + idr_remove(&minors_idr, MINOR(info->dev.devt)); > mutex_unlock(&minors_idr_lock); > } > > static int afu_open(struct inode *inode, struct file *file) > { > - struct ocxl_afu *afu; > + struct ocxl_file_info *info; > struct ocxl_context *ctx; > int rc; > > pr_debug("%s for device %x\n", __func__, inode->i_rdev); > > - afu = find_and_get_afu(inode->i_rdev); > - if (!afu) > + info = find_file_info(inode->i_rdev); > + if (!info) > return -ENODEV; > > ctx = ocxl_context_alloc(); > if (!ctx) { > rc = -ENOMEM; > - goto put_afu; > + goto err; > } > > - rc = ocxl_context_init(ctx, afu, inode->i_mapping); > + rc = ocxl_context_init(ctx, info->afu, inode->i_mapping); > if (rc) > - goto put_afu; > + goto err; > file->private_data = ctx; > - ocxl_afu_put(afu); > return 0; > > -put_afu: > - ocxl_afu_put(afu); > +err: > return rc; The error path with goto is here useless. However, if ocxl_context_init() fails, the memory for the context is never released. You may consider either getting rid of ocxl_context_alloc(), which is just a simple wrapper around kzalloc(), or merging the allocation in ocxl_context_init(). It would impact the external API, but having 2 calls (alloc and init) feels like there's one too many. > +static int ocxl_file_make_visible(struct ocxl_afu *afu) > { > int rc; > + struct ocxl_file_info *info = ocxl_afu_get_private(afu); > > - cdev_init(&afu->cdev, &ocxl_afu_fops); > - rc = cdev_add(&afu->cdev, afu->dev.devt, 1); > + cdev_init(&info->cdev, &ocxl_afu_fops); > + rc = cdev_add(&info->cdev, info->dev.devt, 1); > if (rc) { > - dev_err(&afu->dev, "Unable to add afu char device: %d\n", rc); > + dev_err(&info->dev, "Unable to add afu char device: %d\n", rc); > return rc; > } > + > return 0; > } > > -void ocxl_destroy_cdev(struct ocxl_afu *afu) > +void ocxl_file_make_invisible(struct ocxl_afu *afu) This function is not called anywhere? > -void ocxl_unregister_afu(struct ocxl_afu *afu) > +void ocxl_file_unregister_afu(struct ocxl_afu *afu) > { > - free_afu_minor(afu); > + struct ocxl_file_info *info = ocxl_afu_get_private(afu); > + > + if (!info) > + return; > + So that's likely where we miss the "make invisible" call. However, is it enough to rely on the private data to be set on the AFU? > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 81086534dab5..e04e547df29e 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > +/** > + * Free an AFU > + * > + * afu: The AFU to free > + */ > +void ocxl_free_afu(struct ocxl_afu *afu); This is obsolete and should go away. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend @ 2019-03-25 15:11 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:11 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel This is a huge patch, there are probably ways to split it in smaller pieces to make the review easier. However, considering how much time we've already invested discussing and reviewing it, it's with by me to keep it as is. The ref-counting and device management look good to me now. A few details below. > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -17,12 +17,10 @@ static struct class *ocxl_class; > static struct mutex minors_idr_lock; > static struct idr minors_idr; > > -static struct ocxl_afu *find_and_get_afu(dev_t devno) > +static struct ocxl_file_info *find_file_info(dev_t devno) > { > - struct ocxl_afu *afu; > - int afu_minor; > + struct ocxl_file_info *info; > > - afu_minor = MINOR(devno); > /* > * We don't declare an RCU critical section here, as our AFU > * is protected by a reference counter on the device. By the time the > @@ -30,56 +28,52 @@ static struct ocxl_afu *find_and_get_afu(dev_t devno) > * the device is already at 0, so no user API will access that AFU and > * this function can't return it. > */ The comment is still true, but needs tuning. Something like: "We don't declare an RCU critical section here, as our info structure is protected by a reference counter on the device. By the time the info reference is removed from the idr, the ref count of the device is already at 0, so no user API will access the corresponding AFU and this function can't return it." > - afu = idr_find(&minors_idr, afu_minor); > - if (afu) > - ocxl_afu_get(afu); > - return afu; > + info = idr_find(&minors_idr, MINOR(devno)); > + return info; > } > > -static int allocate_afu_minor(struct ocxl_afu *afu) > +static int allocate_minor(struct ocxl_file_info *info) > { > int minor; > > mutex_lock(&minors_idr_lock); > - minor = idr_alloc(&minors_idr, afu, 0, OCXL_NUM_MINORS, GFP_KERNEL); > + minor = idr_alloc(&minors_idr, info, 0, OCXL_NUM_MINORS, GFP_KERNEL); > mutex_unlock(&minors_idr_lock); > return minor; > } > > -static void free_afu_minor(struct ocxl_afu *afu) > +static void free_minor(struct ocxl_file_info *info) > { > mutex_lock(&minors_idr_lock); > - idr_remove(&minors_idr, MINOR(afu->dev.devt)); > + idr_remove(&minors_idr, MINOR(info->dev.devt)); > mutex_unlock(&minors_idr_lock); > } > > static int afu_open(struct inode *inode, struct file *file) > { > - struct ocxl_afu *afu; > + struct ocxl_file_info *info; > struct ocxl_context *ctx; > int rc; > > pr_debug("%s for device %x\n", __func__, inode->i_rdev); > > - afu = find_and_get_afu(inode->i_rdev); > - if (!afu) > + info = find_file_info(inode->i_rdev); > + if (!info) > return -ENODEV; > > ctx = ocxl_context_alloc(); > if (!ctx) { > rc = -ENOMEM; > - goto put_afu; > + goto err; > } > > - rc = ocxl_context_init(ctx, afu, inode->i_mapping); > + rc = ocxl_context_init(ctx, info->afu, inode->i_mapping); > if (rc) > - goto put_afu; > + goto err; > file->private_data = ctx; > - ocxl_afu_put(afu); > return 0; > > -put_afu: > - ocxl_afu_put(afu); > +err: > return rc; The error path with goto is here useless. However, if ocxl_context_init() fails, the memory for the context is never released. You may consider either getting rid of ocxl_context_alloc(), which is just a simple wrapper around kzalloc(), or merging the allocation in ocxl_context_init(). It would impact the external API, but having 2 calls (alloc and init) feels like there's one too many. > +static int ocxl_file_make_visible(struct ocxl_afu *afu) > { > int rc; > + struct ocxl_file_info *info = ocxl_afu_get_private(afu); > > - cdev_init(&afu->cdev, &ocxl_afu_fops); > - rc = cdev_add(&afu->cdev, afu->dev.devt, 1); > + cdev_init(&info->cdev, &ocxl_afu_fops); > + rc = cdev_add(&info->cdev, info->dev.devt, 1); > if (rc) { > - dev_err(&afu->dev, "Unable to add afu char device: %d\n", rc); > + dev_err(&info->dev, "Unable to add afu char device: %d\n", rc); > return rc; > } > + > return 0; > } > > -void ocxl_destroy_cdev(struct ocxl_afu *afu) > +void ocxl_file_make_invisible(struct ocxl_afu *afu) This function is not called anywhere? > -void ocxl_unregister_afu(struct ocxl_afu *afu) > +void ocxl_file_unregister_afu(struct ocxl_afu *afu) > { > - free_afu_minor(afu); > + struct ocxl_file_info *info = ocxl_afu_get_private(afu); > + > + if (!info) > + return; > + So that's likely where we miss the "make invisible" call. However, is it enough to rely on the private data to be set on the AFU? > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index 81086534dab5..e04e547df29e 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > +/** > + * Free an AFU > + * > + * afu: The AFU to free > + */ > +void ocxl_free_afu(struct ocxl_afu *afu); This is obsolete and should go away. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Most OpenCAPI operations require a valid context, so exposing these functions to external drivers is necessary. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/context.c | 9 +++++-- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/ocxl_internal.h | 6 ----- include/misc/ocxl.h | 45 +++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c73a859d2224..8b97b0f19db8 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -8,6 +8,7 @@ struct ocxl_context *ocxl_context_alloc(void) { return kzalloc(sizeof(struct ocxl_context), GFP_KERNEL); } +EXPORT_SYMBOL_GPL(ocxl_context_alloc); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping) @@ -43,6 +44,7 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, ocxl_afu_get(afu); return 0; } +EXPORT_SYMBOL_GPL(ocxl_context_init); /* * Callback for when a translation fault triggers an error @@ -63,7 +65,7 @@ static void xsl_fault_error(void *data, u64 addr, u64 dsisr) wake_up_all(&ctx->events_wq); } -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, struct mm_struct *mm) { int rc; @@ -75,7 +77,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) } rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, - current->mm->context.id, ctx->tidr, amr, current->mm, + mm->context.id, ctx->tidr, amr, mm, xsl_fault_error, ctx); if (rc) goto out; @@ -85,6 +87,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) mutex_unlock(&ctx->status_mutex); return rc; } +EXPORT_SYMBOL_GPL(ocxl_context_attach); static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, u64 offset, struct ocxl_context *ctx) @@ -243,6 +246,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) } return 0; } +EXPORT_SYMBOL_GPL(ocxl_context_detach); void ocxl_context_detach_all(struct ocxl_afu *afu) { @@ -280,3 +284,4 @@ void ocxl_context_free(struct ocxl_context *ctx) ocxl_afu_put(ctx->afu); kfree(ctx); } +EXPORT_SYMBOL_GPL(ocxl_context_free); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6e6121cd9a3..e51578186fd4 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -94,7 +94,7 @@ static long afu_ioctl_attach(struct ocxl_context *ctx, return -EINVAL; amr = arg.amr & mfspr(SPRN_UAMOR); - rc = ocxl_context_attach(ctx, amr); + rc = ocxl_context_attach(ctx, amr, current->mm); return rc; } diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index e04e547df29e..cda1e7667fc8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -130,15 +130,9 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, */ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); -struct ocxl_context *ocxl_context_alloc(void); -int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, - struct address_space *mapping); -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -int ocxl_context_detach(struct ocxl_context *ctx); void ocxl_context_detach_all(struct ocxl_afu *afu); -void ocxl_context_free(struct ocxl_context *ctx); int ocxl_sysfs_register_afu(struct ocxl_afu *afu); void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 8bafd748e380..a8fe0ce4ea67 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -116,6 +116,51 @@ const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); */ void ocxl_function_close(struct ocxl_fn *fn); +// Context allocation + +/** + * Allocate space for a new OpenCAPI context + * + * Returns NULL on failure + */ +struct ocxl_context *ocxl_context_alloc(void); + +/** + * Initialize an OpenCAPI context + * + * @ctx: The OpenCAPI context to initialize + * @afu: The AFU the context belongs to + * @mapping: The mapping to unmap when the context is closed (may be NULL) + */ +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, + struct address_space *mapping); + +/** + * Free an OpenCAPI context + * + * @ctx: The OpenCAPI context to free + */ +void ocxl_context_free(struct ocxl_context *ctx); + +/** + * Grant access to an MM to an OpenCAPI context + * @ctx: The OpenCAPI context to attach + * @amr: The value of the AMR register to restrict access + * @mm: The mm to attach to the context + * + * Returns 0 on success, negative on failure + */ +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, + struct mm_struct *mm); + +/** + * Detach an MM from an OpenCAPI context + * @ctx: The OpenCAPI context to attach + * + * Returns 0 on success, negative on failure + */ +int ocxl_context_detach(struct ocxl_context *ctx); + // AFU Metadata /** -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Most OpenCAPI operations require a valid context, so exposing these functions to external drivers is necessary. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/context.c | 9 +++++-- drivers/misc/ocxl/file.c | 2 +- drivers/misc/ocxl/ocxl_internal.h | 6 ----- include/misc/ocxl.h | 45 +++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index c73a859d2224..8b97b0f19db8 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -8,6 +8,7 @@ struct ocxl_context *ocxl_context_alloc(void) { return kzalloc(sizeof(struct ocxl_context), GFP_KERNEL); } +EXPORT_SYMBOL_GPL(ocxl_context_alloc); int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, struct address_space *mapping) @@ -43,6 +44,7 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, ocxl_afu_get(afu); return 0; } +EXPORT_SYMBOL_GPL(ocxl_context_init); /* * Callback for when a translation fault triggers an error @@ -63,7 +65,7 @@ static void xsl_fault_error(void *data, u64 addr, u64 dsisr) wake_up_all(&ctx->events_wq); } -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, struct mm_struct *mm) { int rc; @@ -75,7 +77,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) } rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, - current->mm->context.id, ctx->tidr, amr, current->mm, + mm->context.id, ctx->tidr, amr, mm, xsl_fault_error, ctx); if (rc) goto out; @@ -85,6 +87,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) mutex_unlock(&ctx->status_mutex); return rc; } +EXPORT_SYMBOL_GPL(ocxl_context_attach); static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, u64 offset, struct ocxl_context *ctx) @@ -243,6 +246,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) } return 0; } +EXPORT_SYMBOL_GPL(ocxl_context_detach); void ocxl_context_detach_all(struct ocxl_afu *afu) { @@ -280,3 +284,4 @@ void ocxl_context_free(struct ocxl_context *ctx) ocxl_afu_put(ctx->afu); kfree(ctx); } +EXPORT_SYMBOL_GPL(ocxl_context_free); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e6e6121cd9a3..e51578186fd4 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -94,7 +94,7 @@ static long afu_ioctl_attach(struct ocxl_context *ctx, return -EINVAL; amr = arg.amr & mfspr(SPRN_UAMOR); - rc = ocxl_context_attach(ctx, amr); + rc = ocxl_context_attach(ctx, amr, current->mm); return rc; } diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index e04e547df29e..cda1e7667fc8 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -130,15 +130,9 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, */ int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); -struct ocxl_context *ocxl_context_alloc(void); -int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, - struct address_space *mapping); -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); int ocxl_context_mmap(struct ocxl_context *ctx, struct vm_area_struct *vma); -int ocxl_context_detach(struct ocxl_context *ctx); void ocxl_context_detach_all(struct ocxl_afu *afu); -void ocxl_context_free(struct ocxl_context *ctx); int ocxl_sysfs_register_afu(struct ocxl_afu *afu); void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 8bafd748e380..a8fe0ce4ea67 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -116,6 +116,51 @@ const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); */ void ocxl_function_close(struct ocxl_fn *fn); +// Context allocation + +/** + * Allocate space for a new OpenCAPI context + * + * Returns NULL on failure + */ +struct ocxl_context *ocxl_context_alloc(void); + +/** + * Initialize an OpenCAPI context + * + * @ctx: The OpenCAPI context to initialize + * @afu: The AFU the context belongs to + * @mapping: The mapping to unmap when the context is closed (may be NULL) + */ +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, + struct address_space *mapping); + +/** + * Free an OpenCAPI context + * + * @ctx: The OpenCAPI context to free + */ +void ocxl_context_free(struct ocxl_context *ctx); + +/** + * Grant access to an MM to an OpenCAPI context + * @ctx: The OpenCAPI context to attach + * @amr: The value of the AMR register to restrict access + * @mm: The mm to attach to the context + * + * Returns 0 on success, negative on failure + */ +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, + struct mm_struct *mm); + +/** + * Detach an MM from an OpenCAPI context + * @ctx: The OpenCAPI context to attach + * + * Returns 0 on success, negative on failure + */ +int ocxl_context_detach(struct ocxl_context *ctx); + // AFU Metadata /** -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 15:13 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:13 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Most OpenCAPI operations require a valid context, so > exposing these functions to external drivers is necessary. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- See comment on previous patch regarding merging ocxl_context_alloc() and ocxl_context_init(), it would impact the exported symbols. Fred > drivers/misc/ocxl/context.c | 9 +++++-- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/ocxl_internal.h | 6 ----- > include/misc/ocxl.h | 45 +++++++++++++++++++++++++++++++ > 4 files changed, 53 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c73a859d2224..8b97b0f19db8 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -8,6 +8,7 @@ struct ocxl_context *ocxl_context_alloc(void) > { > return kzalloc(sizeof(struct ocxl_context), GFP_KERNEL); > } > +EXPORT_SYMBOL_GPL(ocxl_context_alloc); > > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping) > @@ -43,6 +44,7 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > ocxl_afu_get(afu); > return 0; > } > +EXPORT_SYMBOL_GPL(ocxl_context_init); > > /* > * Callback for when a translation fault triggers an error > @@ -63,7 +65,7 @@ static void xsl_fault_error(void *data, u64 addr, u64 dsisr) > wake_up_all(&ctx->events_wq); > } > > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, struct mm_struct *mm) > { > int rc; > > @@ -75,7 +77,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > } > > rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, > - current->mm->context.id, ctx->tidr, amr, current->mm, > + mm->context.id, ctx->tidr, amr, mm, > xsl_fault_error, ctx); > if (rc) > goto out; > @@ -85,6 +87,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > mutex_unlock(&ctx->status_mutex); > return rc; > } > +EXPORT_SYMBOL_GPL(ocxl_context_attach); > > static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, > u64 offset, struct ocxl_context *ctx) > @@ -243,6 +246,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) > } > return 0; > } > +EXPORT_SYMBOL_GPL(ocxl_context_detach); > > void ocxl_context_detach_all(struct ocxl_afu *afu) > { > @@ -280,3 +284,4 @@ void ocxl_context_free(struct ocxl_context *ctx) > ocxl_afu_put(ctx->afu); > kfree(ctx); > } > +EXPORT_SYMBOL_GPL(ocxl_context_free); > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6e6121cd9a3..e51578186fd4 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -94,7 +94,7 @@ static long afu_ioctl_attach(struct ocxl_context *ctx, > return -EINVAL; > > amr = arg.amr & mfspr(SPRN_UAMOR); > - rc = ocxl_context_attach(ctx, amr); > + rc = ocxl_context_attach(ctx, amr, current->mm); > return rc; > } > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index e04e547df29e..cda1e7667fc8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -130,15 +130,9 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > */ > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > -struct ocxl_context *ocxl_context_alloc(void); > -int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > - struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -int ocxl_context_detach(struct ocxl_context *ctx); > void ocxl_context_detach_all(struct ocxl_afu *afu); > -void ocxl_context_free(struct ocxl_context *ctx); > > int ocxl_sysfs_register_afu(struct ocxl_afu *afu); > void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 8bafd748e380..a8fe0ce4ea67 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -116,6 +116,51 @@ const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); > */ > void ocxl_function_close(struct ocxl_fn *fn); > > +// Context allocation > + > +/** > + * Allocate space for a new OpenCAPI context > + * > + * Returns NULL on failure > + */ > +struct ocxl_context *ocxl_context_alloc(void); > + > +/** > + * Initialize an OpenCAPI context > + * > + * @ctx: The OpenCAPI context to initialize > + * @afu: The AFU the context belongs to > + * @mapping: The mapping to unmap when the context is closed (may be NULL) > + */ > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > + struct address_space *mapping); > + > +/** > + * Free an OpenCAPI context > + * > + * @ctx: The OpenCAPI context to free > + */ > +void ocxl_context_free(struct ocxl_context *ctx); > + > +/** > + * Grant access to an MM to an OpenCAPI context > + * @ctx: The OpenCAPI context to attach > + * @amr: The value of the AMR register to restrict access > + * @mm: The mm to attach to the context > + * > + * Returns 0 on success, negative on failure > + */ > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, > + struct mm_struct *mm); > + > +/** > + * Detach an MM from an OpenCAPI context > + * @ctx: The OpenCAPI context to attach > + * > + * Returns 0 on success, negative on failure > + */ > +int ocxl_context_detach(struct ocxl_context *ctx); > + > // AFU Metadata > > /** > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts @ 2019-03-25 15:13 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:13 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Most OpenCAPI operations require a valid context, so > exposing these functions to external drivers is necessary. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- See comment on previous patch regarding merging ocxl_context_alloc() and ocxl_context_init(), it would impact the exported symbols. Fred > drivers/misc/ocxl/context.c | 9 +++++-- > drivers/misc/ocxl/file.c | 2 +- > drivers/misc/ocxl/ocxl_internal.h | 6 ----- > include/misc/ocxl.h | 45 +++++++++++++++++++++++++++++++ > 4 files changed, 53 insertions(+), 9 deletions(-) > > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index c73a859d2224..8b97b0f19db8 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -8,6 +8,7 @@ struct ocxl_context *ocxl_context_alloc(void) > { > return kzalloc(sizeof(struct ocxl_context), GFP_KERNEL); > } > +EXPORT_SYMBOL_GPL(ocxl_context_alloc); > > int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > struct address_space *mapping) > @@ -43,6 +44,7 @@ int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > ocxl_afu_get(afu); > return 0; > } > +EXPORT_SYMBOL_GPL(ocxl_context_init); > > /* > * Callback for when a translation fault triggers an error > @@ -63,7 +65,7 @@ static void xsl_fault_error(void *data, u64 addr, u64 dsisr) > wake_up_all(&ctx->events_wq); > } > > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, struct mm_struct *mm) > { > int rc; > > @@ -75,7 +77,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > } > > rc = ocxl_link_add_pe(ctx->afu->fn->link, ctx->pasid, > - current->mm->context.id, ctx->tidr, amr, current->mm, > + mm->context.id, ctx->tidr, amr, mm, > xsl_fault_error, ctx); > if (rc) > goto out; > @@ -85,6 +87,7 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr) > mutex_unlock(&ctx->status_mutex); > return rc; > } > +EXPORT_SYMBOL_GPL(ocxl_context_attach); > > static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, > u64 offset, struct ocxl_context *ctx) > @@ -243,6 +246,7 @@ int ocxl_context_detach(struct ocxl_context *ctx) > } > return 0; > } > +EXPORT_SYMBOL_GPL(ocxl_context_detach); > > void ocxl_context_detach_all(struct ocxl_afu *afu) > { > @@ -280,3 +284,4 @@ void ocxl_context_free(struct ocxl_context *ctx) > ocxl_afu_put(ctx->afu); > kfree(ctx); > } > +EXPORT_SYMBOL_GPL(ocxl_context_free); > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e6e6121cd9a3..e51578186fd4 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -94,7 +94,7 @@ static long afu_ioctl_attach(struct ocxl_context *ctx, > return -EINVAL; > > amr = arg.amr & mfspr(SPRN_UAMOR); > - rc = ocxl_context_attach(ctx, amr); > + rc = ocxl_context_attach(ctx, amr, current->mm); > return rc; > } > > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index e04e547df29e..cda1e7667fc8 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -130,15 +130,9 @@ int ocxl_config_check_afu_index(struct pci_dev *dev, > */ > int ocxl_link_update_pe(void *link_handle, int pasid, __u16 tid); > > -struct ocxl_context *ocxl_context_alloc(void); > -int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > - struct address_space *mapping); > -int ocxl_context_attach(struct ocxl_context *ctx, u64 amr); > int ocxl_context_mmap(struct ocxl_context *ctx, > struct vm_area_struct *vma); > -int ocxl_context_detach(struct ocxl_context *ctx); > void ocxl_context_detach_all(struct ocxl_afu *afu); > -void ocxl_context_free(struct ocxl_context *ctx); > > int ocxl_sysfs_register_afu(struct ocxl_afu *afu); > void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 8bafd748e380..a8fe0ce4ea67 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -116,6 +116,51 @@ const struct ocxl_fn_config *ocxl_function_config(struct ocxl_fn *fn); > */ > void ocxl_function_close(struct ocxl_fn *fn); > > +// Context allocation > + > +/** > + * Allocate space for a new OpenCAPI context > + * > + * Returns NULL on failure > + */ > +struct ocxl_context *ocxl_context_alloc(void); > + > +/** > + * Initialize an OpenCAPI context > + * > + * @ctx: The OpenCAPI context to initialize > + * @afu: The AFU the context belongs to > + * @mapping: The mapping to unmap when the context is closed (may be NULL) > + */ > +int ocxl_context_init(struct ocxl_context *ctx, struct ocxl_afu *afu, > + struct address_space *mapping); > + > +/** > + * Free an OpenCAPI context > + * > + * @ctx: The OpenCAPI context to free > + */ > +void ocxl_context_free(struct ocxl_context *ctx); > + > +/** > + * Grant access to an MM to an OpenCAPI context > + * @ctx: The OpenCAPI context to attach > + * @amr: The value of the AMR register to restrict access > + * @mm: The mm to attach to the context > + * > + * Returns 0 on success, negative on failure > + */ > +int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, > + struct mm_struct *mm); > + > +/** > + * Detach an MM from an OpenCAPI context > + * @ctx: The OpenCAPI context to attach > + * > + * Returns 0 on success, negative on failure > + */ > +int ocxl_context_detach(struct ocxl_context *ctx); > + > // AFU Metadata > > /** > ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The use of offsets is required only in the frontend, so alter the IRQ API to only work with IRQ IDs in the backend. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/afu_irq.c | 34 +++++++++++++++---------------- drivers/misc/ocxl/context.c | 7 +++++-- drivers/misc/ocxl/file.c | 13 +++++++----- drivers/misc/ocxl/ocxl_internal.h | 10 +++++---- drivers/misc/ocxl/trace.h | 12 ++++------- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c index 11ab996657a2..2d410cd6f817 100644 --- a/drivers/misc/ocxl/afu_irq.c +++ b/drivers/misc/ocxl/afu_irq.c @@ -14,14 +14,14 @@ struct afu_irq { struct eventfd_ctx *ev_ctx; }; -static int irq_offset_to_id(struct ocxl_context *ctx, u64 offset) +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) { return (offset - ctx->afu->irq_base_offset) >> PAGE_SHIFT; } -static u64 irq_id_to_offset(struct ocxl_context *ctx, int id) +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) { - return ctx->afu->irq_base_offset + (id << PAGE_SHIFT); + return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); } static irqreturn_t afu_irq_handler(int virq, void *data) @@ -69,7 +69,7 @@ static void release_afu_irq(struct afu_irq *irq) kfree(irq->name); } -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) { struct afu_irq *irq; int rc; @@ -101,11 +101,11 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) if (rc) goto err_alloc; - *irq_offset = irq_id_to_offset(ctx, irq->id); - - trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq, - *irq_offset); + trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq); mutex_unlock(&ctx->irq_lock); + + *irq_id = irq->id; + return 0; err_alloc: @@ -123,7 +123,7 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) trace_ocxl_afu_irq_free(ctx->pasid, irq->id); if (ctx->mapping) unmap_mapping_range(ctx->mapping, - irq_id_to_offset(ctx, irq->id), + ocxl_irq_id_to_offset(ctx, irq->id), 1 << PAGE_SHIFT, 1); release_afu_irq(irq); if (irq->ev_ctx) @@ -132,14 +132,13 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) kfree(irq); } -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset) +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; - int id = irq_offset_to_id(ctx, irq_offset); mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (!irq) { mutex_unlock(&ctx->irq_lock); return -EINVAL; @@ -161,14 +160,14 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) mutex_unlock(&ctx->irq_lock); } -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) { struct afu_irq *irq; struct eventfd_ctx *ev_ctx; - int rc = 0, id = irq_offset_to_id(ctx, irq_offset); + int rc = 0; mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (!irq) { rc = -EINVAL; goto unlock; @@ -186,14 +185,13 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) return rc; } -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset) +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; - int id = irq_offset_to_id(ctx, irq_offset); u64 addr = 0; mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (irq) addr = irq->trigger_page; mutex_unlock(&ctx->irq_lock); diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index 8b97b0f19db8..d6056883b85d 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -93,8 +93,9 @@ static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, u64 offset, struct ocxl_context *ctx) { u64 trigger_addr; + int irq_id = ocxl_irq_offset_to_id(ctx, offset); - trigger_addr = ocxl_afu_irq_get_addr(ctx, offset); + trigger_addr = ocxl_afu_irq_get_addr(ctx, irq_id); if (!trigger_addr) return VM_FAULT_SIGBUS; @@ -154,12 +155,14 @@ static const struct vm_operations_struct ocxl_vmops = { static int check_mmap_afu_irq(struct ocxl_context *ctx, struct vm_area_struct *vma) { + int irq_id = ocxl_irq_offset_to_id(ctx, vma->vm_pgoff << PAGE_SHIFT); + /* only one page */ if (vma_pages(vma) != 1) return -EINVAL; /* check offset validty */ - if (!ocxl_afu_irq_get_addr(ctx, vma->vm_pgoff << PAGE_SHIFT)) + if (!ocxl_afu_irq_get_addr(ctx, irq_id)) return -EINVAL; /* diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e51578186fd4..2585fc991108 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -196,6 +196,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd, { struct ocxl_context *ctx = file->private_data; struct ocxl_ioctl_irq_fd irq_fd; + int irq_id; u64 irq_offset; long rc; bool closed; @@ -217,12 +218,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, break; case OCXL_IOCTL_IRQ_ALLOC: - rc = ocxl_afu_irq_alloc(ctx, &irq_offset); + rc = ocxl_afu_irq_alloc(ctx, &irq_id); if (!rc) { + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id); rc = copy_to_user((u64 __user *) args, &irq_offset, sizeof(irq_offset)); if (rc) { - ocxl_afu_irq_free(ctx, irq_offset); + ocxl_afu_irq_free(ctx, irq_id); return -EFAULT; } } @@ -233,7 +235,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, sizeof(irq_offset)); if (rc) return -EFAULT; - rc = ocxl_afu_irq_free(ctx, irq_offset); + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset); + rc = ocxl_afu_irq_free(ctx, irq_id); break; case OCXL_IOCTL_IRQ_SET_FD: @@ -243,8 +246,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, return -EFAULT; if (irq_fd.reserved) return -EINVAL; - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset, - irq_fd.eventfd); + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); break; case OCXL_IOCTL_GET_METADATA: diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index cda1e7667fc8..923e7f29c693 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -137,12 +137,14 @@ void ocxl_context_detach_all(struct ocxl_afu *afu); int ocxl_sysfs_register_afu(struct ocxl_afu *afu); void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd); -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); /** * Free an AFU diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..024f417e7e01 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -107,16 +107,14 @@ DEFINE_EVENT(ocxl_fault_handler, ocxl_fault_ack, ); TRACE_EVENT(ocxl_afu_irq_alloc, - TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq, - u64 irq_offset), - TP_ARGS(pasid, irq_id, virq, hw_irq, irq_offset), + TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq), + TP_ARGS(pasid, irq_id, virq, hw_irq), TP_STRUCT__entry( __field(int, pasid) __field(int, irq_id) __field(unsigned int, virq) __field(int, hw_irq) - __field(u64, irq_offset) ), TP_fast_assign( @@ -124,15 +122,13 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_id = irq_id; __entry->virq = virq; __entry->hw_irq = hw_irq; - __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d", __entry->pasid, __entry->irq_id, __entry->virq, - __entry->hw_irq, - __entry->irq_offset + __entry->hw_irq ) ); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> The use of offsets is required only in the frontend, so alter the IRQ API to only work with IRQ IDs in the backend. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/afu_irq.c | 34 +++++++++++++++---------------- drivers/misc/ocxl/context.c | 7 +++++-- drivers/misc/ocxl/file.c | 13 +++++++----- drivers/misc/ocxl/ocxl_internal.h | 10 +++++---- drivers/misc/ocxl/trace.h | 12 ++++------- 5 files changed, 39 insertions(+), 37 deletions(-) diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c index 11ab996657a2..2d410cd6f817 100644 --- a/drivers/misc/ocxl/afu_irq.c +++ b/drivers/misc/ocxl/afu_irq.c @@ -14,14 +14,14 @@ struct afu_irq { struct eventfd_ctx *ev_ctx; }; -static int irq_offset_to_id(struct ocxl_context *ctx, u64 offset) +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) { return (offset - ctx->afu->irq_base_offset) >> PAGE_SHIFT; } -static u64 irq_id_to_offset(struct ocxl_context *ctx, int id) +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) { - return ctx->afu->irq_base_offset + (id << PAGE_SHIFT); + return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); } static irqreturn_t afu_irq_handler(int virq, void *data) @@ -69,7 +69,7 @@ static void release_afu_irq(struct afu_irq *irq) kfree(irq->name); } -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) { struct afu_irq *irq; int rc; @@ -101,11 +101,11 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) if (rc) goto err_alloc; - *irq_offset = irq_id_to_offset(ctx, irq->id); - - trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq, - *irq_offset); + trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq); mutex_unlock(&ctx->irq_lock); + + *irq_id = irq->id; + return 0; err_alloc: @@ -123,7 +123,7 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) trace_ocxl_afu_irq_free(ctx->pasid, irq->id); if (ctx->mapping) unmap_mapping_range(ctx->mapping, - irq_id_to_offset(ctx, irq->id), + ocxl_irq_id_to_offset(ctx, irq->id), 1 << PAGE_SHIFT, 1); release_afu_irq(irq); if (irq->ev_ctx) @@ -132,14 +132,13 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) kfree(irq); } -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset) +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; - int id = irq_offset_to_id(ctx, irq_offset); mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (!irq) { mutex_unlock(&ctx->irq_lock); return -EINVAL; @@ -161,14 +160,14 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) mutex_unlock(&ctx->irq_lock); } -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) { struct afu_irq *irq; struct eventfd_ctx *ev_ctx; - int rc = 0, id = irq_offset_to_id(ctx, irq_offset); + int rc = 0; mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (!irq) { rc = -EINVAL; goto unlock; @@ -186,14 +185,13 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) return rc; } -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset) +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; - int id = irq_offset_to_id(ctx, irq_offset); u64 addr = 0; mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, id); + irq = idr_find(&ctx->irq_idr, irq_id); if (irq) addr = irq->trigger_page; mutex_unlock(&ctx->irq_lock); diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c index 8b97b0f19db8..d6056883b85d 100644 --- a/drivers/misc/ocxl/context.c +++ b/drivers/misc/ocxl/context.c @@ -93,8 +93,9 @@ static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, u64 offset, struct ocxl_context *ctx) { u64 trigger_addr; + int irq_id = ocxl_irq_offset_to_id(ctx, offset); - trigger_addr = ocxl_afu_irq_get_addr(ctx, offset); + trigger_addr = ocxl_afu_irq_get_addr(ctx, irq_id); if (!trigger_addr) return VM_FAULT_SIGBUS; @@ -154,12 +155,14 @@ static const struct vm_operations_struct ocxl_vmops = { static int check_mmap_afu_irq(struct ocxl_context *ctx, struct vm_area_struct *vma) { + int irq_id = ocxl_irq_offset_to_id(ctx, vma->vm_pgoff << PAGE_SHIFT); + /* only one page */ if (vma_pages(vma) != 1) return -EINVAL; /* check offset validty */ - if (!ocxl_afu_irq_get_addr(ctx, vma->vm_pgoff << PAGE_SHIFT)) + if (!ocxl_afu_irq_get_addr(ctx, irq_id)) return -EINVAL; /* diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index e51578186fd4..2585fc991108 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -196,6 +196,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd, { struct ocxl_context *ctx = file->private_data; struct ocxl_ioctl_irq_fd irq_fd; + int irq_id; u64 irq_offset; long rc; bool closed; @@ -217,12 +218,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, break; case OCXL_IOCTL_IRQ_ALLOC: - rc = ocxl_afu_irq_alloc(ctx, &irq_offset); + rc = ocxl_afu_irq_alloc(ctx, &irq_id); if (!rc) { + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id); rc = copy_to_user((u64 __user *) args, &irq_offset, sizeof(irq_offset)); if (rc) { - ocxl_afu_irq_free(ctx, irq_offset); + ocxl_afu_irq_free(ctx, irq_id); return -EFAULT; } } @@ -233,7 +235,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, sizeof(irq_offset)); if (rc) return -EFAULT; - rc = ocxl_afu_irq_free(ctx, irq_offset); + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset); + rc = ocxl_afu_irq_free(ctx, irq_id); break; case OCXL_IOCTL_IRQ_SET_FD: @@ -243,8 +246,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, return -EFAULT; if (irq_fd.reserved) return -EINVAL; - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset, - irq_fd.eventfd); + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); break; case OCXL_IOCTL_GET_METADATA: diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index cda1e7667fc8..923e7f29c693 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -137,12 +137,14 @@ void ocxl_context_detach_all(struct ocxl_afu *afu); int ocxl_sysfs_register_afu(struct ocxl_afu *afu); void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd); -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); /** * Free an AFU diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h index bcb7ff330c1e..024f417e7e01 100644 --- a/drivers/misc/ocxl/trace.h +++ b/drivers/misc/ocxl/trace.h @@ -107,16 +107,14 @@ DEFINE_EVENT(ocxl_fault_handler, ocxl_fault_ack, ); TRACE_EVENT(ocxl_afu_irq_alloc, - TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq, - u64 irq_offset), - TP_ARGS(pasid, irq_id, virq, hw_irq, irq_offset), + TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq), + TP_ARGS(pasid, irq_id, virq, hw_irq), TP_STRUCT__entry( __field(int, pasid) __field(int, irq_id) __field(unsigned int, virq) __field(int, hw_irq) - __field(u64, irq_offset) ), TP_fast_assign( @@ -124,15 +122,13 @@ TRACE_EVENT(ocxl_afu_irq_alloc, __entry->irq_id = irq_id; __entry->virq = virq; __entry->hw_irq = hw_irq; - __entry->irq_offset = irq_offset; ), - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", + TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d", __entry->pasid, __entry->irq_id, __entry->virq, - __entry->hw_irq, - __entry->irq_offset + __entry->hw_irq ) ); -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 15:24 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:24 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The use of offsets is required only in the frontend, so alter > the IRQ API to only work with IRQ IDs in the backend. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/afu_irq.c | 34 +++++++++++++++---------------- > drivers/misc/ocxl/context.c | 7 +++++-- > drivers/misc/ocxl/file.c | 13 +++++++----- > drivers/misc/ocxl/ocxl_internal.h | 10 +++++---- > drivers/misc/ocxl/trace.h | 12 ++++------- > 5 files changed, 39 insertions(+), 37 deletions(-) > > diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c > index 11ab996657a2..2d410cd6f817 100644 > --- a/drivers/misc/ocxl/afu_irq.c > +++ b/drivers/misc/ocxl/afu_irq.c > @@ -14,14 +14,14 @@ struct afu_irq { > struct eventfd_ctx *ev_ctx; > }; > > -static int irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > { > return (offset - ctx->afu->irq_base_offset) >> PAGE_SHIFT; > } > > -static u64 irq_id_to_offset(struct ocxl_context *ctx, int id) > +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) > { > - return ctx->afu->irq_base_offset + (id << PAGE_SHIFT); > + return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); > } > > static irqreturn_t afu_irq_handler(int virq, void *data) > @@ -69,7 +69,7 @@ static void release_afu_irq(struct afu_irq *irq) > kfree(irq->name); > } > > -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) > { > struct afu_irq *irq; > int rc; > @@ -101,11 +101,11 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) > if (rc) > goto err_alloc; > > - *irq_offset = irq_id_to_offset(ctx, irq->id); > - > - trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq, > - *irq_offset); > + trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq); > mutex_unlock(&ctx->irq_lock); > + > + *irq_id = irq->id; > + > return 0; > > err_alloc: > @@ -123,7 +123,7 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) > trace_ocxl_afu_irq_free(ctx->pasid, irq->id); > if (ctx->mapping) > unmap_mapping_range(ctx->mapping, > - irq_id_to_offset(ctx, irq->id), > + ocxl_irq_id_to_offset(ctx, irq->id), > 1 << PAGE_SHIFT, 1); > release_afu_irq(irq); > if (irq->ev_ctx) > @@ -132,14 +132,13 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) > kfree(irq); > } > > -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset) > +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) > { > struct afu_irq *irq; > - int id = irq_offset_to_id(ctx, irq_offset); > > mutex_lock(&ctx->irq_lock); > > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (!irq) { > mutex_unlock(&ctx->irq_lock); > return -EINVAL; > @@ -161,14 +160,14 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) > mutex_unlock(&ctx->irq_lock); > } > > -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) > { > struct afu_irq *irq; > struct eventfd_ctx *ev_ctx; > - int rc = 0, id = irq_offset_to_id(ctx, irq_offset); > + int rc = 0; > > mutex_lock(&ctx->irq_lock); > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (!irq) { > rc = -EINVAL; > goto unlock; > @@ -186,14 +185,13 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) > return rc; > } > > -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset) > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) > { > struct afu_irq *irq; > - int id = irq_offset_to_id(ctx, irq_offset); > u64 addr = 0; > > mutex_lock(&ctx->irq_lock); > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (irq) > addr = irq->trigger_page; > mutex_unlock(&ctx->irq_lock); > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index 8b97b0f19db8..d6056883b85d 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -93,8 +93,9 @@ static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, > u64 offset, struct ocxl_context *ctx) > { > u64 trigger_addr; > + int irq_id = ocxl_irq_offset_to_id(ctx, offset); > > - trigger_addr = ocxl_afu_irq_get_addr(ctx, offset); > + trigger_addr = ocxl_afu_irq_get_addr(ctx, irq_id); > if (!trigger_addr) > return VM_FAULT_SIGBUS; > > @@ -154,12 +155,14 @@ static const struct vm_operations_struct ocxl_vmops = { > static int check_mmap_afu_irq(struct ocxl_context *ctx, > struct vm_area_struct *vma) > { > + int irq_id = ocxl_irq_offset_to_id(ctx, vma->vm_pgoff << PAGE_SHIFT); > + > /* only one page */ > if (vma_pages(vma) != 1) > return -EINVAL; > > /* check offset validty */ > - if (!ocxl_afu_irq_get_addr(ctx, vma->vm_pgoff << PAGE_SHIFT)) > + if (!ocxl_afu_irq_get_addr(ctx, irq_id)) > return -EINVAL; > > /* > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e51578186fd4..2585fc991108 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -196,6 +196,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > { > struct ocxl_context *ctx = file->private_data; > struct ocxl_ioctl_irq_fd irq_fd; > + int irq_id; > u64 irq_offset; > long rc; > bool closed; > @@ -217,12 +218,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > break; > > case OCXL_IOCTL_IRQ_ALLOC: > - rc = ocxl_afu_irq_alloc(ctx, &irq_offset); > + rc = ocxl_afu_irq_alloc(ctx, &irq_id); > if (!rc) { > + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id); > rc = copy_to_user((u64 __user *) args, &irq_offset, > sizeof(irq_offset)); > if (rc) { > - ocxl_afu_irq_free(ctx, irq_offset); > + ocxl_afu_irq_free(ctx, irq_id); > return -EFAULT; > } > } > @@ -233,7 +235,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > sizeof(irq_offset)); > if (rc) > return -EFAULT; > - rc = ocxl_afu_irq_free(ctx, irq_offset); > + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset); > + rc = ocxl_afu_irq_free(ctx, irq_id); > break; > > case OCXL_IOCTL_IRQ_SET_FD: > @@ -243,8 +246,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > return -EFAULT; > if (irq_fd.reserved) > return -EINVAL; > - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset, > - irq_fd.eventfd); > + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); > + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); > break; > > case OCXL_IOCTL_GET_METADATA: > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index cda1e7667fc8..923e7f29c693 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -137,12 +137,14 @@ void ocxl_context_detach_all(struct ocxl_afu *afu); > int ocxl_sysfs_register_afu(struct ocxl_afu *afu); > void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); > > -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); > +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, > int eventfd); > -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > > /** > * Free an AFU > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..024f417e7e01 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -107,16 +107,14 @@ DEFINE_EVENT(ocxl_fault_handler, ocxl_fault_ack, > ); > > TRACE_EVENT(ocxl_afu_irq_alloc, > - TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq, > - u64 irq_offset), > - TP_ARGS(pasid, irq_id, virq, hw_irq, irq_offset), > + TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq), > + TP_ARGS(pasid, irq_id, virq, hw_irq), > > TP_STRUCT__entry( > __field(int, pasid) > __field(int, irq_id) > __field(unsigned int, virq) > __field(int, hw_irq) > - __field(u64, irq_offset) > ), > > TP_fast_assign( > @@ -124,15 +122,13 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_id = irq_id; > __entry->virq = virq; > __entry->hw_irq = hw_irq; > - __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d", > __entry->pasid, > __entry->irq_id, > __entry->virq, > - __entry->hw_irq, > - __entry->irq_offset > + __entry->hw_irq > ) > ); > > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets @ 2019-03-25 15:24 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:24 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The use of offsets is required only in the frontend, so alter > the IRQ API to only work with IRQ IDs in the backend. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/afu_irq.c | 34 +++++++++++++++---------------- > drivers/misc/ocxl/context.c | 7 +++++-- > drivers/misc/ocxl/file.c | 13 +++++++----- > drivers/misc/ocxl/ocxl_internal.h | 10 +++++---- > drivers/misc/ocxl/trace.h | 12 ++++------- > 5 files changed, 39 insertions(+), 37 deletions(-) > > diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c > index 11ab996657a2..2d410cd6f817 100644 > --- a/drivers/misc/ocxl/afu_irq.c > +++ b/drivers/misc/ocxl/afu_irq.c > @@ -14,14 +14,14 @@ struct afu_irq { > struct eventfd_ctx *ev_ctx; > }; > > -static int irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > { > return (offset - ctx->afu->irq_base_offset) >> PAGE_SHIFT; > } > > -static u64 irq_id_to_offset(struct ocxl_context *ctx, int id) > +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) > { > - return ctx->afu->irq_base_offset + (id << PAGE_SHIFT); > + return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); > } > > static irqreturn_t afu_irq_handler(int virq, void *data) > @@ -69,7 +69,7 @@ static void release_afu_irq(struct afu_irq *irq) > kfree(irq->name); > } > > -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) > { > struct afu_irq *irq; > int rc; > @@ -101,11 +101,11 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset) > if (rc) > goto err_alloc; > > - *irq_offset = irq_id_to_offset(ctx, irq->id); > - > - trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq, > - *irq_offset); > + trace_ocxl_afu_irq_alloc(ctx->pasid, irq->id, irq->virq, irq->hw_irq); > mutex_unlock(&ctx->irq_lock); > + > + *irq_id = irq->id; > + > return 0; > > err_alloc: > @@ -123,7 +123,7 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) > trace_ocxl_afu_irq_free(ctx->pasid, irq->id); > if (ctx->mapping) > unmap_mapping_range(ctx->mapping, > - irq_id_to_offset(ctx, irq->id), > + ocxl_irq_id_to_offset(ctx, irq->id), > 1 << PAGE_SHIFT, 1); > release_afu_irq(irq); > if (irq->ev_ctx) > @@ -132,14 +132,13 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) > kfree(irq); > } > > -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset) > +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) > { > struct afu_irq *irq; > - int id = irq_offset_to_id(ctx, irq_offset); > > mutex_lock(&ctx->irq_lock); > > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (!irq) { > mutex_unlock(&ctx->irq_lock); > return -EINVAL; > @@ -161,14 +160,14 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) > mutex_unlock(&ctx->irq_lock); > } > > -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) > { > struct afu_irq *irq; > struct eventfd_ctx *ev_ctx; > - int rc = 0, id = irq_offset_to_id(ctx, irq_offset); > + int rc = 0; > > mutex_lock(&ctx->irq_lock); > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (!irq) { > rc = -EINVAL; > goto unlock; > @@ -186,14 +185,13 @@ int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, int eventfd) > return rc; > } > > -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset) > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) > { > struct afu_irq *irq; > - int id = irq_offset_to_id(ctx, irq_offset); > u64 addr = 0; > > mutex_lock(&ctx->irq_lock); > - irq = idr_find(&ctx->irq_idr, id); > + irq = idr_find(&ctx->irq_idr, irq_id); > if (irq) > addr = irq->trigger_page; > mutex_unlock(&ctx->irq_lock); > diff --git a/drivers/misc/ocxl/context.c b/drivers/misc/ocxl/context.c > index 8b97b0f19db8..d6056883b85d 100644 > --- a/drivers/misc/ocxl/context.c > +++ b/drivers/misc/ocxl/context.c > @@ -93,8 +93,9 @@ static vm_fault_t map_afu_irq(struct vm_area_struct *vma, unsigned long address, > u64 offset, struct ocxl_context *ctx) > { > u64 trigger_addr; > + int irq_id = ocxl_irq_offset_to_id(ctx, offset); > > - trigger_addr = ocxl_afu_irq_get_addr(ctx, offset); > + trigger_addr = ocxl_afu_irq_get_addr(ctx, irq_id); > if (!trigger_addr) > return VM_FAULT_SIGBUS; > > @@ -154,12 +155,14 @@ static const struct vm_operations_struct ocxl_vmops = { > static int check_mmap_afu_irq(struct ocxl_context *ctx, > struct vm_area_struct *vma) > { > + int irq_id = ocxl_irq_offset_to_id(ctx, vma->vm_pgoff << PAGE_SHIFT); > + > /* only one page */ > if (vma_pages(vma) != 1) > return -EINVAL; > > /* check offset validty */ > - if (!ocxl_afu_irq_get_addr(ctx, vma->vm_pgoff << PAGE_SHIFT)) > + if (!ocxl_afu_irq_get_addr(ctx, irq_id)) > return -EINVAL; > > /* > diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c > index e51578186fd4..2585fc991108 100644 > --- a/drivers/misc/ocxl/file.c > +++ b/drivers/misc/ocxl/file.c > @@ -196,6 +196,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > { > struct ocxl_context *ctx = file->private_data; > struct ocxl_ioctl_irq_fd irq_fd; > + int irq_id; > u64 irq_offset; > long rc; > bool closed; > @@ -217,12 +218,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > break; > > case OCXL_IOCTL_IRQ_ALLOC: > - rc = ocxl_afu_irq_alloc(ctx, &irq_offset); > + rc = ocxl_afu_irq_alloc(ctx, &irq_id); > if (!rc) { > + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id); > rc = copy_to_user((u64 __user *) args, &irq_offset, > sizeof(irq_offset)); > if (rc) { > - ocxl_afu_irq_free(ctx, irq_offset); > + ocxl_afu_irq_free(ctx, irq_id); > return -EFAULT; > } > } > @@ -233,7 +235,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > sizeof(irq_offset)); > if (rc) > return -EFAULT; > - rc = ocxl_afu_irq_free(ctx, irq_offset); > + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset); > + rc = ocxl_afu_irq_free(ctx, irq_id); > break; > > case OCXL_IOCTL_IRQ_SET_FD: > @@ -243,8 +246,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, > return -EFAULT; > if (irq_fd.reserved) > return -EINVAL; > - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset, > - irq_fd.eventfd); > + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); > + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); > break; > > case OCXL_IOCTL_GET_METADATA: > diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h > index cda1e7667fc8..923e7f29c693 100644 > --- a/drivers/misc/ocxl/ocxl_internal.h > +++ b/drivers/misc/ocxl/ocxl_internal.h > @@ -137,12 +137,14 @@ void ocxl_context_detach_all(struct ocxl_afu *afu); > int ocxl_sysfs_register_afu(struct ocxl_afu *afu); > void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); > > -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, u64 *irq_offset); > -int ocxl_afu_irq_free(struct ocxl_context *ctx, u64 irq_offset); > +int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); > +u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); > +int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > +int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > void ocxl_afu_irq_free_all(struct ocxl_context *ctx); > -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, u64 irq_offset, > +int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, > int eventfd); > -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, u64 irq_offset); > +u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > > /** > * Free an AFU > diff --git a/drivers/misc/ocxl/trace.h b/drivers/misc/ocxl/trace.h > index bcb7ff330c1e..024f417e7e01 100644 > --- a/drivers/misc/ocxl/trace.h > +++ b/drivers/misc/ocxl/trace.h > @@ -107,16 +107,14 @@ DEFINE_EVENT(ocxl_fault_handler, ocxl_fault_ack, > ); > > TRACE_EVENT(ocxl_afu_irq_alloc, > - TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq, > - u64 irq_offset), > - TP_ARGS(pasid, irq_id, virq, hw_irq, irq_offset), > + TP_PROTO(int pasid, int irq_id, unsigned int virq, int hw_irq), > + TP_ARGS(pasid, irq_id, virq, hw_irq), > > TP_STRUCT__entry( > __field(int, pasid) > __field(int, irq_id) > __field(unsigned int, virq) > __field(int, hw_irq) > - __field(u64, irq_offset) > ), > > TP_fast_assign( > @@ -124,15 +122,13 @@ TRACE_EVENT(ocxl_afu_irq_alloc, > __entry->irq_id = irq_id; > __entry->virq = virq; > __entry->hw_irq = hw_irq; > - __entry->irq_offset = irq_offset; > ), > > - TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d irq_offset=0x%llx", > + TP_printk("pasid=0x%x irq_id=%d virq=%u hw_irq=%d", > __entry->pasid, > __entry->irq_id, > __entry->virq, > - __entry->hw_irq, > - __entry->irq_offset > + __entry->hw_irq > ) > ); > > ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 6/7] ocxl: move event_fd handling to frontend 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Event_fd is only used in the driver frontend, so it does not need to exist in the backend code. Relocate it to the frontend and provide an opaque mechanism for consumers instead. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/afu_irq.c | 76 ++++++++++++++++++------------- drivers/misc/ocxl/file.c | 22 ++++++++- drivers/misc/ocxl/ocxl_internal.h | 5 -- include/misc/ocxl.h | 46 +++++++++++++++++++ 4 files changed, 111 insertions(+), 38 deletions(-) diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c index 2d410cd6f817..d71e62df7d31 100644 --- a/drivers/misc/ocxl/afu_irq.c +++ b/drivers/misc/ocxl/afu_irq.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ // Copyright 2017 IBM Corp. #include <linux/interrupt.h> -#include <linux/eventfd.h> +#include <asm/pnv-ocxl.h> #include "ocxl_internal.h" #include "trace.h" @@ -11,7 +11,9 @@ struct afu_irq { unsigned int virq; char *name; u64 trigger_page; - struct eventfd_ctx *ev_ctx; + irqreturn_t (*handler)(void *private); + void (*free_private)(void *private); + void *private; }; int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) @@ -24,14 +26,43 @@ u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); } +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, + irqreturn_t (*handler)(void *private), + void (*free_private)(void *private), + void *private) +{ + struct afu_irq *irq; + int rc; + + mutex_lock(&ctx->irq_lock); + irq = idr_find(&ctx->irq_idr, irq_id); + if (!irq) { + rc = -EINVAL; + goto unlock; + } + + irq->handler = handler; + irq->private = private; + + rc = 0; + goto unlock; + +unlock: + mutex_unlock(&ctx->irq_lock); + return rc; +} +EXPORT_SYMBOL_GPL(ocxl_irq_set_handler); + static irqreturn_t afu_irq_handler(int virq, void *data) { struct afu_irq *irq = (struct afu_irq *) data; trace_ocxl_afu_irq_receive(virq); - if (irq->ev_ctx) - eventfd_signal(irq->ev_ctx, 1); - return IRQ_HANDLED; + + if (irq->handler) + return irq->handler(irq->private); + + return IRQ_HANDLED; // Just drop it on the ground } static int setup_afu_irq(struct ocxl_context *ctx, struct afu_irq *irq) @@ -118,6 +149,8 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) return rc; } +EXPORT_SYMBOL_GPL(ocxl_afu_irq_alloc); + static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) { trace_ocxl_afu_irq_free(ctx->pasid, irq->id); @@ -126,8 +159,8 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) ocxl_irq_id_to_offset(ctx, irq->id), 1 << PAGE_SHIFT, 1); release_afu_irq(irq); - if (irq->ev_ctx) - eventfd_ctx_put(irq->ev_ctx); + if (irq->free_private) + irq->free_private(irq->private); ocxl_link_free_irq(ctx->afu->fn->link, irq->hw_irq); kfree(irq); } @@ -149,6 +182,8 @@ int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) return 0; } +EXPORT_SYMBOL_GPL(ocxl_afu_irq_free); + void ocxl_afu_irq_free_all(struct ocxl_context *ctx) { struct afu_irq *irq; @@ -160,31 +195,6 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) mutex_unlock(&ctx->irq_lock); } -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) -{ - struct afu_irq *irq; - struct eventfd_ctx *ev_ctx; - int rc = 0; - - mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, irq_id); - if (!irq) { - rc = -EINVAL; - goto unlock; - } - - ev_ctx = eventfd_ctx_fdget(eventfd); - if (IS_ERR(ev_ctx)) { - rc = -EINVAL; - goto unlock; - } - - irq->ev_ctx = ev_ctx; -unlock: - mutex_unlock(&ctx->irq_lock); - return rc; -} - u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; @@ -197,3 +207,5 @@ u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) mutex_unlock(&ctx->irq_lock); return addr; } + +EXPORT_SYMBOL_GPL(ocxl_afu_irq_get_addr); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 2585fc991108..207e6de1f8b6 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -3,6 +3,7 @@ #include <linux/fs.h> #include <linux/poll.h> #include <linux/sched/signal.h> +#include <linux/eventfd.h> #include <linux/uaccess.h> #include <uapi/misc/ocxl.h> #include <asm/reg.h> @@ -191,11 +192,27 @@ static long afu_ioctl_get_features(struct ocxl_context *ctx, x == OCXL_IOCTL_GET_FEATURES ? "GET_FEATURES" : \ "UNKNOWN") +static irqreturn_t irq_handler(void *private) +{ + struct eventfd_ctx *ev_ctx = private; + + eventfd_signal(ev_ctx, 1); + return IRQ_HANDLED; +} + +static void irq_free(void *private) +{ + struct eventfd_ctx *ev_ctx = private; + + eventfd_ctx_put(ev_ctx); +} + static long afu_ioctl(struct file *file, unsigned int cmd, unsigned long args) { struct ocxl_context *ctx = file->private_data; struct ocxl_ioctl_irq_fd irq_fd; + struct eventfd_ctx *ev_ctx; int irq_id; u64 irq_offset; long rc; @@ -247,7 +264,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd, if (irq_fd.reserved) return -EINVAL; irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); - rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); + ev_ctx = eventfd_ctx_fdget(irq_fd.eventfd); + if (!ev_ctx) + return -EFAULT; + rc = ocxl_irq_set_handler(ctx, irq_id, irq_handler, irq_free, ev_ctx); break; case OCXL_IOCTL_GET_METADATA: diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 923e7f29c693..bc84288390ee 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -139,12 +139,7 @@ void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); -int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, - int eventfd); -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); /** * Free an AFU diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index a8fe0ce4ea67..1b48e9d63abb 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -161,6 +161,52 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, */ int ocxl_context_detach(struct ocxl_context *ctx); +// AFU IRQs + +/** + * Allocate an IRQ associated with an AFU context + * @ctx: the AFU context + * @irq_id: out, the IRQ ID + * + * Returns 0 on success, negative on failure + */ +extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); + +/** + * Frees an IRQ associated with an AFU context + * @ctx: the AFU context + * @irq_id: the IRQ ID + * + * Returns 0 on success, negative on failure + */ +extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); + +/** + * Gets the address of the trigger page for an IRQ + * This can then be provided to an AFU which will write to that + * page to trigger the IRQ. + * @ctx: The AFU context that the IRQ is associated with + * @irq_id: The IRQ ID + * + * returns the trigger page address, or 0 if the IRQ is not valid + */ +extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); + +/** + * Provide a callback to be called when an IRQ is triggered + * @ctx: The AFU context that the IRQ is associated with + * @irq_id: The IRQ ID + * @handler: the callback to be called when the IRQ is triggered + * @free_private: the callback to be called when the IRQ is freed + * @private: Private data to be passed to the callbacks + * + * Returns 0 on success, negative on failure + */ +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, + irqreturn_t (*handler)(void *private), + void (*free_private)(void *private), + void *private); + // AFU Metadata /** -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 6/7] ocxl: move event_fd handling to frontend @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> Event_fd is only used in the driver frontend, so it does not need to exist in the backend code. Relocate it to the frontend and provide an opaque mechanism for consumers instead. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> --- drivers/misc/ocxl/afu_irq.c | 76 ++++++++++++++++++------------- drivers/misc/ocxl/file.c | 22 ++++++++- drivers/misc/ocxl/ocxl_internal.h | 5 -- include/misc/ocxl.h | 46 +++++++++++++++++++ 4 files changed, 111 insertions(+), 38 deletions(-) diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c index 2d410cd6f817..d71e62df7d31 100644 --- a/drivers/misc/ocxl/afu_irq.c +++ b/drivers/misc/ocxl/afu_irq.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ // Copyright 2017 IBM Corp. #include <linux/interrupt.h> -#include <linux/eventfd.h> +#include <asm/pnv-ocxl.h> #include "ocxl_internal.h" #include "trace.h" @@ -11,7 +11,9 @@ struct afu_irq { unsigned int virq; char *name; u64 trigger_page; - struct eventfd_ctx *ev_ctx; + irqreturn_t (*handler)(void *private); + void (*free_private)(void *private); + void *private; }; int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) @@ -24,14 +26,43 @@ u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); } +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, + irqreturn_t (*handler)(void *private), + void (*free_private)(void *private), + void *private) +{ + struct afu_irq *irq; + int rc; + + mutex_lock(&ctx->irq_lock); + irq = idr_find(&ctx->irq_idr, irq_id); + if (!irq) { + rc = -EINVAL; + goto unlock; + } + + irq->handler = handler; + irq->private = private; + + rc = 0; + goto unlock; + +unlock: + mutex_unlock(&ctx->irq_lock); + return rc; +} +EXPORT_SYMBOL_GPL(ocxl_irq_set_handler); + static irqreturn_t afu_irq_handler(int virq, void *data) { struct afu_irq *irq = (struct afu_irq *) data; trace_ocxl_afu_irq_receive(virq); - if (irq->ev_ctx) - eventfd_signal(irq->ev_ctx, 1); - return IRQ_HANDLED; + + if (irq->handler) + return irq->handler(irq->private); + + return IRQ_HANDLED; // Just drop it on the ground } static int setup_afu_irq(struct ocxl_context *ctx, struct afu_irq *irq) @@ -118,6 +149,8 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) return rc; } +EXPORT_SYMBOL_GPL(ocxl_afu_irq_alloc); + static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) { trace_ocxl_afu_irq_free(ctx->pasid, irq->id); @@ -126,8 +159,8 @@ static void afu_irq_free(struct afu_irq *irq, struct ocxl_context *ctx) ocxl_irq_id_to_offset(ctx, irq->id), 1 << PAGE_SHIFT, 1); release_afu_irq(irq); - if (irq->ev_ctx) - eventfd_ctx_put(irq->ev_ctx); + if (irq->free_private) + irq->free_private(irq->private); ocxl_link_free_irq(ctx->afu->fn->link, irq->hw_irq); kfree(irq); } @@ -149,6 +182,8 @@ int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id) return 0; } +EXPORT_SYMBOL_GPL(ocxl_afu_irq_free); + void ocxl_afu_irq_free_all(struct ocxl_context *ctx) { struct afu_irq *irq; @@ -160,31 +195,6 @@ void ocxl_afu_irq_free_all(struct ocxl_context *ctx) mutex_unlock(&ctx->irq_lock); } -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, int eventfd) -{ - struct afu_irq *irq; - struct eventfd_ctx *ev_ctx; - int rc = 0; - - mutex_lock(&ctx->irq_lock); - irq = idr_find(&ctx->irq_idr, irq_id); - if (!irq) { - rc = -EINVAL; - goto unlock; - } - - ev_ctx = eventfd_ctx_fdget(eventfd); - if (IS_ERR(ev_ctx)) { - rc = -EINVAL; - goto unlock; - } - - irq->ev_ctx = ev_ctx; -unlock: - mutex_unlock(&ctx->irq_lock); - return rc; -} - u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) { struct afu_irq *irq; @@ -197,3 +207,5 @@ u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id) mutex_unlock(&ctx->irq_lock); return addr; } + +EXPORT_SYMBOL_GPL(ocxl_afu_irq_get_addr); diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 2585fc991108..207e6de1f8b6 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -3,6 +3,7 @@ #include <linux/fs.h> #include <linux/poll.h> #include <linux/sched/signal.h> +#include <linux/eventfd.h> #include <linux/uaccess.h> #include <uapi/misc/ocxl.h> #include <asm/reg.h> @@ -191,11 +192,27 @@ static long afu_ioctl_get_features(struct ocxl_context *ctx, x == OCXL_IOCTL_GET_FEATURES ? "GET_FEATURES" : \ "UNKNOWN") +static irqreturn_t irq_handler(void *private) +{ + struct eventfd_ctx *ev_ctx = private; + + eventfd_signal(ev_ctx, 1); + return IRQ_HANDLED; +} + +static void irq_free(void *private) +{ + struct eventfd_ctx *ev_ctx = private; + + eventfd_ctx_put(ev_ctx); +} + static long afu_ioctl(struct file *file, unsigned int cmd, unsigned long args) { struct ocxl_context *ctx = file->private_data; struct ocxl_ioctl_irq_fd irq_fd; + struct eventfd_ctx *ev_ctx; int irq_id; u64 irq_offset; long rc; @@ -247,7 +264,10 @@ static long afu_ioctl(struct file *file, unsigned int cmd, if (irq_fd.reserved) return -EINVAL; irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); - rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); + ev_ctx = eventfd_ctx_fdget(irq_fd.eventfd); + if (!ev_ctx) + return -EFAULT; + rc = ocxl_irq_set_handler(ctx, irq_id, irq_handler, irq_free, ev_ctx); break; case OCXL_IOCTL_GET_METADATA: diff --git a/drivers/misc/ocxl/ocxl_internal.h b/drivers/misc/ocxl/ocxl_internal.h index 923e7f29c693..bc84288390ee 100644 --- a/drivers/misc/ocxl/ocxl_internal.h +++ b/drivers/misc/ocxl/ocxl_internal.h @@ -139,12 +139,7 @@ void ocxl_sysfs_unregister_afu(struct ocxl_afu *afu); int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset); u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id); -int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); -int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); void ocxl_afu_irq_free_all(struct ocxl_context *ctx); -int ocxl_afu_irq_set_fd(struct ocxl_context *ctx, int irq_id, - int eventfd); -u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); /** * Free an AFU diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index a8fe0ce4ea67..1b48e9d63abb 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -161,6 +161,52 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, */ int ocxl_context_detach(struct ocxl_context *ctx); +// AFU IRQs + +/** + * Allocate an IRQ associated with an AFU context + * @ctx: the AFU context + * @irq_id: out, the IRQ ID + * + * Returns 0 on success, negative on failure + */ +extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); + +/** + * Frees an IRQ associated with an AFU context + * @ctx: the AFU context + * @irq_id: the IRQ ID + * + * Returns 0 on success, negative on failure + */ +extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); + +/** + * Gets the address of the trigger page for an IRQ + * This can then be provided to an AFU which will write to that + * page to trigger the IRQ. + * @ctx: The AFU context that the IRQ is associated with + * @irq_id: The IRQ ID + * + * returns the trigger page address, or 0 if the IRQ is not valid + */ +extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); + +/** + * Provide a callback to be called when an IRQ is triggered + * @ctx: The AFU context that the IRQ is associated with + * @irq_id: The IRQ ID + * @handler: the callback to be called when the IRQ is triggered + * @free_private: the callback to be called when the IRQ is freed + * @private: Private data to be passed to the callbacks + * + * Returns 0 on success, negative on failure + */ +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, + irqreturn_t (*handler)(void *private), + void (*free_private)(void *private), + void *private); + // AFU Metadata /** -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 6/7] ocxl: move event_fd handling to frontend 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 15:41 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:41 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Event_fd is only used in the driver frontend, so it does not > need to exist in the backend code. Relocate it to the frontend > and provide an opaque mechanism for consumers instead. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > drivers/misc/ocxl/afu_irq.c | 76 ++++++++++++++++++------------- > drivers/misc/ocxl/file.c | 22 ++++++++- > drivers/misc/ocxl/ocxl_internal.h | 5 -- > include/misc/ocxl.h | 46 +++++++++++++++++++ > 4 files changed, 111 insertions(+), 38 deletions(-) > > diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c > index 2d410cd6f817..d71e62df7d31 100644 > --- a/drivers/misc/ocxl/afu_irq.c > +++ b/drivers/misc/ocxl/afu_irq.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0+ > // Copyright 2017 IBM Corp. > #include <linux/interrupt.h> > -#include <linux/eventfd.h> > +#include <asm/pnv-ocxl.h> > #include "ocxl_internal.h" > #include "trace.h" > > @@ -11,7 +11,9 @@ struct afu_irq { > unsigned int virq; > char *name; > u64 trigger_page; > - struct eventfd_ctx *ev_ctx; > + irqreturn_t (*handler)(void *private); > + void (*free_private)(void *private); > + void *private; > }; > > int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > @@ -24,14 +26,43 @@ u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) > return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); > } > > +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, > + irqreturn_t (*handler)(void *private), > + void (*free_private)(void *private), > + void *private) > +{ > + struct afu_irq *irq; > + int rc; > + > + mutex_lock(&ctx->irq_lock); > + irq = idr_find(&ctx->irq_idr, irq_id); > + if (!irq) { > + rc = -EINVAL; > + goto unlock; > + } > + > + irq->handler = handler; > + irq->private = private; > + > + rc = 0; > + goto unlock; That goto is too much. > + > +unlock: > + mutex_unlock(&ctx->irq_lock); > + return rc; > +} > +EXPORT_SYMBOL_GPL(ocxl_irq_set_handler); > + > static irqreturn_t afu_irq_handler(int virq, void *data) > { > struct afu_irq *irq = (struct afu_irq *) data; > > trace_ocxl_afu_irq_receive(virq); > - if (irq->ev_ctx) > - eventfd_signal(irq->ev_ctx, 1); > - return IRQ_HANDLED; > + > + if (irq->handler) > + return irq->handler(irq->private); > + > + return IRQ_HANDLED; // Just drop it on the ground > } > > static int setup_afu_irq(struct ocxl_context *ctx, struct afu_irq *irq) > @@ -118,6 +149,8 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) > return rc; > } > > +EXPORT_SYMBOL_GPL(ocxl_afu_irq_alloc); nit: checkpatch doesn't like the empty line between the function and its symbol export. Also true for a few other symbols in that file. > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index a8fe0ce4ea67..1b48e9d63abb 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -161,6 +161,52 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, > */ > int ocxl_context_detach(struct ocxl_context *ctx); > > +// AFU IRQs > + > +/** > + * Allocate an IRQ associated with an AFU context > + * @ctx: the AFU context > + * @irq_id: out, the IRQ ID > + * > + * Returns 0 on success, negative on failure > + */ > +extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > + > +/** > + * Frees an IRQ associated with an AFU context > + * @ctx: the AFU context > + * @irq_id: the IRQ ID > + * > + * Returns 0 on success, negative on failure > + */ > +extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > + > +/** > + * Gets the address of the trigger page for an IRQ > + * This can then be provided to an AFU which will write to that > + * page to trigger the IRQ. > + * @ctx: The AFU context that the IRQ is associated with > + * @irq_id: The IRQ ID > + * > + * returns the trigger page address, or 0 if the IRQ is not valid > + */ > +extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > + > +/** > + * Provide a callback to be called when an IRQ is triggered > + * @ctx: The AFU context that the IRQ is associated with > + * @irq_id: The IRQ ID > + * @handler: the callback to be called when the IRQ is triggered > + * @free_private: the callback to be called when the IRQ is freed We should mention free_private can be NULL, in which case it is ignored. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 6/7] ocxl: move event_fd handling to frontend @ 2019-03-25 15:41 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:41 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kroah-Hartman, linuxppc-dev, Arnd Bergmann, Andrew Donnellan, linux-kernel Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > Event_fd is only used in the driver frontend, so it does not > need to exist in the backend code. Relocate it to the frontend > and provide an opaque mechanism for consumers instead. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- > drivers/misc/ocxl/afu_irq.c | 76 ++++++++++++++++++------------- > drivers/misc/ocxl/file.c | 22 ++++++++- > drivers/misc/ocxl/ocxl_internal.h | 5 -- > include/misc/ocxl.h | 46 +++++++++++++++++++ > 4 files changed, 111 insertions(+), 38 deletions(-) > > diff --git a/drivers/misc/ocxl/afu_irq.c b/drivers/misc/ocxl/afu_irq.c > index 2d410cd6f817..d71e62df7d31 100644 > --- a/drivers/misc/ocxl/afu_irq.c > +++ b/drivers/misc/ocxl/afu_irq.c > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0+ > // Copyright 2017 IBM Corp. > #include <linux/interrupt.h> > -#include <linux/eventfd.h> > +#include <asm/pnv-ocxl.h> > #include "ocxl_internal.h" > #include "trace.h" > > @@ -11,7 +11,9 @@ struct afu_irq { > unsigned int virq; > char *name; > u64 trigger_page; > - struct eventfd_ctx *ev_ctx; > + irqreturn_t (*handler)(void *private); > + void (*free_private)(void *private); > + void *private; > }; > > int ocxl_irq_offset_to_id(struct ocxl_context *ctx, u64 offset) > @@ -24,14 +26,43 @@ u64 ocxl_irq_id_to_offset(struct ocxl_context *ctx, int irq_id) > return ctx->afu->irq_base_offset + (irq_id << PAGE_SHIFT); > } > > +int ocxl_irq_set_handler(struct ocxl_context *ctx, int irq_id, > + irqreturn_t (*handler)(void *private), > + void (*free_private)(void *private), > + void *private) > +{ > + struct afu_irq *irq; > + int rc; > + > + mutex_lock(&ctx->irq_lock); > + irq = idr_find(&ctx->irq_idr, irq_id); > + if (!irq) { > + rc = -EINVAL; > + goto unlock; > + } > + > + irq->handler = handler; > + irq->private = private; > + > + rc = 0; > + goto unlock; That goto is too much. > + > +unlock: > + mutex_unlock(&ctx->irq_lock); > + return rc; > +} > +EXPORT_SYMBOL_GPL(ocxl_irq_set_handler); > + > static irqreturn_t afu_irq_handler(int virq, void *data) > { > struct afu_irq *irq = (struct afu_irq *) data; > > trace_ocxl_afu_irq_receive(virq); > - if (irq->ev_ctx) > - eventfd_signal(irq->ev_ctx, 1); > - return IRQ_HANDLED; > + > + if (irq->handler) > + return irq->handler(irq->private); > + > + return IRQ_HANDLED; // Just drop it on the ground > } > > static int setup_afu_irq(struct ocxl_context *ctx, struct afu_irq *irq) > @@ -118,6 +149,8 @@ int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id) > return rc; > } > > +EXPORT_SYMBOL_GPL(ocxl_afu_irq_alloc); nit: checkpatch doesn't like the empty line between the function and its symbol export. Also true for a few other symbols in that file. > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index a8fe0ce4ea67..1b48e9d63abb 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -161,6 +161,52 @@ int ocxl_context_attach(struct ocxl_context *ctx, u64 amr, > */ > int ocxl_context_detach(struct ocxl_context *ctx); > > +// AFU IRQs > + > +/** > + * Allocate an IRQ associated with an AFU context > + * @ctx: the AFU context > + * @irq_id: out, the IRQ ID > + * > + * Returns 0 on success, negative on failure > + */ > +extern int ocxl_afu_irq_alloc(struct ocxl_context *ctx, int *irq_id); > + > +/** > + * Frees an IRQ associated with an AFU context > + * @ctx: the AFU context > + * @irq_id: the IRQ ID > + * > + * Returns 0 on success, negative on failure > + */ > +extern int ocxl_afu_irq_free(struct ocxl_context *ctx, int irq_id); > + > +/** > + * Gets the address of the trigger page for an IRQ > + * This can then be provided to an AFU which will write to that > + * page to trigger the IRQ. > + * @ctx: The AFU context that the IRQ is associated with > + * @irq_id: The IRQ ID > + * > + * returns the trigger page address, or 0 if the IRQ is not valid > + */ > +extern u64 ocxl_afu_irq_get_addr(struct ocxl_context *ctx, int irq_id); > + > +/** > + * Provide a callback to be called when an IRQ is triggered > + * @ctx: The AFU context that the IRQ is associated with > + * @irq_id: The IRQ ID > + * @handler: the callback to be called when the IRQ is triggered > + * @free_private: the callback to be called when the IRQ is freed We should mention free_private can be NULL, in which case it is ignored. Fred ^ permalink raw reply [flat|nested] 156+ messages in thread
* [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 5:44 ` Alastair D'Silva -1 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Greg Kurz, Frederic Barrat, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> External drivers that communicate via OpenCAPI will need to make MMIO calls to interact with the devices. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/Makefile | 2 +- drivers/misc/ocxl/mmio.c | 234 +++++++++++++++++++++++++++++++++++++ include/misc/ocxl.h | 110 +++++++++++++++++ 3 files changed, 345 insertions(+), 1 deletion(-) create mode 100644 drivers/misc/ocxl/mmio.c diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile index bc4e39bfda7b..d07d1bb8e8d4 100644 --- a/drivers/misc/ocxl/Makefile +++ b/drivers/misc/ocxl/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ ccflags-$(CONFIG_PPC_WERROR) += -Werror -ocxl-y += main.o pci.o config.o file.o pasid.o +ocxl-y += main.o pci.o config.o file.o pasid.o mmio.o ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o ocxl-y += core.o obj-$(CONFIG_OCXL) += ocxl.o diff --git a/drivers/misc/ocxl/mmio.c b/drivers/misc/ocxl/mmio.c new file mode 100644 index 000000000000..aae713db4ebe --- /dev/null +++ b/drivers/misc/ocxl/mmio.c @@ -0,0 +1,234 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2019 IBM Corp. +#include <linux/sched/mm.h> +#include "trace.h" +#include "ocxl_internal.h" + +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 *val) +{ + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + *val = readl_be((char *)afu->global_mmio_ptr + offset); + break; + + default: + *val = readl((char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read32); + +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 *val) +{ + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + *val = readq_be((char *)afu->global_mmio_ptr + offset); + break; + + default: + *val = readq((char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read64); + +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 val) +{ + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + writel_be(val, (char *)afu->global_mmio_ptr + offset); + break; + + default: + writel(val, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write32); + +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 val) +{ + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + writeq_be(val, (char *)afu->global_mmio_ptr + offset); + break; + + default: + writeq(val, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write64); + +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask) +{ + u32 tmp; + + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readl_be((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readl((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writel(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set32); + +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask) +{ + u64 tmp; + + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readq_be((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readq((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set64); + +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask) +{ + u32 tmp; + + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readl_be((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readl((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writel(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear32); + +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask) +{ + u64 tmp; + + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readq_be((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readq((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear64); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 1b48e9d63abb..e0742c00fb72 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -45,6 +45,12 @@ struct ocxl_fn_config { s8 max_afu_index; }; +enum ocxl_endian { + OCXL_BIG_ENDIAN = 0, /**< AFU data is big-endian */ + OCXL_LITTLE_ENDIAN = 1, /**< AFU data is little-endian */ + OCXL_HOST_ENDIAN = 2, /**< AFU data is the same endianness as the host */ +}; + // These are opaque outside the ocxl driver struct ocxl_afu; struct ocxl_fn; @@ -236,6 +242,110 @@ void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); */ void *ocxl_afu_get_private(struct ocxl_afu *dev); +// Global MMIO +/** + * Read a 32 bit value from global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: returns the value + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 *val); + +/** + * Read a 64 bit value from global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: returns the value + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 *val); + +/** + * Write a 32 bit value to global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: The value to write + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 val); + +/** + * Write a 64 bit value to global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: The value to write + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 val); + +/** + * Set bits in a 32 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask); + +/** + * Set bits in a 64 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask); + +/** + * Set bits in a 32 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask); + +/** + * Set bits in a 64 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask); // Functions left here are for compatibility with the cxlflash driver -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers @ 2019-03-25 5:44 ` Alastair D'Silva 0 siblings, 0 replies; 156+ messages in thread From: Alastair D'Silva @ 2019-03-25 5:44 UTC (permalink / raw) To: alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, Frederic Barrat, linuxppc-dev From: Alastair D'Silva <alastair@d-silva.org> External drivers that communicate via OpenCAPI will need to make MMIO calls to interact with the devices. Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Reviewed-by: Greg Kurz <groug@kaod.org> --- drivers/misc/ocxl/Makefile | 2 +- drivers/misc/ocxl/mmio.c | 234 +++++++++++++++++++++++++++++++++++++ include/misc/ocxl.h | 110 +++++++++++++++++ 3 files changed, 345 insertions(+), 1 deletion(-) create mode 100644 drivers/misc/ocxl/mmio.c diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile index bc4e39bfda7b..d07d1bb8e8d4 100644 --- a/drivers/misc/ocxl/Makefile +++ b/drivers/misc/ocxl/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ ccflags-$(CONFIG_PPC_WERROR) += -Werror -ocxl-y += main.o pci.o config.o file.o pasid.o +ocxl-y += main.o pci.o config.o file.o pasid.o mmio.o ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o ocxl-y += core.o obj-$(CONFIG_OCXL) += ocxl.o diff --git a/drivers/misc/ocxl/mmio.c b/drivers/misc/ocxl/mmio.c new file mode 100644 index 000000000000..aae713db4ebe --- /dev/null +++ b/drivers/misc/ocxl/mmio.c @@ -0,0 +1,234 @@ +// SPDX-License-Identifier: GPL-2.0+ +// Copyright 2019 IBM Corp. +#include <linux/sched/mm.h> +#include "trace.h" +#include "ocxl_internal.h" + +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 *val) +{ + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + *val = readl_be((char *)afu->global_mmio_ptr + offset); + break; + + default: + *val = readl((char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read32); + +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 *val) +{ + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + *val = readq_be((char *)afu->global_mmio_ptr + offset); + break; + + default: + *val = readq((char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read64); + +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 val) +{ + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + writel_be(val, (char *)afu->global_mmio_ptr + offset); + break; + + default: + writel(val, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write32); + +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 val) +{ + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + writeq_be(val, (char *)afu->global_mmio_ptr + offset); + break; + + default: + writeq(val, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write64); + +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask) +{ + u32 tmp; + + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readl_be((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readl((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writel(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set32); + +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask) +{ + u64 tmp; + + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readq_be((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readq((char *)afu->global_mmio_ptr + offset); + tmp |= mask; + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set64); + +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask) +{ + u32 tmp; + + if (offset > afu->config.global_mmio_size - 4) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readl_be((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readl((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writel(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear32); + +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask) +{ + u64 tmp; + + if (offset > afu->config.global_mmio_size - 8) + return -EINVAL; + +#ifdef __BIG_ENDIAN__ + if (endian == OCXL_HOST_ENDIAN) + endian = OCXL_BIG_ENDIAN; +#endif + + switch (endian) { + case OCXL_BIG_ENDIAN: + tmp = readq_be((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); + break; + + default: + tmp = readq((char *)afu->global_mmio_ptr + offset); + tmp &= ~mask; + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + break; + } + + writeq(tmp, (char *)afu->global_mmio_ptr + offset); + + return 0; +} +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear64); diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h index 1b48e9d63abb..e0742c00fb72 100644 --- a/include/misc/ocxl.h +++ b/include/misc/ocxl.h @@ -45,6 +45,12 @@ struct ocxl_fn_config { s8 max_afu_index; }; +enum ocxl_endian { + OCXL_BIG_ENDIAN = 0, /**< AFU data is big-endian */ + OCXL_LITTLE_ENDIAN = 1, /**< AFU data is little-endian */ + OCXL_HOST_ENDIAN = 2, /**< AFU data is the same endianness as the host */ +}; + // These are opaque outside the ocxl driver struct ocxl_afu; struct ocxl_fn; @@ -236,6 +242,110 @@ void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); */ void *ocxl_afu_get_private(struct ocxl_afu *dev); +// Global MMIO +/** + * Read a 32 bit value from global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: returns the value + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 *val); + +/** + * Read a 64 bit value from global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: returns the value + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 *val); + +/** + * Write a 32 bit value to global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: The value to write + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 val); + +/** + * Write a 64 bit value to global MMIO + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @val: The value to write + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 val); + +/** + * Set bits in a 32 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask); + +/** + * Set bits in a 64 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask); + +/** + * Set bits in a 32 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u32 mask); + +/** + * Set bits in a 64 bit global MMIO register + * + * @afu: The AFU + * @offset: The Offset from the start of MMIO + * @endian: the endianness that the MMIO data is in + * @mask: a mask of the bits to set + * + * Returns 0 for success, negative on error + */ +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, + enum ocxl_endian endian, u64 mask); // Functions left here are for compatibility with the cxlflash driver -- 2.20.1 ^ permalink raw reply related [flat|nested] 156+ messages in thread
* Re: [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers 2019-03-25 5:44 ` Alastair D'Silva @ 2019-03-25 15:49 ` Frederic Barrat -1 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:49 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Greg Kurz, Andrew Donnellan, Arnd Bergmann, Greg Kroah-Hartman, linux-kernel, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > External drivers that communicate via OpenCAPI will need to make > MMIO calls to interact with the devices. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/Makefile | 2 +- > drivers/misc/ocxl/mmio.c | 234 +++++++++++++++++++++++++++++++++++++ > include/misc/ocxl.h | 110 +++++++++++++++++ > 3 files changed, 345 insertions(+), 1 deletion(-) > create mode 100644 drivers/misc/ocxl/mmio.c > > diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile > index bc4e39bfda7b..d07d1bb8e8d4 100644 > --- a/drivers/misc/ocxl/Makefile > +++ b/drivers/misc/ocxl/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0+ > ccflags-$(CONFIG_PPC_WERROR) += -Werror > > -ocxl-y += main.o pci.o config.o file.o pasid.o > +ocxl-y += main.o pci.o config.o file.o pasid.o mmio.o > ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o > ocxl-y += core.o > obj-$(CONFIG_OCXL) += ocxl.o > diff --git a/drivers/misc/ocxl/mmio.c b/drivers/misc/ocxl/mmio.c > new file mode 100644 > index 000000000000..aae713db4ebe > --- /dev/null > +++ b/drivers/misc/ocxl/mmio.c > @@ -0,0 +1,234 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2019 IBM Corp. > +#include <linux/sched/mm.h> > +#include "trace.h" > +#include "ocxl_internal.h" > + > +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 *val) > +{ > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + *val = readl_be((char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + *val = readl((char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read32); > + > +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 *val) > +{ > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + *val = readq_be((char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + *val = readq((char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read64); > + > +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 val) > +{ > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + writel_be(val, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + writel(val, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write32); > + > +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 val) > +{ > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + writeq_be(val, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + writeq(val, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write64); > + > +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask) > +{ > + u32 tmp; > + > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readl_be((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readl((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writel(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set32); > + > +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask) > +{ > + u64 tmp; > + > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readq_be((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readq((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set64); > + > +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask) > +{ > + u32 tmp; > + > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readl_be((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readl((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writel(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear32); > + > +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask) > +{ > + u64 tmp; > + > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readq_be((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readq((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear64); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 1b48e9d63abb..e0742c00fb72 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -45,6 +45,12 @@ struct ocxl_fn_config { > s8 max_afu_index; > }; > > +enum ocxl_endian { > + OCXL_BIG_ENDIAN = 0, /**< AFU data is big-endian */ > + OCXL_LITTLE_ENDIAN = 1, /**< AFU data is little-endian */ > + OCXL_HOST_ENDIAN = 2, /**< AFU data is the same endianness as the host */ > +}; > + > // These are opaque outside the ocxl driver > struct ocxl_afu; > struct ocxl_fn; > @@ -236,6 +242,110 @@ void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); > */ > void *ocxl_afu_get_private(struct ocxl_afu *dev); > > +// Global MMIO > +/** > + * Read a 32 bit value from global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: returns the value > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 *val); > + > +/** > + * Read a 64 bit value from global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: returns the value > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 *val); > + > +/** > + * Write a 32 bit value to global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: The value to write > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 val); > + > +/** > + * Write a 64 bit value to global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: The value to write > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 val); > + > +/** > + * Set bits in a 32 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask); > + > +/** > + * Set bits in a 64 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask); > + > +/** > + * Set bits in a 32 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask); > + > +/** > + * Set bits in a 64 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask); > > // Functions left here are for compatibility with the cxlflash driver > > ^ permalink raw reply [flat|nested] 156+ messages in thread
* Re: [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers @ 2019-03-25 15:49 ` Frederic Barrat 0 siblings, 0 replies; 156+ messages in thread From: Frederic Barrat @ 2019-03-25 15:49 UTC (permalink / raw) To: Alastair D'Silva, alastair Cc: Arnd Bergmann, Greg Kroah-Hartman, Greg Kurz, linux-kernel, Andrew Donnellan, linuxppc-dev Le 25/03/2019 à 06:44, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > External drivers that communicate via OpenCAPI will need to make > MMIO calls to interact with the devices. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > Reviewed-by: Greg Kurz <groug@kaod.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.ibm.com> > drivers/misc/ocxl/Makefile | 2 +- > drivers/misc/ocxl/mmio.c | 234 +++++++++++++++++++++++++++++++++++++ > include/misc/ocxl.h | 110 +++++++++++++++++ > 3 files changed, 345 insertions(+), 1 deletion(-) > create mode 100644 drivers/misc/ocxl/mmio.c > > diff --git a/drivers/misc/ocxl/Makefile b/drivers/misc/ocxl/Makefile > index bc4e39bfda7b..d07d1bb8e8d4 100644 > --- a/drivers/misc/ocxl/Makefile > +++ b/drivers/misc/ocxl/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0+ > ccflags-$(CONFIG_PPC_WERROR) += -Werror > > -ocxl-y += main.o pci.o config.o file.o pasid.o > +ocxl-y += main.o pci.o config.o file.o pasid.o mmio.o > ocxl-y += link.o context.o afu_irq.o sysfs.o trace.o > ocxl-y += core.o > obj-$(CONFIG_OCXL) += ocxl.o > diff --git a/drivers/misc/ocxl/mmio.c b/drivers/misc/ocxl/mmio.c > new file mode 100644 > index 000000000000..aae713db4ebe > --- /dev/null > +++ b/drivers/misc/ocxl/mmio.c > @@ -0,0 +1,234 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// Copyright 2019 IBM Corp. > +#include <linux/sched/mm.h> > +#include "trace.h" > +#include "ocxl_internal.h" > + > +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 *val) > +{ > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + *val = readl_be((char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + *val = readl((char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read32); > + > +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 *val) > +{ > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + *val = readq_be((char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + *val = readq((char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_read64); > + > +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 val) > +{ > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + writel_be(val, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + writel(val, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write32); > + > +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 val) > +{ > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + writeq_be(val, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + writeq(val, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_write64); > + > +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask) > +{ > + u32 tmp; > + > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readl_be((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readl((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writel(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set32); > + > +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask) > +{ > + u64 tmp; > + > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readq_be((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readq((char *)afu->global_mmio_ptr + offset); > + tmp |= mask; > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_set64); > + > +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask) > +{ > + u32 tmp; > + > + if (offset > afu->config.global_mmio_size - 4) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readl_be((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writel_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readl((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writel(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear32); > + > +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask) > +{ > + u64 tmp; > + > + if (offset > afu->config.global_mmio_size - 8) > + return -EINVAL; > + > +#ifdef __BIG_ENDIAN__ > + if (endian == OCXL_HOST_ENDIAN) > + endian = OCXL_BIG_ENDIAN; > +#endif > + > + switch (endian) { > + case OCXL_BIG_ENDIAN: > + tmp = readq_be((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writeq_be(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + > + default: > + tmp = readq((char *)afu->global_mmio_ptr + offset); > + tmp &= ~mask; > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + break; > + } > + > + writeq(tmp, (char *)afu->global_mmio_ptr + offset); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(ocxl_global_mmio_clear64); > diff --git a/include/misc/ocxl.h b/include/misc/ocxl.h > index 1b48e9d63abb..e0742c00fb72 100644 > --- a/include/misc/ocxl.h > +++ b/include/misc/ocxl.h > @@ -45,6 +45,12 @@ struct ocxl_fn_config { > s8 max_afu_index; > }; > > +enum ocxl_endian { > + OCXL_BIG_ENDIAN = 0, /**< AFU data is big-endian */ > + OCXL_LITTLE_ENDIAN = 1, /**< AFU data is little-endian */ > + OCXL_HOST_ENDIAN = 2, /**< AFU data is the same endianness as the host */ > +}; > + > // These are opaque outside the ocxl driver > struct ocxl_afu; > struct ocxl_fn; > @@ -236,6 +242,110 @@ void ocxl_afu_set_private(struct ocxl_afu *afu, void *private); > */ > void *ocxl_afu_get_private(struct ocxl_afu *dev); > > +// Global MMIO > +/** > + * Read a 32 bit value from global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: returns the value > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_read32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 *val); > + > +/** > + * Read a 64 bit value from global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: returns the value > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_read64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 *val); > + > +/** > + * Write a 32 bit value to global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: The value to write > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_write32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 val); > + > +/** > + * Write a 64 bit value to global MMIO > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @val: The value to write > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_write64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 val); > + > +/** > + * Set bits in a 32 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_set32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask); > + > +/** > + * Set bits in a 64 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_set64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask); > + > +/** > + * Set bits in a 32 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_clear32(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u32 mask); > + > +/** > + * Set bits in a 64 bit global MMIO register > + * > + * @afu: The AFU > + * @offset: The Offset from the start of MMIO > + * @endian: the endianness that the MMIO data is in > + * @mask: a mask of the bits to set > + * > + * Returns 0 for success, negative on error > + */ > +int ocxl_global_mmio_clear64(struct ocxl_afu *afu, size_t offset, > + enum ocxl_endian endian, u64 mask); > > // Functions left here are for compatibility with the cxlflash driver > > ^ permalink raw reply [flat|nested] 156+ messages in thread
end of thread, other threads:[~2019-05-03 7:00 UTC | newest] Thread overview: 156+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-02-27 4:57 [PATCH 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 4:57 ` [PATCH 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 7:15 ` Andrew Donnellan 2019-02-27 7:15 ` Andrew Donnellan 2019-02-27 7:34 ` Alastair D'Silva 2019-02-27 7:34 ` Alastair D'Silva 2019-02-27 7:54 ` Andrew Donnellan 2019-02-27 7:54 ` Andrew Donnellan 2019-02-27 8:04 ` Alastair D'Silva 2019-02-27 8:04 ` Alastair D'Silva 2019-02-27 8:18 ` Andrew Donnellan 2019-02-27 8:18 ` Andrew Donnellan 2019-02-27 13:45 ` Frederic Barrat 2019-02-27 13:45 ` Frederic Barrat 2019-02-27 13:59 ` Greg Kurz 2019-02-27 13:59 ` Greg Kurz 2019-02-27 13:53 ` Greg Kurz 2019-02-27 13:53 ` Greg Kurz 2019-02-27 4:57 ` [PATCH 2/5] ocxl: Clean up printf formats Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 13:40 ` Frederic Barrat 2019-02-27 13:40 ` Frederic Barrat 2019-02-28 5:02 ` Andrew Donnellan 2019-02-28 5:02 ` Andrew Donnellan 2019-03-02 1:13 ` Joe Perches 2019-03-02 1:13 ` Joe Perches 2019-02-27 4:57 ` [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 13:25 ` Frederic Barrat 2019-02-27 13:25 ` Frederic Barrat 2019-02-28 5:03 ` Andrew Donnellan 2019-02-28 5:03 ` Andrew Donnellan 2019-02-27 4:57 ` [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 13:36 ` Frederic Barrat 2019-02-27 13:36 ` Frederic Barrat 2019-02-28 5:05 ` Andrew Donnellan 2019-02-28 5:05 ` Andrew Donnellan 2019-02-27 4:57 ` [PATCH 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva 2019-02-27 4:57 ` Alastair D'Silva 2019-02-27 13:39 ` Frederic Barrat 2019-02-27 13:39 ` Frederic Barrat 2019-02-28 5:23 ` Andrew Donnellan 2019-02-28 5:23 ` Andrew Donnellan 2019-03-13 4:06 ` [PATCH v2 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva 2019-03-13 4:06 ` Alastair D'Silva 2019-03-13 4:06 ` [PATCH 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva 2019-03-13 4:06 ` Alastair D'Silva 2019-03-15 6:58 ` Andrew Donnellan 2019-03-15 6:58 ` Andrew Donnellan 2019-03-13 4:06 ` [PATCH 2/5] ocxl: Clean up printf formats Alastair D'Silva 2019-03-13 4:06 ` Alastair D'Silva 2019-03-13 8:24 ` Greg Kurz 2019-03-14 4:58 ` Andrew Donnellan 2019-03-14 4:58 ` Andrew Donnellan 2019-03-13 4:06 ` [PATCH 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva 2019-03-13 4:06 ` Alastair D'Silva 2019-03-14 4:59 ` Andrew Donnellan 2019-03-14 4:59 ` Andrew Donnellan 2019-03-13 4:07 ` [PATCH 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva 2019-03-13 4:07 ` Alastair D'Silva 2019-03-13 8:28 ` Greg Kurz 2019-03-14 5:08 ` Andrew Donnellan 2019-03-14 5:08 ` Andrew Donnellan 2019-03-13 4:07 ` [PATCH 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva 2019-03-13 4:07 ` Alastair D'Silva 2019-03-13 9:10 ` Greg Kurz 2019-03-14 2:23 ` Alastair D'Silva 2019-03-14 6:50 ` Greg Kurz 2019-03-15 4:49 ` Andrew Donnellan 2019-03-15 4:49 ` Andrew Donnellan 2019-03-15 5:07 ` Andrew Donnellan 2019-03-15 5:07 ` Andrew Donnellan 2019-03-20 5:34 ` [PATCH v3 0/5] ocxl: OpenCAPI Cleanup Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-20 5:34 ` [PATCH v3 1/5] ocxl: Rename struct link to ocxl_link Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-20 5:34 ` [PATCH v3 2/5] ocxl: Clean up printf formats Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-20 17:24 ` Joe Perches 2019-03-20 17:24 ` Joe Perches 2019-03-20 5:34 ` [PATCH v3 3/5] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-20 5:34 ` [PATCH v3 4/5] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-20 5:34 ` [PATCH v3 5/5] ocxl: Remove some unused exported symbols Alastair D'Silva 2019-03-20 5:34 ` Alastair D'Silva 2019-03-25 5:34 ` [PATCH v4 0/4] ocxl: OpenCAPI Cleanup Alastair D'Silva 2019-03-25 5:34 ` Alastair D'Silva 2019-03-25 5:34 ` [PATCH v4 1/4] ocxl: Rename struct link to ocxl_link Alastair D'Silva 2019-03-25 5:34 ` Alastair D'Silva 2019-04-03 14:18 ` Frederic Barrat 2019-04-03 14:18 ` Frederic Barrat 2019-04-05 7:05 ` Andrew Donnellan 2019-04-05 7:05 ` Andrew Donnellan 2019-05-03 6:59 ` Michael Ellerman 2019-03-25 5:34 ` [PATCH v4 2/4] ocxl: read_pasid never returns an error, so make it void Alastair D'Silva 2019-03-25 5:34 ` Alastair D'Silva 2019-04-03 14:20 ` Frederic Barrat 2019-04-03 14:20 ` Frederic Barrat 2019-04-05 7:05 ` Andrew Donnellan 2019-04-05 7:05 ` Andrew Donnellan 2019-03-25 5:34 ` [PATCH v4 3/4] ocxl: Remove superfluous 'extern' from headers Alastair D'Silva 2019-03-25 5:34 ` Alastair D'Silva 2019-03-25 16:55 ` Greg Kurz 2019-03-25 16:55 ` Greg Kurz 2019-04-03 14:20 ` Frederic Barrat 2019-04-03 14:20 ` Frederic Barrat 2019-04-05 7:09 ` Andrew Donnellan 2019-04-05 7:09 ` Andrew Donnellan 2019-03-25 5:34 ` [PATCH v4 4/4] ocxl: Remove some unused exported symbols Alastair D'Silva 2019-03-25 5:34 ` Alastair D'Silva 2019-03-25 16:57 ` Greg Kurz 2019-03-25 16:57 ` Greg Kurz 2019-04-03 14:23 ` Frederic Barrat 2019-04-03 14:23 ` Frederic Barrat 2019-04-05 7:28 ` Andrew Donnellan 2019-04-05 7:28 ` Andrew Donnellan 2019-03-25 16:49 ` [PATCH v4 0/4] ocxl: OpenCAPI Cleanup Greg Kurz 2019-03-25 16:49 ` Greg Kurz 2019-03-25 17:34 ` Frederic Barrat 2019-03-25 17:34 ` Frederic Barrat 2019-03-25 21:45 ` Alastair D'Silva 2019-03-25 21:45 ` Alastair D'Silva 2019-03-25 5:44 ` [PATCH v3 0/7] Refactor OCXL driver to allow external drivers to use it Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 5:44 ` [PATCH v3 1/7] ocxl: Split pci.c Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 10:01 ` Frederic Barrat 2019-03-25 10:01 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 2/7] ocxl: Don't pass pci_dev around Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 10:04 ` Frederic Barrat 2019-03-25 10:04 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 3/7] ocxl: Create a clear delineation between ocxl backend & frontend Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 15:11 ` Frederic Barrat 2019-03-25 15:11 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 4/7] ocxl: Allow external drivers to use OpenCAPI contexts Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 15:13 ` Frederic Barrat 2019-03-25 15:13 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 5/7] ocxl: afu_irq only deals with IRQ IDs, not offsets Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 15:24 ` Frederic Barrat 2019-03-25 15:24 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 6/7] ocxl: move event_fd handling to frontend Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 15:41 ` Frederic Barrat 2019-03-25 15:41 ` Frederic Barrat 2019-03-25 5:44 ` [PATCH v3 7/7] ocxl: Provide global MMIO accessors for external drivers Alastair D'Silva 2019-03-25 5:44 ` Alastair D'Silva 2019-03-25 15:49 ` Frederic Barrat 2019-03-25 15:49 ` Frederic Barrat
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.