aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2015-05-27 02:07:09 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-06-02 23:27:18 -0400
commitb12994fbfe9362e3b5ed9f360d3cd6fb34d6645a (patch)
treee2c9d1a7e755a0de3509e467beec43fcbdc1dce5
parenteda3693c842ed169af66af943554c648633769d0 (diff)
cxl: cxl_afu_reset() -> __cxl_afu_reset()
Rename cxl_afu_reset() to __cxl_afu_reset() to we can reuse this function name in the API. Signed-off-by: Michael Neuling <mikey@neuling.org> Acked-by: Ian Munsie <imunsie@au1.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--drivers/misc/cxl/cxl.h2
-rw-r--r--drivers/misc/cxl/native.c8
-rw-r--r--drivers/misc/cxl/pci.c4
-rw-r--r--drivers/misc/cxl/sysfs.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 7b7509c79e11..d6570a7ee4ef 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -661,7 +661,7 @@ int cxl_check_error(struct cxl_afu *afu);
661int cxl_afu_slbia(struct cxl_afu *afu); 661int cxl_afu_slbia(struct cxl_afu *afu);
662int cxl_tlb_slb_invalidate(struct cxl *adapter); 662int cxl_tlb_slb_invalidate(struct cxl *adapter);
663int cxl_afu_disable(struct cxl_afu *afu); 663int cxl_afu_disable(struct cxl_afu *afu);
664int cxl_afu_reset(struct cxl_afu *afu); 664int __cxl_afu_reset(struct cxl_afu *afu);
665int cxl_psl_purge(struct cxl_afu *afu); 665int cxl_psl_purge(struct cxl_afu *afu);
666 666
667void cxl_stop_trace(struct cxl *cxl); 667void cxl_stop_trace(struct cxl *cxl);
diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index 29185fc61276..f85b6ae5ecf2 100644
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -73,7 +73,7 @@ int cxl_afu_disable(struct cxl_afu *afu)
73} 73}
74 74
75/* This will disable as well as reset */ 75/* This will disable as well as reset */
76int cxl_afu_reset(struct cxl_afu *afu) 76int __cxl_afu_reset(struct cxl_afu *afu)
77{ 77{
78 pr_devel("AFU reset request\n"); 78 pr_devel("AFU reset request\n");
79 79
@@ -495,7 +495,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu)
495 cxl_sysfs_afu_m_remove(afu); 495 cxl_sysfs_afu_m_remove(afu);
496 cxl_chardev_afu_remove(afu); 496 cxl_chardev_afu_remove(afu);
497 497
498 cxl_afu_reset(afu); 498 __cxl_afu_reset(afu);
499 cxl_afu_disable(afu); 499 cxl_afu_disable(afu);
500 cxl_psl_purge(afu); 500 cxl_psl_purge(afu);
501 501
@@ -566,7 +566,7 @@ static int attach_dedicated(struct cxl_context *ctx, u64 wed, u64 amr)
566 /* master only context for dedicated */ 566 /* master only context for dedicated */
567 assign_psn_space(ctx); 567 assign_psn_space(ctx);
568 568
569 if ((rc = cxl_afu_reset(afu))) 569 if ((rc = __cxl_afu_reset(afu)))
570 return rc; 570 return rc;
571 571
572 cxl_p2n_write(afu, CXL_PSL_WED_An, wed); 572 cxl_p2n_write(afu, CXL_PSL_WED_An, wed);
@@ -629,7 +629,7 @@ int cxl_attach_process(struct cxl_context *ctx, bool kernel, u64 wed, u64 amr)
629 629
630static inline int detach_process_native_dedicated(struct cxl_context *ctx) 630static inline int detach_process_native_dedicated(struct cxl_context *ctx)
631{ 631{
632 cxl_afu_reset(ctx->afu); 632 __cxl_afu_reset(ctx->afu);
633 cxl_afu_disable(ctx->afu); 633 cxl_afu_disable(ctx->afu);
634 cxl_psl_purge(ctx->afu); 634 cxl_psl_purge(ctx->afu);
635 return 0; 635 return 0;
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 12fa40676320..88de2ce79dca 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -657,7 +657,7 @@ static int sanitise_afu_regs(struct cxl_afu *afu)
657 reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An); 657 reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An);
658 if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) { 658 if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) {
659 dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg); 659 dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg);
660 if (cxl_afu_reset(afu)) 660 if (__cxl_afu_reset(afu))
661 return -EIO; 661 return -EIO;
662 if (cxl_afu_disable(afu)) 662 if (cxl_afu_disable(afu))
663 return -EIO; 663 return -EIO;
@@ -761,7 +761,7 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
761 goto err2; 761 goto err2;
762 762
763 /* We need to reset the AFU before we can read the AFU descriptor */ 763 /* We need to reset the AFU before we can read the AFU descriptor */
764 if ((rc = cxl_afu_reset(afu))) 764 if ((rc = __cxl_afu_reset(afu)))
765 goto err2; 765 goto err2;
766 766
767 if (cxl_verbose) 767 if (cxl_verbose)
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index 4942d55ba77f..31f38bc71a3d 100644
--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -185,7 +185,7 @@ static ssize_t reset_store_afu(struct device *device,
185 goto err; 185 goto err;
186 } 186 }
187 187
188 if ((rc = cxl_afu_reset(afu))) 188 if ((rc = __cxl_afu_reset(afu)))
189 goto err; 189 goto err;
190 190
191 rc = count; 191 rc = count;