Message ID | 20180511061303.10728-5-alastair@au1.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 19df39581ce99eb1fcfb119945810c9c5bc3f8d4 |
Headers | show |
Series | ocxl: Implement Power9 as_notify/wait for OpenCAPI | expand |
Le 11/05/2018 à 08:13, Alastair D'Silva a écrit : > From: Alastair D'Silva <alastair@d-silva.org> > > The function removes the process element from NPU cache. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> > --- Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> > arch/powerpc/include/asm/pnv-ocxl.h | 2 +- > arch/powerpc/platforms/powernv/ocxl.c | 4 ++-- > drivers/misc/ocxl/link.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/powerpc/include/asm/pnv-ocxl.h b/arch/powerpc/include/asm/pnv-ocxl.h > index f6945d3bc971..208b5503f4ed 100644 > --- a/arch/powerpc/include/asm/pnv-ocxl.h > +++ b/arch/powerpc/include/asm/pnv-ocxl.h > @@ -28,7 +28,7 @@ extern int pnv_ocxl_map_xsl_regs(struct pci_dev *dev, void __iomem **dsisr, > extern int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask, > void **platform_data); > extern void pnv_ocxl_spa_release(void *platform_data); > -extern int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle); > +extern int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle); > > extern int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr); > extern void pnv_ocxl_free_xive_irq(u32 irq); > diff --git a/arch/powerpc/platforms/powernv/ocxl.c b/arch/powerpc/platforms/powernv/ocxl.c > index fa9b53af3c7b..8c65aacda9c8 100644 > --- a/arch/powerpc/platforms/powernv/ocxl.c > +++ b/arch/powerpc/platforms/powernv/ocxl.c > @@ -475,7 +475,7 @@ void pnv_ocxl_spa_release(void *platform_data) > } > EXPORT_SYMBOL_GPL(pnv_ocxl_spa_release); > > -int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle) > +int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle) > { > struct spa_data *data = (struct spa_data *) platform_data; > int rc; > @@ -483,7 +483,7 @@ int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle) > rc = opal_npu_spa_clear_cache(data->phb_opal_id, data->bdfn, pe_handle); > return rc; > } > -EXPORT_SYMBOL_GPL(pnv_ocxl_spa_remove_pe); > +EXPORT_SYMBOL_GPL(pnv_ocxl_spa_remove_pe_from_cache); > > int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr) > { > diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c > index f30790582dc0..656e8610eec2 100644 > --- a/drivers/misc/ocxl/link.c > +++ b/drivers/misc/ocxl/link.c > @@ -599,7 +599,7 @@ int ocxl_link_remove_pe(void *link_handle, int pasid) > * On powerpc, the entry needs to be cleared from the context > * cache of the NPU. > */ > - rc = pnv_ocxl_spa_remove_pe(link->platform_data, pe_handle); > + rc = pnv_ocxl_spa_remove_pe_from_cache(link->platform_data, pe_handle); > WARN_ON(rc); > > pe_data = radix_tree_delete(&spa->pe_tree, pe_handle); >
On 11/05/18 16:13, Alastair D'Silva wrote: > From: Alastair D'Silva <alastair@d-silva.org> > > The function removes the process element from NPU cache. > > Signed-off-by: Alastair D'Silva <alastair@d-silva.org> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
diff --git a/arch/powerpc/include/asm/pnv-ocxl.h b/arch/powerpc/include/asm/pnv-ocxl.h index f6945d3bc971..208b5503f4ed 100644 --- a/arch/powerpc/include/asm/pnv-ocxl.h +++ b/arch/powerpc/include/asm/pnv-ocxl.h @@ -28,7 +28,7 @@ extern int pnv_ocxl_map_xsl_regs(struct pci_dev *dev, void __iomem **dsisr, extern int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask, void **platform_data); extern void pnv_ocxl_spa_release(void *platform_data); -extern int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle); +extern int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle); extern int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr); extern void pnv_ocxl_free_xive_irq(u32 irq); diff --git a/arch/powerpc/platforms/powernv/ocxl.c b/arch/powerpc/platforms/powernv/ocxl.c index fa9b53af3c7b..8c65aacda9c8 100644 --- a/arch/powerpc/platforms/powernv/ocxl.c +++ b/arch/powerpc/platforms/powernv/ocxl.c @@ -475,7 +475,7 @@ void pnv_ocxl_spa_release(void *platform_data) } EXPORT_SYMBOL_GPL(pnv_ocxl_spa_release); -int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle) +int pnv_ocxl_spa_remove_pe_from_cache(void *platform_data, int pe_handle) { struct spa_data *data = (struct spa_data *) platform_data; int rc; @@ -483,7 +483,7 @@ int pnv_ocxl_spa_remove_pe(void *platform_data, int pe_handle) rc = opal_npu_spa_clear_cache(data->phb_opal_id, data->bdfn, pe_handle); return rc; } -EXPORT_SYMBOL_GPL(pnv_ocxl_spa_remove_pe); +EXPORT_SYMBOL_GPL(pnv_ocxl_spa_remove_pe_from_cache); int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr) { diff --git a/drivers/misc/ocxl/link.c b/drivers/misc/ocxl/link.c index f30790582dc0..656e8610eec2 100644 --- a/drivers/misc/ocxl/link.c +++ b/drivers/misc/ocxl/link.c @@ -599,7 +599,7 @@ int ocxl_link_remove_pe(void *link_handle, int pasid) * On powerpc, the entry needs to be cleared from the context * cache of the NPU. */ - rc = pnv_ocxl_spa_remove_pe(link->platform_data, pe_handle); + rc = pnv_ocxl_spa_remove_pe_from_cache(link->platform_data, pe_handle); WARN_ON(rc); pe_data = radix_tree_delete(&spa->pe_tree, pe_handle);