Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / x86 / lib / scu.c

diff --git a/arch/x86/lib/scu.c b/arch/x86/lib/scu.c
index bb23d0b829e5de265e623a67a4365c744bf18220..d29d701631d27095f437e49d15ec1c8b88514dfa 100644 (file)
--- a/arch/x86/lib/scu.c
+++ b/arch/x86/lib/scu.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2017 Intel Corporation
  *
@@ -7,8 +8,6 @@
  * is servicing watchdog and controlling system reset function.
  *
  * This driver enables IPC channel to SCU.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <dm.h>
@@ -16,6 +15,8 @@
 #include <syscon.h>
 #include <asm/cpu.h>
 #include <asm/scu.h>
+#include <linux/bitops.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
@@ -102,6 +103,57 @@ static int scu_ipc_cmd(struct ipc_regs *regs, u32 cmd, u32 sub,
        return err;
 }
 
+/**
+ * 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
+ * @dptr:   data writing to SPTR register
+ * @sptr:   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 scu_ipc_raw_command(u32 cmd, u32 sub, u32 *in, int inlen, u32 *out,
+                       int outlen, u32 dptr, u32 sptr)
+{
+       int inbuflen = DIV_ROUND_UP(inlen, 4);
+       struct udevice *dev;
+       struct scu *scu;
+       int ret;
+
+       ret = syscon_get_by_driver_data(X86_SYSCON_SCU, &dev);
+       if (ret)
+               return ret;
+
+       scu = dev_get_priv(dev);
+
+       /* Up to 16 bytes */
+       if (inbuflen > 4)
+               return -EINVAL;
+
+       writel(dptr, &scu->regs->dptr);
+       writel(sptr, &scu->regs->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.
+        */
+
+       u32 inbuf[4] = {0};
+
+       memcpy(inbuf, in, inlen);
+
+       return scu_ipc_cmd(scu->regs, cmd, sub, inbuf, inlen, out, outlen);
+}
+
 /**
  * scu_ipc_simple_command() - send a simple command
  * @cmd: command
@@ -130,6 +182,17 @@ int scu_ipc_simple_command(u32 cmd, u32 sub)
        return scu_ipc_check_status(scu->regs);
 }
 
+/**
+ *  scu_ipc_command - command with data
+ *  @cmd: command
+ *  @sub: sub type
+ *  @in: input data
+ *  @inlen: input length in dwords
+ *  @out: output data
+ *  @outlen: output length in dwords
+ *
+ *  Issue a command to the SCU which involves data transfers.
+ */
 int scu_ipc_command(u32 cmd, u32 sub, u32 *in, int inlen, u32 *out, int outlen)
 {
        struct scu *scu;