similarity index 78%copy from kernel/drivers/rpmsg/rockchip_rpmsg.ccopy to kernel/drivers/rpmsg/rockchip_rpmsg_softirq.c.. | .. |
---|
2 | 2 | /* |
---|
3 | 3 | * Rockchip Remote Processors Messaging Platform Support. |
---|
4 | 4 | * |
---|
5 | | - * Copyright (c) 2022 Rockchip Electronics Co. Ltd. |
---|
6 | | - * Author: Steven Liu <steven.liu@rock-chips.com> |
---|
| 5 | + * Copyright (c) 2023 Rockchip Electronics Co. Ltd. |
---|
| 6 | + * Author: Hongming Zou <hongming.zou@rock-chips.com> |
---|
7 | 7 | */ |
---|
8 | 8 | |
---|
9 | 9 | #include <linux/delay.h> |
---|
10 | 10 | #include <linux/err.h> |
---|
11 | 11 | #include <linux/init.h> |
---|
12 | 12 | #include <linux/interrupt.h> |
---|
| 13 | +#include <linux/irq.h> |
---|
| 14 | +#include <linux/irqreturn.h> |
---|
| 15 | +#include <linux/of_irq.h> |
---|
13 | 16 | #include <linux/kernel.h> |
---|
14 | | -#include <linux/mailbox_client.h> |
---|
15 | | -#include <linux/mailbox_controller.h> |
---|
16 | 17 | #include <linux/module.h> |
---|
17 | 18 | #include <linux/of_device.h> |
---|
18 | 19 | #include <linux/of_reserved_mem.h> |
---|
.. | .. |
---|
22 | 23 | #include <linux/virtio_config.h> |
---|
23 | 24 | #include <linux/virtio_ids.h> |
---|
24 | 25 | #include <linux/virtio_ring.h> |
---|
25 | | -#include <soc/rockchip/rockchip-mailbox.h> |
---|
26 | 26 | |
---|
27 | 27 | #include "rpmsg_internal.h" |
---|
28 | 28 | |
---|
.. | .. |
---|
35 | 35 | struct rk_rpmsg_dev *rpdev; |
---|
36 | 36 | }; |
---|
37 | 37 | |
---|
| 38 | +struct rk_rpmsg_irqs { |
---|
| 39 | + int irq_tx; |
---|
| 40 | + int irq_rx; |
---|
| 41 | +}; |
---|
| 42 | + |
---|
38 | 43 | #define to_rk_rpvdev(vd) container_of(vd, struct rk_virtio_dev, vdev) |
---|
39 | 44 | |
---|
40 | 45 | struct rk_rpmsg_dev { |
---|
.. | .. |
---|
43 | 48 | unsigned int link_id; |
---|
44 | 49 | int first_notify; |
---|
45 | 50 | u32 flags; |
---|
46 | | - struct mbox_client mbox_cl; |
---|
47 | | - struct mbox_chan *mbox_rx_chan; |
---|
48 | | - struct mbox_chan *mbox_tx_chan; |
---|
49 | 51 | struct rk_virtio_dev *rpvdev[RPMSG_MAX_INSTANCE_NUM]; |
---|
| 52 | + struct rk_rpmsg_irqs irqs; |
---|
50 | 53 | }; |
---|
51 | 54 | |
---|
52 | 55 | struct rk_rpmsg_vq_info { |
---|
.. | .. |
---|
55 | 58 | struct rk_rpmsg_dev *rpdev; |
---|
56 | 59 | }; |
---|
57 | 60 | |
---|
58 | | -static void rk_rpmsg_rx_callback(struct mbox_client *client, void *message) |
---|
| 61 | +static irqreturn_t rk_rpmsg_rx_callback(int irq, void *_pdev) |
---|
59 | 62 | { |
---|
60 | 63 | u32 link_id; |
---|
| 64 | + struct platform_device *pdev = _pdev; |
---|
61 | 65 | struct rk_virtio_dev *rpvdev; |
---|
62 | | - struct rk_rpmsg_dev *rpdev = container_of(client, struct rk_rpmsg_dev, mbox_cl); |
---|
63 | | - struct platform_device *pdev = rpdev->pdev; |
---|
| 66 | + struct rk_rpmsg_dev *rpdev = platform_get_drvdata(pdev); |
---|
64 | 67 | struct device *dev = &pdev->dev; |
---|
65 | | - struct rockchip_mbox_msg *rx_msg; |
---|
66 | 68 | |
---|
67 | | - rx_msg = message; |
---|
68 | | - dev_dbg(dev, "rpmsg master: receive cmd=0x%x data=0x%x\n", |
---|
69 | | - rx_msg->cmd, rx_msg->data); |
---|
70 | | - if (rx_msg->data != RPMSG_MBOX_MAGIC) |
---|
71 | | - dev_err(dev, "rpmsg master: mailbox data error!\n"); |
---|
72 | | - link_id = rx_msg->cmd & 0xFFU; |
---|
73 | | - /* TODO: only support one remote core now */ |
---|
| 69 | + link_id = rpdev->link_id; |
---|
74 | 70 | rpvdev = rpdev->rpvdev[0]; |
---|
75 | 71 | rpdev->flags |= RPMSG_REMOTE_IS_READY; |
---|
76 | 72 | dev_dbg(dev, "rpmsg master: rx link_id=0x%x flag=0x%x\n", link_id, rpdev->flags); |
---|
77 | 73 | vring_interrupt(0, rpvdev->vq[0]); |
---|
| 74 | + |
---|
| 75 | + return IRQ_HANDLED; |
---|
78 | 76 | } |
---|
79 | 77 | |
---|
80 | 78 | static bool rk_rpmsg_notify(struct virtqueue *vq) |
---|
.. | .. |
---|
83 | 81 | struct rk_rpmsg_dev *rpdev = rpvq->rpdev; |
---|
84 | 82 | struct platform_device *pdev = rpdev->pdev; |
---|
85 | 83 | struct device *dev = &pdev->dev; |
---|
86 | | - u32 link_id; |
---|
87 | | - int ret; |
---|
88 | | - struct rockchip_mbox_msg tx_msg; |
---|
| 84 | + struct irq_chip *chip; |
---|
89 | 85 | |
---|
90 | | - memset(&tx_msg, 0, sizeof(tx_msg)); |
---|
| 86 | + chip = irq_get_chip(rpdev->irqs.irq_tx); |
---|
| 87 | + |
---|
91 | 88 | dev_dbg(dev, "queue_id-0x%x virt_vring_addr 0x%p\n", |
---|
92 | 89 | rpvq->queue_id, rpvq->vring_addr); |
---|
93 | | - |
---|
94 | | - link_id = rpdev->link_id; |
---|
95 | | - tx_msg.cmd = link_id & 0xFFU; |
---|
96 | | - tx_msg.data = RPMSG_MBOX_MAGIC; |
---|
97 | 90 | |
---|
98 | 91 | if ((rpdev->first_notify == 0) && (rpvq->queue_id % 2 == 0)) { |
---|
99 | 92 | /* first_notify is used in the master init handshake phase. */ |
---|
.. | .. |
---|
103 | 96 | /* tx done is not supported, so ignored */ |
---|
104 | 97 | return true; |
---|
105 | 98 | } |
---|
106 | | - ret = mbox_send_message(rpdev->mbox_tx_chan, &tx_msg); |
---|
107 | | - if (ret < 0) { |
---|
108 | | - dev_err(dev, "mbox send failed!\n"); |
---|
109 | | - return false; |
---|
110 | | - } |
---|
| 99 | + |
---|
| 100 | + if (chip && chip->irq_retrigger) |
---|
| 101 | + chip->irq_retrigger(irq_get_irq_data(rpdev->irqs.irq_tx)); |
---|
111 | 102 | |
---|
112 | 103 | return true; |
---|
113 | 104 | } |
---|
.. | .. |
---|
292 | 283 | { |
---|
293 | 284 | struct device *dev = &pdev->dev; |
---|
294 | 285 | struct rk_rpmsg_dev *rpdev = NULL; |
---|
295 | | - struct mbox_client *cl; |
---|
| 286 | + |
---|
296 | 287 | int i, ret = 0; |
---|
297 | 288 | |
---|
298 | 289 | rpdev = devm_kzalloc(dev, sizeof(*rpdev), GFP_KERNEL); |
---|
.. | .. |
---|
303 | 294 | rpdev->pdev = pdev; |
---|
304 | 295 | rpdev->first_notify = 0; |
---|
305 | 296 | |
---|
306 | | - cl = &rpdev->mbox_cl; |
---|
307 | | - cl->dev = dev; |
---|
308 | | - cl->rx_callback = rk_rpmsg_rx_callback; |
---|
309 | | - |
---|
310 | | - rpdev->mbox_rx_chan = mbox_request_channel_byname(cl, "rpmsg-rx"); |
---|
311 | | - if (IS_ERR(rpdev->mbox_rx_chan)) { |
---|
312 | | - ret = PTR_ERR(rpdev->mbox_rx_chan); |
---|
313 | | - dev_err(dev, "failed to request mbox rx chan, ret %d\n", ret); |
---|
314 | | - return ret; |
---|
315 | | - } |
---|
316 | | - rpdev->mbox_tx_chan = mbox_request_channel_byname(cl, "rpmsg-tx"); |
---|
317 | | - if (IS_ERR(rpdev->mbox_tx_chan)) { |
---|
318 | | - ret = PTR_ERR(rpdev->mbox_tx_chan); |
---|
319 | | - dev_err(dev, "failed to request mbox tx chan, ret %d\n", ret); |
---|
320 | | - return ret; |
---|
321 | | - } |
---|
322 | | - |
---|
323 | 297 | ret = device_property_read_u32(dev, "rockchip,link-id", &rpdev->link_id); |
---|
324 | 298 | if (ret) { |
---|
325 | 299 | dev_err(dev, "failed to get link_id, ret %d\n", ret); |
---|
326 | | - goto free_channel; |
---|
| 300 | + |
---|
| 301 | + return ret; |
---|
327 | 302 | } |
---|
328 | 303 | ret = device_property_read_u32(dev, "rockchip,vdev-nums", &rpdev->vdev_nums); |
---|
329 | 304 | if (ret) { |
---|
330 | 305 | dev_info(dev, "vdev-nums default 1\n"); |
---|
331 | 306 | rpdev->vdev_nums = 1; |
---|
| 307 | + |
---|
| 308 | + return ret; |
---|
332 | 309 | } |
---|
333 | 310 | if (rpdev->vdev_nums > RPMSG_MAX_INSTANCE_NUM) { |
---|
334 | 311 | dev_err(dev, "vdev-nums exceed the max %d\n", RPMSG_MAX_INSTANCE_NUM); |
---|
335 | | - ret = -EINVAL; |
---|
336 | | - goto free_channel; |
---|
| 312 | + |
---|
| 313 | + return -EINVAL; |
---|
| 314 | + } |
---|
| 315 | + |
---|
| 316 | + rpdev->irqs.irq_tx = platform_get_irq(pdev, 0); |
---|
| 317 | + if (rpdev->irqs.irq_tx < 0) |
---|
| 318 | + return rpdev->irqs.irq_tx; |
---|
| 319 | + |
---|
| 320 | + rpdev->irqs.irq_rx = platform_get_irq(pdev, 1); |
---|
| 321 | + if (rpdev->irqs.irq_rx < 0) |
---|
| 322 | + return rpdev->irqs.irq_rx; |
---|
| 323 | + |
---|
| 324 | + ret = devm_request_threaded_irq(&pdev->dev, rpdev->irqs.irq_rx, NULL, rk_rpmsg_rx_callback, |
---|
| 325 | + IRQF_ONESHOT, "rockchip-rpmsg", pdev); |
---|
| 326 | + if (ret) { |
---|
| 327 | + dev_err(dev, "could not install irq"); |
---|
| 328 | + |
---|
| 329 | + return ret; |
---|
337 | 330 | } |
---|
338 | 331 | |
---|
339 | 332 | ret = rk_set_vring_phy_buf(pdev, rpdev, rpdev->vdev_nums); |
---|
340 | 333 | if (ret) { |
---|
341 | 334 | dev_err(dev, "No vring buffer.\n"); |
---|
342 | | - ret = -ENOMEM; |
---|
343 | | - goto free_channel; |
---|
| 335 | + |
---|
| 336 | + return -EINVAL; |
---|
344 | 337 | } |
---|
345 | 338 | if (of_reserved_mem_device_init(dev)) { |
---|
346 | 339 | dev_info(dev, "No shared DMA pool.\n"); |
---|
.. | .. |
---|
374 | 367 | if (rpdev->flags & RPMSG_SHARED_DMA_POOL) |
---|
375 | 368 | of_reserved_mem_device_release(dev); |
---|
376 | 369 | |
---|
377 | | -free_channel: |
---|
378 | | - mbox_free_channel(rpdev->mbox_rx_chan); |
---|
379 | | - mbox_free_channel(rpdev->mbox_tx_chan); |
---|
380 | | - |
---|
381 | 370 | return ret; |
---|
382 | 371 | } |
---|
383 | 372 | |
---|
384 | 373 | static int rockchip_rpmsg_remove(struct platform_device *pdev) |
---|
385 | 374 | { |
---|
| 375 | + struct device *dev = &pdev->dev; |
---|
386 | 376 | struct rk_rpmsg_dev *rpdev = platform_get_drvdata(pdev); |
---|
387 | 377 | |
---|
388 | | - mbox_free_channel(rpdev->mbox_rx_chan); |
---|
389 | | - mbox_free_channel(rpdev->mbox_tx_chan); |
---|
| 378 | + int i; |
---|
| 379 | + |
---|
| 380 | + for (i = 0; i < rpdev->vdev_nums; i++) |
---|
| 381 | + unregister_virtio_device(&rpdev->rpvdev[i]->vdev); |
---|
| 382 | + |
---|
| 383 | + of_reserved_mem_device_release(dev); |
---|
390 | 384 | |
---|
391 | 385 | return 0; |
---|
392 | 386 | } |
---|
393 | 387 | |
---|
394 | 388 | static const struct of_device_id rockchip_rpmsg_match[] = { |
---|
395 | | - { .compatible = "rockchip,rpmsg", }, |
---|
| 389 | + { .compatible = "rockchip,rpmsg-softirq", }, |
---|
396 | 390 | { /* sentinel */ }, |
---|
397 | 391 | }; |
---|
398 | 392 | |
---|
399 | 393 | MODULE_DEVICE_TABLE(of, rockchip_rpmsg_match); |
---|
400 | 394 | |
---|
401 | | -static struct platform_driver rockchip_rpmsg_driver = { |
---|
| 395 | +static struct platform_driver rockchip_rpmsg_softirq_driver = { |
---|
402 | 396 | .probe = rockchip_rpmsg_probe, |
---|
403 | 397 | .remove = rockchip_rpmsg_remove, |
---|
404 | 398 | .driver = { |
---|
405 | | - .name = "rockchip-rpmsg", |
---|
| 399 | + .name = "rockchip-rpmsg-softirq", |
---|
406 | 400 | .of_match_table = rockchip_rpmsg_match, |
---|
407 | 401 | }, |
---|
408 | 402 | }; |
---|
409 | | -module_platform_driver(rockchip_rpmsg_driver); |
---|
| 403 | +module_platform_driver(rockchip_rpmsg_softirq_driver); |
---|
410 | 404 | |
---|
411 | 405 | MODULE_LICENSE("GPL"); |
---|
412 | | -MODULE_DESCRIPTION("Rockchip Remote Processors Messaging Platform Support"); |
---|
413 | | -MODULE_AUTHOR("Steven Liu <steven.liu@rock-chips.com>"); |
---|
414 | | - |
---|
| 406 | +MODULE_DESCRIPTION("Rockchip Using Softirq Mode Remote Processors Messaging Platform Support"); |
---|
| 407 | +MODULE_AUTHOR("Hongming Zou <hongming.zou@rock-chips.com>"); |
---|