Browse Source

ocxl: Rename pnv_ocxl_spa_remove_pe to clarify it's action

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>
Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Alastair D'Silva 7 years ago
parent
commit
19df39581c

+ 1 - 1
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,
 extern int pnv_ocxl_spa_setup(struct pci_dev *dev, void *spa_mem, int PE_mask,
 			void **platform_data);
 			void **platform_data);
 extern void pnv_ocxl_spa_release(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 int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr);
 extern void pnv_ocxl_free_xive_irq(u32 irq);
 extern void pnv_ocxl_free_xive_irq(u32 irq);

+ 2 - 2
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);
 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;
 	struct spa_data *data = (struct spa_data *) platform_data;
 	int rc;
 	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);
 	rc = opal_npu_spa_clear_cache(data->phb_opal_id, data->bdfn, pe_handle);
 	return rc;
 	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)
 int pnv_ocxl_alloc_xive_irq(u32 *irq, u64 *trigger_addr)
 {
 {

+ 1 - 1
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
 	 * On powerpc, the entry needs to be cleared from the context
 	 * cache of the NPU.
 	 * 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);
 	WARN_ON(rc);
 
 
 	pe_data = radix_tree_delete(&spa->pe_tree, pe_handle);
 	pe_data = radix_tree_delete(&spa->pe_tree, pe_handle);