Commit b12994fb authored by Michael Neuling's avatar Michael Neuling Committed by Michael Ellerman

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: default avatarMichael Neuling <mikey@neuling.org>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eda3693c
...@@ -661,7 +661,7 @@ int cxl_check_error(struct cxl_afu *afu); ...@@ -661,7 +661,7 @@ int cxl_check_error(struct cxl_afu *afu);
int cxl_afu_slbia(struct cxl_afu *afu); int cxl_afu_slbia(struct cxl_afu *afu);
int cxl_tlb_slb_invalidate(struct cxl *adapter); int cxl_tlb_slb_invalidate(struct cxl *adapter);
int cxl_afu_disable(struct cxl_afu *afu); int cxl_afu_disable(struct cxl_afu *afu);
int cxl_afu_reset(struct cxl_afu *afu); int __cxl_afu_reset(struct cxl_afu *afu);
int cxl_psl_purge(struct cxl_afu *afu); int cxl_psl_purge(struct cxl_afu *afu);
void cxl_stop_trace(struct cxl *cxl); void cxl_stop_trace(struct cxl *cxl);
......
...@@ -73,7 +73,7 @@ int cxl_afu_disable(struct cxl_afu *afu) ...@@ -73,7 +73,7 @@ int cxl_afu_disable(struct cxl_afu *afu)
} }
/* This will disable as well as reset */ /* This will disable as well as reset */
int cxl_afu_reset(struct cxl_afu *afu) int __cxl_afu_reset(struct cxl_afu *afu)
{ {
pr_devel("AFU reset request\n"); pr_devel("AFU reset request\n");
...@@ -495,7 +495,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu) ...@@ -495,7 +495,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu)
cxl_sysfs_afu_m_remove(afu); cxl_sysfs_afu_m_remove(afu);
cxl_chardev_afu_remove(afu); cxl_chardev_afu_remove(afu);
cxl_afu_reset(afu); __cxl_afu_reset(afu);
cxl_afu_disable(afu); cxl_afu_disable(afu);
cxl_psl_purge(afu); cxl_psl_purge(afu);
...@@ -566,7 +566,7 @@ static int attach_dedicated(struct cxl_context *ctx, u64 wed, u64 amr) ...@@ -566,7 +566,7 @@ static int attach_dedicated(struct cxl_context *ctx, u64 wed, u64 amr)
/* master only context for dedicated */ /* master only context for dedicated */
assign_psn_space(ctx); assign_psn_space(ctx);
if ((rc = cxl_afu_reset(afu))) if ((rc = __cxl_afu_reset(afu)))
return rc; return rc;
cxl_p2n_write(afu, CXL_PSL_WED_An, wed); 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,7 +629,7 @@ int cxl_attach_process(struct cxl_context *ctx, bool kernel, u64 wed, u64 amr)
static inline int detach_process_native_dedicated(struct cxl_context *ctx) static inline int detach_process_native_dedicated(struct cxl_context *ctx)
{ {
cxl_afu_reset(ctx->afu); __cxl_afu_reset(ctx->afu);
cxl_afu_disable(ctx->afu); cxl_afu_disable(ctx->afu);
cxl_psl_purge(ctx->afu); cxl_psl_purge(ctx->afu);
return 0; return 0;
......
...@@ -657,7 +657,7 @@ static int sanitise_afu_regs(struct cxl_afu *afu) ...@@ -657,7 +657,7 @@ static int sanitise_afu_regs(struct cxl_afu *afu)
reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An); reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An);
if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) { if ((reg & CXL_AFU_Cntl_An_ES_MASK) != CXL_AFU_Cntl_An_ES_Disabled) {
dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg); dev_warn(&afu->dev, "WARNING: AFU was not disabled: %#.16llx\n", reg);
if (cxl_afu_reset(afu)) if (__cxl_afu_reset(afu))
return -EIO; return -EIO;
if (cxl_afu_disable(afu)) if (cxl_afu_disable(afu))
return -EIO; return -EIO;
...@@ -761,7 +761,7 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev) ...@@ -761,7 +761,7 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
goto err2; goto err2;
/* We need to reset the AFU before we can read the AFU descriptor */ /* We need to reset the AFU before we can read the AFU descriptor */
if ((rc = cxl_afu_reset(afu))) if ((rc = __cxl_afu_reset(afu)))
goto err2; goto err2;
if (cxl_verbose) if (cxl_verbose)
......
...@@ -185,7 +185,7 @@ static ssize_t reset_store_afu(struct device *device, ...@@ -185,7 +185,7 @@ static ssize_t reset_store_afu(struct device *device,
goto err; goto err;
} }
if ((rc = cxl_afu_reset(afu))) if ((rc = __cxl_afu_reset(afu)))
goto err; goto err;
rc = count; rc = count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment