mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 12:11:59 +00:00
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>
This commit is contained in:
parent
eda3693c84
commit
b12994fbfe
@ -661,7 +661,7 @@ int cxl_check_error(struct cxl_afu *afu);
|
||||
int cxl_afu_slbia(struct cxl_afu *afu);
|
||||
int cxl_tlb_slb_invalidate(struct cxl *adapter);
|
||||
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);
|
||||
|
||||
void cxl_stop_trace(struct cxl *cxl);
|
||||
|
@ -73,7 +73,7 @@ int cxl_afu_disable(struct cxl_afu *afu)
|
||||
}
|
||||
|
||||
/* 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");
|
||||
|
||||
@ -495,7 +495,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu)
|
||||
cxl_sysfs_afu_m_remove(afu);
|
||||
cxl_chardev_afu_remove(afu);
|
||||
|
||||
cxl_afu_reset(afu);
|
||||
__cxl_afu_reset(afu);
|
||||
cxl_afu_disable(afu);
|
||||
cxl_psl_purge(afu);
|
||||
|
||||
@ -566,7 +566,7 @@ static int attach_dedicated(struct cxl_context *ctx, u64 wed, u64 amr)
|
||||
/* master only context for dedicated */
|
||||
assign_psn_space(ctx);
|
||||
|
||||
if ((rc = cxl_afu_reset(afu)))
|
||||
if ((rc = __cxl_afu_reset(afu)))
|
||||
return rc;
|
||||
|
||||
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)
|
||||
|
||||
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_psl_purge(ctx->afu);
|
||||
return 0;
|
||||
|
@ -657,7 +657,7 @@ static int sanitise_afu_regs(struct cxl_afu *afu)
|
||||
reg = cxl_p2n_read(afu, CXL_AFU_Cntl_An);
|
||||
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);
|
||||
if (cxl_afu_reset(afu))
|
||||
if (__cxl_afu_reset(afu))
|
||||
return -EIO;
|
||||
if (cxl_afu_disable(afu))
|
||||
return -EIO;
|
||||
@ -761,7 +761,7 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
|
||||
goto err2;
|
||||
|
||||
/* 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;
|
||||
|
||||
if (cxl_verbose)
|
||||
|
@ -185,7 +185,7 @@ static ssize_t reset_store_afu(struct device *device,
|
||||
goto err;
|
||||
}
|
||||
|
||||
if ((rc = cxl_afu_reset(afu)))
|
||||
if ((rc = __cxl_afu_reset(afu)))
|
||||
goto err;
|
||||
|
||||
rc = count;
|
||||
|
Loading…
Reference in New Issue
Block a user