platform/x86: intel_pmc_ipc: Start using SCU IPC
authorMika Westerberg <mika.westerberg@linux.intel.com>
Thu, 16 Apr 2020 08:15:41 +0000 (11:15 +0300)
committerLee Jones <lee.jones@linaro.org>
Fri, 24 Apr 2020 10:17:48 +0000 (11:17 +0100)
SCU IPC is pretty much the same IPC implemented in the intel_pmc_ipc
driver so drop the duplicate implementation and call directly the SCU
IPC.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/platform/x86/Kconfig
drivers/platform/x86/intel_pmc_ipc.c

index d1e4d49..cd0a6c1 100644 (file)
@@ -1330,6 +1330,7 @@ config INTEL_PMC_CORE
 config INTEL_PMC_IPC
        tristate "Intel PMC IPC Driver"
        depends on ACPI && PCI
+       select INTEL_SCU_IPC
        ---help---
        This driver provides support for PMC control on some Intel platforms.
        The PMC is an ARC processor which defines IPC commands for communication
index 2433bf7..0558ead 100644 (file)
 #include <linux/platform_device.h>
 
 #include <asm/intel_pmc_ipc.h>
+#include <asm/intel_scu_ipc.h>
 
 #include <linux/platform_data/itco_wdt.h>
 
-/*
- * IPC registers
- * The IA write to IPC_CMD command register triggers an interrupt to the ARC,
- * The ARC handles the interrupt and services it, writing optional data to
- * the IPC1 registers, updates the IPC_STS response register with the status.
- */
-#define IPC_CMD                        0x00
-#define                IPC_CMD_MSI             BIT(8)
-#define                IPC_CMD_SIZE            16
-#define                IPC_CMD_SUBCMD          12
-#define IPC_STATUS             0x04
-#define                IPC_STATUS_IRQ          BIT(2)
-#define                IPC_STATUS_ERR          BIT(1)
-#define                IPC_STATUS_BUSY         BIT(0)
-#define IPC_SPTR               0x08
-#define IPC_DPTR               0x0C
-#define IPC_WRITE_BUFFER       0x80
-#define IPC_READ_BUFFER                0x90
-
 /* Residency with clock rate at 19.2MHz to usecs */
 #define S0IX_RESIDENCY_IN_USECS(d, s)          \
 ({                                             \
        result;                                 \
 })
 
-/*
- * 16-byte buffer for sending data associated with IPC command.
- */
-#define IPC_DATA_BUFFER_SIZE   16
-
-#define IPC_LOOP_CNT           3000000
-#define IPC_MAX_SEC            3
-
-#define IPC_TRIGGER_MODE_IRQ           true
-
 /* exported resources from IFWI */
 #define PLAT_RESOURCE_IPC_INDEX                0
 #define PLAT_RESOURCE_IPC_SIZE         0x1000
 
 static struct intel_pmc_ipc_dev {
        struct device *dev;
-       void __iomem *ipc_base;
-       bool irq_mode;
-       int irq;
-       int cmd;
-       struct completion cmd_complete;
 
        /* The following PMC BARs share the same ACPI device with the IPC */
        resource_size_t acpi_io_base;
@@ -132,53 +99,6 @@ static struct intel_pmc_ipc_dev {
        struct platform_device *telemetry_dev;
 } ipcdev;
 
-static char *ipc_err_sources[] = {
-       [IPC_ERR_NONE] =
-               "no error",
-       [IPC_ERR_CMD_NOT_SUPPORTED] =
-               "command not supported",
-       [IPC_ERR_CMD_NOT_SERVICED] =
-               "command not serviced",
-       [IPC_ERR_UNABLE_TO_SERVICE] =
-               "unable to service",
-       [IPC_ERR_CMD_INVALID] =
-               "command invalid",
-       [IPC_ERR_CMD_FAILED] =
-               "command failed",
-       [IPC_ERR_EMSECURITY] =
-               "Invalid Battery",
-       [IPC_ERR_UNSIGNEDKERNEL] =
-               "Unsigned kernel",
-};
-
-/* Prevent concurrent calls to the PMC */
-static DEFINE_MUTEX(ipclock);
-
-static inline void ipc_send_command(u32 cmd)
-{
-       ipcdev.cmd = cmd;
-       if (ipcdev.irq_mode) {
-               reinit_completion(&ipcdev.cmd_complete);
-               cmd |= IPC_CMD_MSI;
-       }
-       writel(cmd, ipcdev.ipc_base + IPC_CMD);
-}
-
-static inline u32 ipc_read_status(void)
-{
-       return readl(ipcdev.ipc_base + IPC_STATUS);
-}
-
-static inline void ipc_data_writel(u32 data, u32 offset)
-{
-       writel(data, ipcdev.ipc_base + IPC_WRITE_BUFFER + offset);
-}
-
-static inline u32 ipc_data_readl(u32 offset)
-{
-       return readl(ipcdev.ipc_base + IPC_READ_BUFFER + offset);
-}
-
 static inline u64 gcr_data_readq(u32 offset)
 {
        return readq(ipcdev.gcr_mem_base + offset);
@@ -274,127 +194,6 @@ static int update_no_reboot_bit(void *priv, bool set)
                                    PMC_CFG_NO_REBOOT_MASK, value);
 }
 
-static int intel_pmc_ipc_check_status(void)
-{
-       int status;
-       int ret = 0;
-
-       if (ipcdev.irq_mode) {
-               if (0 == wait_for_completion_timeout(
-                               &ipcdev.cmd_complete, IPC_MAX_SEC * HZ))
-                       ret = -ETIMEDOUT;
-       } else {
-               int loop_count = IPC_LOOP_CNT;
-
-               while ((ipc_read_status() & IPC_STATUS_BUSY) && --loop_count)
-                       udelay(1);
-               if (loop_count == 0)
-                       ret = -ETIMEDOUT;
-       }
-
-       status = ipc_read_status();
-       if (ret == -ETIMEDOUT) {
-               dev_err(ipcdev.dev,
-                       "IPC timed out, TS=0x%x, CMD=0x%x\n",
-                       status, ipcdev.cmd);
-               return ret;
-       }
-
-       if (status & IPC_STATUS_ERR) {
-               int i;
-
-               ret = -EIO;
-               i = (status >> IPC_CMD_SIZE) & 0xFF;
-               if (i < ARRAY_SIZE(ipc_err_sources))
-                       dev_err(ipcdev.dev,
-                               "IPC failed: %s, STS=0x%x, CMD=0x%x\n",
-                               ipc_err_sources[i], status, ipcdev.cmd);
-               else
-                       dev_err(ipcdev.dev,
-                               "IPC failed: unknown, STS=0x%x, CMD=0x%x\n",
-                               status, ipcdev.cmd);
-               if ((i == IPC_ERR_UNSIGNEDKERNEL) || (i == IPC_ERR_EMSECURITY))
-                       ret = -EACCES;
-       }
-
-       return ret;
-}
-
-/**
- * intel_pmc_ipc_simple_command() - Simple IPC command
- * @cmd:       IPC command code.
- * @sub:       IPC command sub type.
- *
- * Send a simple IPC command to PMC when don't need to specify
- * input/output data and source/dest pointers.
- *
- * Return:     an IPC error code or 0 on success.
- */
-static int intel_pmc_ipc_simple_command(int cmd, int sub)
-{
-       int ret;
-
-       mutex_lock(&ipclock);
-       if (ipcdev.dev == NULL) {
-               mutex_unlock(&ipclock);
-               return -ENODEV;
-       }
-       ipc_send_command(sub << IPC_CMD_SUBCMD | cmd);
-       ret = intel_pmc_ipc_check_status();
-       mutex_unlock(&ipclock);
-
-       return ret;
-}
-
-/**
- * intel_pmc_ipc_raw_cmd() - IPC command with data and pointers
- * @cmd:       IPC command code.
- * @sub:       IPC command sub type.
- * @in:                input data of this IPC command.
- * @inlen:     input data length in bytes.
- * @out:       output data of this IPC command.
- * @outlen:    output data length in dwords.
- * @sptr:      data writing to SPTR register.
- * @dptr:      data writing to DPTR register.
- *
- * Send an IPC command to PMC with input/output data and source/dest pointers.
- *
- * Return:     an IPC error code or 0 on success.
- */
-static int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen, u32 *out,
-                                u32 outlen, u32 dptr, u32 sptr)
-{
-       u32 wbuf[4] = { 0 };
-       int ret;
-       int i;
-
-       if (inlen > IPC_DATA_BUFFER_SIZE || outlen > IPC_DATA_BUFFER_SIZE / 4)
-               return -EINVAL;
-
-       mutex_lock(&ipclock);
-       if (ipcdev.dev == NULL) {
-               mutex_unlock(&ipclock);
-               return -ENODEV;
-       }
-       memcpy(wbuf, in, inlen);
-       writel(dptr, ipcdev.ipc_base + IPC_DPTR);
-       writel(sptr, ipcdev.ipc_base + IPC_SPTR);
-       /* The input data register is 32bit register and inlen is in Byte */
-       for (i = 0; i < ((inlen + 3) / 4); i++)
-               ipc_data_writel(wbuf[i], 4 * i);
-       ipc_send_command((inlen << IPC_CMD_SIZE) |
-                       (sub << IPC_CMD_SUBCMD) | cmd);
-       ret = intel_pmc_ipc_check_status();
-       if (!ret) {
-               /* out is read from 32bit register and outlen is in 32bit */
-               for (i = 0; i < outlen; i++)
-                       *out++ = ipc_data_readl(4 * i);
-       }
-       mutex_unlock(&ipclock);
-
-       return ret;
-}
-
 /**
  * intel_pmc_ipc_command() -  IPC command with input/output data
  * @cmd:       IPC command code.
@@ -411,54 +210,32 @@ static int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen, u32 *out,
 int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,
                          u32 *out, u32 outlen)
 {
-       return intel_pmc_ipc_raw_cmd(cmd, sub, in, inlen, out, outlen, 0, 0);
+       return intel_scu_ipc_dev_command(NULL, cmd, sub, in, inlen, out, outlen);
 }
 EXPORT_SYMBOL_GPL(intel_pmc_ipc_command);
 
-static irqreturn_t ioc(int irq, void *dev_id)
-{
-       int status;
-
-       if (ipcdev.irq_mode) {
-               status = ipc_read_status();
-               writel(status | IPC_STATUS_IRQ, ipcdev.ipc_base + IPC_STATUS);
-       }
-       complete(&ipcdev.cmd_complete);
-
-       return IRQ_HANDLED;
-}
-
 static int ipc_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct intel_pmc_ipc_dev *pmc = &ipcdev;
+       struct intel_scu_ipc_data scu_data = {};
+       struct intel_scu_ipc_dev *scu;
        int ret;
 
        /* Only one PMC is supported */
        if (pmc->dev)
                return -EBUSY;
 
-       pmc->irq_mode = IPC_TRIGGER_MODE_IRQ;
-
        spin_lock_init(&ipcdev.gcr_lock);
 
        ret = pcim_enable_device(pdev);
        if (ret)
                return ret;
 
-       ret = pcim_iomap_regions(pdev, 1 << 0, pci_name(pdev));
-       if (ret)
-               return ret;
-
-       init_completion(&pmc->cmd_complete);
-
-       pmc->ipc_base = pcim_iomap_table(pdev)[0];
+       scu_data.mem = pdev->resource[0];
 
-       ret = devm_request_irq(&pdev->dev, pdev->irq, ioc, 0, "intel_pmc_ipc",
-                               pmc);
-       if (ret) {
-               dev_err(&pdev->dev, "Failed to request irq\n");
-               return ret;
-       }
+       scu = devm_intel_scu_ipc_register(&pdev->dev, &scu_data);
+       if (IS_ERR(scu))
+               return PTR_ERR(scu);
 
        pmc->dev = &pdev->dev;
 
@@ -485,6 +262,7 @@ static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev,
                                              struct device_attribute *attr,
                                              const char *buf, size_t count)
 {
+       struct intel_scu_ipc_dev *scu = dev_get_drvdata(dev);
        int subcmd;
        int cmd;
        int ret;
@@ -495,7 +273,7 @@ static ssize_t intel_pmc_ipc_simple_cmd_store(struct device *dev,
                return -EINVAL;
        }
 
-       ret = intel_pmc_ipc_simple_command(cmd, subcmd);
+       ret = intel_scu_ipc_dev_simple_command(scu, cmd, subcmd);
        if (ret) {
                dev_err(dev, "command %d error with %d\n", cmd, ret);
                return ret;
@@ -508,6 +286,7 @@ static ssize_t intel_pmc_ipc_northpeak_store(struct device *dev,
                                             struct device_attribute *attr,
                                             const char *buf, size_t count)
 {
+       struct intel_scu_ipc_dev *scu = dev_get_drvdata(dev);
        unsigned long val;
        int subcmd;
        int ret;
@@ -520,7 +299,7 @@ static ssize_t intel_pmc_ipc_northpeak_store(struct device *dev,
                subcmd = 1;
        else
                subcmd = 0;
-       ret = intel_pmc_ipc_simple_command(PMC_IPC_NORTHPEAK_CTRL, subcmd);
+       ret = intel_scu_ipc_dev_simple_command(scu, PMC_IPC_NORTHPEAK_CTRL, subcmd);
        if (ret) {
                dev_err(dev, "command north %d error with %d\n", subcmd, ret);
                return ret;
@@ -714,9 +493,11 @@ static int ipc_create_pmc_devices(void)
        return ret;
 }
 
-static int ipc_plat_get_res(struct platform_device *pdev)
+static int ipc_plat_get_res(struct platform_device *pdev,
+                           struct intel_scu_ipc_data *scu_data)
 {
        struct resource *res, *punit_res = punit_res_array;
+       resource_size_t start;
        void __iomem *addr;
        int size;
 
@@ -785,23 +566,30 @@ static int ipc_plat_get_res(struct platform_device *pdev)
                dev_info(&pdev->dev, "punit GTD interface res: %pR\n", res);
        }
 
+       scu_data->irq = platform_get_irq(pdev, 0);
+
        res = platform_get_resource(pdev, IORESOURCE_MEM,
                                    PLAT_RESOURCE_IPC_INDEX);
        if (!res) {
                dev_err(&pdev->dev, "Failed to get ipc resource\n");
                return -ENXIO;
        }
-       size = PLAT_RESOURCE_IPC_SIZE + PLAT_RESOURCE_GCR_SIZE;
-       res->end = res->start + size - 1;
+       dev_info(&pdev->dev, "ipc res: %pR\n", res);
 
-       addr = devm_ioremap_resource(&pdev->dev, res);
-       if (IS_ERR(addr))
-               return PTR_ERR(addr);
+       scu_data->mem.flags = res->flags;
+       scu_data->mem.start = res->start;
+       scu_data->mem.end = res->start + PLAT_RESOURCE_IPC_SIZE - 1;
 
-       ipcdev.ipc_base = addr;
+       start = res->start + PLAT_RESOURCE_GCR_OFFSET;
+       if (!devm_request_mem_region(&pdev->dev, start, PLAT_RESOURCE_GCR_SIZE,
+                                    "pmc_ipc_plat"))
+               return -EBUSY;
 
-       ipcdev.gcr_mem_base = addr + PLAT_RESOURCE_GCR_OFFSET;
-       dev_info(&pdev->dev, "ipc res: %pR\n", res);
+       addr = devm_ioremap(&pdev->dev, start, PLAT_RESOURCE_GCR_SIZE);
+       if (!addr)
+               return -ENOMEM;
+
+       ipcdev.gcr_mem_base = addr;
 
        ipcdev.telem_res_inval = 0;
        res = platform_get_resource(pdev, IORESOURCE_MEM,
@@ -854,51 +642,38 @@ MODULE_DEVICE_TABLE(acpi, ipc_acpi_ids);
 
 static int ipc_plat_probe(struct platform_device *pdev)
 {
+       struct intel_scu_ipc_data scu_data = {};
+       struct intel_scu_ipc_dev *scu;
        int ret;
 
        ipcdev.dev = &pdev->dev;
-       ipcdev.irq_mode = IPC_TRIGGER_MODE_IRQ;
-       init_completion(&ipcdev.cmd_complete);
        spin_lock_init(&ipcdev.gcr_lock);
 
-       ipcdev.irq = platform_get_irq(pdev, 0);
-       if (ipcdev.irq < 0)
-               return -EINVAL;
-
-       ret = ipc_plat_get_res(pdev);
+       ret = ipc_plat_get_res(pdev, &scu_data);
        if (ret) {
                dev_err(&pdev->dev, "Failed to request resource\n");
                return ret;
        }
 
+       scu = devm_intel_scu_ipc_register(&pdev->dev, &scu_data);
+       if (IS_ERR(scu))
+               return PTR_ERR(scu);
+
+       platform_set_drvdata(pdev, scu);
+
        ret = ipc_create_pmc_devices();
        if (ret) {
                dev_err(&pdev->dev, "Failed to create pmc devices\n");
                return ret;
        }
 
-       if (devm_request_irq(&pdev->dev, ipcdev.irq, ioc, IRQF_NO_SUSPEND,
-                            "intel_pmc_ipc", &ipcdev)) {
-               dev_err(&pdev->dev, "Failed to request irq\n");
-               ret = -EBUSY;
-               goto err_irq;
-       }
-
        ipcdev.has_gcr_regs = true;
 
        return 0;
-
-err_irq:
-       platform_device_unregister(ipcdev.tco_dev);
-       platform_device_unregister(ipcdev.punit_dev);
-       platform_device_unregister(ipcdev.telemetry_dev);
-
-       return ret;
 }
 
 static int ipc_plat_remove(struct platform_device *pdev)
 {
-       devm_free_irq(&pdev->dev, ipcdev.irq, &ipcdev);
        platform_device_unregister(ipcdev.tco_dev);
        platform_device_unregister(ipcdev.punit_dev);
        platform_device_unregister(ipcdev.telemetry_dev);