mfd: cros_ec: Use fixed size arrays to transfer data with the EC

The struct cros_ec_command will be used as an ioctl() argument for the
API to control the ChromeOS EC from user-space. So the data structure
has to be 64-bit safe to make it compatible between 32 and 64 avoiding
the need for a compat ioctl interface. Since pointers are self-aligned
to different byte boundaries, use fixed size arrays instead of pointers
for transferring ingoing and outgoing data with the Embedded Controller.

Also, re-arrange struct members by decreasing alignment requirements to
reduce the needing padding size.

Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Acked-by: Lee Jones <lee.jones@linaro.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index ffa989f2c785..769f8f7f62b7 100644
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -148,16 +148,19 @@ static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev,
 
 static int cros_ec_keyb_get_state(struct cros_ec_keyb *ckdev, uint8_t *kb_state)
 {
+        int ret;
         struct cros_ec_command msg = {
-                .version = 0,
                 .command = EC_CMD_MKBP_STATE,
-                .outdata = NULL,
-                .outsize = 0,
-                .indata = kb_state,
                 .insize = ckdev->cols,
         };
 
-        return cros_ec_cmd_xfer(ckdev->ec, &msg);
+        ret = cros_ec_cmd_xfer(ckdev->ec, &msg);
+        if (ret < 0)
+                return ret;
+
+        memcpy(kb_state, msg.indata, ckdev->cols);
+
+        return 0;
 }
 
 static irqreturn_t cros_ec_keyb_irq(int irq, void *data)