On Fri, Apr 25, 2025 at 8:22 PM Nicolas Frattaroli <nicolas.frattar...@collabora.com> wrote: > > On Tuesday, 25 February 2025 08:55:50 Central European Summer Time Tomeu > Vizoso wrote: > > This initial version supports the NPU as shipped in the RK3588 SoC and > > described in the first part of its TRM, in Chapter 36. > > > > This NPU contains 3 independent cores that the driver can submit jobs > > to. > > > > This commit adds just hardware initialization and power management. > > > > v2: > > - Split cores and IOMMUs as independent devices (Sebastian Reichel) > > - Add some documentation (Jeffrey Hugo) > > - Be more explicit in the Kconfig documentation (Jeffrey Hugo) > > - Remove resets, as these haven't been found useful so far (Zenghui Yu) > > - Repack structs (Jeffrey Hugo) > > - Use DEFINE_DRM_ACCEL_FOPS (Jeffrey Hugo) > > - Use devm_drm_dev_alloc (Jeffrey Hugo) > > - Use probe log helper (Jeffrey Hugo) > > - Introduce UABI header in a later patch (Jeffrey Hugo) > > > > Signed-off-by: Tomeu Vizoso <to...@tomeuvizoso.net> > > --- > > Documentation/accel/index.rst | 1 + > > Documentation/accel/rocket/index.rst | 19 + > > MAINTAINERS | 8 + > > drivers/accel/Kconfig | 1 + > > drivers/accel/Makefile | 1 + > > drivers/accel/rocket/Kconfig | 25 + > > drivers/accel/rocket/Makefile | 8 + > > drivers/accel/rocket/rocket_core.c | 71 + > > drivers/accel/rocket/rocket_core.h | 29 + > > drivers/accel/rocket/rocket_device.c | 29 + > > drivers/accel/rocket/rocket_device.h | 29 + > > drivers/accel/rocket/rocket_drv.c | 273 ++ > > drivers/accel/rocket/rocket_drv.h | 13 + > > drivers/accel/rocket/rocket_registers.h | 4425 > > +++++++++++++++++++++++++++++++ > > 14 files changed, 4932 insertions(+) > > > > [...] > > diff --git a/drivers/accel/rocket/rocket_drv.c > > b/drivers/accel/rocket/rocket_drv.c > > new file mode 100644 > > index > > 0000000000000000000000000000000000000000..c22d965f20f1239a36b1d823d5fe5f372713555d > > --- /dev/null > > +++ b/drivers/accel/rocket/rocket_drv.c > > @@ -0,0 +1,273 @@ > > [...] > > +static int rocket_probe(struct platform_device *pdev) > > +{ > > + struct component_match *match = NULL; > > + struct device_node *core_node; > > + > > + if (fwnode_device_is_compatible(pdev->dev.fwnode, > > "rockchip,rk3588-rknn-core")) > > + return component_add(&pdev->dev, &rocket_core_ops); > > + > > + for_each_compatible_node(core_node, NULL, > > "rockchip,rk3588-rknn-core") { > > + if (!of_device_is_available(core_node)) > > + continue; > > + > > + drm_of_component_match_add(&pdev->dev, &match, > > + component_compare_of, core_node); > > + } > > + > > + return component_master_add_with_match(&pdev->dev, &rocket_drm_ops, > > match); > > +} > > Hi Tomeu, > > something I've noticed while playing with this: currently, it doesn't seem > like > it's possible to support 1-core NPUs. rknn-core-top is a real core, but if no > rknn-core is enabled beside it, it'll call component_master_add_with_match > with > match being NULL. This causes a kernel Oops. > > I'm not sure what the proper fix is, since the component API doesn't seem to > really have a consideration for a master with no other components.
Yeah, I think we could add a code path for single-core NPUs that doesn't make use of the component API at all. > I ran into this when I was trying to debug why I get job timeouts followed by > a full SoC lock-up on RK3576 by running with only one of the two cores > enabled. > > As an aside note, my throwaway rocket-on-RK3576-hacking-branch is at [1] and > contains some changes you may want to consider for v3, e.g. [2] and [3]+[4]. > In > [4], specifically the `domain-supply` part which means the NPU regulators > don't > have to be always-on. Though feel free to pull in my entire ROCK 5B enablement > patch. Ok, [2] I already had in my WIP branch. Will pick up [3] and [4], though I cannot test them myself. Regards, Tomeu > Kind regards, > Nicolas Frattaroli, who discovered that his cat is apparently 5% space heater > according to mobilenet while playing with this patch series. > > [1]: > https://gitlab.collabora.com/fratti/linux/-/commits/tomeu-npu?ref_type=heads > [2]: > https://gitlab.collabora.com/fratti/linux/-/commit/73aba31a00b34c254be575b524da568e115d985d > [3]: > https://gitlab.collabora.com/fratti/linux/-/commit/bd3a7bf5054c54c2915a9dc0396730d0f24b3b7c > [4]: > https://gitlab.collabora.com/fratti/linux/-/commit/5da44d61b09c345309f76159574d447d071c295d > > >