Implement fixed-up message handlers to maintain compatibility with existing i.MX devices that rely on the NXP legacy RPMSG firmware and its transport protocol. This ensures backward compatibility and preserves functionality for deployed NXP systems.
Signed-off-by: Shenwei Wang <[email protected]> --- drivers/gpio/Kconfig | 15 ++++ drivers/gpio/gpio-rpmsg.c | 147 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index cff0fda8a283..cd0ac5bf4443 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -1907,6 +1907,21 @@ config GPIO_RPMSG If unsure, say N. +if GPIO_RPMSG + +config GPIO_RPMSG_NXP_LEGACY + bool "Support for the NXP legacy firmware" + depends on GPIO_RPMSG && ARCH_MXC + default y + help + Enable support for the legacy NXP firmware protocol used by older + i.MX products. This option provides compatibility for systems + that still rely on the nxp legacy message format and allows + existing deployments to continue functioning without requiring + firmware changes. + +endif + endmenu menu "SPI GPIO expanders" diff --git a/drivers/gpio/gpio-rpmsg.c b/drivers/gpio/gpio-rpmsg.c index 9c609b55bc14..be263c09a1f0 100644 --- a/drivers/gpio/gpio-rpmsg.c +++ b/drivers/gpio/gpio-rpmsg.c @@ -84,6 +84,147 @@ struct rpdev_drvdata { void *channel_devices[MAX_PORT_PER_CHANNEL]; }; +#ifdef CONFIG_GPIO_RPMSG_NXP_LEGACY +/* NXP I.MX Legacy GPIO RPMSG protocol */ +#define IMX_RPMSG_CONFIG_INPUT 0 +#define IMX_RPMSG_CONFIG_OUTPUT 1 +#define IMX_RPMSG_GET_LEVEL 2 +#define IMX_RPMSG_GET_DIRECTION 3 +#define IMX_RPMSG_CMD_UNKNOWN 0x7F + +#define IMX_RPMSG_TRI_LOW_LEVEL 4 +#define IMX_RPMSG_TRI_HIGH_LEVEL 5 + +#define IMX_RPMSG_ID 5 +#define IMX_RPMSG_VENDOR 1 +#define IMX_RPMSG_VERSION 0 + +struct rpmsg_gpio_nxp_packet { + u8 id; /* Message ID Code */ + u8 vendor; /* Vendor ID number */ + u8 version; /* Protocol version number */ + u8 type; /* Message type */ + u8 cmd; /* Command code */ + u8 reserved[5]; + u8 line; + u8 port_idx; + u8 val1; + u8 val2; +}; + +static struct rpmsg_gpio_packet * +rpmsg_gpio_imx_recv_fixed_up(struct rpmsg_device *rpdev, void *data) +{ + struct rpmsg_gpio_nxp_packet *imx_msg = data; + struct rpmsg_gpio_packet *msg; + struct rpdev_drvdata *drvdata; + + if (!imx_msg) + return NULL; + + drvdata = dev_get_drvdata(&rpdev->dev); + if (!drvdata->recv_pkt) + drvdata->recv_pkt = devm_kzalloc(&rpdev->dev, sizeof(*msg), GFP_ATOMIC); + + if (!drvdata->recv_pkt) + return NULL; + + msg = drvdata->recv_pkt; + + msg->type = imx_msg->type; + msg->cmd = imx_msg->cmd; + msg->port_idx = imx_msg->port_idx; + msg->line = imx_msg->line; + msg->val1 = imx_msg->val1; + msg->val2 = imx_msg->val2; + + switch (imx_msg->cmd) { + case IMX_RPMSG_GET_LEVEL: + msg->cmd = VIRTIO_GPIO_MSG_GET_VALUE; + break; + + case IMX_RPMSG_GET_DIRECTION: + msg->cmd = VIRTIO_GPIO_MSG_GET_DIRECTION; + break; + + case IMX_RPMSG_CONFIG_OUTPUT: + msg->cmd = VIRTIO_GPIO_MSG_SET_DIRECTION; + msg->val2 = VIRTIO_GPIO_DIRECTION_OUT; + break; + + case IMX_RPMSG_CONFIG_INPUT: + msg->cmd = VIRTIO_GPIO_MSG_SET_DIRECTION; + msg->val2 = VIRTIO_GPIO_DIRECTION_IN; + break; + + default: + break; + } + + return msg; +} + +static const int imx_std_cmd_map[] = { + IMX_RPMSG_CMD_UNKNOWN, + IMX_RPMSG_CMD_UNKNOWN, /* VIRTIO_GPIO_MSG_GET_NAMES */ + IMX_RPMSG_GET_DIRECTION, /* VIRTIO_GPIO_MSG_GET_DIRECTION */ + IMX_RPMSG_CONFIG_INPUT, /* VIRTIO_GPIO_MSG_SET_DIRECTION */ + IMX_RPMSG_GET_LEVEL, /* VIRTIO_GPIO_MSG_GET_VALUE */ + IMX_RPMSG_CONFIG_OUTPUT, /* VIRTIO_GPIO_MSG_SET_VALUE */ + IMX_RPMSG_CONFIG_INPUT /* VIRTIO_GPIO_MSG_IRQ_TYPE */ +}; + +static int rpmsg_gpio_imx_send_fixed_up(struct rpmsg_gpio_info *info, + struct rpmsg_gpio_packet *msg) +{ + struct rpmsg_gpio_nxp_packet imx_msg; + + if (msg->cmd >= ARRAY_SIZE(imx_std_cmd_map)) + return -EINVAL; + + imx_msg.id = IMX_RPMSG_ID; + imx_msg.vendor = IMX_RPMSG_VENDOR; + imx_msg.version = IMX_RPMSG_VERSION; + imx_msg.type = msg->type; + imx_msg.cmd = imx_std_cmd_map[msg->cmd]; + imx_msg.port_idx = msg->port_idx; + imx_msg.line = msg->line; + imx_msg.val1 = msg->val1; + imx_msg.val2 = msg->val2; + + switch (msg->cmd) { + case VIRTIO_GPIO_MSG_IRQ_TYPE: + switch (msg->val1) { + case VIRTIO_GPIO_IRQ_TYPE_LEVEL_HIGH: + imx_msg.val1 = IMX_RPMSG_TRI_HIGH_LEVEL; + break; + case VIRTIO_GPIO_IRQ_TYPE_LEVEL_LOW: + imx_msg.val1 = IMX_RPMSG_TRI_LOW_LEVEL; + break; + default: + break; + } + break; + + case VIRTIO_GPIO_MSG_SET_DIRECTION: + imx_msg.val1 = 0; + if (msg->val1 == VIRTIO_GPIO_DIRECTION_OUT) + imx_msg.cmd = IMX_RPMSG_CONFIG_OUTPUT; + break; + + default: + break; + } + + return rpmsg_send(info->rpdev->ept, &imx_msg, sizeof(imx_msg)); +} + +static const struct rpmsg_gpio_fixed_up imx_fixed_up_data = { + .recv_fixed_up = rpmsg_gpio_imx_recv_fixed_up, + .send_fixed_up = rpmsg_gpio_imx_send_fixed_up, +}; +#endif + static int rpmsg_gpio_send_message(struct rpmsg_gpio_port *port, struct rpmsg_gpio_packet *msg, bool sync) @@ -576,6 +717,12 @@ static const struct of_device_id rpmsg_gpio_dt_ids[] = { static struct rpmsg_device_id rpmsg_gpio_channel_id_table[] = { { .name = "rpmsg-io" }, +#ifdef CONFIG_GPIO_RPMSG_NXP_LEGACY + { + .name = "rpmsg-io-channel", + .driver_data = (kernel_ulong_t)&imx_fixed_up_data + }, +#endif { }, }; MODULE_DEVICE_TABLE(rpmsg, rpmsg_gpio_channel_id_table); -- 2.43.0
