* [PATCH 13/17] media: rockchip: rga: bind all cores to the master
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Bind all core components to the master component. Previously only the
first core has been added to the master device to avoid creating
multiple video devices. As the video device creation has been moved to
the master component, it allows us to bind all cores without creating
additional video devices.
We expect that all cores to report the same version number, as we only
add cores with the same compatible value. This is important, as we
setup the command buffer before actually scheduling the work to a
specific core. Therefore adjusting command buffers depending on the
version register only works when all cores have the same value.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 22 +++++++++++-----------
drivers/media/platform/rockchip/rga/rga.h | 1 +
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 0413b8518dfc8..6add6c510c127 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -742,6 +742,7 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
{
struct rockchip_rga *rga = data;
struct rga_core *core = dev_get_drvdata(dev);
+ struct rockchip_rga_version version;
int ret = 0;
core->rga = rga;
@@ -750,14 +751,21 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
if (ret < 0)
return ret;
- rga->version = rga->hw->get_version(core);
+ version = rga->hw->get_version(core);
v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
- rga->version.major, rga->version.minor);
+ version.major, version.minor);
+
+ if (rga->num_cores) {
+ /* we are not the first core, expect that we have the same version */
+ if (rga->version.major != version.major || rga->version.minor != version.minor)
+ v4l2_warn(&rga->v4l2_dev, "Detected multi-core setup with different core versions!\n");
+ } else
+ rga->version = version;
pm_runtime_put(core->dev);
- rga->cores[0] = core;
+ rga->cores[rga->num_cores++] = core;
return 0;
}
@@ -983,14 +991,6 @@ static int rga_probe(struct platform_device *pdev)
component_match_add_release(dev, &match, component_release_of,
component_compare_of, core_node);
num_cores++;
-
- /*
- * As multi core is not implemented yet,
- * break out of the loop to only have one core per rockchip_rga struct.
- * Also put the node, which otherwise would've been done by the loop iteration.
- */
- of_node_put(core_node);
- break;
}
if (!match)
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index fcf1ef7d2029f..6237436b984eb 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -88,6 +88,7 @@ struct rockchip_rga {
const struct rga_hw *hw;
+ u8 num_cores;
struct rga_core *cores[];
};
--
2.54.0
^ permalink raw reply related
* [PATCH 12/17] media: rockchip: rga: move core initialization from bind to probe
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Move the core initialization from the core binding function to the core
probing function. This better matches the actual sequence, where the
core probe initializes most things and the bind function just binds the
core to the actual rga struct from the master device.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 83 ++++++++++++++++---------------
1 file changed, 42 insertions(+), 41 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 952377ae467f5..0413b8518dfc8 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -740,21 +740,49 @@ static int rga_parse_dt(struct rga_core *core)
static int rga_core_bind(struct device *dev, struct device *master, void *data)
{
- struct platform_device *pdev = to_platform_device(dev);
struct rockchip_rga *rga = data;
+ struct rga_core *core = dev_get_drvdata(dev);
+ int ret = 0;
+
+ core->rga = rga;
+
+ ret = pm_runtime_resume_and_get(core->dev);
+ if (ret < 0)
+ return ret;
+
+ rga->version = rga->hw->get_version(core);
+
+ v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
+ rga->version.major, rga->version.minor);
+
+ pm_runtime_put(core->dev);
+
+ rga->cores[0] = core;
+
+ return 0;
+}
+
+static const struct component_ops rga_core_ops = {
+ .bind = rga_core_bind,
+};
+
+static int rga_core_probe(struct platform_device *pdev)
+{
struct rga_core *core;
+ const struct rga_hw *hw;
int ret = 0;
int irq;
if (!pdev->dev.of_node)
return -ENODEV;
+ hw = of_device_get_match_data(&pdev->dev);
+ if (!hw)
+ return dev_err_probe(&pdev->dev, -ENODEV, "failed to get match data\n");
+
core = devm_kzalloc(&pdev->dev, sizeof(*core), GFP_KERNEL);
- core->rga = rga;
core->dev = &pdev->dev;
- rga->cores[0] = core;
-
ret = rga_parse_dt(core);
if (ret)
return dev_err_probe(&pdev->dev, ret, "Unable to parse OF data\n");
@@ -775,7 +803,7 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
}
ret = devm_request_irq(core->dev, irq, rga_isr,
- rga_has_internal_iommu(rga) ? 0 : IRQF_SHARED,
+ hw->has_internal_iommu ? 0 : IRQF_SHARED,
dev_name(core->dev), core);
if (ret < 0) {
dev_err(core->dev, "failed to request irq\n");
@@ -790,42 +818,6 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
platform_set_drvdata(pdev, core);
- ret = pm_runtime_resume_and_get(core->dev);
- if (ret < 0)
- goto err_put_clk;
-
- rga->version = rga->hw->get_version(core);
-
- v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
- rga->version.major, rga->version.minor);
-
- pm_runtime_put(core->dev);
-
- return 0;
-
-err_put_clk:
- pm_runtime_disable(core->dev);
-
- return ret;
-}
-
-static void rga_core_unbind(struct device *dev, struct device *master,
- void *data)
-{
- struct rga_core *core = dev_get_drvdata(dev);
-
- pm_runtime_disable(core->dev);
-}
-
-static const struct component_ops rga_core_ops = {
- .bind = rga_core_bind,
- .unbind = rga_core_unbind,
-};
-
-static int rga_core_probe(struct platform_device *pdev)
-{
- int ret = 0;
-
ret = component_add(&pdev->dev, &rga_core_ops);
if (ret < 0) {
dev_err(&pdev->dev, "failed to register component: %d", ret);
@@ -833,11 +825,20 @@ static int rga_core_probe(struct platform_device *pdev)
}
return 0;
+
+err_put_clk:
+ pm_runtime_disable(core->dev);
+
+ return ret;
}
static void rga_core_remove(struct platform_device *pdev)
{
+ struct rga_core *core = platform_get_drvdata(pdev);
+
component_del(&pdev->dev, &rga_core_ops);
+
+ pm_runtime_disable(core->dev);
}
static int __maybe_unused rga_runtime_suspend(struct device *dev)
--
2.54.0
^ permalink raw reply related
* [PATCH 14/17] media: rockchip: rga: put all cores into first core iommu domain
From: Sven Püschel @ 2026-06-05 22:07 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Put all cores into the iommu domain of the first core to allow them to
be used by any core. All buffers accessed by the hardware are allocated
on the first core, as the scheduling to a specific core is done after
the allocation. Therefore put all cores into the same domain to have the
same iommu mapping on all cores.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 6add6c510c127..9cebb461b3fd2 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -10,6 +10,7 @@
#include <linux/delay.h>
#include <linux/fs.h>
#include <linux/interrupt.h>
+#include <linux/iommu.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_platform.h>
@@ -757,6 +758,19 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
version.major, version.minor);
if (rga->num_cores) {
+ /* Attach to the first cores iommu */
+ struct iommu_domain *domain = iommu_get_domain_for_dev(rga->cores[0]->dev);
+
+ if (IS_ERR(domain)) {
+ dev_err(core->dev, "Couldn't get domain of the first core\n");
+ return PTR_ERR(domain);
+ }
+ ret = iommu_attach_device(domain, core->dev);
+ if (ret) {
+ dev_err(core->dev, "Couldn't attach to the domain of the first core\n");
+ return ret;
+ }
+
/* we are not the first core, expect that we have the same version */
if (rga->version.major != version.major || rga->version.minor != version.minor)
v4l2_warn(&rga->v4l2_dev, "Detected multi-core setup with different core versions!\n");
--
2.54.0
^ permalink raw reply related
* [PATCH 11/17] media: rockchip: rga: move video device to the master
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Move the video device allocation and registration to the master
component bind function in preparation for binding multiple cores
to the master. Moving it to the master bind function allows to
only register the v4l2 device when all cores have been successfully
bound to the master device. This also causes the video device to be
bound against the master platform device instead of a specific core.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 96 ++++++++++++++++---------------
1 file changed, 50 insertions(+), 46 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 11912bf5b6906..952377ae467f5 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -743,7 +743,6 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
struct platform_device *pdev = to_platform_device(dev);
struct rockchip_rga *rga = data;
struct rga_core *core;
- struct video_device *vfd;
int ret = 0;
int irq;
@@ -789,33 +788,11 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
goto err_put_clk;
}
- ret = v4l2_device_register(&pdev->dev, &rga->v4l2_dev);
- if (ret)
- goto err_put_clk;
- vfd = video_device_alloc();
- if (!vfd) {
- v4l2_err(&rga->v4l2_dev, "Failed to allocate video device\n");
- ret = -ENOMEM;
- goto unreg_v4l2_dev;
- }
- *vfd = rga_videodev;
- vfd->lock = &rga->mutex;
- vfd->v4l2_dev = &rga->v4l2_dev;
-
- video_set_drvdata(vfd, rga);
- rga->vfd = vfd;
-
platform_set_drvdata(pdev, core);
- rga->m2m_dev = v4l2_m2m_init(&rga_m2m_ops);
- if (IS_ERR(rga->m2m_dev)) {
- v4l2_err(&rga->v4l2_dev, "Failed to init mem2mem device\n");
- ret = PTR_ERR(rga->m2m_dev);
- goto rel_vdev;
- }
ret = pm_runtime_resume_and_get(core->dev);
if (ret < 0)
- goto rel_m2m;
+ goto err_put_clk;
rga->version = rga->hw->get_version(core);
@@ -824,23 +801,8 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
pm_runtime_put(core->dev);
- ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
- if (ret) {
- v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
- goto rel_m2m;
- }
-
- v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n",
- vfd->name, video_device_node_name(vfd));
-
return 0;
-rel_m2m:
- v4l2_m2m_release(rga->m2m_dev);
-rel_vdev:
- video_device_release(vfd);
-unreg_v4l2_dev:
- v4l2_device_unregister(&rga->v4l2_dev);
err_put_clk:
pm_runtime_disable(core->dev);
@@ -851,13 +813,6 @@ static void rga_core_unbind(struct device *dev, struct device *master,
void *data)
{
struct rga_core *core = dev_get_drvdata(dev);
- struct rockchip_rga *rga = core->rga;
-
- v4l2_info(&rga->v4l2_dev, "Removing\n");
-
- v4l2_m2m_release(rga->m2m_dev);
- video_unregister_device(rga->vfd);
- v4l2_device_unregister(&rga->v4l2_dev);
pm_runtime_disable(core->dev);
}
@@ -937,6 +892,7 @@ static struct platform_driver rga_core_pdrv = {
static int rga_bind(struct device *dev)
{
struct rockchip_rga *rga = dev_get_drvdata(dev);
+ struct video_device *vfd;
int ret;
ret = component_bind_all(dev, rga);
@@ -945,11 +901,59 @@ static int rga_bind(struct device *dev)
return ret;
}
+ ret = v4l2_device_register(dev, &rga->v4l2_dev);
+ if (ret)
+ return ret;
+ vfd = video_device_alloc();
+ if (!vfd) {
+ v4l2_err(&rga->v4l2_dev, "Failed to allocate video device\n");
+ ret = -ENOMEM;
+ goto unreg_v4l2_dev;
+ }
+ *vfd = rga_videodev;
+ vfd->lock = &rga->mutex;
+ vfd->v4l2_dev = &rga->v4l2_dev;
+
+ video_set_drvdata(vfd, rga);
+ rga->vfd = vfd;
+
+ rga->m2m_dev = v4l2_m2m_init(&rga_m2m_ops);
+ if (IS_ERR(rga->m2m_dev)) {
+ v4l2_err(&rga->v4l2_dev, "Failed to init mem2mem device\n");
+ ret = PTR_ERR(rga->m2m_dev);
+ goto rel_vdev;
+ }
+
+ ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
+ if (ret) {
+ v4l2_err(&rga->v4l2_dev, "Failed to register video device\n");
+ goto rel_m2m;
+ }
+
+ v4l2_info(&rga->v4l2_dev, "Registered %s as /dev/%s\n",
+ vfd->name, video_device_node_name(vfd));
+
return 0;
+
+rel_m2m:
+ v4l2_m2m_release(rga->m2m_dev);
+rel_vdev:
+ video_device_release(vfd);
+unreg_v4l2_dev:
+ v4l2_device_unregister(&rga->v4l2_dev);
+ return ret;
}
static void rga_unbind(struct device *dev)
{
+ struct rockchip_rga *rga = dev_get_drvdata(dev);
+
+ v4l2_info(&rga->v4l2_dev, "Removing\n");
+
+ v4l2_m2m_release(rga->m2m_dev);
+ video_unregister_device(rga->vfd);
+ v4l2_device_unregister(&rga->v4l2_dev);
+
component_unbind_all(dev, NULL);
}
--
2.54.0
^ permalink raw reply related
* [PATCH 04/17] media: rockchip: rga: removed unused regmap member
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
The grf member variable is never accessed or written by the RGA driver.
Therefore drop it from the rockchip_rga struct.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index 2b4f5694375a4..0e62337f8dd38 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -71,7 +71,6 @@ struct rockchip_rga {
struct video_device *vfd;
struct device *dev;
- struct regmap *grf;
void __iomem *regs;
struct clk_bulk_data *clks;
int num_clks;
--
2.54.0
^ permalink raw reply related
* [PATCH 09/17] media: rockchip: rga: use components to manage multiple cores
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Use component helpers to manage multiple cores and aggregate them into a
central master device. This gives us a dedicated master device and
ensures that all cores (components) are properly set up before creating
the video device.
This commit only sets up a basic component device. Instead of the
rga_disable_multicore function only the first core is added to the
master device. To avoid the secondary core creating an additional video
device the whole core probe implementation is moved to the bind method,
which is only called when the core is bound to a master device.
The implementation is based on the etnaviv gpu driver, which also groups
multiple gpu cores under a single etnaviv master device.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 256 +++++++++++++++++++++++-------
1 file changed, 202 insertions(+), 54 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 15d095a1d1973..178f45b8da940 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -5,6 +5,7 @@
*/
#include <linux/clk.h>
+#include <linux/component.h>
#include <linux/debugfs.h>
#include <linux/delay.h>
#include <linux/fs.h>
@@ -737,51 +738,9 @@ static int rga_parse_dt(struct rga_core *core)
return 0;
}
-/*
- * Some SoCs, like RK3588 have multiple identical RGA3 cores, but the
- * kernel is currently missing support for multi-core handling. Exposing
- * separate devices for each core to userspace is bad, since that does
- * not allow scheduling tasks properly (and creates ABI). With this workaround
- * the driver will only probe for the first core and early exit for the other
- * cores. Once the driver gains multi-core support, the same technique
- * for detecting the main core can be used to cluster all cores together.
- */
-static int rga_disable_multicore(struct device *dev)
-{
- struct device_node *node = NULL;
- const char *compatible;
- bool is_main_core;
- int ret;
-
- /* Intentionally ignores the fallback strings */
- ret = of_property_read_string(dev->of_node, "compatible", &compatible);
- if (ret)
- return ret;
-
- /* The first compatible and available node found is considered the main core */
- do {
- node = of_find_compatible_node(node, NULL, compatible);
- if (of_device_is_available(node))
- break;
- } while (node);
-
- if (!node)
- return -EINVAL;
-
- is_main_core = (dev->of_node == node);
-
- of_node_put(node);
-
- if (!is_main_core) {
- dev_info(dev, "missing multi-core support, ignoring this instance\n");
- return -ENODEV;
- }
-
- return 0;
-}
-
-static int rga_probe(struct platform_device *pdev)
+static int rga_core_bind(struct device *dev, struct device *master, void *data)
{
+ struct platform_device *pdev = to_platform_device(dev);
struct rockchip_rga *rga;
struct rga_core *core;
struct video_device *vfd;
@@ -791,10 +750,6 @@ static int rga_probe(struct platform_device *pdev)
if (!pdev->dev.of_node)
return -ENODEV;
- ret = rga_disable_multicore(&pdev->dev);
- if (ret)
- return ret;
-
rga = devm_kzalloc(&pdev->dev, sizeof(*rga) + 1 * sizeof(*rga->cores), GFP_KERNEL);
if (!rga)
return -ENOMEM;
@@ -903,9 +858,10 @@ static int rga_probe(struct platform_device *pdev)
return ret;
}
-static void rga_remove(struct platform_device *pdev)
+static void rga_core_unbind(struct device *dev, struct device *master,
+ void *data)
{
- struct rga_core *core = platform_get_drvdata(pdev);
+ struct rga_core *core = dev_get_drvdata(dev);
struct rockchip_rga *rga = core->rga;
v4l2_info(&rga->v4l2_dev, "Removing\n");
@@ -917,6 +873,29 @@ static void rga_remove(struct platform_device *pdev)
pm_runtime_disable(core->dev);
}
+static const struct component_ops rga_core_ops = {
+ .bind = rga_core_bind,
+ .unbind = rga_core_unbind,
+};
+
+static int rga_core_probe(struct platform_device *pdev)
+{
+ int ret = 0;
+
+ ret = component_add(&pdev->dev, &rga_core_ops);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to register component: %d", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void rga_core_remove(struct platform_device *pdev)
+{
+ component_del(&pdev->dev, &rga_core_ops);
+}
+
static int __maybe_unused rga_runtime_suspend(struct device *dev)
{
struct rga_core *core = dev_get_drvdata(dev);
@@ -933,7 +912,7 @@ static int __maybe_unused rga_runtime_resume(struct device *dev)
return clk_bulk_prepare_enable(core->num_clks, core->clks);
}
-static const struct dev_pm_ops rga_pm = {
+static const struct dev_pm_ops rga_core_pm = {
SET_RUNTIME_PM_OPS(rga_runtime_suspend,
rga_runtime_resume, NULL)
};
@@ -956,17 +935,186 @@ static const struct of_device_id rockchip_rga_match[] = {
MODULE_DEVICE_TABLE(of, rockchip_rga_match);
+static struct platform_driver rga_core_pdrv = {
+ .probe = rga_core_probe,
+ .remove = rga_core_remove,
+ .driver = {
+ .name = RGA_NAME "-core",
+ .pm = &rga_core_pm,
+ .of_match_table = rockchip_rga_match,
+ },
+};
+
+static int rga_bind(struct device *dev)
+{
+ int ret;
+
+ ret = component_bind_all(dev, NULL);
+ if (ret) {
+ dev_err(dev, "component bind failed\n");
+ return ret;
+ }
+
+ return 0;
+}
+
+static void rga_unbind(struct device *dev)
+{
+ component_unbind_all(dev, NULL);
+}
+
+struct component_master_ops rga_master_ops = {
+ .bind = rga_bind,
+ .unbind = rga_unbind,
+};
+
+static int rga_probe(struct platform_device *pdev)
+{
+ const struct of_device_id *match_desc = pdev->dev.platform_data;
+ struct device *dev = &pdev->dev;
+ struct component_match *match = NULL;
+ struct device_node *core_node;
+
+ if (!match_desc)
+ return dev_err_probe(dev, -ENODEV, "missing platform data\n");
+
+ for_each_compatible_node(core_node, NULL, match_desc->compatible) {
+ if (!of_device_is_available(core_node))
+ continue;
+
+ of_node_get(core_node);
+ component_match_add_release(dev, &match, component_release_of,
+ component_compare_of, core_node);
+
+ /*
+ * As multi core is not implemented yet,
+ * break out of the loop to only have one core per rockchip_rga struct.
+ * Also put the node, which otherwise would've been done by the loop iteration.
+ */
+ of_node_put(core_node);
+ break;
+ }
+
+ if (!match)
+ return dev_err_probe(
+ dev, -ENODEV,
+ "no matching available component devices found\n");
+
+ return component_master_add_with_match(dev, &rga_master_ops, match);
+}
+
+static void rga_remove(struct platform_device *pdev)
+{
+ component_master_del(&pdev->dev, &rga_master_ops);
+}
+
static struct platform_driver rga_pdrv = {
.probe = rga_probe,
.remove = rga_remove,
.driver = {
.name = RGA_NAME,
- .pm = &rga_pm,
- .of_match_table = rockchip_rga_match,
},
};
-module_platform_driver(rga_pdrv);
+static bool rga_of_has_available_node(const char *compat)
+{
+ struct device_node *node;
+
+ for_each_compatible_node(node, NULL, compat) {
+ if (of_device_is_available(node)) {
+ of_node_put(node);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static int rga_create_platform_device(struct platform_device **ppdev,
+ const struct of_device_id *match)
+{
+ struct platform_device *pdev;
+ int ret;
+
+ pdev = platform_device_alloc(match->compatible, PLATFORM_DEVID_NONE);
+ if (!pdev)
+ return -ENOMEM;
+
+ ret = platform_device_add_data(pdev, match, sizeof(*match));
+ if (ret)
+ goto free_platform_device;
+
+ ret = platform_device_add(pdev);
+ if (ret)
+ goto free_platform_device;
+
+ ret = device_driver_attach(&rga_pdrv.driver, &pdev->dev);
+ if (ret)
+ goto del_platform_device;
+
+ *ppdev = pdev;
+
+ return 0;
+
+del_platform_device:
+ platform_device_del(pdev);
+free_platform_device:
+ platform_device_put(pdev);
+ return ret;
+}
+
+static struct platform_device *master_pdevs[ARRAY_SIZE(rockchip_rga_match) - 1];
+
+static int __init rga_init(void)
+{
+ int ret;
+ unsigned int i;
+
+ ret = platform_driver_register(&rga_core_pdrv);
+ if (ret != 0)
+ return ret;
+
+ ret = platform_driver_register(&rga_pdrv);
+ if (ret != 0)
+ goto unregister_core_driver;
+
+ for (i = 0; i < ARRAY_SIZE(master_pdevs); i++) {
+ if (!rga_of_has_available_node(
+ rockchip_rga_match[i].compatible))
+ continue;
+
+ ret = rga_create_platform_device(&master_pdevs[i],
+ &rockchip_rga_match[i]);
+ if (ret)
+ goto unregister_platform_devices;
+ }
+
+ return 0;
+
+unregister_platform_devices:
+ for (i = 0; i < ARRAY_SIZE(master_pdevs); i++) {
+ platform_device_unregister(master_pdevs[i]);
+ master_pdevs[i] = NULL;
+ }
+ platform_driver_unregister(&rga_pdrv);
+unregister_core_driver:
+ platform_driver_unregister(&rga_core_pdrv);
+ return ret;
+}
+module_init(rga_init);
+
+static void __exit rga_exit(void)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(master_pdevs); i++) {
+ platform_device_unregister(master_pdevs[i]);
+ master_pdevs[i] = NULL;
+ }
+ platform_driver_unregister(&rga_pdrv);
+ platform_driver_unregister(&rga_core_pdrv);
+}
+module_exit(rga_exit);
MODULE_AUTHOR("Jacob Chen <jacob-chen@iotwrt.com>");
MODULE_DESCRIPTION("Rockchip Raster 2d Graphic Acceleration Unit");
--
2.54.0
^ permalink raw reply related
* [PATCH 01/17] media: rockchip: rga: zero cmdbuf in shared code
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Zero the command buffer (cmdbuf) in the shared code instead of the
individual RGA2/RGA3 implementations. Besides centralizing the memset
operation this also uses the cmdbuf_size member for the memset size,
which is also used as the size for the actual allocation.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga-hw.c | 2 --
drivers/media/platform/rockchip/rga/rga.c | 1 +
drivers/media/platform/rockchip/rga/rga.h | 3 +++
drivers/media/platform/rockchip/rga/rga3-hw.c | 2 --
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c
index be1bc8ddbd03b..4d7b0a03820a1 100644
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -443,8 +443,6 @@ static void rga_cmd_set(struct rga_ctx *ctx,
static void rga_hw_setup_cmdbuf(struct rga_ctx *ctx)
{
- memset(ctx->cmdbuf_virt, 0, RGA_CMDBUF_SIZE);
-
rga_cmd_set_mode(ctx);
rga_cmd_set_trans_info(ctx);
}
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index b3cb6bf8eb863..bd0afd33affe4 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -41,6 +41,7 @@ static void device_run(void *prv)
spin_lock_irqsave(&rga->ctrl_lock, flags);
if (ctx->cmdbuf_dirty) {
ctx->cmdbuf_dirty = false;
+ memset(ctx->cmdbuf_virt, 0, rga->hw->cmdbuf_size);
rga->hw->setup_cmdbuf(ctx);
}
spin_unlock_irqrestore(&rga->ctrl_lock, flags);
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index bd431534d0d39..2b4f5694375a4 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -152,6 +152,9 @@ struct rga_hw {
u8 stride_alignment;
u8 features;
+ /*
+ * Requires that the cmdbuf is already zeroed.
+ */
void (*setup_cmdbuf)(struct rga_ctx *ctx);
void (*start)(struct rockchip_rga *rga,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst);
diff --git a/drivers/media/platform/rockchip/rga/rga3-hw.c b/drivers/media/platform/rockchip/rga/rga3-hw.c
index ca1c268303dd4..72741e1faccff 100644
--- a/drivers/media/platform/rockchip/rga/rga3-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga3-hw.c
@@ -261,8 +261,6 @@ static void rga3_cmd_set_wr_format(struct rga_ctx *ctx)
static void rga3_hw_setup_cmdbuf(struct rga_ctx *ctx)
{
- memset(ctx->cmdbuf_virt, 0, RGA3_CMDBUF_SIZE);
-
rga3_cmd_set_win0_format(ctx);
rga3_cmd_set_trans_info(ctx);
rga3_cmd_set_wr_format(ctx);
--
2.54.0
^ permalink raw reply related
* [PATCH 05/17] media: v4l2-mem2mem: support running multiple jobs in parallel
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Add support for running multiple jobs in parallel for SoCs containing
multiple identical devices. An example is the Rockchip RK3588 SoC,
which contains two identical RGA3 devices. Therefore it is desirable to
have the kernel schedule the work across all available devices and only
expose one video device to the userspace.
Previously the curr_ctx member of a v4l2_m2m_dev was used to track the
currently running context. But the currently running context will always
be at the top of the job_queue. As the TRANS_RUNNING flag can be used to
check if the queue head is already running, the curr_ctx member can be
completely dropped
To avoid queueing too many parallel jobs, the
v4l2_m2m_set_max_parallel_jobs method is added. It allows a driver
to set the number of parallel jobs and avoids calling device_run when
the given number of jobs is already running. This is set to 1 by default
to prevent parallel job runs. Drivers with the need and support for
scheduling jobs can adjust this value accordingly.
Note that this change doesn't allow a context to be used multiple times
in parallel. So a single stream won't be able to utilize multiple devices
at once, but N streams can utilize up to N devices. This is caused by the
fact that a context is not added multiple times to the job_list and also
holds the job_flags to distinguish if it's currently running.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/v4l2-core/v4l2-mem2mem.c | 89 ++++++++++++++++++++++------------
include/media/v4l2-mem2mem.h | 3 ++
2 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index a65cbb124cfe0..14ac9c85803d1 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -84,16 +84,15 @@ static const char * const m2m_entity_name[] = {
* v4l2_m2m_unregister_media_controller().
* @intf_devnode: &struct media_intf devnode pointer with the interface
* with controls the M2M device.
- * @curr_ctx: currently running instance
* @job_queue: instances queued to run
* @job_spinlock: protects job_queue
* @job_work: worker to run queued jobs.
* @job_queue_flags: flags of the queue status, %QUEUE_PAUSED.
+ * @max_parallel_jobs: max job_queue instances number marked as running
* @m2m_ops: driver callbacks
* @kref: device reference count
*/
struct v4l2_m2m_dev {
- struct v4l2_m2m_ctx *curr_ctx;
#ifdef CONFIG_MEDIA_CONTROLLER
struct media_entity *source;
struct media_pad source_pad;
@@ -108,6 +107,7 @@ struct v4l2_m2m_dev {
spinlock_t job_spinlock;
struct work_struct job_work;
unsigned long job_queue_flags;
+ u32 max_parallel_jobs;
const struct v4l2_m2m_ops *m2m_ops;
@@ -123,6 +123,12 @@ static struct v4l2_m2m_queue_ctx *get_queue_ctx(struct v4l2_m2m_ctx *m2m_ctx,
return &m2m_ctx->cap_q_ctx;
}
+void v4l2_m2m_set_max_parallel_jobs(struct v4l2_m2m_dev *m2m_dev,
+ u32 max_parallel_jobs)
+{
+ m2m_dev->max_parallel_jobs = max_parallel_jobs;
+}
+
struct vb2_queue *v4l2_m2m_get_vq(struct v4l2_m2m_ctx *m2m_ctx,
enum v4l2_buf_type type)
{
@@ -229,14 +235,22 @@ EXPORT_SYMBOL_GPL(v4l2_m2m_buf_remove_by_idx);
void *v4l2_m2m_get_curr_priv(struct v4l2_m2m_dev *m2m_dev)
{
unsigned long flags;
- void *ret = NULL;
+ struct v4l2_m2m_ctx *first_ctx;
spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
- if (m2m_dev->curr_ctx)
- ret = m2m_dev->curr_ctx->priv;
+ if (list_empty(&m2m_dev->job_queue)) {
+ spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
+ return NULL;
+ }
+
+ first_ctx = list_first_entry(&m2m_dev->job_queue,
+ struct v4l2_m2m_ctx, queue);
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
- return ret;
+ if (first_ctx->job_flags & TRANS_RUNNING)
+ return first_ctx->priv;
+ else
+ return NULL;
}
EXPORT_SYMBOL(v4l2_m2m_get_curr_priv);
@@ -252,13 +266,11 @@ EXPORT_SYMBOL(v4l2_m2m_get_curr_priv);
static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
{
unsigned long flags;
+ struct v4l2_m2m_ctx *ctx;
+ struct v4l2_m2m_ctx *chosen_ctx = NULL;
+ u32 running_jobs = 0;
spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
- if (NULL != m2m_dev->curr_ctx) {
- spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
- dprintk("Another instance is running, won't run now\n");
- return;
- }
if (list_empty(&m2m_dev->job_queue)) {
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
@@ -272,13 +284,30 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
return;
}
- m2m_dev->curr_ctx = list_first_entry(&m2m_dev->job_queue,
- struct v4l2_m2m_ctx, queue);
- m2m_dev->curr_ctx->job_flags |= TRANS_RUNNING;
+ list_for_each_entry(ctx, &m2m_dev->job_queue, queue) {
+ if (!(ctx->job_flags & TRANS_RUNNING)) {
+ chosen_ctx = ctx;
+ break;
+ }
+
+ running_jobs++;
+ }
+ if (running_jobs >= m2m_dev->max_parallel_jobs) {
+ spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
+ dprintk("Maximum number of parallel jobs reached\n");
+ return;
+ }
+ if (!chosen_ctx) {
+ spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
+ dprintk("All jobs already running\n");
+ return;
+ }
+
+ chosen_ctx->job_flags |= TRANS_RUNNING;
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
- dprintk("Running job on m2m_ctx: %p\n", m2m_dev->curr_ctx);
- m2m_dev->m2m_ops->device_run(m2m_dev->curr_ctx->priv);
+ dprintk("Running job on m2m_ctx: %p\n", chosen_ctx);
+ m2m_dev->m2m_ops->device_run(chosen_ctx->priv);
}
/*
@@ -469,15 +498,14 @@ static void v4l2_m2m_schedule_next_job(struct v4l2_m2m_dev *m2m_dev,
static bool _v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
struct v4l2_m2m_ctx *m2m_ctx)
{
- if (!m2m_dev->curr_ctx || m2m_dev->curr_ctx != m2m_ctx) {
+ if (!m2m_ctx || !(m2m_ctx->job_flags & TRANS_RUNNING)) {
dprintk("Called by an instance not currently running\n");
return false;
}
- list_del(&m2m_dev->curr_ctx->queue);
- m2m_dev->curr_ctx->job_flags &= ~(TRANS_QUEUED | TRANS_RUNNING);
- wake_up(&m2m_dev->curr_ctx->finished);
- m2m_dev->curr_ctx = NULL;
+ list_del(&m2m_ctx->queue);
+ m2m_ctx->job_flags &= ~(TRANS_QUEUED | TRANS_RUNNING);
+ wake_up(&m2m_ctx->finished);
return true;
}
@@ -544,16 +572,19 @@ EXPORT_SYMBOL(v4l2_m2m_buf_done_and_job_finish);
void v4l2_m2m_suspend(struct v4l2_m2m_dev *m2m_dev)
{
unsigned long flags;
- struct v4l2_m2m_ctx *curr_ctx;
+ struct v4l2_m2m_ctx *ctx;
+ struct v4l2_m2m_ctx *ctx_safe;
spin_lock_irqsave(&m2m_dev->job_spinlock, flags);
m2m_dev->job_queue_flags |= QUEUE_PAUSED;
- curr_ctx = m2m_dev->curr_ctx;
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags);
- if (curr_ctx)
- wait_event(curr_ctx->finished,
- !(curr_ctx->job_flags & TRANS_RUNNING));
+ list_for_each_entry_safe(ctx, ctx_safe, &m2m_dev->job_queue, queue) {
+ if (!(ctx->job_flags & TRANS_RUNNING))
+ break;
+
+ wait_event(ctx->finished, !(ctx->job_flags & TRANS_RUNNING));
+ }
}
EXPORT_SYMBOL(v4l2_m2m_suspend);
@@ -896,10 +927,8 @@ int v4l2_m2m_streamoff(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
q_ctx->num_rdy = 0;
spin_unlock_irqrestore(&q_ctx->rdy_spinlock, flags);
- if (m2m_dev->curr_ctx == m2m_ctx) {
- m2m_dev->curr_ctx = NULL;
+ if (m2m_ctx->job_flags & TRANS_RUNNING)
wake_up(&m2m_ctx->finished);
- }
spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags_job);
return 0;
@@ -1194,12 +1223,12 @@ struct v4l2_m2m_dev *v4l2_m2m_init(const struct v4l2_m2m_ops *m2m_ops)
if (!m2m_dev)
return ERR_PTR(-ENOMEM);
- m2m_dev->curr_ctx = NULL;
m2m_dev->m2m_ops = m2m_ops;
INIT_LIST_HEAD(&m2m_dev->job_queue);
spin_lock_init(&m2m_dev->job_spinlock);
INIT_WORK(&m2m_dev->job_work, v4l2_m2m_device_run_work);
kref_init(&m2m_dev->kref);
+ m2m_dev->max_parallel_jobs = 1;
return m2m_dev;
}
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 31de25d792b98..e6177d0eaf637 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -594,6 +594,9 @@ static inline void v4l2_m2m_set_dst_buffered(struct v4l2_m2m_ctx *m2m_ctx,
m2m_ctx->cap_q_ctx.buffered = buffered;
}
+void v4l2_m2m_set_max_parallel_jobs(struct v4l2_m2m_dev *m2m_dev,
+ u32 max_parallel_jobs);
+
/**
* v4l2_m2m_ctx_release() - release m2m context
*
--
2.54.0
^ permalink raw reply related
* [PATCH 08/17] media: rockchip: rga: add rga_core structure
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Add a rga_core structure to separate the core specific data from the
m2m device. This is done in preparation for multi-core support, where
multiple identical cores are exposed as a single m2m device to the
user-space.
Allocation related calls are explicitly done on the first core, as the
scheduling decisions will be made on demand after the buffers have been
allocated and filled.
In preparation of storing the rockchip_rga struct on a dedicated master
platform device, the rga_core struct is allocated on it's own and only a
pointer is saved in the rockchip_rga struct.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga-buf.c | 4 +-
drivers/media/platform/rockchip/rga/rga-hw.c | 32 ++++----
drivers/media/platform/rockchip/rga/rga.c | 104 ++++++++++++++------------
drivers/media/platform/rockchip/rga/rga.h | 39 +++++-----
drivers/media/platform/rockchip/rga/rga3-hw.c | 24 +++---
5 files changed, 108 insertions(+), 95 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/platform/rockchip/rga/rga-buf.c
index 3f7c3c68e0cb8..47a8d5a4500a3 100644
--- a/drivers/media/platform/rockchip/rga/rga-buf.c
+++ b/drivers/media/platform/rockchip/rga/rga-buf.c
@@ -93,7 +93,7 @@ static int rga_buf_init(struct vb2_buffer *vb)
n_desc = DIV_ROUND_UP(size, PAGE_SIZE);
rbuf->n_desc = n_desc;
- rbuf->dma_desc = dma_alloc_coherent(rga->dev,
+ rbuf->dma_desc = dma_alloc_coherent(rga->cores[0]->dev,
rbuf->n_desc * sizeof(*rbuf->dma_desc),
&rbuf->dma_desc_pa, GFP_KERNEL);
if (!rbuf->dma_desc)
@@ -191,7 +191,7 @@ static void rga_buf_cleanup(struct vb2_buffer *vb)
if (!rga_has_internal_iommu(rga))
return;
- dma_free_coherent(rga->dev, rbuf->n_desc * sizeof(*rbuf->dma_desc),
+ dma_free_coherent(rga->cores[0]->dev, rbuf->n_desc * sizeof(*rbuf->dma_desc),
rbuf->dma_desc, rbuf->dma_desc_pa);
}
diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c
index 190104f3b2954..9a5da4e1716ca 100644
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -417,10 +417,10 @@ static void rga_cmd_set_mode(struct rga_ctx *ctx)
dest[(RGA_MODE_CTRL - RGA_MODE_BASE_REG) >> 2] = mode.val;
}
-static void rga_cmd_set(struct rga_ctx *ctx,
+static void rga_cmd_set(struct rga_core *core,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst)
{
- struct rockchip_rga *rga = ctx->rga;
+ struct rga_ctx *ctx = core->curr;
rga_cmd_set_src_addr(ctx, src->dma_desc_pa);
/*
@@ -434,10 +434,10 @@ static void rga_cmd_set(struct rga_ctx *ctx,
rga_cmd_set_src_info(ctx, &src->dma_addrs);
rga_cmd_set_dst_info(ctx, &dst->dma_addrs);
- rga_write(rga, RGA_CMD_BASE, ctx->cmdbuf_phy);
+ rga_write(core, RGA_CMD_BASE, ctx->cmdbuf_phy);
/* sync CMD buf for RGA */
- dma_sync_single_for_device(rga->dev, ctx->cmdbuf_phy,
+ dma_sync_single_for_device(core->rga->cores[0]->dev, ctx->cmdbuf_phy,
PAGE_SIZE, DMA_BIDIRECTIONAL);
}
@@ -447,36 +447,34 @@ static void rga_hw_setup_cmdbuf(struct rga_ctx *ctx)
rga_cmd_set_trans_info(ctx);
}
-static void rga_hw_start(struct rockchip_rga *rga,
+static void rga_hw_start(struct rga_core *core,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst)
{
- struct rga_ctx *ctx = rga->curr;
-
- rga_cmd_set(ctx, src, dst);
+ rga_cmd_set(core, src, dst);
- rga_write(rga, RGA_SYS_CTRL, 0x00);
+ rga_write(core, RGA_SYS_CTRL, 0x00);
- rga_write(rga, RGA_SYS_CTRL, 0x22);
+ rga_write(core, RGA_SYS_CTRL, 0x22);
- rga_write(rga, RGA_INT, 0x600);
+ rga_write(core, RGA_INT, 0x600);
- rga_write(rga, RGA_CMD_CTRL, 0x1);
+ rga_write(core, RGA_CMD_CTRL, 0x1);
}
-static bool rga_handle_irq(struct rockchip_rga *rga)
+static bool rga_handle_irq(struct rga_core *core)
{
int intr;
- intr = rga_read(rga, RGA_INT) & 0xf;
+ intr = rga_read(core, RGA_INT) & 0xf;
- rga_mod(rga, RGA_INT, intr << 4, 0xf << 4);
+ rga_mod(core, RGA_INT, intr << 4, 0xf << 4);
return intr & RGA_INT_COMMAND_FINISHED;
}
-static struct rockchip_rga_version rga_get_version(struct rockchip_rga *rga)
+static struct rockchip_rga_version rga_get_version(struct rga_core *core)
{
- u32 version = rga_read(rga, RGA_VERSION_INFO);
+ u32 version = rga_read(core, RGA_VERSION_INFO);
return (struct rockchip_rga_version) {
.major = (version >> 24) & 0xFF,
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index b8edd3596c919..15d095a1d1973 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -11,6 +11,7 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/of_platform.h>
#include <linux/pm_runtime.h>
#include <linux/reset.h>
#include <linux/sched.h>
@@ -35,11 +36,12 @@ static void device_run(void *prv)
{
struct rga_ctx *ctx = prv;
struct rockchip_rga *rga = ctx->rga;
+ struct rga_core *core = rga->cores[0];
struct vb2_v4l2_buffer *src, *dst;
unsigned long flags;
int ret;
- ret = pm_runtime_resume_and_get(rga->dev);
+ ret = pm_runtime_resume_and_get(core->dev);
if (ret < 0) {
v4l2_m2m_buf_done_and_job_finish(rga->m2m_dev, ctx->fh.m2m_ctx,
VB2_BUF_STATE_ERROR);
@@ -54,27 +56,28 @@ static void device_run(void *prv)
}
spin_unlock_irqrestore(&rga->ctrl_lock, flags);
- rga->curr = ctx;
+ core->curr = ctx;
src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
src->sequence = ctx->osequence++;
dst = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
- rga->hw->start(rga, vb_to_rga(src), vb_to_rga(dst));
+ rga->hw->start(core, vb_to_rga(src), vb_to_rga(dst));
}
static irqreturn_t rga_isr(int irq, void *prv)
{
- struct rockchip_rga *rga = prv;
+ struct rga_core *core = prv;
+ struct rockchip_rga *rga = core->rga;
- if (rga->hw->handle_irq(rga)) {
+ if (rga->hw->handle_irq(core)) {
struct vb2_v4l2_buffer *src, *dst;
- struct rga_ctx *ctx = rga->curr;
+ struct rga_ctx *ctx = core->curr;
WARN_ON(!ctx);
- rga->curr = NULL;
+ core->curr = NULL;
src = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
dst = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
@@ -90,7 +93,7 @@ static irqreturn_t rga_isr(int irq, void *prv)
v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);
v4l2_m2m_job_finish(rga->m2m_dev, ctx->fh.m2m_ctx);
- pm_runtime_put_autosuspend(rga->dev);
+ pm_runtime_put_autosuspend(core->dev);
}
return IRQ_HANDLED;
@@ -118,7 +121,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
src_vq->buf_struct_size = sizeof(struct rga_vb_buffer);
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &ctx->rga->mutex;
- src_vq->dev = ctx->rga->v4l2_dev.dev;
+ src_vq->dev = ctx->rga->cores[0]->dev;
ret = vb2_queue_init(src_vq);
if (ret)
@@ -136,7 +139,7 @@ queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
dst_vq->buf_struct_size = sizeof(struct rga_vb_buffer);
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &ctx->rga->mutex;
- dst_vq->dev = ctx->rga->v4l2_dev.dev;
+ dst_vq->dev = ctx->rga->cores[0]->dev;
return vb2_queue_init(dst_vq);
}
@@ -275,7 +278,7 @@ static int rga_open(struct file *file)
return -ENOMEM;
/* Create CMD buffer */
- ctx->cmdbuf_virt = dma_alloc_attrs(rga->dev, rga->hw->cmdbuf_size,
+ ctx->cmdbuf_virt = dma_alloc_attrs(rga->cores[0]->dev, rga->hw->cmdbuf_size,
&ctx->cmdbuf_phy, GFP_KERNEL,
DMA_ATTR_WRITE_COMBINE);
if (!ctx->cmdbuf_virt) {
@@ -322,7 +325,7 @@ static int rga_open(struct file *file)
unlock_mutex:
mutex_unlock(&rga->mutex);
rel_cmdbuf:
- dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
+ dma_free_attrs(rga->cores[0]->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
rel_ctx:
kfree(ctx);
@@ -342,7 +345,7 @@ static int rga_release(struct file *file)
v4l2_fh_del(&ctx->fh, file);
v4l2_fh_exit(&ctx->fh);
- dma_free_attrs(rga->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
+ dma_free_attrs(rga->cores[0]->dev, rga->hw->cmdbuf_size, ctx->cmdbuf_virt,
ctx->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
kfree(ctx);
@@ -689,26 +692,26 @@ static const struct video_device rga_videodev = {
.device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING,
};
-static int rga_parse_dt(struct rockchip_rga *rga)
+static int rga_parse_dt(struct rga_core *core)
{
struct reset_control *core_rst, *axi_rst, *ahb_rst;
int ret;
- core_rst = devm_reset_control_get(rga->dev, "core");
+ core_rst = devm_reset_control_get(core->dev, "core");
if (IS_ERR(core_rst)) {
- dev_err(rga->dev, "failed to get core reset controller\n");
+ dev_err(core->dev, "failed to get core reset controller\n");
return PTR_ERR(core_rst);
}
- axi_rst = devm_reset_control_get(rga->dev, "axi");
+ axi_rst = devm_reset_control_get(core->dev, "axi");
if (IS_ERR(axi_rst)) {
- dev_err(rga->dev, "failed to get axi reset controller\n");
+ dev_err(core->dev, "failed to get axi reset controller\n");
return PTR_ERR(axi_rst);
}
- ahb_rst = devm_reset_control_get(rga->dev, "ahb");
+ ahb_rst = devm_reset_control_get(core->dev, "ahb");
if (IS_ERR(ahb_rst)) {
- dev_err(rga->dev, "failed to get ahb reset controller\n");
+ dev_err(core->dev, "failed to get ahb reset controller\n");
return PTR_ERR(ahb_rst);
}
@@ -724,12 +727,12 @@ static int rga_parse_dt(struct rockchip_rga *rga)
udelay(1);
reset_control_deassert(ahb_rst);
- ret = devm_clk_bulk_get_all(rga->dev, &rga->clks);
+ ret = devm_clk_bulk_get_all(core->dev, &core->clks);
if (ret < 0) {
- dev_err(rga->dev, "failed to get clocks\n");
+ dev_err(core->dev, "failed to get clocks\n");
return ret;
}
- rga->num_clks = ret;
+ core->num_clks = ret;
return 0;
}
@@ -780,6 +783,7 @@ static int rga_disable_multicore(struct device *dev)
static int rga_probe(struct platform_device *pdev)
{
struct rockchip_rga *rga;
+ struct rga_core *core;
struct video_device *vfd;
int ret = 0;
int irq;
@@ -791,7 +795,7 @@ static int rga_probe(struct platform_device *pdev)
if (ret)
return ret;
- rga = devm_kzalloc(&pdev->dev, sizeof(*rga), GFP_KERNEL);
+ rga = devm_kzalloc(&pdev->dev, sizeof(*rga) + 1 * sizeof(*rga->cores), GFP_KERNEL);
if (!rga)
return -ENOMEM;
@@ -799,20 +803,25 @@ static int rga_probe(struct platform_device *pdev)
if (!rga->hw)
return dev_err_probe(&pdev->dev, -ENODEV, "failed to get match data\n");
- rga->dev = &pdev->dev;
spin_lock_init(&rga->ctrl_lock);
mutex_init(&rga->mutex);
- ret = rga_parse_dt(rga);
+ core = devm_kzalloc(&pdev->dev, sizeof(*core), GFP_KERNEL);
+ core->rga = rga;
+ core->dev = &pdev->dev;
+
+ rga->cores[0] = core;
+
+ ret = rga_parse_dt(core);
if (ret)
return dev_err_probe(&pdev->dev, ret, "Unable to parse OF data\n");
- pm_runtime_set_autosuspend_delay(rga->dev, 50);
- pm_runtime_enable(rga->dev);
+ pm_runtime_set_autosuspend_delay(core->dev, 50);
+ pm_runtime_enable(core->dev);
- rga->regs = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(rga->regs)) {
- ret = PTR_ERR(rga->regs);
+ core->regs = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(core->regs)) {
+ ret = PTR_ERR(core->regs);
goto err_put_clk;
}
@@ -822,17 +831,17 @@ static int rga_probe(struct platform_device *pdev)
goto err_put_clk;
}
- ret = devm_request_irq(rga->dev, irq, rga_isr,
+ ret = devm_request_irq(core->dev, irq, rga_isr,
rga_has_internal_iommu(rga) ? 0 : IRQF_SHARED,
- dev_name(rga->dev), rga);
+ dev_name(core->dev), core);
if (ret < 0) {
- dev_err(rga->dev, "failed to request irq\n");
+ dev_err(core->dev, "failed to request irq\n");
goto err_put_clk;
}
- ret = dma_set_mask_and_coherent(rga->dev, DMA_BIT_MASK(32));
+ ret = dma_set_mask_and_coherent(core->dev, DMA_BIT_MASK(32));
if (ret) {
- dev_err(rga->dev, "32-bit DMA not supported");
+ dev_err(core->dev, "32-bit DMA not supported");
goto err_put_clk;
}
@@ -852,7 +861,7 @@ static int rga_probe(struct platform_device *pdev)
video_set_drvdata(vfd, rga);
rga->vfd = vfd;
- platform_set_drvdata(pdev, rga);
+ platform_set_drvdata(pdev, core);
rga->m2m_dev = v4l2_m2m_init(&rga_m2m_ops);
if (IS_ERR(rga->m2m_dev)) {
v4l2_err(&rga->v4l2_dev, "Failed to init mem2mem device\n");
@@ -860,16 +869,16 @@ static int rga_probe(struct platform_device *pdev)
goto rel_vdev;
}
- ret = pm_runtime_resume_and_get(rga->dev);
+ ret = pm_runtime_resume_and_get(core->dev);
if (ret < 0)
goto rel_m2m;
- rga->version = rga->hw->get_version(rga);
+ rga->version = rga->hw->get_version(core);
v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
rga->version.major, rga->version.minor);
- pm_runtime_put(rga->dev);
+ pm_runtime_put(core->dev);
ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
if (ret) {
@@ -889,14 +898,15 @@ static int rga_probe(struct platform_device *pdev)
unreg_v4l2_dev:
v4l2_device_unregister(&rga->v4l2_dev);
err_put_clk:
- pm_runtime_disable(rga->dev);
+ pm_runtime_disable(core->dev);
return ret;
}
static void rga_remove(struct platform_device *pdev)
{
- struct rockchip_rga *rga = platform_get_drvdata(pdev);
+ struct rga_core *core = platform_get_drvdata(pdev);
+ struct rockchip_rga *rga = core->rga;
v4l2_info(&rga->v4l2_dev, "Removing\n");
@@ -904,23 +914,23 @@ static void rga_remove(struct platform_device *pdev)
video_unregister_device(rga->vfd);
v4l2_device_unregister(&rga->v4l2_dev);
- pm_runtime_disable(rga->dev);
+ pm_runtime_disable(core->dev);
}
static int __maybe_unused rga_runtime_suspend(struct device *dev)
{
- struct rockchip_rga *rga = dev_get_drvdata(dev);
+ struct rga_core *core = dev_get_drvdata(dev);
- clk_bulk_disable_unprepare(rga->num_clks, rga->clks);
+ clk_bulk_disable_unprepare(core->num_clks, core->clks);
return 0;
}
static int __maybe_unused rga_runtime_resume(struct device *dev)
{
- struct rockchip_rga *rga = dev_get_drvdata(dev);
+ struct rga_core *core = dev_get_drvdata(dev);
- return clk_bulk_prepare_enable(rga->num_clks, rga->clks);
+ return clk_bulk_prepare_enable(core->num_clks, core->clks);
}
static const struct dev_pm_ops rga_pm = {
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index 0e854cdf739f4..fcf1ef7d2029f 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -14,7 +14,6 @@
#include <media/v4l2-device.h>
#define RGA_NAME "rockchip-rga"
-
#define DEFAULT_WIDTH 100
#define DEFAULT_HEIGHT 100
@@ -36,6 +35,16 @@ struct rockchip_rga_version {
u32 minor;
};
+struct rga_core {
+ struct device *dev;
+ void __iomem *regs;
+ struct clk_bulk_data *clks;
+ int num_clks;
+
+ struct rockchip_rga *rga;
+ struct rga_ctx *curr;
+};
+
struct rga_ctx {
struct v4l2_fh fh;
struct rockchip_rga *rga;
@@ -70,10 +79,6 @@ struct rockchip_rga {
struct v4l2_m2m_dev *m2m_dev;
struct video_device *vfd;
- struct device *dev;
- void __iomem *regs;
- struct clk_bulk_data *clks;
- int num_clks;
struct rockchip_rga_version version;
/* vfd lock */
@@ -81,9 +86,9 @@ struct rockchip_rga {
/* ctrl parm lock */
spinlock_t ctrl_lock;
- struct rga_ctx *curr;
-
const struct rga_hw *hw;
+
+ struct rga_core *cores[];
};
struct rga_addrs {
@@ -119,22 +124,22 @@ int rga_check_scaling(const struct rga_hw *hw, const struct v4l2_rect *crop_in,
extern const struct vb2_ops rga_qops;
/* RGA Hardware */
-static inline void rga_write(struct rockchip_rga *rga, u32 reg, u32 value)
+static inline void rga_write(struct rga_core *core, u32 reg, u32 value)
{
- writel(value, rga->regs + reg);
+ writel(value, core->regs + reg);
};
-static inline u32 rga_read(struct rockchip_rga *rga, u32 reg)
+static inline u32 rga_read(struct rga_core *core, u32 reg)
{
- return readl(rga->regs + reg);
+ return readl(core->regs + reg);
};
-static inline void rga_mod(struct rockchip_rga *rga, u32 reg, u32 val, u32 mask)
+static inline void rga_mod(struct rga_core *core, u32 reg, u32 val, u32 mask)
{
- u32 temp = rga_read(rga, reg) & ~(mask);
+ u32 temp = rga_read(core, reg) & ~(mask);
temp |= val & mask;
- rga_write(rga, reg, temp);
+ rga_write(core, reg, temp);
};
#define RGA_FEATURE_FLIP BIT(0)
@@ -155,10 +160,10 @@ struct rga_hw {
* Requires that the cmdbuf is already zeroed.
*/
void (*setup_cmdbuf)(struct rga_ctx *ctx);
- void (*start)(struct rockchip_rga *rga,
+ void (*start)(struct rga_core *core,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst);
- bool (*handle_irq)(struct rockchip_rga *rga);
- struct rockchip_rga_version (*get_version)(struct rockchip_rga *rga);
+ bool (*handle_irq)(struct rga_core *core);
+ struct rockchip_rga_version (*get_version)(struct rga_core *core);
void *(*adjust_and_map_format)(struct rga_ctx *ctx,
struct v4l2_pix_format_mplane *format,
bool is_output);
diff --git a/drivers/media/platform/rockchip/rga/rga3-hw.c b/drivers/media/platform/rockchip/rga/rga3-hw.c
index 3469523a5ecad..f7e4bc8c6ff21 100644
--- a/drivers/media/platform/rockchip/rga/rga3-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga3-hw.c
@@ -266,42 +266,42 @@ static void rga3_hw_setup_cmdbuf(struct rga_ctx *ctx)
rga3_cmd_set_wr_format(ctx);
}
-static void rga3_hw_start(struct rockchip_rga *rga,
+static void rga3_hw_start(struct rga_core *core,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst)
{
- struct rga_ctx *ctx = rga->curr;
+ struct rga_ctx *ctx = core->curr;
rga3_cmd_set_win0_addr(ctx, &src->dma_addrs);
rga3_cmd_set_wr_addr(ctx, &dst->dma_addrs);
- rga_write(rga, RGA3_CMD_ADDR, ctx->cmdbuf_phy);
+ rga_write(core, RGA3_CMD_ADDR, ctx->cmdbuf_phy);
/* sync CMD buf for RGA */
- dma_sync_single_for_device(rga->dev, ctx->cmdbuf_phy,
+ dma_sync_single_for_device(core->rga->cores[0]->dev, ctx->cmdbuf_phy,
PAGE_SIZE, DMA_BIDIRECTIONAL);
/* set to master mode and start the conversion */
- rga_write(rga, RGA3_SYS_CTRL,
+ rga_write(core, RGA3_SYS_CTRL,
FIELD_PREP(RGA3_CMD_MODE, RGA3_CMD_MODE_MASTER));
- rga_write(rga, RGA3_INT_EN, FIELD_PREP(RGA3_INT_FRM_DONE, 1));
- rga_write(rga, RGA3_CMD_CTRL,
+ rga_write(core, RGA3_INT_EN, FIELD_PREP(RGA3_INT_FRM_DONE, 1));
+ rga_write(core, RGA3_CMD_CTRL,
FIELD_PREP(RGA3_CMD_LINE_START_PULSE, 1));
}
-static bool rga3_handle_irq(struct rockchip_rga *rga)
+static bool rga3_handle_irq(struct rga_core *core)
{
u32 intr;
- intr = rga_read(rga, RGA3_INT_RAW);
+ intr = rga_read(core, RGA3_INT_RAW);
/* clear all interrupts */
- rga_write(rga, RGA3_INT_CLR, intr);
+ rga_write(core, RGA3_INT_CLR, intr);
return FIELD_GET(RGA3_INT_FRM_DONE, intr);
}
-static struct rockchip_rga_version rga3_get_version(struct rockchip_rga *rga)
+static struct rockchip_rga_version rga3_get_version(struct rga_core *core)
{
- u32 version = rga_read(rga, RGA3_VERSION_NUM);
+ u32 version = rga_read(core, RGA3_VERSION_NUM);
return (struct rockchip_rga_version) {
.major = FIELD_GET(RGA3_VERSION_NUM_MAJOR, version),
--
2.54.0
^ permalink raw reply related
* [PATCH 10/17] media: rockchip: rga: move rockchip_rga allocation to master probe
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Move the rockchip_rga struct allocation to the master component probe
function in preparation of enabling all cores. This also adjusts the
allocation to use the actual number of cores found in the of tree
instead of being fixed to one core.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 32 ++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 178f45b8da940..11912bf5b6906 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -741,7 +741,7 @@ static int rga_parse_dt(struct rga_core *core)
static int rga_core_bind(struct device *dev, struct device *master, void *data)
{
struct platform_device *pdev = to_platform_device(dev);
- struct rockchip_rga *rga;
+ struct rockchip_rga *rga = data;
struct rga_core *core;
struct video_device *vfd;
int ret = 0;
@@ -750,17 +750,6 @@ static int rga_core_bind(struct device *dev, struct device *master, void *data)
if (!pdev->dev.of_node)
return -ENODEV;
- rga = devm_kzalloc(&pdev->dev, sizeof(*rga) + 1 * sizeof(*rga->cores), GFP_KERNEL);
- if (!rga)
- return -ENOMEM;
-
- rga->hw = of_device_get_match_data(&pdev->dev);
- if (!rga->hw)
- return dev_err_probe(&pdev->dev, -ENODEV, "failed to get match data\n");
-
- spin_lock_init(&rga->ctrl_lock);
- mutex_init(&rga->mutex);
-
core = devm_kzalloc(&pdev->dev, sizeof(*core), GFP_KERNEL);
core->rga = rga;
core->dev = &pdev->dev;
@@ -947,9 +936,10 @@ static struct platform_driver rga_core_pdrv = {
static int rga_bind(struct device *dev)
{
+ struct rockchip_rga *rga = dev_get_drvdata(dev);
int ret;
- ret = component_bind_all(dev, NULL);
+ ret = component_bind_all(dev, rga);
if (ret) {
dev_err(dev, "component bind failed\n");
return ret;
@@ -974,6 +964,8 @@ static int rga_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct component_match *match = NULL;
struct device_node *core_node;
+ struct rockchip_rga *rga;
+ u8 num_cores = 0;
if (!match_desc)
return dev_err_probe(dev, -ENODEV, "missing platform data\n");
@@ -985,6 +977,7 @@ static int rga_probe(struct platform_device *pdev)
of_node_get(core_node);
component_match_add_release(dev, &match, component_release_of,
component_compare_of, core_node);
+ num_cores++;
/*
* As multi core is not implemented yet,
@@ -1000,6 +993,19 @@ static int rga_probe(struct platform_device *pdev)
dev, -ENODEV,
"no matching available component devices found\n");
+ rga = devm_kzalloc(dev, sizeof(*rga) + num_cores * sizeof(*rga->cores), GFP_KERNEL);
+ if (!rga)
+ return -ENOMEM;
+
+ rga->hw = match_desc->data;
+ if (!rga->hw)
+ return dev_err_probe(dev, -ENODEV, "failed to get match data\n");
+
+ spin_lock_init(&rga->ctrl_lock);
+ mutex_init(&rga->mutex);
+
+ dev_set_drvdata(dev, rga);
+
return component_master_add_with_match(dev, &rga_master_ops, match);
}
--
2.54.0
^ permalink raw reply related
* Re: [PATCH 3/4] arm64: wire SDEI NMI into the hardlockup watchdog
From: Doug Anderson @ 2026-06-05 22:08 UTC (permalink / raw)
To: Kiryl Shutsemau
Cc: Catalin Marinas, Will Deacon, James Morse, Mark Rutland,
Marc Zyngier, Petr Mladek, Thomas Gleixner, Andrew Morton,
Baoquan He, Puranjay Mohan, Usama Arif, Breno Leitao,
Julien Thierry, Lecopzer Chen, Sumit Garg, kernel-team, kexec,
linux-arm-kernel, linux-kernel
In-Reply-To: <aiM69AZXtGduS4VY@thinkstation>
Hi,
On Fri, Jun 5, 2026 at 2:12 PM Kiryl Shutsemau <kirill@shutemov.name> wrote:
>
> On Fri, Jun 05, 2026 at 01:03:05PM -0700, Doug Anderson wrote:
> > Hi,
> >
> > On Wed, Jun 3, 2026 at 7:36 AM Kiryl Shutsemau <kirill@shutemov.name> wrote:
> > >
> > > From: "Kiryl Shutsemau (Meta)" <kas@kernel.org>
> > >
> > > Select HAVE_HARDLOCKUP_DETECTOR_ARCH so the framework takes its backend
> > > from this driver. A per-CPU hrtimer checks its buddy's heartbeat and
> > > signals event 0 at a stalled CPU, which runs watchdog_hardlockup_check()
> > > NMI-like.
> > >
> > > The source is chosen at boot: SDEI if firmware provides it, otherwise a
> > > perf-NMI counter (pseudo-NMI) fallback -- one image covers both.
> > >
> > > Signed-off-by: Kiryl Shutsemau (Meta) <kas@kernel.org>
> > > ---
> > > arch/arm64/Kconfig | 1 +
> > > drivers/firmware/Kconfig | 3 +
> > > drivers/firmware/sdei_nmi.c | 247 +++++++++++++++++++++++++++++++++++-
> > > 3 files changed, 248 insertions(+), 3 deletions(-)
> >
> > I'm a little confused about this patch. We already have a buddy
> > hardlockup detector using the hrtimer, and it's even been improved
> > recently to trigger in a smaller time bound. It looks as if you're
> > duplicating bits of the perf and buddy detector here?
> >
> > I don't think you need this patch at all. The existing buddy detector
> > + patches #1 and #2 in your series should be sufficient.
>
> You're mostly right.
>
> Buddy + #2 covers the console case (the remote branch triggers the
> culprit's backtrace, which #2 makes deliverable), and #4 gets the wedged
> CPU's registers into the vmcore.
>
> The one thing this patch adds that a config can't is boot-time source
> selection: PERF-compiled kernels have no detector on a pseudo_nmi=0
> boot, and PREFER_BUDDY costs the pseudo-NMI machines perf
> self-detection. But that's arguably out of scope for the patchset.
>
> I'll drop this patch in v2 and run PREFER_BUDDY here. If a runtime
> perf->buddy fallback ever materializes, the gap closes entirely.
Sure. If you're interested in trying to make pref vs. buddy coexist,
that should be done in a platform-agnostic way. Feel free to post
patches for that. I know we discussed this previously. Ah, here they
are:
https://lore.kernel.org/r/20250916145122.416128-1-wangjinchao600@gmail.com
I think those got bikeshedded to death and nobody cared enough to keep pushing.
FWIW, my belief is that the buddy detector is superior in every way
except that it can't detect when all CPUs lock up simultaneously.
...though I wonder if a nicer way to solve the "all CPUs locked up" is
to just NMI-enable the "bark" interrupt of a hardware watchdog timer.
That ought to be quite easy...
-Doug
^ permalink raw reply
* [PATCH 15/17] media: rockchip: rga: schedule jobs to multiple cores
From: Sven Püschel @ 2026-06-05 22:07 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Schedule jobs to multiple cores to utilize all RGA cores. To avoid race
conditions when selecting the next free core a dedicated spinlock is added.
Note that this doesn't increase the max frame rate of a single
stream, as a context will wait for the job to finish before starting
the next device_run call.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga.c | 22 +++++++++++++++++++---
drivers/media/platform/rockchip/rga/rga.h | 1 +
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 9cebb461b3fd2..f00b7f99f2521 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -38,15 +38,31 @@ static void device_run(void *prv)
{
struct rga_ctx *ctx = prv;
struct rockchip_rga *rga = ctx->rga;
- struct rga_core *core = rga->cores[0];
+ struct rga_core *core = NULL;
struct vb2_v4l2_buffer *src, *dst;
unsigned long flags;
int ret;
+ unsigned int i;
+
+ spin_lock_irqsave(&rga->cores_lock, flags);
+ for (i = 0; i < rga->num_cores; i++) {
+ if (!rga->cores[i]->curr) {
+ core = rga->cores[i];
+ core->curr = ctx;
+ break;
+ }
+ }
+ spin_unlock_irqrestore(&rga->cores_lock, flags);
+
+ WARN_ONCE(!core, "No free core although max parallel jobs matches the core count!\n");
+ if (!core)
+ return;
ret = pm_runtime_resume_and_get(core->dev);
if (ret < 0) {
v4l2_m2m_buf_done_and_job_finish(rga->m2m_dev, ctx->fh.m2m_ctx,
VB2_BUF_STATE_ERROR);
+ core->curr = NULL;
return;
}
@@ -58,8 +74,6 @@ static void device_run(void *prv)
}
spin_unlock_irqrestore(&rga->ctrl_lock, flags);
- core->curr = ctx;
-
src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
src->sequence = ctx->osequence++;
@@ -946,6 +960,7 @@ static int rga_bind(struct device *dev)
ret = PTR_ERR(rga->m2m_dev);
goto rel_vdev;
}
+ v4l2_m2m_set_max_parallel_jobs(rga->m2m_dev, rga->num_cores);
ret = video_register_device(vfd, VFL_TYPE_VIDEO, -1);
if (ret) {
@@ -1021,6 +1036,7 @@ static int rga_probe(struct platform_device *pdev)
return dev_err_probe(dev, -ENODEV, "failed to get match data\n");
spin_lock_init(&rga->ctrl_lock);
+ spin_lock_init(&rga->cores_lock);
mutex_init(&rga->mutex);
dev_set_drvdata(dev, rga);
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index 6237436b984eb..c0dfacdb6f212 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -85,6 +85,7 @@ struct rockchip_rga {
struct mutex mutex;
/* ctrl parm lock */
spinlock_t ctrl_lock;
+ spinlock_t cores_lock;
const struct rga_hw *hw;
--
2.54.0
^ permalink raw reply related
* [PATCH 07/17] media: rockchip: rga: adjust get_version to return the version
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Adjust get_version to return the version instead of directly updating it
in the rockchip_rga structure. This is done in preparation for a
multi-core support to check that cores with the same compatible share the
same version.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga-hw.c | 10 +++++++---
drivers/media/platform/rockchip/rga/rga.c | 2 +-
drivers/media/platform/rockchip/rga/rga.h | 2 +-
drivers/media/platform/rockchip/rga/rga3-hw.c | 8 +++++---
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga-hw.c b/drivers/media/platform/rockchip/rga/rga-hw.c
index 4d7b0a03820a1..190104f3b2954 100644
--- a/drivers/media/platform/rockchip/rga/rga-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga-hw.c
@@ -474,10 +474,14 @@ static bool rga_handle_irq(struct rockchip_rga *rga)
return intr & RGA_INT_COMMAND_FINISHED;
}
-static void rga_get_version(struct rockchip_rga *rga)
+static struct rockchip_rga_version rga_get_version(struct rockchip_rga *rga)
{
- rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
- rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
+ u32 version = rga_read(rga, RGA_VERSION_INFO);
+
+ return (struct rockchip_rga_version) {
+ .major = (version >> 24) & 0xFF,
+ .minor = (version >> 20) & 0x0F,
+ };
}
static struct rga_fmt formats[] = {
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 0eff558d7f133..b8edd3596c919 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -864,7 +864,7 @@ static int rga_probe(struct platform_device *pdev)
if (ret < 0)
goto rel_m2m;
- rga->hw->get_version(rga);
+ rga->version = rga->hw->get_version(rga);
v4l2_info(&rga->v4l2_dev, "HW Version: 0x%02x.%02x\n",
rga->version.major, rga->version.minor);
diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
index 0e62337f8dd38..0e854cdf739f4 100644
--- a/drivers/media/platform/rockchip/rga/rga.h
+++ b/drivers/media/platform/rockchip/rga/rga.h
@@ -158,7 +158,7 @@ struct rga_hw {
void (*start)(struct rockchip_rga *rga,
struct rga_vb_buffer *src, struct rga_vb_buffer *dst);
bool (*handle_irq)(struct rockchip_rga *rga);
- void (*get_version)(struct rockchip_rga *rga);
+ struct rockchip_rga_version (*get_version)(struct rockchip_rga *rga);
void *(*adjust_and_map_format)(struct rga_ctx *ctx,
struct v4l2_pix_format_mplane *format,
bool is_output);
diff --git a/drivers/media/platform/rockchip/rga/rga3-hw.c b/drivers/media/platform/rockchip/rga/rga3-hw.c
index 72741e1faccff..3469523a5ecad 100644
--- a/drivers/media/platform/rockchip/rga/rga3-hw.c
+++ b/drivers/media/platform/rockchip/rga/rga3-hw.c
@@ -299,12 +299,14 @@ static bool rga3_handle_irq(struct rockchip_rga *rga)
return FIELD_GET(RGA3_INT_FRM_DONE, intr);
}
-static void rga3_get_version(struct rockchip_rga *rga)
+static struct rockchip_rga_version rga3_get_version(struct rockchip_rga *rga)
{
u32 version = rga_read(rga, RGA3_VERSION_NUM);
- rga->version.major = FIELD_GET(RGA3_VERSION_NUM_MAJOR, version);
- rga->version.minor = FIELD_GET(RGA3_VERSION_NUM_MINOR, version);
+ return (struct rockchip_rga_version) {
+ .major = FIELD_GET(RGA3_VERSION_NUM_MAJOR, version),
+ .minor = FIELD_GET(RGA3_VERSION_NUM_MINOR, version),
+ };
}
static struct rga3_fmt rga3_formats[] = {
--
2.54.0
^ permalink raw reply related
* [PATCH 17/17] iommu/rockchip: disable fetch dte time limit
From: Sven Püschel @ 2026-06-05 22:07 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel,
Simon Xue, Joerg Roedel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
From: Simon Xue <xxm@rock-chips.com>
Disable the Bit 31 of the AUTO_GATING iommu register, as it causes
hangups with the RGA3 (Raster Graphics Acceleration 3) peripheral.
The RGA3 register description of the TRM already states that the bit
must be set to 1. The vendor kernel sets the bit unconditionally to
1 to fix VOP (Video Output Processor) screen black issues. This patch
squashes the 2 vendor kernel commits with the following commit messages:
Master fetch data and cpu update page table may work in parallel, may
have the following procedure:
master cpu
fetch dte update page tabl
| |
(make dte invalid) <- zap iotlb entry
| |
fetch dte again
(make dte invalid) <- zap iotlb entry
| |
fetch dte again
(make dte invalid) <- zap iotlb entry
| |
fetch dte again
(make iommu block) <- zap iotlb entry
New iommu version has the above bug, if fetch dte consecutively four
times, then it will be blocked. Fortunately, we can set bit 31 of
register MMU_AUTO_GATING to 1 to make it work as old version which does
not have this issue.
This issue only appears on RV1126 so far, so make a workaround dedicated
to "rockchip,rv1126" machine type.
iommu/rockchip: fix vop blocked and screen black on RK356X and RK3588
RK3568 and RK3588 has the same issue as RV1126/RV1109 that caused by
dte fetch time limit, So we can set BIT(31) of register 0x24 default
to 1 as a workaround.
Signed-off-by: Simon Xue <xxm@rock-chips.com>
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
(cherry picked from commit 8d4346ecd4950ae08cc76a6de327c264e846758c)
picked from the next branch of
https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git
for a convenient usage of the patches.
---
drivers/iommu/rockchip-iommu.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 0013cf196c573..87ae036d64145 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -76,6 +76,8 @@
#define SPAGE_ORDER 12
#define SPAGE_SIZE (1 << SPAGE_ORDER)
+#define DISABLE_FETCH_DTE_TIME_LIMIT BIT(31)
+
/*
* Support mapping any size that fits in one page table:
* 4 KiB to 4 MiB
@@ -930,6 +932,7 @@ static int rk_iommu_enable(struct rk_iommu *iommu)
struct iommu_domain *domain = iommu->domain;
struct rk_iommu_domain *rk_domain = to_rk_domain(domain);
int ret, i;
+ u32 auto_gate;
ret = clk_bulk_enable(iommu->num_clocks, iommu->clocks);
if (ret)
@@ -948,6 +951,11 @@ static int rk_iommu_enable(struct rk_iommu *iommu)
rk_ops->mk_dtentries(rk_domain->dt_dma));
rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK);
+
+ /* Workaround for iommu blocked, BIT(31) default to 1 */
+ auto_gate = rk_iommu_read(iommu->bases[i], RK_MMU_AUTO_GATING);
+ auto_gate |= DISABLE_FETCH_DTE_TIME_LIMIT;
+ rk_iommu_write(iommu->bases[i], RK_MMU_AUTO_GATING, auto_gate);
}
ret = rk_iommu_enable_paging(iommu);
--
2.54.0
^ permalink raw reply related
* [PATCH 06/17] media: rockchip: rga: move power handling to device_run
From: Sven Püschel @ 2026-06-05 22:06 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Move the power handling to the device_run function in preparation for
enabling multiple cores. This allows to power the only the necessary cores
instead of powering all available cores.
As the decision on which core the given job is executed will be done in
device_run, we can only power to correct core there.
To avoid unpowering the core in a streaming state switch to autosuspend.
This avoids powering down the core when the next frame is scheduled in
the next 50ms. The timeout maps to a framerate of 20fps, which should be
pretty uncommon in a normal video stream.
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
---
drivers/media/platform/rockchip/rga/rga-buf.c | 12 ------------
drivers/media/platform/rockchip/rga/rga.c | 11 +++++++++++
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c b/drivers/media/platform/rockchip/rga/rga-buf.c
index c0ea6003336bf..3f7c3c68e0cb8 100644
--- a/drivers/media/platform/rockchip/rga/rga-buf.c
+++ b/drivers/media/platform/rockchip/rga/rga-buf.c
@@ -242,14 +242,6 @@ static int rga_buf_prepare_streaming(struct vb2_queue *q)
static int rga_buf_start_streaming(struct vb2_queue *q, unsigned int count)
{
struct rga_ctx *ctx = vb2_get_drv_priv(q);
- struct rockchip_rga *rga = ctx->rga;
- int ret;
-
- ret = pm_runtime_resume_and_get(rga->dev);
- if (ret < 0) {
- rga_buf_return_buffers(q, VB2_BUF_STATE_QUEUED);
- return ret;
- }
if (V4L2_TYPE_IS_OUTPUT(q->type))
ctx->osequence = 0;
@@ -261,11 +253,7 @@ static int rga_buf_start_streaming(struct vb2_queue *q, unsigned int count)
static void rga_buf_stop_streaming(struct vb2_queue *q)
{
- struct rga_ctx *ctx = vb2_get_drv_priv(q);
- struct rockchip_rga *rga = ctx->rga;
-
rga_buf_return_buffers(q, VB2_BUF_STATE_ERROR);
- pm_runtime_put(rga->dev);
}
const struct vb2_ops rga_qops = {
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 8c03422d669cf..0eff558d7f133 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -37,6 +37,14 @@ static void device_run(void *prv)
struct rockchip_rga *rga = ctx->rga;
struct vb2_v4l2_buffer *src, *dst;
unsigned long flags;
+ int ret;
+
+ ret = pm_runtime_resume_and_get(rga->dev);
+ if (ret < 0) {
+ v4l2_m2m_buf_done_and_job_finish(rga->m2m_dev, ctx->fh.m2m_ctx,
+ VB2_BUF_STATE_ERROR);
+ return;
+ }
spin_lock_irqsave(&rga->ctrl_lock, flags);
if (ctx->cmdbuf_dirty) {
@@ -81,6 +89,8 @@ static irqreturn_t rga_isr(int irq, void *prv)
v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);
v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);
v4l2_m2m_job_finish(rga->m2m_dev, ctx->fh.m2m_ctx);
+
+ pm_runtime_put_autosuspend(rga->dev);
}
return IRQ_HANDLED;
@@ -797,6 +807,7 @@ static int rga_probe(struct platform_device *pdev)
if (ret)
return dev_err_probe(&pdev->dev, ret, "Unable to parse OF data\n");
+ pm_runtime_set_autosuspend_delay(rga->dev, 50);
pm_runtime_enable(rga->dev);
rga->regs = devm_platform_ioremap_resource(pdev, 0);
--
2.54.0
^ permalink raw reply related
* [PATCH 16/17] arm64: dts: rockchip: add rga3 dt nodes to rk3588
From: Sven Püschel @ 2026-06-05 22:07 UTC (permalink / raw)
To: Jacob Chen, Ezequiel Garcia, Mauro Carvalho Chehab,
Heiko Stuebner, Philipp Zabel
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel,
kernel, Detlev Casanova, Michael Tretter, Sven Püschel
In-Reply-To: <20260606-spu-rga3multicore-v1-0-3ec2b15675f7@pengutronix.de>
Add devicetree nodes for the RGA3 (Raster Graphics Acceleration 3)
peripheral in the RK3588.
The existing rga node refers to the RGA2-Enhanced peripheral. The RK3588
contains one RGA2-Enhanced core and two RGA3 cores. Both feature a similar
functionality of scaling, cropping and rotating of up to two input
images into one output image. Key differences of the RGA3 are:
- supports 10bit YUV output formats
- supports 8x8 tiles and FBCD as inputs and outputs
- supports BT2020 color space conversion
- max output resolution of (8192-64)x(8192-64)
- MMU can map up to 32G DDR RAM
- fully planar formats (3 planes) are not supported
- max scale up/down factor of 8 (RGA2 allows up to 16)
Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
Link: https://patch.msgid.link/20260521-spu-rga3-v7-28-3f33e8c7145f@pengutronix.de
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
(cherry picked from commit 25ee898961a2c661e4cd72bc98f0060f1cd11222)
picked from linux-next to have the necessary RGA3 nodes available.
---
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 44 +++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
index 4fb8888c281c8..a4f44af512375 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi
@@ -1262,6 +1262,50 @@ vpu121_mmu: iommu@fdb50800 {
#iommu-cells = <0>;
};
+ rga3_core0: rga@fdb60000 {
+ compatible = "rockchip,rk3588-rga3";
+ reg = <0x0 0xfdb60000 0x0 0x200>;
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&cru ACLK_RGA3_0>, <&cru HCLK_RGA3_0>, <&cru CLK_RGA3_0_CORE>;
+ clock-names = "aclk", "hclk", "sclk";
+ resets = <&cru SRST_RGA3_0_CORE>, <&cru SRST_A_RGA3_0>, <&cru SRST_H_RGA3_0>;
+ reset-names = "core", "axi", "ahb";
+ power-domains = <&power RK3588_PD_RGA30>;
+ iommus = <&rga3_0_mmu>;
+ };
+
+ rga3_0_mmu: iommu@fdb60f00 {
+ compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
+ reg = <0x0 0xfdb60f00 0x0 0x100>;
+ interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&cru ACLK_RGA3_0>, <&cru HCLK_RGA3_0>;
+ clock-names = "aclk", "iface";
+ #iommu-cells = <0>;
+ power-domains = <&power RK3588_PD_RGA30>;
+ };
+
+ rga3_core1: rga@fdb70000 {
+ compatible = "rockchip,rk3588-rga3";
+ reg = <0x0 0xfdb70000 0x0 0x200>;
+ interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&cru ACLK_RGA3_1>, <&cru HCLK_RGA3_1>, <&cru CLK_RGA3_1_CORE>;
+ clock-names = "aclk", "hclk", "sclk";
+ resets = <&cru SRST_RGA3_1_CORE>, <&cru SRST_A_RGA3_1>, <&cru SRST_H_RGA3_1>;
+ reset-names = "core", "axi", "ahb";
+ power-domains = <&power RK3588_PD_RGA31>;
+ iommus = <&rga3_1_mmu>;
+ };
+
+ rga3_1_mmu: iommu@fdb70f00 {
+ compatible = "rockchip,rk3588-iommu", "rockchip,rk3568-iommu";
+ reg = <0x0 0xfdb70f00 0x0 0x100>;
+ interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH 0>;
+ clocks = <&cru ACLK_RGA3_1>, <&cru HCLK_RGA3_1>;
+ clock-names = "aclk", "iface";
+ #iommu-cells = <0>;
+ power-domains = <&power RK3588_PD_RGA31>;
+ };
+
rga: rga@fdb80000 {
compatible = "rockchip,rk3588-rga", "rockchip,rk3288-rga";
reg = <0x0 0xfdb80000 0x0 0x180>;
--
2.54.0
^ permalink raw reply related
* ❌ FAIL: Test report for for-kernelci (7.1.0-rc6, upstream-arm-next, ffe7bef3)
From: cki-project @ 2026-06-05 22:13 UTC (permalink / raw)
To: catalin.marinas, linux-arm-kernel, will, yoyang
Hi, we tested your kernel and here are the results:
Overall result: FAILED
Merge: OK
Compile: OK
Test: FAILED
Kernel information:
Commit message: Merge branch 'for-next/core' into for-kernelci
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:2580039734
One or more kernel tests failed:
Unrecognized or new issues:
xfstests - btrfs
aarch64
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:2580039734_aarch64_kernel_kcidb_tool_21420461_9
Non-passing ran subtests:
❌ FAIL generic/301
aarch64
Logs: https://datawarehouse.cki-project.org/kcidb/tests/redhat:2580039734_aarch64_kernel_kcidb_tool_21420462_9
Non-passing ran subtests:
❌ FAIL generic/301
We also see the following known issues which are not related to your changes:
Issue: [upstream] Hardware - Firmware test suite - auto-waive failures
URL: https://gitlab.com/cki-project/infrastructure/-/issues/779
Affected tests:
Hardware - Firmware test suite [aarch64]
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
^ permalink raw reply
* [GIT PULL] Rockchip dts64 changes for 7.2 #2
From: Heiko Stuebner @ 2026-06-05 22:18 UTC (permalink / raw)
To: arm; +Cc: soc, linux-rockchip, linux-arm-kernel
Hi soc maintainers,
please find below some more Rockchip DT changes for the merge-window
for 7.2 .
The most interesting addition is of course basic camera support
on RK3588 which enables unfiltered camera capture (i.e. without
postprocessing for whitebalance etc)
Please pull.
Thanks
Heiko
The following changes since commit eb24b60553e0692cbbec2863ca31d2a56bff098d:
arm64: dts: rockchip: Add watchdog node for RK3528 (2026-05-07 13:27:53 +0200)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git tags/v7.2-rockchip-dts64-2
for you to fetch changes up to 8545eda00fdf3d7e17933ce0f706d005b1bad42d:
arm64: dts: rockchip: Fix vcc_sdio regulator max voltage on Pinebook Pro (2026-06-02 22:47:18 +0200)
----------------------------------------------------------------
We've got basic camera support on RK3588!
New peripherals RK3588 vicap plus camera addition to some boards,
RK3528 USB and USB enablement on some boards, RGA3 support on RK3588.
Missing EL2 virtual timer interrupt added to RK3588.
Some more added peripherals for the Khadas Edge 2L board.
----------------------------------------------------------------
Chen-Yu Tsai (2):
arm64: dts: rockchip: Fix EEPROM compatible on rk3399-nanopi-r4s-enterprise
arm64: dts: rockchip: Disable removed devices from rk3399-nanopi-r4s
Chukun Pan (1):
arm64: dts: rockchip: enable adc button for Radxa E25
Gray Huang (2):
arm64: dts: rockchip: Enable USB for Khadas Edge 2L
arm64: dts: rockchip: Add Bluetooth support for Khadas Edge 2L
Hugo Osvaldo Barrera (1):
arm64: dts: rockchip: Fix vcc_sdio regulator max voltage on Pinebook Pro
Jonas Karlman (5):
arm64: dts: rockchip: Add USB nodes for RK3528
arm64: dts: rockchip: Enable USB 2.0 ports on Radxa E20C
arm64: dts: rockchip: Enable USB ports on Radxa ROCK 2A/2F
arm64: dts: rockchip: Enable USB 2.0 ports on ArmSoM Sige1
arm64: dts: rockchip: Enable USB 2.0 ports on NanoPi Zero2
Marc Zyngier (1):
arm64: dts: rockchip: Add EL2 virtual timer interrupt
Michael Riesch (3):
arm64: dts: rockchip: add vicap node to rk3588
arm64: dts: rockchip: add radxa camera 4k on rock 5b+ cam0
arm64: dts: rockchip: add radxa camera 4k on rock 5b+ cam1
Sven Püschel (1):
arm64: dts: rockchip: add rga3 dt nodes to rk3588
arch/arm64/boot/dts/rockchip/Makefile | 7 ++
.../dts/rockchip/rk3399-nanopi-r4s-enterprise.dts | 2 +-
.../arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dtsi | 68 +++++++++++
.../boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +-
.../boot/dts/rockchip/rk3528-armsom-sige1.dts | 25 ++++
.../boot/dts/rockchip/rk3528-nanopi-zero2.dts | 29 +++++
arch/arm64/boot/dts/rockchip/rk3528-radxa-e20c.dts | 60 +++++++++
arch/arm64/boot/dts/rockchip/rk3528-rock-2.dtsi | 17 +++
arch/arm64/boot/dts/rockchip/rk3528-rock-2a.dts | 11 ++
arch/arm64/boot/dts/rockchip/rk3528-rock-2f.dts | 12 ++
arch/arm64/boot/dts/rockchip/rk3528.dtsi | 80 ++++++++++++
arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 14 +++
arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 3 +-
.../boot/dts/rockchip/rk3576-khadas-edge-2l.dts | 82 +++++++++++++
arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 135 +++++++++++++++++++++
.../rk3588-rock-5b-plus-radxa-cam4k-cam0.dtso | 99 +++++++++++++++
.../rk3588-rock-5b-plus-radxa-cam4k-cam1.dtso | 99 +++++++++++++++
17 files changed, 742 insertions(+), 3 deletions(-)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus-radxa-cam4k-cam0.dtso
create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b-plus-radxa-cam4k-cam1.dtso
^ permalink raw reply
* Re: [PATCH v4 18/24] iommu/arm-smmu-v3: Introduce master->ats_broken flag
From: Jason Gunthorpe @ 2026-06-05 23:03 UTC (permalink / raw)
To: Nicolin Chen
Cc: Will Deacon, Robin Murphy, Joerg Roedel, Bjorn Helgaas,
Rafael J . Wysocki, Len Brown, Pranjal Shrivastava, Mostafa Saleh,
Lu Baolu, Kevin Tian, linux-arm-kernel, iommu, linux-kernel,
linux-acpi, linux-pci, vsethi, Shuai Xue
In-Reply-To: <aiNF9kzjzDY/u1NG@nvidia.com>
On Fri, Jun 05, 2026 at 02:56:06PM -0700, Nicolin Chen wrote:
> On Fri, Jun 05, 2026 at 04:42:59PM -0300, Jason Gunthorpe wrote:
> > I don't see any of these options as appealing. We have to maintain a
> > few key invariants, and I think it cannot be done without a way to
> > find all the domains that are using the STE.
> >
> > One way or another you have to be using the invs list rw locks to
> > synchronize the EATS state changes.
> >
> > It is okayish to be sloppy when turning EATS off, but when turning it
> > back on we do need to cycle through every invs list and toggle its
> > lock to ensure that the invalidations are synchronized before
> > EATS=enable happens.
>
> I think the core guarantees that "cycle through every invs list"
> happens: a PCI reset calls reset_prepare() blocking all the RID
> and PASID domains and removing ATS entries from every invs list,
> and then calls reset_done() that re-attach RID/PASID domains so
> freshly new ATS entries will be installed before EATS=enable.
I think this whole thing is so async and racy this is not something we
can truely rely on. The driver is going to have to make sure it
doesn't get turned on accidentally while the CD is still populated.
> > Given you must have a way to go from STE -> master -> all invs lists
> > I'm not sure either option really makes such a large difference.
> >
> > If so then adjusting the invs to disable the ATS is pretty simple, run
> > over the xarray and set them all off. Yes you could find the master
> > through a SID lookup with some locking adjustment.
> > >
> > > (1) Per-invs marker: INV_TYPE_ATS_BROKEN + master_domains
> > > disable_ats() in the timeout path walks master->master_domains
> > > and flips matching ATS invs entries to the BROKEN type.
> > >
> > > + invs walker is free (one case label in the existing type switch).
> > > + No lock or pointer deref in the invs walker.
> > > + No master pointer stored in invs; no lifetime concern.
> > >
> > > - disable_ats() walks every (master, domain) and marks each invs
> > > set; the list needs locking usable from atomic.
> >
> > This doesn't seem so bad
>
> Yea, the only thing is that the disable path has to deal with a
> complexity from going through a per-device domain list. Maybe it
> can reuse iommu_group->pasid_array by taking xa_lock?
Maybe the locking seems tricky as the locks might end up nesting in
weird ways.
The streams rb tree and existing master domains linked list seems
appealing if the locking can nest acceptably.
> > > (3) Per-master flag + inv->master pointer (v4)
> > > invs entry carries a master pointer; the invs walker reads
> > > cur->master->ats_broken directly.
> > >
> > > + invs walker is one READ_ONCE through a cached pointer.
> > > + disable_ats is one WRITE_ONCE.
> > > + atc_inv_master early-skip via one READ_ONCE.
> > > + attach gate + post-attach re-check, same as (2).
> > >
> > > - invs holds a master ptr, so release_device must synchronize_rcu()
> > > before freeing the master to drain walkers under rcu_read_lock().
> > > We dropped this from v4 for that reason.
> >
> > synchronize_rcu is not right because you have to have gone through the
> > rwlock so there can be no readers.
>
> Ah, I think you are right! When release_device() is invoked, the
> device must be already in the release (blocked) domain. So there
> should be no domain->invs in the system holding its ATS entries.
> And the enable part would work as (2).
>
> In this case, (3) seems the best? It's fast on every aspect.
I don't like it mainly because of the sketch enable side, and if we
tighten that then you can just do 1 which doesn't have a perf impact..
But still, I'm not sure how all the asyncess and races will resolve in
any of these cases.
Jason
^ permalink raw reply
* Re: [PATCH bpf-next v2 1/8] bpf: mark instructions accessing program stack
From: Alexei Starovoitov @ 2026-06-05 23:20 UTC (permalink / raw)
To: Alexis Lothoré (eBPF Foundation), Alexei Starovoitov,
Daniel Borkmann, Andrii Nakryiko, Martin KaFai Lau,
Eduard Zingerman, Kumar Kartikeya Dwivedi, Song Liu,
Yonghong Song, Jiri Olsa, John Fastabend, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Shuah Khan, Maxime Coquelin, Alexandre Torgue, Ihor Solodrai
Cc: ebpf, Bastien Curutchet, Thomas Petazzoni, bpf, linux-kernel,
linux-kselftest, linux-stm32, linux-arm-kernel
In-Reply-To: <20260604-kasan-v2-1-c066e627fda8@bootlin.com>
On Thu Jun 4, 2026 at 1:21 PM PDT, Alexis Lothoré (eBPF Foundation) wrote:
>
> +bool bpf_insn_accesses_stack_only(const struct bpf_verifier_env *env,
> + const struct bpf_prog *prog, int insn_idx)
> +{
> + struct bpf_insn *insn;
> +
> + /* cBPF: we have no verifier state, do a best-effort check based on
> + * dst/src reg
> + */
> + insn_idx += prog->aux->subprog_start;
> + insn = (struct bpf_insn *)prog->insnsi + insn_idx;
> + if (!env)
> + return insn->dst_reg == BPF_REG_FP ||
> + insn->src_reg == BPF_REG_FP;
> + return !env->insn_aux_data[insn_idx].non_stack_access;
> +}
Let's skip this function and cBPF altogether.
This effort aims to catch verifier and kfunc bugs.
cBPF doesn't have normal verifier and has plenty of unpriv gotchas.
The kernel compiled with KASAN is for debugging, but I'd like to
avoid thinking about unpriv complications with cBPF and KASAN.
^ permalink raw reply
* Re: [PATCH bpf-next v2 4/8] bpf, x86: refactor BPF_ST management in do_jit
From: Alexei Starovoitov @ 2026-06-05 23:22 UTC (permalink / raw)
To: Alexis Lothoré (eBPF Foundation), Alexei Starovoitov,
Daniel Borkmann, Andrii Nakryiko, Martin KaFai Lau,
Eduard Zingerman, Kumar Kartikeya Dwivedi, Song Liu,
Yonghong Song, Jiri Olsa, John Fastabend, Thomas Gleixner,
Ingo Molnar, Borislav Petkov, Dave Hansen, x86, H. Peter Anvin,
Shuah Khan, Maxime Coquelin, Alexandre Torgue, Ihor Solodrai
Cc: ebpf, Bastien Curutchet, Thomas Petazzoni, bpf, linux-kernel,
linux-kselftest, linux-stm32, linux-arm-kernel
In-Reply-To: <20260604-kasan-v2-4-c066e627fda8@bootlin.com>
On Thu Jun 4, 2026 at 1:22 PM PDT, Alexis Lothoré (eBPF Foundation) wrote:
> In order to prepare for KASAN checks insertion before every
> memory-related load or store, group all BPF_ST instructions that indeed
> access memory in a single block of fall-through cases to allow
> instrumenting those in one call, rather than having to instrument all
> cases individually.
>
> Signed-off-by: Alexis Lothoré (eBPF Foundation) <alexis.lothore@bootlin.com>
> ---
> arch/x86/net/bpf_jit_comp.c | 53 ++++++++++++++++++++++++++-------------------
> 1 file changed, 31 insertions(+), 22 deletions(-)
>
> diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
> index 0981791014eb..943a0f315cf2 100644
> --- a/arch/x86/net/bpf_jit_comp.c
> +++ b/arch/x86/net/bpf_jit_comp.c
> @@ -2300,41 +2300,50 @@ static int do_jit(struct bpf_verifier_env *env, struct bpf_prog *bpf_prog, int *
> EMIT_LFENCE();
> break;
>
> - /* ST: *(u8*)(dst_reg + off) = imm */
> case BPF_ST | BPF_MEM | BPF_B:
> - if (is_ereg(dst_reg))
> - EMIT2(0x41, 0xC6);
> - else
> - EMIT1(0xC6);
> - goto st;
> case BPF_ST | BPF_MEM | BPF_H:
> - if (is_ereg(dst_reg))
> - EMIT3(0x66, 0x41, 0xC7);
> - else
> - EMIT2(0x66, 0xC7);
> - goto st;
> case BPF_ST | BPF_MEM | BPF_W:
> - if (is_ereg(dst_reg))
> - EMIT2(0x41, 0xC7);
> - else
> - EMIT1(0xC7);
> - goto st;
> case BPF_ST | BPF_MEM | BPF_DW:
> - if (dst_reg == BPF_REG_PARAMS && insn->off == -8) {
> - /* Arg 6: store immediate in r9 register */
> - emit_mov_imm64(&prog, X86_REG_R9, imm32 >> 31, (u32)imm32);
> + switch (BPF_SIZE(insn->code)) {
> + case BPF_B:
> + if (is_ereg(dst_reg))
> + EMIT2(0x41, 0xC6);
> + else
> + EMIT1(0xC6);
> + break;
> + case BPF_H:
> + if (is_ereg(dst_reg))
> + EMIT3(0x66, 0x41, 0xC7);
> + else
> + EMIT2(0x66, 0xC7);
> + break;
> + case BPF_W:
> + if (is_ereg(dst_reg))
> + EMIT2(0x41, 0xC7);
> + else
> + EMIT1(0xC7);
> + break;
> + case BPF_DW:
> + if (dst_reg == BPF_REG_PARAMS &&
> + insn->off == -8) {
> + /* Arg 6: store immediate in r9 register */
> + emit_mov_imm64(&prog, X86_REG_R9,
> + imm32 >> 31, (u32)imm32);
> + break;
> + }
> + EMIT2(add_1mod(0x48, dst_reg), 0xC7);
maybe it's an opportunity to cover this into separate helper function?
When indent reaches 4 tabs it's about time.
^ permalink raw reply
* Re: [PATCH v6 01/20] s390: Expose protected virtualization through cc_platform_has()
From: JAEHOON KIM @ 2026-06-06 0:34 UTC (permalink / raw)
To: Aneesh Kumar K.V (Arm), iommu, linux-arm-kernel, linux-kernel,
linux-coco
Cc: Robin Murphy, Marek Szyprowski, Will Deacon, Marc Zyngier,
Steven Price, Suzuki K Poulose, Catalin Marinas, Jiri Pirko,
Jason Gunthorpe, Mostafa Saleh, Petr Tesarik,
Alexey Kardashevskiy, Dan Williams, Xu Yilun, linuxppc-dev,
linux-s390, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Alexander Gordeev,
Gerald Schaefer, Heiko Carstens, Vasily Gorbik,
Christian Borntraeger, Sven Schnelle, x86, Halil Pasic,
Matthew Rosato
In-Reply-To: <20260604083959.1265923-2-aneesh.kumar@kernel.org>
On 6/4/2026 3:39 AM, Aneesh Kumar K.V (Arm) wrote:
> Protected virtualization guests use memory encryption, so advertise that to
> the rest of the kernel through cc_platform_has(CC_ATTR_MEM_ENCRYPT).
>
> s390 already forces DMA mappings to be unencrypted for protected
> virtualization guests through force_dma_unencrypted(). Add
> ARCH_HAS_CC_PLATFORM and provide the matching cc_platform_has()
> implementation
>
> Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>
Tested-by: Jaehoon Kim <jhkim@linux.ibm.com>
Tested on s390 PV guest with swiotlb_dynamic configuration. SWIOTLB
bounce buffer allocation and dynamic pool management work correctly.
Also concurrent I/O stress completed successfully.
Thanks,
Jaehoon.
> ---
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Matthew Rosato <mjrosato@linux.ibm.com>
> Cc: Jaehoon Kim <jhkim@linux.ibm.com>
> ---
> arch/s390/Kconfig | 1 +
> arch/s390/mm/init.c | 14 ++++++++++++++
> 2 files changed, 15 insertions(+)
>
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index ecbcbb781e40..9b5e6029e043 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -87,6 +87,7 @@ config S390
> select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2
> select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
> select ARCH_HAS_CC_CAN_LINK
> + select ARCH_HAS_CC_PLATFORM
> select ARCH_HAS_CPU_FINALIZE_INIT
> select ARCH_HAS_CURRENT_STACK_POINTER
> select ARCH_HAS_DEBUG_VIRTUAL
> diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
> index 1f72efc2a579..ad3c6d92b801 100644
> --- a/arch/s390/mm/init.c
> +++ b/arch/s390/mm/init.c
> @@ -50,6 +50,7 @@
> #include <linux/virtio_anchor.h>
> #include <linux/virtio_config.h>
> #include <linux/execmem.h>
> +#include <linux/cc_platform.h>
>
> pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(".bss..swapper_pg_dir");
> pgd_t invalid_pg_dir[PTRS_PER_PGD] __section(".bss..invalid_pg_dir");
> @@ -140,6 +141,19 @@ bool force_dma_unencrypted(struct device *dev)
> return is_prot_virt_guest();
> }
>
> +
> +bool cc_platform_has(enum cc_attr attr)
> +{
> + switch (attr) {
> + case CC_ATTR_MEM_ENCRYPT:
> + return is_prot_virt_guest();
> +
> + default:
> + return false;
> + }
> +}
> +EXPORT_SYMBOL_GPL(cc_platform_has);
> +
> /* protected virtualization */
> static void __init pv_init(void)
> {
^ permalink raw reply
* Re: [PATCH net] net: airoha: Add NULL check for of_reserved_mem_lookup() in airoha_qdma_init_hfwd_queues()
From: patchwork-bot+netdevbpf @ 2026-06-06 1:30 UTC (permalink / raw)
To: ZhaoJinming
Cc: lorenzo, andrew+netdev, davem, edumazet, kuba, pabeni, horms,
linux-arm-kernel, linux-mediatek, netdev, linux-kernel, stable
In-Reply-To: <20260604070352.2603077-1-zhaojinming@uniontech.com>
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Thu, 4 Jun 2026 15:03:52 +0800 you wrote:
> of_reserved_mem_lookup() may return NULL if the reserved memory region
> referenced by the "memory-region" phandle is not found in the reserved
> memory table (e.g. due to a misconfigured DTS or a removed
> memory-region node). The current code dereferences the returned
> pointer without checking for NULL, leading to a kernel NULL pointer
> dereference at the following lines:
>
> [...]
Here is the summary with links:
- [net] net: airoha: Add NULL check for of_reserved_mem_lookup() in airoha_qdma_init_hfwd_queues()
https://git.kernel.org/netdev/net/c/f9f25118faa4
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply
* Re: [PATCH net-next] net: stmmac: dwmac4: Report DCB feature capability
From: patchwork-bot+netdevbpf @ 2026-06-06 1:40 UTC (permalink / raw)
To: Ovidiu Panait
Cc: andrew+netdev, davem, edumazet, kuba, pabeni, mcoquelin.stm32,
alexandre.torgue, rmk+kernel, maxime.chevallier, o.rempel, netdev,
linux-stm32, linux-arm-kernel, linux-kernel
In-Reply-To: <20260603173644.24371-1-ovidiu.panait.rb@renesas.com>
Hello:
This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 3 Jun 2026 17:36:43 +0000 you wrote:
> Bit 16 of the MAC HW Feature1 register reports the DCB (Data Centre
> Bridging) feature. Read it so that dma_cap.dcben and the debugfs
> report it accurately. Right now it is always reported as being disabled.
>
> Signed-off-by: Ovidiu Panait <ovidiu.panait.rb@renesas.com>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 +
> drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 1 +
> 2 files changed, 2 insertions(+)
Here is the summary with links:
- [net-next] net: stmmac: dwmac4: Report DCB feature capability
https://git.kernel.org/netdev/net-next/c/3a58a1b8d505
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply
* [PATCH 01/11] pinctrl: airoha: an7581: add missed gpio32 pin group
From: Mikhail Kshevetskiy @ 2026-06-06 2:03 UTC (permalink / raw)
To: Lorenzo Bianconi, Sean Wang, Linus Walleij, Matthias Brugger,
AngeloGioacchino Del Regno, Benjamin Larsson, Christian Marangi,
linux-mediatek, linux-gpio, linux-kernel, linux-arm-kernel,
Markus Gothe, Matheus Sampaio Queiroga
Cc: Mikhail Kshevetskiy
In-Reply-To: <20260606020342.1256509-1-mikhail.kshevetskiy@iopsys.eu>
gpio32 pin group is missed for an7581 SoC. This patch add it.
Fixes: 1c8ace2d0725 ("pinctrl: airoha: Add support for EN7581 SoC")
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
---
drivers/pinctrl/mediatek/pinctrl-airoha.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/pinctrl/mediatek/pinctrl-airoha.c b/drivers/pinctrl/mediatek/pinctrl-airoha.c
index 995ba6175c95..805166223228 100644
--- a/drivers/pinctrl/mediatek/pinctrl-airoha.c
+++ b/drivers/pinctrl/mediatek/pinctrl-airoha.c
@@ -539,6 +539,7 @@ static const int en7581_gpio28_pins[] = { 41 };
static const int en7581_gpio29_pins[] = { 42 };
static const int en7581_gpio30_pins[] = { 43 };
static const int en7581_gpio31_pins[] = { 44 };
+static const int en7581_gpio32_pins[] = { 45 };
static const int en7581_gpio33_pins[] = { 46 };
static const int en7581_gpio34_pins[] = { 47 };
static const int en7581_gpio35_pins[] = { 48 };
@@ -623,6 +624,7 @@ static const struct pingroup en7581_pinctrl_groups[] = {
PINCTRL_PIN_GROUP("gpio29", en7581_gpio29),
PINCTRL_PIN_GROUP("gpio30", en7581_gpio30),
PINCTRL_PIN_GROUP("gpio31", en7581_gpio31),
+ PINCTRL_PIN_GROUP("gpio32", en7581_gpio32),
PINCTRL_PIN_GROUP("gpio33", en7581_gpio33),
PINCTRL_PIN_GROUP("gpio34", en7581_gpio34),
PINCTRL_PIN_GROUP("gpio35", en7581_gpio35),
--
2.53.0
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox