cxl: Refine slice error debug messages

The PSL Slice Error Register (PSL_SERR_An) reports implementation
dependent AFU errors, in the form of a bitmap. The PSL_SERR_An
register content is printed in the form of hex dump debug message.

This patch decodes the PSL_ERR_An register contents, and prints a
specific error message for each possible error bit. It also dumps
the secondary registers AFU_ERR_An and PSL_DSISR_An, that may
contain extra debug information.

This patch also removes the large WARN message that used to report
the cxl slice error interrupt, and replaces it by a short informative
message, that draws attention to AFU implementation errors.

Signed-off-by: Philippe Bergheaud <felix@linux.vnet.ibm.com>
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index aafffa8554e2964e4f054c8f1855d98a929301fc..36b3237fc2b19c24edfad8e809476a9562ea8143 100644 (file)
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -189,6 +189,18 @@ static const cxl_p2n_reg_t CXL_PSL_WED_An     = {0x0A0};
 #define CXL_PSL_ID_An_F        (1ull << (63-31))
 #define CXL_PSL_ID_An_L        (1ull << (63-30))
 
+/****** CXL_PSL_SERR_An ****************************************************/
+#define CXL_PSL_SERR_An_afuto  (1ull << (63-0))
+#define CXL_PSL_SERR_An_afudis (1ull << (63-1))
+#define CXL_PSL_SERR_An_afuov  (1ull << (63-2))
+#define CXL_PSL_SERR_An_badsrc (1ull << (63-3))
+#define CXL_PSL_SERR_An_badctx (1ull << (63-4))
+#define CXL_PSL_SERR_An_llcmdis        (1ull << (63-5))
+#define CXL_PSL_SERR_An_llcmdto        (1ull << (63-6))
+#define CXL_PSL_SERR_An_afupar (1ull << (63-7))
+#define CXL_PSL_SERR_An_afudup (1ull << (63-8))
+#define CXL_PSL_SERR_An_AE     (1ull << (63-30))
+
 /****** CXL_PSL_SCNTL_An ****************************************************/
 #define CXL_PSL_SCNTL_An_CR          (0x1ull << (63-15))
 /* Programming Modes: */
@@ -916,4 +928,7 @@ extern const struct cxl_backend_ops *cxl_ops;
 
 /* check if the given pci_dev is on the the cxl vphb bus */
 bool cxl_pci_is_vphb_device(struct pci_dev *dev);
+
+/* decode AFU error bits in the PSL register PSL_SERR_An */
+void cxl_afu_decode_psl_serr(struct cxl_afu *afu, u64 serr);
 #endif

diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
index 1edba5248620632bb2ac5409181f1256af6d1650..ee7148e78ca78188265cf593b85e6336f29b81e1 100644 (file)
--- a/drivers/misc/cxl/guest.c
+++ b/drivers/misc/cxl/guest.c
@@ -196,15 +196,18 @@ static irqreturn_t guest_slice_irq_err(int irq, void *data)
 {
        struct cxl_afu *afu = data;
        int rc;
-       u64 serr;
+       u64 serr, afu_error, dsisr;
 
-       WARN(irq, "CXL SLICE ERROR interrupt %i\n", irq);
        rc = cxl_h_get_fn_error_interrupt(afu->guest->handle, &serr);
        if (rc) {
                dev_crit(&afu->dev, "Couldn't read PSL_SERR_An: %d\n", rc);
                return IRQ_HANDLED;
        }
-       dev_crit(&afu->dev, "PSL_SERR_An: 0x%.16llx\n", serr);
+       afu_error = cxl_p2n_read(afu, CXL_AFU_ERR_An);
+       dsisr = cxl_p2n_read(afu, CXL_PSL_DSISR_An);
+       cxl_afu_decode_psl_serr(afu, serr);
+       dev_crit(&afu->dev, "AFU_ERR_An: 0x%.16llx\n", afu_error);
+       dev_crit(&afu->dev, "PSL_DSISR_An: 0x%.16llx\n", dsisr);
 
        rc = cxl_h_ack_fn_error_interrupt(afu->guest->handle, serr);
        if (rc)

diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
index f3a7d4aa1cd53a5c029ff0d8c01dc485ea1d2296..dec60f58a7677b8999af2a246613e03a19b0d3bc 100644 (file)
--- a/drivers/misc/cxl/irq.c
+++ b/drivers/misc/cxl/irq.c
@@ -371,3 +371,32 @@ void afu_release_irqs(struct cxl_context *ctx, void *cookie)
 
        ctx->irq_count = 0;
 }
+
+void cxl_afu_decode_psl_serr(struct cxl_afu *afu, u64 serr)
+{
+       dev_crit(&afu->dev,
+                "PSL Slice error received. Check AFU for root cause.\n");
+       dev_crit(&afu->dev, "PSL_SERR_An: 0x%016llx\n", serr);
+       if (serr & CXL_PSL_SERR_An_afuto)
+               dev_crit(&afu->dev, "AFU MMIO Timeout\n");
+       if (serr & CXL_PSL_SERR_An_afudis)
+               dev_crit(&afu->dev,
+                        "MMIO targeted Accelerator that was not enabled\n");
+       if (serr & CXL_PSL_SERR_An_afuov)
+               dev_crit(&afu->dev, "AFU CTAG Overflow\n");
+       if (serr & CXL_PSL_SERR_An_badsrc)
+               dev_crit(&afu->dev, "Bad Interrupt Source\n");
+       if (serr & CXL_PSL_SERR_An_badctx)
+               dev_crit(&afu->dev, "Bad Context Handle\n");
+       if (serr & CXL_PSL_SERR_An_llcmdis)
+               dev_crit(&afu->dev, "LLCMD to Disabled AFU\n");
+       if (serr & CXL_PSL_SERR_An_llcmdto)
+               dev_crit(&afu->dev, "LLCMD Timeout to AFU\n");
+       if (serr & CXL_PSL_SERR_An_afupar)
+               dev_crit(&afu->dev, "AFU MMIO Parity Error\n");
+       if (serr & CXL_PSL_SERR_An_afudup)
+               dev_crit(&afu->dev, "AFU MMIO Duplicate CTAG Error\n");
+       if (serr & CXL_PSL_SERR_An_AE)
+               dev_crit(&afu->dev,
+                        "AFU asserted JDONE with JERROR in AFU Directed Mode\n");
+}

diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index 04c27e41b654b0888428dcc078cffdad2b8dbdcc..3bcdaee11ba159aa13580bdd48151e0ef0755dbd 100644 (file)
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -862,7 +862,7 @@ void cxl_native_psl_irq_dump_regs(struct cxl_context *ctx)
        dev_crit(&ctx->afu->dev, "PSL_FIR2: 0x%016llx\n", fir2);
        if (ctx->afu->adapter->native->sl_ops->register_serr_irq) {
                serr = cxl_p1n_read(ctx->afu, CXL_PSL_SERR_An);
-               dev_crit(&ctx->afu->dev, "PSL_SERR_An: 0x%016llx\n", serr);
+               cxl_afu_decode_psl_serr(ctx->afu, serr);
        }
        dev_crit(&ctx->afu->dev, "PSL_FIR_SLICE_An: 0x%016llx\n", fir_slice);
        dev_crit(&ctx->afu->dev, "CXL_PSL_AFU_DEBUG_An: 0x%016llx\n", afu_debug);
@@ -956,21 +956,23 @@ void native_irq_wait(struct cxl_context *ctx)
 static irqreturn_t native_slice_irq_err(int irq, void *data)
 {
        struct cxl_afu *afu = data;
-       u64 fir_slice, errstat, serr, afu_debug;
+       u64 fir_slice, errstat, serr, afu_debug, afu_error, dsisr;
 
        /*
         * slice err interrupt is only used with full PSL (no XSL)
         */
-       WARN(irq, "CXL SLICE ERROR interrupt %i\n", irq);
-
        serr = cxl_p1n_read(afu, CXL_PSL_SERR_An);
        fir_slice = cxl_p1n_read(afu, CXL_PSL_FIR_SLICE_An);
        errstat = cxl_p2n_read(afu, CXL_PSL_ErrStat_An);
        afu_debug = cxl_p1n_read(afu, CXL_AFU_DEBUG_An);
-       dev_crit(&afu->dev, "PSL_SERR_An: 0x%016llx\n", serr);
+       afu_error = cxl_p2n_read(afu, CXL_AFU_ERR_An);
+       dsisr = cxl_p2n_read(afu, CXL_PSL_DSISR_An);
+       cxl_afu_decode_psl_serr(afu, serr);
        dev_crit(&afu->dev, "PSL_FIR_SLICE_An: 0x%016llx\n", fir_slice);
        dev_crit(&afu->dev, "CXL_PSL_ErrStat_An: 0x%016llx\n", errstat);
        dev_crit(&afu->dev, "CXL_PSL_AFU_DEBUG_An: 0x%016llx\n", afu_debug);
+       dev_crit(&afu->dev, "AFU_ERR_An: 0x%.16llx\n", afu_error);
+       dev_crit(&afu->dev, "PSL_DSISR_An: 0x%.16llx\n", dsisr);
 
        cxl_p1n_write(afu, CXL_PSL_SERR_An, serr);