Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f663527 authored by Michael Neuling's avatar Michael Neuling Committed by Michael Ellerman
Browse files

cxl: Configure PSL for kernel contexts and merge code 



This updates AFU directed and dedicated modes for contexts attached to the
kernel.

The SR (similar to the MSR in the core) calculation is getting
quite complex and is duplicated in AFU directed and dedicated
modes.  This patch also merges this SR calculation for these modes.

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 c358d84b

drivers/misc/cxl/native.c

+35 −28
Original line number Diff line number Diff line
@@ -430,34 +430,46 @@ static int activate_afu_directed(struct cxl_afu *afu) 
#define set_endian(sr) ((sr) &= ~(CXL_PSL_SR_An_LE))

#endif



static int attach_afu_directed(struct cxl_context *ctx, u64 wed, u64 amr)

static u64 calculate_sr(struct cxl_context *ctx)

{

	u64 sr;

	int r, result;



	cxl_assign_psn_space(ctx);



	ctx->elem->ctxtime = 0; /* disable */

	ctx->elem->lpid = cpu_to_be32(mfspr(SPRN_LPID));

	ctx->elem->haurp = 0; /* disable */

	ctx->elem->sdr = cpu_to_be64(mfspr(SPRN_SDR1));

	u64 sr = 0;



	sr = 0;

	if (ctx->master)

		sr |= CXL_PSL_SR_An_MP;

	if (mfspr(SPRN_LPCR) & LPCR_TC)

		sr |= CXL_PSL_SR_An_TC;

	/* HV=0, PR=1, R=1 for userspace

	 * For kernel contexts: this would need to change

	 */

	if (ctx->kernel) {

		sr |= CXL_PSL_SR_An_R | (mfmsr() & MSR_SF);

		sr |= CXL_PSL_SR_An_HV;

	} else {

		sr |= CXL_PSL_SR_An_PR | CXL_PSL_SR_An_R;

		set_endian(sr);

		sr &= ~(CXL_PSL_SR_An_HV);

		if (!test_tsk_thread_flag(current, TIF_32BIT))

			sr |= CXL_PSL_SR_An_SF;

	ctx->elem->common.pid = cpu_to_be32(current->pid);

	}

	return sr;

}



static int attach_afu_directed(struct cxl_context *ctx, u64 wed, u64 amr)

{

	u32 pid;

	int r, result;



	cxl_assign_psn_space(ctx);



	ctx->elem->ctxtime = 0; /* disable */

	ctx->elem->lpid = cpu_to_be32(mfspr(SPRN_LPID));

	ctx->elem->haurp = 0; /* disable */

	ctx->elem->sdr = cpu_to_be64(mfspr(SPRN_SDR1));



	pid = current->pid;

	if (ctx->kernel)

		pid = 0;

	ctx->elem->common.tid = 0;

	ctx->elem->sr = cpu_to_be64(sr);

	ctx->elem->common.pid = cpu_to_be32(pid);



	ctx->elem->sr = cpu_to_be64(calculate_sr(ctx));



	ctx->elem->common.csrp = 0; /* disable */

	ctx->elem->common.aurp0 = 0; /* disable */
@@ -530,20 +542,15 @@ static int activate_dedicated_process(struct cxl_afu *afu) 
static int attach_dedicated(struct cxl_context *ctx, u64 wed, u64 amr)

{

	struct cxl_afu *afu = ctx->afu;

	u64 sr;

	u64 pid;

	int rc;



	sr = 0;

	set_endian(sr);

	if (ctx->master)

		sr |= CXL_PSL_SR_An_MP;

	if (mfspr(SPRN_LPCR) & LPCR_TC)

		sr |= CXL_PSL_SR_An_TC;

	sr |= CXL_PSL_SR_An_PR | CXL_PSL_SR_An_R;

	if (!test_tsk_thread_flag(current, TIF_32BIT))

		sr |= CXL_PSL_SR_An_SF;

	cxl_p2n_write(afu, CXL_PSL_PID_TID_An, (u64)current->pid << 32);

	cxl_p1n_write(afu, CXL_PSL_SR_An, sr);

	pid = (u64)current->pid << 32;

	if (ctx->kernel)

		pid = 0;

	cxl_p2n_write(afu, CXL_PSL_PID_TID_An, pid);



	cxl_p1n_write(afu, CXL_PSL_SR_An, calculate_sr(ctx));



	if ((rc = cxl_write_sstp(afu, ctx->sstp0, ctx->sstp1)))

		return rc;