cxl: Rename some psl8 specific functions

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1686519
Rename a few functions, changing the '_psl' suffix to '_psl8', to make
clear that the implementation is psl8 specific.
Those functions will have an equivalent implementation for the psl9 in
a later patch.

Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
(cherry picked from commit 64663f372c72cedeba1b1dc86df9cc159ae5a93d)
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 626073d1786c2da4966e95abef3ce916b0d3a31d..a54c0030932c47b607aca946194c97dd205ba60b 100644 (file)
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -813,10 +813,10 @@ int afu_register_irqs(struct cxl_context *ctx, u32 count);
 void afu_release_irqs(struct cxl_context *ctx, void *cookie);
 void afu_irq_name_free(struct cxl_context *ctx);
 
-int cxl_attach_afu_directed_psl(struct cxl_context *ctx, u64 wed, u64 amr);
-int cxl_activate_dedicated_process_psl(struct cxl_afu *afu);
-int cxl_attach_dedicated_process_psl(struct cxl_context *ctx, u64 wed, u64 amr);
-void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx);
+int cxl_attach_afu_directed_psl8(struct cxl_context *ctx, u64 wed, u64 amr);
+int cxl_activate_dedicated_process_psl8(struct cxl_afu *afu);
+int cxl_attach_dedicated_process_psl8(struct cxl_context *ctx, u64 wed, u64 amr);
+void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx);
 
 #ifdef CONFIG_DEBUG_FS
 
@@ -826,10 +826,10 @@ int cxl_debugfs_adapter_add(struct cxl *adapter);
 void cxl_debugfs_adapter_remove(struct cxl *adapter);
 int cxl_debugfs_afu_add(struct cxl_afu *afu);
 void cxl_debugfs_afu_remove(struct cxl_afu *afu);
-void cxl_stop_trace_psl(struct cxl *cxl);
-void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter, struct dentry *dir);
+void cxl_stop_trace_psl8(struct cxl *cxl);
+void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir);
 void cxl_debugfs_add_adapter_regs_xsl(struct cxl *adapter, struct dentry *dir);
-void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir);
+void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir);
 
 #else /* CONFIG_DEBUG_FS */
 
@@ -860,11 +860,11 @@ static inline void cxl_debugfs_afu_remove(struct cxl_afu *afu)
 {
 }
 
-static inline void cxl_stop_trace(struct cxl *cxl)
+static inline void cxl_stop_trace_psl8(struct cxl *cxl)
 {
 }
 
-static inline void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter,
+static inline void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter,
                                                    struct dentry *dir)
 {
 }
@@ -874,7 +874,7 @@ static inline void cxl_debugfs_add_adapter_regs_xsl(struct cxl *adapter,
 {
 }
 
-static inline void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir)
+static inline void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)
 {
 }
 
@@ -919,8 +919,8 @@ struct cxl_irq_info {
 };
 
 void cxl_assign_psn_space(struct cxl_context *ctx);
-int cxl_invalidate_all_psl(struct cxl *adapter);
-irqreturn_t cxl_irq_psl(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info);
+int cxl_invalidate_all_psl8(struct cxl *adapter);
+irqreturn_t cxl_irq_psl8(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info);
 irqreturn_t cxl_fail_irq_psl(struct cxl_afu *afu, struct cxl_irq_info *irq_info);
 int cxl_register_one_irq(struct cxl *adapter, irq_handler_t handler,
                        void *cookie, irq_hw_number_t *dest_hwirq,
@@ -932,7 +932,7 @@ int cxl_data_cache_flush(struct cxl *adapter);
 int cxl_afu_disable(struct cxl_afu *afu);
 int cxl_psl_purge(struct cxl_afu *afu);
 
-void cxl_native_irq_dump_regs_psl(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);
 int cxl_pci_vphb_add(struct cxl_afu *afu);
 void cxl_pci_vphb_remove(struct cxl_afu *afu);

diff --git a/drivers/misc/cxl/debugfs.c b/drivers/misc/cxl/debugfs.c
index 4848ebf846648de972b07aeb60bfcfe35d6162cf..2ff10a9335f34a585e7fe3fda0297b1c6730bdf6 100644 (file)
--- a/drivers/misc/cxl/debugfs.c
+++ b/drivers/misc/cxl/debugfs.c
@@ -15,7 +15,7 @@
 
 static struct dentry *cxl_debugfs;
 
-void cxl_stop_trace_psl(struct cxl *adapter)
+void cxl_stop_trace_psl8(struct cxl *adapter)
 {
        int slice;
 
@@ -53,7 +53,7 @@ static struct dentry *debugfs_create_io_x64(const char *name, umode_t mode,
                                          (void __force *)value, &fops_io_x64);
 }
 
-void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter, struct dentry *dir)
+void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir)
 {
        debugfs_create_io_x64("fir1", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_FIR1));
        debugfs_create_io_x64("fir2", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_FIR2));
@@ -92,7 +92,7 @@ void cxl_debugfs_adapter_remove(struct cxl *adapter)
        debugfs_remove_recursive(adapter->debugfs);
 }
 
-void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir)
+void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)
 {
        debugfs_create_io_x64("fir", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_FIR_SLICE_An));
        debugfs_create_io_x64("serr", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SERR_An));

diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
index f6ba69889e40867faaa1dc3106b4a1bfef96f60f..3ad73817b5669770a960e840c7269161d94c4807 100644 (file)
--- a/drivers/misc/cxl/guest.c
+++ b/drivers/misc/cxl/guest.c
@@ -169,7 +169,7 @@ static irqreturn_t guest_psl_irq(int irq, void *data)
                return IRQ_HANDLED;
        }
 
-       rc = cxl_irq_psl(irq, ctx, &irq_info);
+       rc = cxl_irq_psl8(irq, ctx, &irq_info);
        return rc;
 }
 

diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c
index 2fa119edb27d14a37915f86e8555b5e587c07eb7..fa9f8a2543a1fe5d15caf9a7aabea6f2b26a8030 100644 (file)
--- a/drivers/misc/cxl/irq.c
+++ b/drivers/misc/cxl/irq.c
@@ -34,7 +34,7 @@ static irqreturn_t schedule_cxl_fault(struct cxl_context *ctx, u64 dsisr, u64 da
        return IRQ_HANDLED;
 }
 
-irqreturn_t cxl_irq_psl(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info)
+irqreturn_t cxl_irq_psl8(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info)
 {
        u64 dsisr, dar;
 

diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index b1ade6cb8c6205cc47f621a256397cac8af9ca60..15e2b3a89f30c2b238665c38b021fde40b8e5886 100644 (file)
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -257,7 +257,7 @@ void cxl_release_spa(struct cxl_afu *afu)
        }
 }
 
-int cxl_invalidate_all_psl(struct cxl *adapter)
+int cxl_invalidate_all_psl8(struct cxl *adapter)
 {
        unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);
 
@@ -577,7 +577,7 @@ static void update_ivtes_directed(struct cxl_context *ctx)
                WARN_ON(add_process_element(ctx));
 }
 
-int cxl_attach_afu_directed_psl(struct cxl_context *ctx, u64 wed, u64 amr)
+int cxl_attach_afu_directed_psl8(struct cxl_context *ctx, u64 wed, u64 amr)
 {
        u32 pid;
        int result;
@@ -670,7 +670,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu)
        return 0;
 }
 
-int cxl_activate_dedicated_process_psl(struct cxl_afu *afu)
+int cxl_activate_dedicated_process_psl8(struct cxl_afu *afu)
 {
        dev_info(&afu->dev, "Activating dedicated process mode\n");
 
@@ -693,7 +693,7 @@ int cxl_activate_dedicated_process_psl(struct cxl_afu *afu)
        return cxl_chardev_d_afu_add(afu);
 }
 
-void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx)
+void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx)
 {
        struct cxl_afu *afu = ctx->afu;
 
@@ -709,7 +709,7 @@ void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx)
                        ((u64)ctx->irqs.range[3] & 0xffff));
 }
 
-int cxl_attach_dedicated_process_psl(struct cxl_context *ctx, u64 wed, u64 amr)
+int cxl_attach_dedicated_process_psl8(struct cxl_context *ctx, u64 wed, u64 amr)
 {
        struct cxl_afu *afu = ctx->afu;
        u64 pid;
@@ -879,7 +879,7 @@ static int native_get_irq_info(struct cxl_afu *afu, struct cxl_irq_info *info)
        return 0;
 }
 
-void cxl_native_irq_dump_regs_psl(struct cxl_context *ctx)
+void cxl_native_irq_dump_regs_psl8(struct cxl_context *ctx)
 {
        u64 fir1, fir2, fir_slice, serr, afu_debug;
 

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 2b794bdb63b0cd7f67a15f2d9e0ffa9593182efd..85e30ec362fcd7308fa700d54c403f2b0058447e 100644 (file)
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c
@@ -377,7 +377,7 @@ static int calc_capp_routing(struct pci_dev *dev, u64 *chipid, u64 *capp_unit_id
        return 0;
 }
 
-static int init_implementation_adapter_regs_psl(struct cxl *adapter, struct pci_dev *dev)
+static int init_implementation_adapter_regs_psl8(struct cxl *adapter, struct pci_dev *dev)
 {
        u64 psl_dsnctl, psl_fircntl;
        u64 chipid;
@@ -434,7 +434,7 @@ static int init_implementation_adapter_regs_xsl(struct cxl *adapter, struct pci_
 /* For the PSL this is a multiple for 0 < n <= 7: */
 #define PSL_2048_250MHZ_CYCLES 1
 
-static void write_timebase_ctrl_psl(struct cxl *adapter)
+static void write_timebase_ctrl_psl8(struct cxl *adapter)
 {
        cxl_p1_write(adapter, CXL_PSL_TB_CTLSTAT,
                     TBSYNC_CNT(2 * PSL_2048_250MHZ_CYCLES));
@@ -455,7 +455,7 @@ static void write_timebase_ctrl_xsl(struct cxl *adapter)
                     TBSYNC_CNT(XSL_4000_CLOCKS));
 }
 
-static u64 timebase_read_psl(struct cxl *adapter)
+static u64 timebase_read_psl8(struct cxl *adapter)
 {
        return cxl_p1_read(adapter, CXL_PSL_Timebase);
 }
@@ -513,7 +513,7 @@ static void cxl_setup_psl_timebase(struct cxl *adapter, struct pci_dev *dev)
        return;
 }
 
-static int init_implementation_afu_regs_psl(struct cxl_afu *afu)
+static int init_implementation_afu_regs_psl8(struct cxl_afu *afu)
 {
        /* read/write masks for this slice */
        cxl_p1n_write(afu, CXL_PSL_APCALLOC_A, 0xFFFFFFFEFEFEFEFEULL);
@@ -996,7 +996,7 @@ static int cxl_afu_descriptor_looks_ok(struct cxl_afu *afu)
        return 0;
 }
 
-static int sanitise_afu_regs_psl(struct cxl_afu *afu)
+static int sanitise_afu_regs_psl8(struct cxl_afu *afu)
 {
        u64 reg;
 
@@ -1526,40 +1526,40 @@ static void cxl_deconfigure_adapter(struct cxl *adapter)
        pci_disable_device(pdev);
 }
 
-static const struct cxl_service_layer_ops psl_ops = {
-       .adapter_regs_init = init_implementation_adapter_regs_psl,
-       .invalidate_all = cxl_invalidate_all_psl,
-       .afu_regs_init = init_implementation_afu_regs_psl,
-       .sanitise_afu_regs = sanitise_afu_regs_psl,
+static const struct cxl_service_layer_ops psl8_ops = {
+       .adapter_regs_init = init_implementation_adapter_regs_psl8,
+       .invalidate_all = cxl_invalidate_all_psl8,
+       .afu_regs_init = init_implementation_afu_regs_psl8,
+       .sanitise_afu_regs = sanitise_afu_regs_psl8,
        .register_serr_irq = cxl_native_register_serr_irq,
        .release_serr_irq = cxl_native_release_serr_irq,
-       .handle_interrupt = cxl_irq_psl,
+       .handle_interrupt = cxl_irq_psl8,
        .fail_irq = cxl_fail_irq_psl,
-       .activate_dedicated_process = cxl_activate_dedicated_process_psl,
-       .attach_afu_directed = cxl_attach_afu_directed_psl,
-       .attach_dedicated_process = cxl_attach_dedicated_process_psl,
-       .update_dedicated_ivtes = cxl_update_dedicated_ivtes_psl,
-       .debugfs_add_adapter_regs = cxl_debugfs_add_adapter_regs_psl,
-       .debugfs_add_afu_regs = cxl_debugfs_add_afu_regs_psl,
-       .psl_irq_dump_registers = cxl_native_irq_dump_regs_psl,
+       .activate_dedicated_process = cxl_activate_dedicated_process_psl8,
+       .attach_afu_directed = cxl_attach_afu_directed_psl8,
+       .attach_dedicated_process = cxl_attach_dedicated_process_psl8,
+       .update_dedicated_ivtes = cxl_update_dedicated_ivtes_psl8,
+       .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,
-       .debugfs_stop_trace = cxl_stop_trace_psl,
-       .write_timebase_ctrl = write_timebase_ctrl_psl,
-       .timebase_read = timebase_read_psl,
+       .debugfs_stop_trace = cxl_stop_trace_psl8,
+       .write_timebase_ctrl = write_timebase_ctrl_psl8,
+       .timebase_read = timebase_read_psl8,
        .capi_mode = OPAL_PHB_CAPI_MODE_CAPI,
        .needs_reset_before_disable = true,
 };
 
 static const struct cxl_service_layer_ops xsl_ops = {
        .adapter_regs_init = init_implementation_adapter_regs_xsl,
-       .invalidate_all = cxl_invalidate_all_psl,
-       .sanitise_afu_regs = sanitise_afu_regs_psl,
-       .handle_interrupt = cxl_irq_psl,
+       .invalidate_all = cxl_invalidate_all_psl8,
+       .sanitise_afu_regs = sanitise_afu_regs_psl8,
+       .handle_interrupt = cxl_irq_psl8,
        .fail_irq = cxl_fail_irq_psl,
-       .activate_dedicated_process = cxl_activate_dedicated_process_psl,
-       .attach_afu_directed = cxl_attach_afu_directed_psl,
-       .attach_dedicated_process = cxl_attach_dedicated_process_psl,
-       .update_dedicated_ivtes = cxl_update_dedicated_ivtes_psl,
+       .activate_dedicated_process = cxl_activate_dedicated_process_psl8,
+       .attach_afu_directed = cxl_attach_afu_directed_psl8,
+       .attach_dedicated_process = cxl_attach_dedicated_process_psl8,
+       .update_dedicated_ivtes = cxl_update_dedicated_ivtes_psl8,
        .debugfs_add_adapter_regs = cxl_debugfs_add_adapter_regs_xsl,
        .write_timebase_ctrl = write_timebase_ctrl_xsl,
        .timebase_read = timebase_read_xsl,
@@ -1574,8 +1574,8 @@ static void set_sl_ops(struct cxl *adapter, struct pci_dev *dev)
                adapter->native->sl_ops = &xsl_ops;
                adapter->min_pe = 1; /* Workaround for CX-4 hardware bug */
        } else {
-               dev_info(&dev->dev, "Device uses a PSL\n");
-               adapter->native->sl_ops = &psl_ops;
+               dev_info(&dev->dev, "Device uses a PSL8\n");
+               adapter->native->sl_ops = &psl8_ops;
        }
 }