5 files changed, 43 insertions, 2 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl
index 640f65e79ef1..8e69345c37cc 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -244,3 +244,11 @@ Description:    read only
                 Returns 1 if the psl timebase register is synchronized
                 with the core timebase register, 0 otherwise.
 Users:          https://github.com/ibm-capi/libcxl
+
+What:           /sys/class/cxl/<card>/tunneled_ops_supported
+Date:           May 2018
+Contact:        linuxppc-dev@lists.ozlabs.org
+Description:    read only
+                Returns 1 if tunneled operations are supported in capi mode,
+                0 otherwise.
+Users:          https://github.com/ibm-capi/libcxl
diff --git a/arch/powerpc/platforms/powernv/opal-nvram.c b/arch/powerpc/platforms/powernv/opal-nvram.c
index 1bceb95f422d..5584247f5029 100644
--- a/arch/powerpc/platforms/powernv/opal-nvram.c
+++ b/arch/powerpc/platforms/powernv/opal-nvram.c
@@ -44,6 +44,10 @@ static ssize_t opal_nvram_read(char *buf, size_t count, loff_t *index)
         return count;
 }
 
+/*
+ * This can be called in the panic path with interrupts off, so use
+ * mdelay in that case.
+ */
 static ssize_t opal_nvram_write(char *buf, size_t count, loff_t *index)
 {
         s64 rc = OPAL_BUSY;
@@ -58,10 +62,16 @@ static ssize_t opal_nvram_write(char *buf, size_t count, loff_t *index)
         while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
                 rc = opal_write_nvram(__pa(buf), count, off);
                 if (rc == OPAL_BUSY_EVENT) {
-                        msleep(OPAL_BUSY_DELAY_MS);
+                        if (in_interrupt() || irqs_disabled())
+                                mdelay(OPAL_BUSY_DELAY_MS);
+                        else
+                                msleep(OPAL_BUSY_DELAY_MS);
                         opal_poll_events(NULL);
                 } else if (rc == OPAL_BUSY) {
-                        msleep(OPAL_BUSY_DELAY_MS);
+                        if (in_interrupt() || irqs_disabled())
+                                mdelay(OPAL_BUSY_DELAY_MS);
+                        else
+                                msleep(OPAL_BUSY_DELAY_MS);
                 }
         }
 
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index a4c9c8297a6d..918d4fb742d1 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -717,6 +717,7 @@ struct cxl {
         bool perst_select_user;
         bool perst_same_image;
         bool psl_timebase_synced;
+        bool tunneled_ops_supported;
 
         /*
          * number of contexts mapped on to this card. Possible values are:
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 83f1d08058fc..4d6736f9d463 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -1742,6 +1742,15 @@ static int cxl_configure_adapter(struct cxl *adapter, struct pci_dev *dev)
         /* Required for devices using CAPP DMA mode, harmless for others */
         pci_set_master(dev);
 
+        adapter->tunneled_ops_supported = false;
+
+        if (cxl_is_power9()) {
+                if (pnv_pci_set_tunnel_bar(dev, 0x00020000E0000000ull, 1))
+                        dev_info(&dev->dev, "Tunneled operations unsupported\n");
+                else
+                        adapter->tunneled_ops_supported = true;
+        }
+
         if ((rc = pnv_phb_to_cxl_mode(dev, adapter->native->sl_ops->capi_mode)))
                 goto err;
 
@@ -1768,6 +1777,9 @@ static void cxl_deconfigure_adapter(struct cxl *adapter)
 {
         struct pci_dev *pdev = to_pci_dev(adapter->dev.parent);
 
+        if (cxl_is_power9())
+                pnv_pci_set_tunnel_bar(pdev, 0x00020000E0000000ull, 0);
+
         cxl_native_release_psl_err_irq(adapter);
         cxl_unmap_adapter_regs(adapter);
 
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index 95285b7f636f..4b5a4c5d3c01 100644
--- a/drivers/misc/cxl/sysfs.c
+++ b/drivers/misc/cxl/sysfs.c
@@ -78,6 +78,15 @@ static ssize_t psl_timebase_synced_show(struct device *device,
         return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->psl_timebase_synced);
 }
 
+static ssize_t tunneled_ops_supported_show(struct device *device,
+                                        struct device_attribute *attr,
+                                        char *buf)
+{
+        struct cxl *adapter = to_cxl_adapter(device);
+
+        return scnprintf(buf, PAGE_SIZE, "%i\n", adapter->tunneled_ops_supported);
+}
+
 static ssize_t reset_adapter_store(struct device *device,
                                    struct device_attribute *attr,
                                    const char *buf, size_t count)
@@ -183,6 +192,7 @@ static struct device_attribute adapter_attrs[] = {
         __ATTR_RO(base_image),
         __ATTR_RO(image_loaded),
         __ATTR_RO(psl_timebase_synced),
+        __ATTR_RO(tunneled_ops_supported),
         __ATTR_RW(load_image_on_perst),
         __ATTR_RW(perst_reloads_same_image),
         __ATTR(reset, S_IWUSR, NULL, reset_adapter_store),