From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/rpmsg/rockchip_rpmsg_softirq.c | 129 ++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 68 deletions(-)
diff --git a/kernel/drivers/rpmsg/rockchip_rpmsg.c b/kernel/drivers/rpmsg/rockchip_rpmsg_softirq.c
similarity index 78%
copy from kernel/drivers/rpmsg/rockchip_rpmsg.c
copy to kernel/drivers/rpmsg/rockchip_rpmsg_softirq.c
index 8977125..df3c77b 100644
--- a/kernel/drivers/rpmsg/rockchip_rpmsg.c
+++ b/kernel/drivers/rpmsg/rockchip_rpmsg_softirq.c
@@ -2,17 +2,18 @@
/*
* Rockchip Remote Processors Messaging Platform Support.
*
- * Copyright (c) 2022 Rockchip Electronics Co. Ltd.
- * Author: Steven Liu <steven.liu@rock-chips.com>
+ * Copyright (c) 2023 Rockchip Electronics Co. Ltd.
+ * Author: Hongming Zou <hongming.zou@rock-chips.com>
*/
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqreturn.h>
+#include <linux/of_irq.h>
#include <linux/kernel.h>
-#include <linux/mailbox_client.h>
-#include <linux/mailbox_controller.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of_reserved_mem.h>
@@ -22,7 +23,6 @@
#include <linux/virtio_config.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_ring.h>
-#include <soc/rockchip/rockchip-mailbox.h>
#include "rpmsg_internal.h"
@@ -35,6 +35,11 @@
struct rk_rpmsg_dev *rpdev;
};
+struct rk_rpmsg_irqs {
+ int irq_tx;
+ int irq_rx;
+};
+
#define to_rk_rpvdev(vd) container_of(vd, struct rk_virtio_dev, vdev)
struct rk_rpmsg_dev {
@@ -43,10 +48,8 @@
unsigned int link_id;
int first_notify;
u32 flags;
- struct mbox_client mbox_cl;
- struct mbox_chan *mbox_rx_chan;
- struct mbox_chan *mbox_tx_chan;
struct rk_virtio_dev *rpvdev[RPMSG_MAX_INSTANCE_NUM];
+ struct rk_rpmsg_irqs irqs;
};
struct rk_rpmsg_vq_info {
@@ -55,26 +58,21 @@
struct rk_rpmsg_dev *rpdev;
};
-static void rk_rpmsg_rx_callback(struct mbox_client *client, void *message)
+static irqreturn_t rk_rpmsg_rx_callback(int irq, void *_pdev)
{
u32 link_id;
+ struct platform_device *pdev = _pdev;
struct rk_virtio_dev *rpvdev;
- struct rk_rpmsg_dev *rpdev = container_of(client, struct rk_rpmsg_dev, mbox_cl);
- struct platform_device *pdev = rpdev->pdev;
+ struct rk_rpmsg_dev *rpdev = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev;
- struct rockchip_mbox_msg *rx_msg;
- rx_msg = message;
- dev_dbg(dev, "rpmsg master: receive cmd=0x%x data=0x%x\n",
- rx_msg->cmd, rx_msg->data);
- if (rx_msg->data != RPMSG_MBOX_MAGIC)
- dev_err(dev, "rpmsg master: mailbox data error!\n");
- link_id = rx_msg->cmd & 0xFFU;
- /* TODO: only support one remote core now */
+ link_id = rpdev->link_id;
rpvdev = rpdev->rpvdev[0];
rpdev->flags |= RPMSG_REMOTE_IS_READY;
dev_dbg(dev, "rpmsg master: rx link_id=0x%x flag=0x%x\n", link_id, rpdev->flags);
vring_interrupt(0, rpvdev->vq[0]);
+
+ return IRQ_HANDLED;
}
static bool rk_rpmsg_notify(struct virtqueue *vq)
@@ -83,17 +81,12 @@
struct rk_rpmsg_dev *rpdev = rpvq->rpdev;
struct platform_device *pdev = rpdev->pdev;
struct device *dev = &pdev->dev;
- u32 link_id;
- int ret;
- struct rockchip_mbox_msg tx_msg;
+ struct irq_chip *chip;
- memset(&tx_msg, 0, sizeof(tx_msg));
+ chip = irq_get_chip(rpdev->irqs.irq_tx);
+
dev_dbg(dev, "queue_id-0x%x virt_vring_addr 0x%p\n",
rpvq->queue_id, rpvq->vring_addr);
-
- link_id = rpdev->link_id;
- tx_msg.cmd = link_id & 0xFFU;
- tx_msg.data = RPMSG_MBOX_MAGIC;
if ((rpdev->first_notify == 0) && (rpvq->queue_id % 2 == 0)) {
/* first_notify is used in the master init handshake phase. */
@@ -103,11 +96,9 @@
/* tx done is not supported, so ignored */
return true;
}
- ret = mbox_send_message(rpdev->mbox_tx_chan, &tx_msg);
- if (ret < 0) {
- dev_err(dev, "mbox send failed!\n");
- return false;
- }
+
+ if (chip && chip->irq_retrigger)
+ chip->irq_retrigger(irq_get_irq_data(rpdev->irqs.irq_tx));
return true;
}
@@ -292,7 +283,7 @@
{
struct device *dev = &pdev->dev;
struct rk_rpmsg_dev *rpdev = NULL;
- struct mbox_client *cl;
+
int i, ret = 0;
rpdev = devm_kzalloc(dev, sizeof(*rpdev), GFP_KERNEL);
@@ -303,44 +294,46 @@
rpdev->pdev = pdev;
rpdev->first_notify = 0;
- cl = &rpdev->mbox_cl;
- cl->dev = dev;
- cl->rx_callback = rk_rpmsg_rx_callback;
-
- rpdev->mbox_rx_chan = mbox_request_channel_byname(cl, "rpmsg-rx");
- if (IS_ERR(rpdev->mbox_rx_chan)) {
- ret = PTR_ERR(rpdev->mbox_rx_chan);
- dev_err(dev, "failed to request mbox rx chan, ret %d\n", ret);
- return ret;
- }
- rpdev->mbox_tx_chan = mbox_request_channel_byname(cl, "rpmsg-tx");
- if (IS_ERR(rpdev->mbox_tx_chan)) {
- ret = PTR_ERR(rpdev->mbox_tx_chan);
- dev_err(dev, "failed to request mbox tx chan, ret %d\n", ret);
- return ret;
- }
-
ret = device_property_read_u32(dev, "rockchip,link-id", &rpdev->link_id);
if (ret) {
dev_err(dev, "failed to get link_id, ret %d\n", ret);
- goto free_channel;
+
+ return ret;
}
ret = device_property_read_u32(dev, "rockchip,vdev-nums", &rpdev->vdev_nums);
if (ret) {
dev_info(dev, "vdev-nums default 1\n");
rpdev->vdev_nums = 1;
+
+ return ret;
}
if (rpdev->vdev_nums > RPMSG_MAX_INSTANCE_NUM) {
dev_err(dev, "vdev-nums exceed the max %d\n", RPMSG_MAX_INSTANCE_NUM);
- ret = -EINVAL;
- goto free_channel;
+
+ return -EINVAL;
+ }
+
+ rpdev->irqs.irq_tx = platform_get_irq(pdev, 0);
+ if (rpdev->irqs.irq_tx < 0)
+ return rpdev->irqs.irq_tx;
+
+ rpdev->irqs.irq_rx = platform_get_irq(pdev, 1);
+ if (rpdev->irqs.irq_rx < 0)
+ return rpdev->irqs.irq_rx;
+
+ ret = devm_request_threaded_irq(&pdev->dev, rpdev->irqs.irq_rx, NULL, rk_rpmsg_rx_callback,
+ IRQF_ONESHOT, "rockchip-rpmsg", pdev);
+ if (ret) {
+ dev_err(dev, "could not install irq");
+
+ return ret;
}
ret = rk_set_vring_phy_buf(pdev, rpdev, rpdev->vdev_nums);
if (ret) {
dev_err(dev, "No vring buffer.\n");
- ret = -ENOMEM;
- goto free_channel;
+
+ return -EINVAL;
}
if (of_reserved_mem_device_init(dev)) {
dev_info(dev, "No shared DMA pool.\n");
@@ -374,41 +367,41 @@
if (rpdev->flags & RPMSG_SHARED_DMA_POOL)
of_reserved_mem_device_release(dev);
-free_channel:
- mbox_free_channel(rpdev->mbox_rx_chan);
- mbox_free_channel(rpdev->mbox_tx_chan);
-
return ret;
}
static int rockchip_rpmsg_remove(struct platform_device *pdev)
{
+ struct device *dev = &pdev->dev;
struct rk_rpmsg_dev *rpdev = platform_get_drvdata(pdev);
- mbox_free_channel(rpdev->mbox_rx_chan);
- mbox_free_channel(rpdev->mbox_tx_chan);
+ int i;
+
+ for (i = 0; i < rpdev->vdev_nums; i++)
+ unregister_virtio_device(&rpdev->rpvdev[i]->vdev);
+
+ of_reserved_mem_device_release(dev);
return 0;
}
static const struct of_device_id rockchip_rpmsg_match[] = {
- { .compatible = "rockchip,rpmsg", },
+ { .compatible = "rockchip,rpmsg-softirq", },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, rockchip_rpmsg_match);
-static struct platform_driver rockchip_rpmsg_driver = {
+static struct platform_driver rockchip_rpmsg_softirq_driver = {
.probe = rockchip_rpmsg_probe,
.remove = rockchip_rpmsg_remove,
.driver = {
- .name = "rockchip-rpmsg",
+ .name = "rockchip-rpmsg-softirq",
.of_match_table = rockchip_rpmsg_match,
},
};
-module_platform_driver(rockchip_rpmsg_driver);
+module_platform_driver(rockchip_rpmsg_softirq_driver);
MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Rockchip Remote Processors Messaging Platform Support");
-MODULE_AUTHOR("Steven Liu <steven.liu@rock-chips.com>");
-
+MODULE_DESCRIPTION("Rockchip Using Softirq Mode Remote Processors Messaging Platform Support");
+MODULE_AUTHOR("Hongming Zou <hongming.zou@rock-chips.com>");
--
Gitblit v1.6.2