mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-30 00:21:17 +00:00
arm-bsp/linux: corstone1000: Remove External system patches
Remove the External system patches as they are not upstreamable. Signed-off-by: Harsimran Singh Tungal <harsimransingh.tungal@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Harsimran Singh Tungal
committed by
Jon Mason
Jon Mason
parent
9361cde6ae
commit
3314bfb27d
-220
@@ -1,220 +0,0 @@
|
||||
From 9eac502eacd36a4975ec34a3f076594fa4364032 Mon Sep 17 00:00:00 2001
|
||||
From: Emekcan <emekcan.aras@arm.com>
|
||||
Date: Fri, 19 Aug 2022 14:51:08 +0100
|
||||
Subject: [PATCH] Add external system driver
|
||||
|
||||
Adds external system driver to control it
|
||||
from user-space. It provides run and reset
|
||||
functionality at the moment.
|
||||
|
||||
Upstream-Status: Pending [Not submitted to upstream yet]
|
||||
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
drivers/misc/Kconfig | 1 +
|
||||
drivers/misc/Makefile | 1 +
|
||||
drivers/misc/arm/Kconfig | 5 ++
|
||||
drivers/misc/arm/Makefile | 1 +
|
||||
drivers/misc/arm/extsys_ctrl.c | 151 +++++++++++++++++++++++++++++++++
|
||||
5 files changed, 159 insertions(+)
|
||||
create mode 100644 drivers/misc/arm/Kconfig
|
||||
create mode 100644 drivers/misc/arm/Makefile
|
||||
create mode 100644 drivers/misc/arm/extsys_ctrl.c
|
||||
|
||||
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
||||
index 433aa4197785..912986abc46c 100644
|
||||
--- a/drivers/misc/Kconfig
|
||||
+++ b/drivers/misc/Kconfig
|
||||
@@ -555,4 +555,5 @@ source "drivers/misc/cardreader/Kconfig"
|
||||
source "drivers/misc/uacce/Kconfig"
|
||||
source "drivers/misc/pvpanic/Kconfig"
|
||||
source "drivers/misc/mchp_pci1xxxx/Kconfig"
|
||||
+source "drivers/misc/arm/Kconfig"
|
||||
endmenu
|
||||
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
||||
index 56de43943cd5..22e6561b8192 100644
|
||||
--- a/drivers/misc/Makefile
|
||||
+++ b/drivers/misc/Makefile
|
||||
@@ -63,5 +63,6 @@ obj-$(CONFIG_HI6421V600_IRQ) += hi6421v600-irq.o
|
||||
obj-$(CONFIG_OPEN_DICE) += open-dice.o
|
||||
obj-$(CONFIG_GP_PCI1XXXX) += mchp_pci1xxxx/
|
||||
obj-$(CONFIG_VCPU_STALL_DETECTOR) += vcpu_stall_detector.o
|
||||
+obj-y += arm/
|
||||
obj-$(CONFIG_TMR_MANAGER) += xilinx_tmr_manager.o
|
||||
obj-$(CONFIG_TMR_INJECT) += xilinx_tmr_inject.o
|
||||
diff --git a/drivers/misc/arm/Kconfig b/drivers/misc/arm/Kconfig
|
||||
new file mode 100644
|
||||
index 000000000000..9f1eb284e530
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/arm/Kconfig
|
||||
@@ -0,0 +1,5 @@
|
||||
+config EXTSYS_CTRL
|
||||
+ tristate "Arm External System control driver"
|
||||
+ help
|
||||
+ Say y here to enable support for external system control
|
||||
+ driver for the Arm Corstone-700 and Corstone1000 platform
|
||||
\ No newline at end of file
|
||||
diff --git a/drivers/misc/arm/Makefile b/drivers/misc/arm/Makefile
|
||||
new file mode 100644
|
||||
index 000000000000..1ca3084cf8a0
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/arm/Makefile
|
||||
@@ -0,0 +1 @@
|
||||
+obj-$(CONFIG_EXTSYS_CTRL) += extsys_ctrl.o
|
||||
diff --git a/drivers/misc/arm/extsys_ctrl.c b/drivers/misc/arm/extsys_ctrl.c
|
||||
new file mode 100644
|
||||
index 000000000000..7929070ff43d
|
||||
--- /dev/null
|
||||
+++ b/drivers/misc/arm/extsys_ctrl.c
|
||||
@@ -0,0 +1,151 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * Arm Corstone700 and Corstone1000 external system reset control driver
|
||||
+ *
|
||||
+ * Copyright (C) 2019 Arm Ltd.
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/fs.h>
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/err.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/mod_devicetable.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/miscdevice.h>
|
||||
+#include <linux/init.h>
|
||||
+
|
||||
+#define EXTSYS_DRV_NAME "extsys_ctrl"
|
||||
+#define EXTSYS_MAX_DEVS 4
|
||||
+
|
||||
+#define EXTSYS_RST_SIZE U(0x8)
|
||||
+#define EXTSYS_RST_CTRL_OFF U(0x0)
|
||||
+#define EXTSYS_RST_ST_OFF U(0x4)
|
||||
+
|
||||
+/* External system reset control indexes */
|
||||
+#define EXTSYS_CPU_WAIT (0x0)
|
||||
+#define EXTSYS_RST_REQ (0x1)
|
||||
+
|
||||
+/* External system reset status masks */
|
||||
+#define EXTSYS_RST_ST_ACK_OFF U(0x1)
|
||||
+
|
||||
+/* No Reset Requested */
|
||||
+#define EXTSYS_RST_ST_ACK_NRR (0x0 << EXTSYS_RST_ST_ACK_OFF)
|
||||
+
|
||||
+/* Reset Request Complete */
|
||||
+#define EXTSYS_RST_ST_ACK_RRC (0x2 << EXTSYS_RST_ST_ACK_OFF)
|
||||
+
|
||||
+/* Reset Request Unable to Complete */
|
||||
+#define EXTSYS_RST_ST_ACK_RRUC (0x3 << EXTSYS_RST_ST_ACK_OFF)
|
||||
+
|
||||
+/* IOCTL commands */
|
||||
+#define EXTSYS_CPU_WAIT_DISABLE 0x0
|
||||
+#define EXTSYS_RESET_REQ_ENABLE 0x1
|
||||
+
|
||||
+struct extsys_ctrl {
|
||||
+ struct miscdevice miscdev;
|
||||
+ void __iomem *reset_reg;
|
||||
+ void __iomem *set_reg;
|
||||
+};
|
||||
+
|
||||
+#define CLEAR_BIT(addr, index) writel(readl(addr) & ~(1UL << index), addr)
|
||||
+#define SET_BIT(addr, index) writel(readl(addr) | (1UL << index), addr)
|
||||
+
|
||||
+static long extsys_ctrl_ioctl(struct file *f, unsigned int cmd,
|
||||
+ unsigned long arg)
|
||||
+{
|
||||
+ struct extsys_ctrl *extsys;
|
||||
+
|
||||
+ extsys = container_of(f->private_data, struct extsys_ctrl, miscdev);
|
||||
+
|
||||
+ switch (cmd) {
|
||||
+ case EXTSYS_CPU_WAIT_DISABLE:
|
||||
+ CLEAR_BIT(extsys->reset_reg, EXTSYS_CPU_WAIT);
|
||||
+ break;
|
||||
+ case EXTSYS_RESET_REQ_ENABLE:
|
||||
+ SET_BIT(extsys->reset_reg, EXTSYS_RST_REQ);
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations extsys_ctrl_fops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .unlocked_ioctl = extsys_ctrl_ioctl,
|
||||
+};
|
||||
+
|
||||
+static int extsys_ctrl_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct extsys_ctrl *extsys;
|
||||
+ struct resource *res;
|
||||
+ void __iomem *reset_reg;
|
||||
+ void __iomem *set_reg;
|
||||
+ int ret;
|
||||
+
|
||||
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rstreg");
|
||||
+ reset_reg = devm_ioremap_resource(dev, res);
|
||||
+ if (IS_ERR(reset_reg))
|
||||
+ return PTR_ERR(reset_reg);
|
||||
+
|
||||
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "streg");
|
||||
+ set_reg = devm_ioremap_resource(dev, res);
|
||||
+ if (IS_ERR(set_reg))
|
||||
+ return PTR_ERR(set_reg);
|
||||
+
|
||||
+ extsys = devm_kzalloc(dev, sizeof(*extsys), GFP_KERNEL);
|
||||
+ if (!extsys)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ extsys->reset_reg = reset_reg;
|
||||
+ extsys->set_reg = set_reg;
|
||||
+
|
||||
+ extsys->miscdev.minor = MISC_DYNAMIC_MINOR;
|
||||
+ extsys->miscdev.name = EXTSYS_DRV_NAME;
|
||||
+ extsys->miscdev.fops = &extsys_ctrl_fops;
|
||||
+ extsys->miscdev.parent = dev;
|
||||
+
|
||||
+ ret = misc_register(&extsys->miscdev);
|
||||
+ if (ret)
|
||||
+ return ret;
|
||||
+
|
||||
+ dev_info(dev, "external system controller ready\n");
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int extsys_ctrl_remove(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct extsys_ctrl *extsys = dev_get_drvdata(&pdev->dev);
|
||||
+
|
||||
+ misc_deregister(&extsys->miscdev);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct of_device_id extsys_ctrl_match[] = {
|
||||
+ { .compatible = "arm,extsys_ctrl" },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, extsys_ctrl_match);
|
||||
+
|
||||
+static struct platform_driver extsys_ctrl_driver = {
|
||||
+ .driver = {
|
||||
+ .name = EXTSYS_DRV_NAME,
|
||||
+ .of_match_table = extsys_ctrl_match,
|
||||
+ },
|
||||
+ .probe = extsys_ctrl_probe,
|
||||
+ .remove = extsys_ctrl_remove,
|
||||
+};
|
||||
+module_platform_driver(extsys_ctrl_driver);
|
||||
+
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
+MODULE_DESCRIPTION("Arm External System Control Driver");
|
||||
+MODULE_AUTHOR("Morten Borup Petersen");
|
||||
+MODULE_AUTHOR("Rui Miguel Silva <rui.silva@arm.com>");
|
||||
-218
@@ -1,218 +0,0 @@
|
||||
From a834f4e143ff647e7677dc60ab57ee5883f3ac8f Mon Sep 17 00:00:00 2001
|
||||
From: Emekcan <emekcan.aras@arm.com>
|
||||
Date: Wed, 17 Aug 2022 14:21:42 +0100
|
||||
Subject: [PATCH] Add rpmsg driver for corstone1000
|
||||
|
||||
Adds rpmsg driver to communicate with external
|
||||
system in corstone1000 platform.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
drivers/rpmsg/Kconfig | 10 ++
|
||||
drivers/rpmsg/Makefile | 1 +
|
||||
drivers/rpmsg/rpmsg_arm_mailbox.c | 164 ++++++++++++++++++++++++++++++
|
||||
3 files changed, 175 insertions(+)
|
||||
create mode 100644 drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
|
||||
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
|
||||
index d3795860f5c0..fc6916d7b523 100644
|
||||
--- a/drivers/rpmsg/Kconfig
|
||||
+++ b/drivers/rpmsg/Kconfig
|
||||
@@ -81,4 +81,14 @@ config RPMSG_VIRTIO
|
||||
select RPMSG_NS
|
||||
select VIRTIO
|
||||
|
||||
+config RPMSG_ARM
|
||||
+ tristate "ARM RPMSG driver"
|
||||
+ select RPMSG
|
||||
+ depends on HAS_IOMEM
|
||||
+ depends on MAILBOX
|
||||
+ help
|
||||
+ Say y here to enable support for rpmsg lient driver which is built
|
||||
+ around mailbox client using Arm MHUv2.1 as physical medium.This
|
||||
+ driver enables communication which remote processor using MHU.
|
||||
+
|
||||
endmenu
|
||||
diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile
|
||||
index 58e3b382e316..6bdcc69688b2 100644
|
||||
--- a/drivers/rpmsg/Makefile
|
||||
+++ b/drivers/rpmsg/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
obj-$(CONFIG_RPMSG) += rpmsg_core.o
|
||||
+obj-$(CONFIG_RPMSG_ARM) += rpmsg_arm_mailbox.o
|
||||
obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o
|
||||
obj-$(CONFIG_RPMSG_CTRL) += rpmsg_ctrl.o
|
||||
obj-$(CONFIG_RPMSG_NS) += rpmsg_ns.o
|
||||
diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
new file mode 100644
|
||||
index 000000000000..4a80102669f6
|
||||
--- /dev/null
|
||||
+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
@@ -0,0 +1,164 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0
|
||||
+/*
|
||||
+ * rpmsg client driver using mailbox client interface
|
||||
+ *
|
||||
+ * Copyright (C) 2019 ARM Ltd.
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/bitmap.h>
|
||||
+#include <linux/export.h>
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/ktime.h>
|
||||
+#include <linux/mailbox_client.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/of_address.h>
|
||||
+#include <linux/of_device.h>
|
||||
+#include <linux/processor.h>
|
||||
+#include <linux/semaphore.h>
|
||||
+#include <linux/slab.h>
|
||||
+#include <linux/rpmsg.h>
|
||||
+#include "rpmsg_internal.h"
|
||||
+#include <linux/mailbox/arm_mhuv2_message.h>
|
||||
+
|
||||
+#define RPMSG_NAME "arm_rpmsg"
|
||||
+#define RPMSG_ADDR_ANY 0xFFFFFFFF
|
||||
+
|
||||
+struct arm_channel {
|
||||
+ struct rpmsg_endpoint ept;
|
||||
+ struct mbox_client cl;
|
||||
+ struct mbox_chan *mbox;
|
||||
+};
|
||||
+
|
||||
+#define arm_channel_from_rpmsg(_ept) container_of(_ept, struct arm_channel, ept)
|
||||
+#define arm_channel_from_mbox(_ept) container_of(_ept, struct arm_channel, cl)
|
||||
+
|
||||
+
|
||||
+static void arm_msg_rx_handler(struct mbox_client *cl, void *mssg)
|
||||
+{
|
||||
+ struct arm_mhuv2_mbox_msg *msg = mssg;
|
||||
+ struct arm_channel* channel = arm_channel_from_mbox(cl);
|
||||
+ int err = channel->ept.cb(channel->ept.rpdev, msg->data, 4, channel->ept.priv, RPMSG_ADDR_ANY);
|
||||
+ if(err) {
|
||||
+ printk("ARM Mailbox: Endpoint callback failed with error: %d", err);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void arm_destroy_ept(struct rpmsg_endpoint *ept)
|
||||
+{
|
||||
+ struct arm_channel *channel = arm_channel_from_rpmsg(ept);
|
||||
+ mbox_free_channel(channel->mbox);
|
||||
+ kfree(channel);
|
||||
+}
|
||||
+
|
||||
+static int arm_send(struct rpmsg_endpoint *ept, void *data, int len)
|
||||
+{
|
||||
+ struct arm_channel *channel = arm_channel_from_rpmsg(ept);
|
||||
+
|
||||
+ mbox_send_message(channel->mbox, data);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int arm_sendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dest)
|
||||
+{
|
||||
+ struct arm_mhuv2_mbox_msg msg;
|
||||
+ struct arm_channel *channel = arm_channel_from_rpmsg(ept);
|
||||
+ msg.data = data;
|
||||
+ msg.len = len;
|
||||
+ mbox_send_message(channel->mbox, &msg);
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static const struct rpmsg_endpoint_ops arm_endpoint_ops = {
|
||||
+ .destroy_ept = arm_destroy_ept,
|
||||
+ .send = arm_send,
|
||||
+ .sendto = arm_sendto,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static struct rpmsg_endpoint *arm_create_ept(struct rpmsg_device *rpdev,
|
||||
+ rpmsg_rx_cb_t cb, void *priv, struct rpmsg_channel_info chinfo)
|
||||
+{
|
||||
+ struct arm_channel *channel;
|
||||
+
|
||||
+ channel = kzalloc(sizeof(*channel), GFP_KERNEL);
|
||||
+
|
||||
+ // Initialize rpmsg endpoint
|
||||
+ kref_init(&channel->ept.refcount);
|
||||
+ channel->ept.rpdev = rpdev;
|
||||
+ channel->ept.cb = cb;
|
||||
+ channel->ept.priv = priv;
|
||||
+ channel->ept.ops = &arm_endpoint_ops;
|
||||
+
|
||||
+ // Initialize mailbox client
|
||||
+ channel->cl.dev = rpdev->dev.parent;
|
||||
+ channel->cl.rx_callback = arm_msg_rx_handler;
|
||||
+ channel->cl.tx_done = NULL; /* operate in blocking mode */
|
||||
+ channel->cl.tx_block = true;
|
||||
+ channel->cl.tx_tout = 500; /* by half a second */
|
||||
+ channel->cl.knows_txdone = false; /* depending upon protocol */
|
||||
+
|
||||
+ channel->mbox = mbox_request_channel_byname(&channel->cl, chinfo.name);
|
||||
+ if (IS_ERR_OR_NULL(channel->mbox)) {
|
||||
+ printk("RPMsg ARM: Cannot get channel by name: '%s'\n", chinfo.name);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return &channel->ept;
|
||||
+}
|
||||
+
|
||||
+static const struct rpmsg_device_ops arm_device_ops = {
|
||||
+ .create_ept = arm_create_ept,
|
||||
+};
|
||||
+
|
||||
+
|
||||
+static void arm_release_device(struct device *dev)
|
||||
+{
|
||||
+ struct rpmsg_device *rpdev = to_rpmsg_device(dev);
|
||||
+
|
||||
+ kfree(rpdev);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static int client_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct rpmsg_device *rpdev;
|
||||
+
|
||||
+ rpdev = kzalloc(sizeof(*rpdev), GFP_KERNEL);
|
||||
+ if (!rpdev)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ /* Assign callbacks for rpmsg_device */
|
||||
+ rpdev->ops = &arm_device_ops;
|
||||
+
|
||||
+ /* Assign public information to the rpmsg_device */
|
||||
+ memcpy(rpdev->id.name, RPMSG_NAME, strlen(RPMSG_NAME));
|
||||
+
|
||||
+ rpdev->dev.parent = dev;
|
||||
+ rpdev->dev.release = arm_release_device;
|
||||
+
|
||||
+ return rpmsg_chrdev_register_device(rpdev);
|
||||
+}
|
||||
+
|
||||
+static const struct of_device_id client_of_match[] = {
|
||||
+ { .compatible = "arm,client", .data = NULL },
|
||||
+ { /* Sentinel */ },
|
||||
+};
|
||||
+
|
||||
+static struct platform_driver client_driver = {
|
||||
+ .driver = {
|
||||
+ .name = "arm-mhu-client",
|
||||
+ .of_match_table = client_of_match,
|
||||
+ },
|
||||
+ .probe = client_probe,
|
||||
+};
|
||||
+
|
||||
+module_platform_driver(client_driver);
|
||||
+
|
||||
+MODULE_LICENSE("GPL v2");
|
||||
+MODULE_DESCRIPTION("ARM RPMSG Driver");
|
||||
+MODULE_AUTHOR("Tushar Khandelwal <tushar.khandelwal@arm.com>");
|
||||
-30
@@ -1,30 +0,0 @@
|
||||
From c1ffd793062a13afdcc07d4bc1a8007188bfca5f Mon Sep 17 00:00:00 2001
|
||||
From: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
Date: Tue, 27 Sep 2022 10:05:27 +0100
|
||||
Subject: [PATCH] rpmsg: arm: fix return value
|
||||
|
||||
The creation of and endpoint returns a pointer, fix the return
|
||||
value to the right type.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
drivers/rpmsg/rpmsg_arm_mailbox.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
index 4a80102669f6..5c0dcc8e353d 100644
|
||||
--- a/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
@@ -103,8 +103,9 @@ static struct rpmsg_endpoint *arm_create_ept(struct rpmsg_device *rpdev,
|
||||
|
||||
channel->mbox = mbox_request_channel_byname(&channel->cl, chinfo.name);
|
||||
if (IS_ERR_OR_NULL(channel->mbox)) {
|
||||
- printk("RPMsg ARM: Cannot get channel by name: '%s'\n", chinfo.name);
|
||||
- return -1;
|
||||
+ printk("RPMsg ARM: Cannot get channel by name: %s\n",
|
||||
+ chinfo.name);
|
||||
+ return ERR_PTR(-ENOENT);
|
||||
}
|
||||
|
||||
return &channel->ept;
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
From a8c295e1ff1d2b1032cc7495f212c56ba9f3e874 Mon Sep 17 00:00:00 2001
|
||||
From: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
Date: Tue, 27 Sep 2022 10:07:21 +0100
|
||||
Subject: [PATCH] rpmsg: arm: update chrdev to ctrldev registration
|
||||
|
||||
Since "rpmsg: Update rpmsg_chrdev_register_device function",
|
||||
there was a replacement of the chrdev driver to ctrldev
|
||||
driver. Fix the registration.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
|
||||
---
|
||||
drivers/rpmsg/rpmsg_arm_mailbox.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
index 5c0dcc8e353d..90bc8df90885 100644
|
||||
--- a/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c
|
||||
@@ -142,7 +142,7 @@ static int client_probe(struct platform_device *pdev)
|
||||
rpdev->dev.parent = dev;
|
||||
rpdev->dev.release = arm_release_device;
|
||||
|
||||
- return rpmsg_chrdev_register_device(rpdev);
|
||||
+ return rpmsg_ctrldev_register_device(rpdev);
|
||||
}
|
||||
|
||||
static const struct of_device_id client_of_match[] = {
|
||||
@@ -30,11 +30,7 @@ LINUX_KERNEL_TYPE:corstone1000 = "standard"
|
||||
KERNEL_EXTRA_ARGS:corstone1000 += "CONFIG_INITRAMFS_COMPRESSION_NONE=y"
|
||||
SRC_URI:append:corstone1000 = " \
|
||||
file://defconfig \
|
||||
file://0002-Add-external-system-driver.patch \
|
||||
file://0003-Add-rpmsg-driver-for-corstone1000.patch \
|
||||
file://0004-rpmsg-arm-fix-return-value.patch \
|
||||
file://0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch \
|
||||
file://0006-Adds-workaround-for-cs1k-specific-bug.patch \
|
||||
file://0002-Adds-workaround-for-cs1k-specific-bug.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:corstone1000 = " ${@bb.utils.contains('MACHINE_FEATURES', \
|
||||
|
||||
Reference in New Issue
Block a user