Merge branch 'for-4.3/gembird' into for-linus

1 files changed, 105 insertions, 26 deletions

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 1ef01647265f..32ad09705949 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -90,6 +90,7 @@
 /* This works a little different than the p1/p2 register accesses to make it
  * easier to pull out individual fields */
 #define AFUD_READ(afu, off)             in_be64(afu->afu_desc_mmio + off)
+#define AFUD_READ_LE(afu, off)          in_le64(afu->afu_desc_mmio + off)
 #define EXTRACT_PPC_BIT(val, bit)       (!!(val & PPC_BIT(bit)))
 #define EXTRACT_PPC_BITS(val, bs, be)   ((val & PPC_BITMASK(bs, be)) >> PPC_BITLSHIFT(be))
 
@@ -204,7 +205,7 @@ static void dump_cxl_config_space(struct pci_dev *dev)
         dev_info(&dev->dev, "p1 regs: %#llx, len: %#llx\n",
                 p1_base(dev), p1_size(dev));
         dev_info(&dev->dev, "p2 regs: %#llx, len: %#llx\n",
-                p1_base(dev), p2_size(dev));
+                p2_base(dev), p2_size(dev));
         dev_info(&dev->dev, "BAR 4/5: %#llx, len: %#llx\n",
                 pci_resource_start(dev, 4), pci_resource_len(dev, 4));
 
@@ -286,7 +287,8 @@ static void dump_cxl_config_space(struct pci_dev *dev)
 
 static void dump_afu_descriptor(struct cxl_afu *afu)
 {
-        u64 val;
+        u64 val, afu_cr_num, afu_cr_off, afu_cr_len;
+        int i;
 
 #define show_reg(name, what) \
         dev_info(&afu->dev, "afu desc: %30s: %#llx\n", name, what)
@@ -296,6 +298,7 @@ static void dump_afu_descriptor(struct cxl_afu *afu)
         show_reg("num_of_processes", AFUD_NUM_PROCS(val));
         show_reg("num_of_afu_CRs", AFUD_NUM_CRS(val));
         show_reg("req_prog_mode", val & 0xffffULL);
+        afu_cr_num = AFUD_NUM_CRS(val);
 
         val = AFUD_READ(afu, 0x8);
         show_reg("Reserved", val);
@@ -307,8 +310,10 @@ static void dump_afu_descriptor(struct cxl_afu *afu)
         val = AFUD_READ_CR(afu);
         show_reg("Reserved", (val >> (63-7)) & 0xff);
         show_reg("AFU_CR_len", AFUD_CR_LEN(val));
+        afu_cr_len = AFUD_CR_LEN(val) * 256;
 
         val = AFUD_READ_CR_OFF(afu);
+        afu_cr_off = val;
         show_reg("AFU_CR_offset", val);
 
         val = AFUD_READ_PPPSA(afu);
@@ -325,6 +330,11 @@ static void dump_afu_descriptor(struct cxl_afu *afu)
         val = AFUD_READ_EB_OFF(afu);
         show_reg("AFU_EB_offset", val);
 
+        for (i = 0; i < afu_cr_num; i++) {
+                val = AFUD_READ_LE(afu, afu_cr_off + i * afu_cr_len);
+                show_reg("CR Vendor", val & 0xffff);
+                show_reg("CR Device", (val >> 16) & 0xffff);
+        }
 #undef show_reg
 }
 
@@ -529,7 +539,7 @@ err:
 
 static void cxl_unmap_slice_regs(struct cxl_afu *afu)
 {
-        if (afu->p1n_mmio)
+        if (afu->p2n_mmio)
                 iounmap(afu->p2n_mmio);
         if (afu->p1n_mmio)
                 iounmap(afu->p1n_mmio);
@@ -593,6 +603,22 @@ static int cxl_read_afu_descriptor(struct cxl_afu *afu)
         afu->crs_len = AFUD_CR_LEN(val) * 256;
         afu->crs_offset = AFUD_READ_CR_OFF(afu);
 
+
+        /* eb_len is in multiple of 4K */
+        afu->eb_len = AFUD_EB_LEN(AFUD_READ_EB(afu)) * 4096;
+        afu->eb_offset = AFUD_READ_EB_OFF(afu);
+
+        /* eb_off is 4K aligned so lower 12 bits are always zero */
+        if (EXTRACT_PPC_BITS(afu->eb_offset, 0, 11) != 0) {
+                dev_warn(&afu->dev,
+                         "Invalid AFU error buffer offset %Lx\n",
+                         afu->eb_offset);
+                dev_info(&afu->dev,
+                         "Ignoring AFU error buffer in the descriptor\n");
+                /* indicate that no afu buffer exists */
+                afu->eb_len = 0;
+        }
+
         return 0;
 }
 
@@ -631,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;
@@ -672,6 +698,50 @@ static int sanitise_afu_regs(struct cxl_afu *afu)
         return 0;
 }
 
+#define ERR_BUFF_MAX_COPY_SIZE PAGE_SIZE
+/*
+ * afu_eb_read:
+ * Called from sysfs and reads the afu error info buffer. The h/w only supports
+ * 4/8 bytes aligned access. So in case the requested offset/count arent 8 byte
+ * aligned the function uses a bounce buffer which can be max PAGE_SIZE.
+ */
+ssize_t cxl_afu_read_err_buffer(struct cxl_afu *afu, char *buf,
+                                loff_t off, size_t count)
+{
+        loff_t aligned_start, aligned_end;
+        size_t aligned_length;
+        void *tbuf;
+        const void __iomem *ebuf = afu->afu_desc_mmio + afu->eb_offset;
+
+        if (count == 0 || off < 0 || (size_t)off >= afu->eb_len)
+                return 0;
+
+        /* calculate aligned read window */
+        count = min((size_t)(afu->eb_len - off), count);
+        aligned_start = round_down(off, 8);
+        aligned_end = round_up(off + count, 8);
+        aligned_length = aligned_end - aligned_start;
+
+        /* max we can copy in one read is PAGE_SIZE */
+        if (aligned_length > ERR_BUFF_MAX_COPY_SIZE) {
+                aligned_length = ERR_BUFF_MAX_COPY_SIZE;
+                count = ERR_BUFF_MAX_COPY_SIZE - (off & 0x7);
+        }
+
+        /* use bounce buffer for copy */
+        tbuf = (void *)__get_free_page(GFP_TEMPORARY);
+        if (!tbuf)
+                return -ENOMEM;
+
+        /* perform aligned read from the mmio region */
+        memcpy_fromio(tbuf, ebuf + aligned_start, aligned_length);
+        memcpy(buf, tbuf + (off & 0x7), count);
+
+        free_page((unsigned long)tbuf);
+
+        return count;
+}
+
 static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
 {
         struct cxl_afu *afu;
@@ -691,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)
@@ -731,6 +801,9 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
 
         adapter->afu[afu->slice] = afu;
 
+        if ((rc = cxl_pci_vphb_add(afu)))
+                dev_info(&afu->dev, "Can't register vPHB\n");
+
         return 0;
 
 err_put2:
@@ -783,8 +856,10 @@ int cxl_reset(struct cxl *adapter)
 
         dev_info(&dev->dev, "CXL reset\n");
 
-        for (i = 0; i < adapter->slices; i++)
+        for (i = 0; i < adapter->slices; i++) {
+                cxl_pci_vphb_remove(adapter->afu[i]);
                 cxl_remove_afu(adapter->afu[i]);
+        }
 
         /* pcie_warm_reset requests a fundamental pci reset which includes a
          * PERST assert/deassert.  PERST triggers a loading of the image
@@ -857,13 +932,13 @@ static int cxl_read_vsec(struct cxl *adapter, struct pci_dev *dev)
         u8 image_state;
 
         if (!(vsec = find_cxl_vsec(dev))) {
-                dev_err(&adapter->dev, "ABORTING: CXL VSEC not found!\n");
+                dev_err(&dev->dev, "ABORTING: CXL VSEC not found!\n");
                 return -ENODEV;
         }
 
         CXL_READ_VSEC_LENGTH(dev, vsec, &vseclen);
         if (vseclen < CXL_VSEC_MIN_SIZE) {
-                pr_err("ABORTING: CXL VSEC too short\n");
+                dev_err(&dev->dev, "ABORTING: CXL VSEC too short\n");
                 return -EINVAL;
         }
 
@@ -902,24 +977,24 @@ static int cxl_vsec_looks_ok(struct cxl *adapter, struct pci_dev *dev)
                 return -EBUSY;
 
         if (adapter->vsec_status & CXL_UNSUPPORTED_FEATURES) {
-                dev_err(&adapter->dev, "ABORTING: CXL requires unsupported features\n");
+                dev_err(&dev->dev, "ABORTING: CXL requires unsupported features\n");
                 return -EINVAL;
         }
 
         if (!adapter->slices) {
                 /* Once we support dynamic reprogramming we can use the card if
                  * it supports loadable AFUs */
-                dev_err(&adapter->dev, "ABORTING: Device has no AFUs\n");
+                dev_err(&dev->dev, "ABORTING: Device has no AFUs\n");
                 return -EINVAL;
         }
 
         if (!adapter->afu_desc_off || !adapter->afu_desc_size) {
-                dev_err(&adapter->dev, "ABORTING: VSEC shows no AFU descriptors\n");
+                dev_err(&dev->dev, "ABORTING: VSEC shows no AFU descriptors\n");
                 return -EINVAL;
         }
 
         if (adapter->ps_size > p2_size(dev) - adapter->ps_off) {
-                dev_err(&adapter->dev, "ABORTING: Problem state size larger than "
+                dev_err(&dev->dev, "ABORTING: Problem state size larger than "
                                    "available in BAR2: 0x%llx > 0x%llx\n",
                          adapter->ps_size, p2_size(dev) - adapter->ps_off);
                 return -EINVAL;
@@ -968,6 +1043,15 @@ static struct cxl *cxl_init_adapter(struct pci_dev *dev)
         if (!(adapter = cxl_alloc_adapter(dev)))
                 return ERR_PTR(-ENOMEM);
 
+        if ((rc = cxl_read_vsec(adapter, dev)))
+                goto err1;
+
+        if ((rc = cxl_vsec_looks_ok(adapter, dev)))
+                goto err1;
+
+        if ((rc = setup_cxl_bars(dev)))
+                goto err1;
+
         if ((rc = switch_card_to_cxl(dev)))
                 goto err1;
 
@@ -977,12 +1061,6 @@ static struct cxl *cxl_init_adapter(struct pci_dev *dev)
         if ((rc = dev_set_name(&adapter->dev, "card%i", adapter->adapter_num)))
                 goto err2;
 
-        if ((rc = cxl_read_vsec(adapter, dev)))
-                goto err2;
-
-        if ((rc = cxl_vsec_looks_ok(adapter, dev)))
-                goto err2;
-
         if ((rc = cxl_update_image_control(adapter)))
                 goto err2;
 
@@ -1067,9 +1145,6 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
         if (cxl_verbose)
                 dump_cxl_config_space(dev);
 
-        if ((rc = setup_cxl_bars(dev)))
-                return rc;
-
         if ((rc = pci_enable_device(dev))) {
                 dev_err(&dev->dev, "pci_enable_device failed: %i\n", rc);
                 return rc;
@@ -1078,6 +1153,7 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
         adapter = cxl_init_adapter(dev);
         if (IS_ERR(adapter)) {
                 dev_err(&dev->dev, "cxl_init_adapter failed: %li\n", PTR_ERR(adapter));
+                pci_disable_device(dev);
                 return PTR_ERR(adapter);
         }
 
@@ -1092,16 +1168,18 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
 static void cxl_remove(struct pci_dev *dev)
 {
         struct cxl *adapter = pci_get_drvdata(dev);
-        int afu;
-
-        dev_warn(&dev->dev, "pci remove\n");
+        struct cxl_afu *afu;
+        int i;
 
         /*
          * Lock to prevent someone grabbing a ref through the adapter list as
          * we are removing it
          */
-        for (afu = 0; afu < adapter->slices; afu++)
-                cxl_remove_afu(adapter->afu[afu]);
+        for (i = 0; i < adapter->slices; i++) {
+                afu = adapter->afu[i];
+                cxl_pci_vphb_remove(afu);
+                cxl_remove_afu(afu);
+        }
         cxl_remove_adapter(adapter);
 }
 
@@ -1110,4 +1188,5 @@ struct pci_driver cxl_pci_driver = {
         .id_table = cxl_pci_tbl,
         .probe = cxl_probe,
         .remove = cxl_remove,
+        .shutdown = cxl_remove,
 };