Commit 990f19ae authored by Vaibhav Jain's avatar Vaibhav Jain Committed by Michael Ellerman
Browse files

cxl: Dump PSL_FIR register on PSL9 error irq 



For PSL9 currently we aren't dumping the PSL FIR register when a
PSL error interrupt is triggered. Contents of this register are useful
in debugging AFU issues.

This patch fixes issue by adding a new service_layer_ops callback
cxl_native_err_irq_dump_regs_psl9() to dump the PSL_FIR registers on a
PSL error interrupt thereby bringing the behavior in line with PSL on
POWER-8. Also the existing service_layer_ops callback
for PSL8 has been renamed to cxl_native_err_irq_dump_regs_psl8().

Signed-off-by: default avatarVaibhav Jain <vaibhav@linux.vnet.ibm.com>
Acked-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Acked-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 89aca475

drivers/misc/cxl/cxl.h

+2 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,8 @@ u64 cxl_calculate_sr(bool master, bool kernel, bool real_mode, bool p9); 


void cxl_native_irq_dump_regs_psl9(struct cxl_context *ctx);

void cxl_native_irq_dump_regs_psl8(struct cxl_context *ctx);

void cxl_native_err_irq_dump_regs(struct cxl *adapter);

void cxl_native_err_irq_dump_regs_psl8(struct cxl *adapter);

void cxl_native_err_irq_dump_regs_psl9(struct cxl *adapter);

int cxl_pci_vphb_add(struct cxl_afu *afu);

void cxl_pci_vphb_remove(struct cxl_afu *afu);

void cxl_release_mapping(struct cxl_context *ctx);

drivers/misc/cxl/native.c

+12 −3
Original line number Diff line number Diff line
@@ -1263,14 +1263,23 @@ static irqreturn_t native_slice_irq_err(int irq, void *data) 
	return IRQ_HANDLED;

}



void cxl_native_err_irq_dump_regs(struct cxl *adapter)

void cxl_native_err_irq_dump_regs_psl9(struct cxl *adapter)

{

	u64 fir1;



	fir1 = cxl_p1_read(adapter, CXL_PSL9_FIR1);

	dev_crit(&adapter->dev, "PSL_FIR: 0x%016llx\n", fir1);

}



void cxl_native_err_irq_dump_regs_psl8(struct cxl *adapter)

{

	u64 fir1, fir2;



	fir1 = cxl_p1_read(adapter, CXL_PSL_FIR1);

	fir2 = cxl_p1_read(adapter, CXL_PSL_FIR2);



	dev_crit(&adapter->dev, "PSL_FIR1: 0x%016llx\nPSL_FIR2: 0x%016llx\n", fir1, fir2);

	dev_crit(&adapter->dev,

		 "PSL_FIR1: 0x%016llx\nPSL_FIR2: 0x%016llx\n",

		 fir1, fir2);

}



static irqreturn_t native_irq_err(int irq, void *data)

drivers/misc/cxl/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1763,6 +1763,7 @@ static const struct cxl_service_layer_ops psl9_ops = { 
	.debugfs_add_adapter_regs = cxl_debugfs_add_adapter_regs_psl9,

	.debugfs_add_afu_regs = cxl_debugfs_add_afu_regs_psl9,

	.psl_irq_dump_registers = cxl_native_irq_dump_regs_psl9,

	.err_irq_dump_registers = cxl_native_err_irq_dump_regs_psl9,

	.debugfs_stop_trace = cxl_stop_trace_psl9,

	.write_timebase_ctrl = write_timebase_ctrl_psl9,

	.timebase_read = timebase_read_psl9,
@@ -1786,7 +1787,7 @@ static const struct cxl_service_layer_ops psl8_ops = { 
	.debugfs_add_adapter_regs = cxl_debugfs_add_adapter_regs_psl8,

	.debugfs_add_afu_regs = cxl_debugfs_add_afu_regs_psl8,

	.psl_irq_dump_registers = cxl_native_irq_dump_regs_psl8,

	.err_irq_dump_registers = cxl_native_err_irq_dump_regs,

	.err_irq_dump_registers = cxl_native_err_irq_dump_regs_psl8,

	.debugfs_stop_trace = cxl_stop_trace_psl8,

	.write_timebase_ctrl = write_timebase_ctrl_psl8,

	.timebase_read = timebase_read_psl8,

CRA Git | Maintained and supported by SUSTech CRA and CCSE