* [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory
@ 2017-04-05 16:05 Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 2/5] platform/x86: intel_scu_ipc: Rearrange init sequence Andy Shevchenko
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-04-05 16:05 UTC (permalink / raw)
To: x86, Darren Hart, platform-driver-x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-kernel
Cc: Andy Shevchenko
Fail ->probe() if there is no platform data supplied.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_scu_ipc.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index e81daff65f62..d789fe1baf17 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -579,6 +579,8 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return -EBUSY;
pdata = (struct intel_scu_ipc_pdata_t *)id->driver_data;
+ if (!pdata)
+ return -ENODEV;
scu->dev = &pdev->dev;
scu->irq_mode = pdata->irq_mode;
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 2/5] platform/x86: intel_scu_ipc: Rearrange init sequence
2017-04-05 16:05 [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory Andy Shevchenko
@ 2017-04-05 16:05 ` Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 3/5] platform/x86: intel_scu_ipc: Remove redundant subarch check Andy Shevchenko
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-04-05 16:05 UTC (permalink / raw)
To: x86, Darren Hart, platform-driver-x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-kernel
Cc: Andy Shevchenko
Device pointer is used as a flag that everything is prepared.
Nevertheless the assignment happened quite before and there is a window
when a caller can get weird results or even crashes since not all fields
are initialized yet.
Rearrange initialization sequence in ->probe() to prepare everything
before use.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_scu_ipc.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index d789fe1baf17..8a34c1e7536f 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -582,7 +582,6 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!pdata)
return -ENODEV;
- scu->dev = &pdev->dev;
scu->irq_mode = pdata->irq_mode;
err = pcim_enable_device(pdev);
@@ -595,17 +594,20 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
init_completion(&scu->cmd_complete);
- err = devm_request_irq(&pdev->dev, pdev->irq, ioc, 0, "intel_scu_ipc",
- scu);
- if (err)
- return err;
-
scu->ipc_base = pcim_iomap_table(pdev)[0];
scu->i2c_base = ioremap_nocache(pdata->i2c_base, pdata->i2c_len);
if (!scu->i2c_base)
return -ENOMEM;
+ err = devm_request_irq(&pdev->dev, pdev->irq, ioc, 0, "intel_scu_ipc",
+ scu);
+ if (err)
+ return err;
+
+ /* Assign device at last */
+ scu->dev = &pdev->dev;
+
intel_scu_devices_create();
pci_set_drvdata(pdev, scu);
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 3/5] platform/x86: intel_scu_ipc: Remove redundant subarch check
2017-04-05 16:05 [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 2/5] platform/x86: intel_scu_ipc: Rearrange init sequence Andy Shevchenko
@ 2017-04-05 16:05 ` Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 4/5] platform/x86: intel_scu_ipc: Introduce SCU_DEVICE() macro Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 5/5] platform/x86: intel_scu_ipc: Introduce intel_scu_ipc_raw_command() Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-04-05 16:05 UTC (permalink / raw)
To: x86, Darren Hart, platform-driver-x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-kernel
Cc: Andy Shevchenko
The driver is bound to the devices based on their PCI IDs.
There is no need to do an additional check.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_scu_ipc.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 8a34c1e7536f..6d626a8878c7 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -566,15 +566,10 @@ static irqreturn_t ioc(int irq, void *dev_id)
*/
static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
- int platform; /* Platform type */
int err;
struct intel_scu_ipc_dev *scu = &ipcdev;
struct intel_scu_ipc_pdata_t *pdata;
- platform = intel_mid_identify_cpu();
- if (platform == 0)
- return -ENODEV;
-
if (scu->dev) /* We support only one SCU */
return -EBUSY;
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 4/5] platform/x86: intel_scu_ipc: Introduce SCU_DEVICE() macro
2017-04-05 16:05 [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 2/5] platform/x86: intel_scu_ipc: Rearrange init sequence Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 3/5] platform/x86: intel_scu_ipc: Remove redundant subarch check Andy Shevchenko
@ 2017-04-05 16:05 ` Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 5/5] platform/x86: intel_scu_ipc: Introduce intel_scu_ipc_raw_command() Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-04-05 16:05 UTC (permalink / raw)
To: x86, Darren Hart, platform-driver-x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-kernel
Cc: Andy Shevchenko
For better maintainability and readability introduce a macro
for device ID table.
No functional change intended.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/platform/x86/intel_scu_ipc.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 6d626a8878c7..f9d3eb505a0b 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -609,22 +609,14 @@ static int ipc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return 0;
}
+#define SCU_DEVICE(id, pdata) {PCI_VDEVICE(INTEL, id), (kernel_ulong_t)&pdata}
+
static const struct pci_device_id pci_ids[] = {
- {
- PCI_VDEVICE(INTEL, PCI_DEVICE_ID_LINCROFT),
- (kernel_ulong_t)&intel_scu_ipc_lincroft_pdata,
- }, {
- PCI_VDEVICE(INTEL, PCI_DEVICE_ID_PENWELL),
- (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
- }, {
- PCI_VDEVICE(INTEL, PCI_DEVICE_ID_CLOVERVIEW),
- (kernel_ulong_t)&intel_scu_ipc_penwell_pdata,
- }, {
- PCI_VDEVICE(INTEL, PCI_DEVICE_ID_TANGIER),
- (kernel_ulong_t)&intel_scu_ipc_tangier_pdata,
- }, {
- 0,
- }
+ SCU_DEVICE(PCI_DEVICE_ID_LINCROFT, intel_scu_ipc_lincroft_pdata),
+ SCU_DEVICE(PCI_DEVICE_ID_PENWELL, intel_scu_ipc_penwell_pdata),
+ SCU_DEVICE(PCI_DEVICE_ID_CLOVERVIEW, intel_scu_ipc_penwell_pdata),
+ SCU_DEVICE(PCI_DEVICE_ID_TANGIER, intel_scu_ipc_tangier_pdata),
+ {}
};
static struct pci_driver ipc_driver = {
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v1 5/5] platform/x86: intel_scu_ipc: Introduce intel_scu_ipc_raw_command()
2017-04-05 16:05 [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory Andy Shevchenko
` (2 preceding siblings ...)
2017-04-05 16:05 ` [PATCH v1 4/5] platform/x86: intel_scu_ipc: Introduce SCU_DEVICE() macro Andy Shevchenko
@ 2017-04-05 16:05 ` Andy Shevchenko
3 siblings, 0 replies; 5+ messages in thread
From: Andy Shevchenko @ 2017-04-05 16:05 UTC (permalink / raw)
To: x86, Darren Hart, platform-driver-x86, Thomas Gleixner,
Ingo Molnar, H. Peter Anvin, linux-kernel
Cc: Andy Shevchenko
A new call to SCU intel_scu_ipc_raw_command() writes SPTR and DPTR
registers before sending a command.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/include/asm/intel_scu_ipc.h | 8 ++++-
drivers/platform/x86/intel_scu_ipc.c | 63 ++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/intel_scu_ipc.h b/arch/x86/include/asm/intel_scu_ipc.h
index 4fb1d0abef95..81d3d8776fd9 100644
--- a/arch/x86/include/asm/intel_scu_ipc.h
+++ b/arch/x86/include/asm/intel_scu_ipc.h
@@ -3,6 +3,9 @@
#include <linux/notifier.h>
+#define IPCMSG_INDIRECT_READ 0x02
+#define IPCMSG_INDIRECT_WRITE 0x05
+
#define IPCMSG_COLD_OFF 0x80 /* Only for Tangier */
#define IPCMSG_WARM_RESET 0xF0
@@ -45,7 +48,10 @@ int intel_scu_ipc_update_register(u16 addr, u8 data, u8 mask);
/* Issue commands to the SCU with or without data */
int intel_scu_ipc_simple_command(int cmd, int sub);
int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
- u32 *out, int outlen);
+ u32 *out, int outlen);
+int intel_scu_ipc_raw_command(int cmd, int sub, u8 *in, int inlen,
+ u32 *out, int outlen, u32 dptr, u32 sptr);
+
/* I2C control api */
int intel_scu_ipc_i2c_cntrl(u32 addr, u32 *data);
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index f9d3eb505a0b..f7cf981502cd 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -491,6 +491,69 @@ int intel_scu_ipc_command(int cmd, int sub, u32 *in, int inlen,
}
EXPORT_SYMBOL(intel_scu_ipc_command);
+#define IPC_SPTR 0x08
+#define IPC_DPTR 0x0C
+
+/**
+ * intel_scu_ipc_raw_command() - 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 dwords.
+ * @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 SCU with input/output data and source/dest pointers.
+ *
+ * Return: an IPC error code or 0 on success.
+ */
+int intel_scu_ipc_raw_command(int cmd, int sub, u8 *in, int inlen,
+ u32 *out, int outlen, u32 dptr, u32 sptr)
+{
+ struct intel_scu_ipc_dev *scu = &ipcdev;
+ int inbuflen = DIV_ROUND_UP(inlen, 4);
+ u32 inbuf[4];
+ int i, err;
+
+ /* Up to 16 bytes */
+ if (inbuflen > 4)
+ return -EINVAL;
+
+ mutex_lock(&ipclock);
+ if (scu->dev == NULL) {
+ mutex_unlock(&ipclock);
+ return -ENODEV;
+ }
+
+ writel(dptr, scu->ipc_base + IPC_DPTR);
+ writel(sptr, scu->ipc_base + IPC_SPTR);
+
+ /*
+ * SRAM controller doesn't support 8-bit writes, it only
+ * supports 32-bit writes, so we have to copy input data into
+ * the temporary buffer, and SCU FW will use the inlen to
+ * determine the actual input data length in the temporary
+ * buffer.
+ */
+ memcpy(inbuf, in, inlen);
+
+ for (i = 0; i < inbuflen; i++)
+ ipc_data_writel(scu, inbuf[i], 4 * i);
+
+ ipc_command(scu, (inlen << 16) | (sub << 12) | cmd);
+ err = intel_scu_ipc_check_status(scu);
+ if (!err) {
+ for (i = 0; i < outlen; i++)
+ *out++ = ipc_data_readl(scu, 4 * i);
+ }
+
+ mutex_unlock(&ipclock);
+ return err;
+}
+EXPORT_SYMBOL_GPL(intel_scu_ipc_raw_command);
+
/* I2C commands */
#define IPC_I2C_WRITE 1 /* I2C Write command */
#define IPC_I2C_READ 2 /* I2C Read command */
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-05 16:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-05 16:05 [PATCH v1 1/5] platform/x86: intel_scu_ipc: Platform data is mandatory Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 2/5] platform/x86: intel_scu_ipc: Rearrange init sequence Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 3/5] platform/x86: intel_scu_ipc: Remove redundant subarch check Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 4/5] platform/x86: intel_scu_ipc: Introduce SCU_DEVICE() macro Andy Shevchenko
2017-04-05 16:05 ` [PATCH v1 5/5] platform/x86: intel_scu_ipc: Introduce intel_scu_ipc_raw_command() Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.