R-Car X5H Ironhide CPG/MDLC SCMI remapping support
Subsystems (8)
Geert Uytterhoeven
maintainerv5 cover R-Car X5H Ironhide CPG/MDLC SCMI remapping support
Hi all,
TL;DR:
Describe hardware in DT, and perform mapping to abstractions offered by SCMI in Linux.
The Renesas R-Car X5H-based Ironhide board is the first Renesas SoC/board combination that implements the ARM System Control and Management Interface (SCMI).
This means Linux can no longer perform various system operations (e.g. clock, power domain, and reset control) by accessing the hardware directly. Instead, these operations are abstracted according to various SCMI sub-protocols, and Linux has to send messages to an SCMI-compliant firmware running on a System Control Processor (SCP).
More specifically, the R-Car X5H SCP FW SCMI controls access to:
1. Core clocks and module clocks,
2. Module resets,
3. Power domains,
4. System power.
The latter is not relevant for this discussion.
Using SCMI also has an impact on the board DTS: besides the addition of a firmware/scmi node with protocol-specific subnodes, devices using SCMI-abstracted system resources now have to refer to these resources using resource specifiers containing phandles to the SCMI protocol subnodes, and firmware-specific object IDs[1].
Unfortunately we encountered several issues with this:
- The clock, reset, and power domain IDs are not stable by design, causing DT incompatibilities.
SCMI requires that the ID space exposed to an agent (i.e. Linux) starts at zero and is contiguous. Hence any change in system partitioning (Application CPU core vs. Realtime CPU core, virtualization, ...) may mean a renumbering of all SCMI IDs, implying a massive change to the DT.
- There may be different SCP firmware lineages, e.g. proprietary and certified variants, and FLOSS variants,
- SCMI features may differ across firmware versions,
- SCMI may abstract the hardware in a different way, requiring changes in (possibly existing) DT bindings and drivers to support the same hardware with and without SCMI:
- E.g. the number of SCMI clocks inputs to a hardware block may differ from the actual hardware,
- E.g. hardware clock inputs may be abstracted as SCMI power domains (or vice versa), like on Qualcomm SA8255P[2].
Experience has taught that not describing the hardware in DT may lead to major issues later.
- SCMI does not support the concept of a clock domain, so existing drivers can no longer rely on Runtime PM, but need to be changed to manage functional clocks explicitly,
- U-Boot IPL (Initial Program Loader) needs a proper hardware description in DT, not using SCMI.
This list deliberately ignores ID instability and the need for SCMI quirks during development of the SCMI firmware. While upstream Linux must only support sufficiently mature firmware versions, vendor trees (e.g. renesas-lts) may still want to support development firmware versions.
During last OSSJ+LPC, Marek Vasut pondered if we could keep our own ID lists stable, and perform a mapping to the IDs used by the actual SCMI implementation running on the system. This was also briefly discussed at LPC[3]. After some refining of the initial idea, this series takes a slightly different approach, by:
1. Describing the actual hardware components in DT, plus a minimum SCMI glue,
2. Mapping DT hardware descriptions to SCMI-backed objects and abstractions (or replacements, in case they are unusable, unavailable, or too different), in Linux drivers, based on the detected firmware version.
This has the following advantages:
1. The DT ABI is stable,
2. DT bindings and drivers for existing hardware blocks do not need to be modified,
2. Current and future firmware can be handled in driver code,
3. U-Boot IPL can use almost the same DT; it just needs stripping of the SCMI node and subnodes,
4. If ever needed, the Clock Pulse Generator (CPG) and Module Controller (MDLC) drivers can be extended to program the hardware directly if SCMI is not present,
Last month I gave a presentation about the issues and our solution at ELCE2026 in Prague[4].
This series consists of four parts:
A. Patches 1-5 prepare and add SCMI remapping support to the R-Car X5H
CPG clock driver,
B. Patches 6-10 fix and add new interfaces needed for remapping in the
R-Car X5H MDLC pmdomain driver,
C. Patches 11-14 prepare and add SCMI remapping support to the R-Car
X5H MDLC pmdomain driver,
D. Patch 15 enables more SCMI protocols on R-Car X5H Ironhide.
Dependencies and merge strategy:
- A targets the renesas-clk tree,
- C depends on B, so both target the pmdomain tree,
- D depends on A, B, C, and out-of-tree SCMI quirks, so needs to be postponed.
Changes compared to v4[5]:
- New patches:
- "[01/15] clk: renesas: r8a78000: Merge debug prints in r8a78000_clk_get()",
- "[02/15] clk: renesas: r8a78000: Replace sentinel by explicit ID map size",
- "[03/15] clk: renesas: r8a78000: Shrink IDs to 16 bits",
- "[08/15] pmdomain: Make genpd_get_from_provider() always",
- "[11/15] pmdomain: renesas: r8a78000: Drop MDLC name comment",
- "[12/15] pmdomain: renesas: r8a78000: Replace sentinel by",
- "[13/15] pmdomain: renesas: r8a78000: Shrink IDs to 16 bits",
- Add Tested-by (I retained Wolfram's tag, as the inner workings haven't changed),
- Add Reviewed-by,
- Rebase,
- Shrink DT, hardware, and firmware IDs to 16 bits,
- Rework mapping data structures, keeping the original ID maps and adding separate arrays of clk_hw, genpd, and reset pointers,
- Use kzalloc_objs() and __free() for the temporary array of fixed clocks,
- Use new *alloc_obj*() allocators,
- Add missing clk_put() after of_clk_get_from_provider() in get_hws(),
- Move of_node_get() after for-loop that may fail to fix device node reference leak on failure,
- Add support for missing SCMI firmware IDs indicated by -1,
- Fix double clk_put() in pm_clk_add_clk() error handling,
- Fix reset control leaks in fill_mod_map() error path,
- Fix scmi_clk_np reference leak by marking it __free(), and retaining it explicitly on probe success.
- Drop unneeded mdlc name comments,
- More details can be found in the individual patches.
Changes compared to v3[6]:
- Remove dependencies by making assumptions and dropping disputed items, to move this series forward:
- Assume all SCMI IDs are stable.
This let us drop the addition of scmi_get_base_info(), and support for handling different ID spaces.
- Drop the "renesas,scmi-firmware" DT property, and find a device node compatible with "arm,scmi" instead.
This let us drop the addition of fw_devlink support for this property, too, but required a new probe deferral fix in the pmdomain code: "pmdomain: Make genpd_get_from_provider() return -EPROBE_DEFER".
This will have to be revisited when systems with multiple SCMI providers appear.
- Drop unneeded IS_ERR() check after __clk_get_hw(),
- Mark scmi_{clk,reset,power}_np __free(device_node),
- Include initial mapping tables for R-Car X5H SCP FW SDKv4.31.0 and later, supporting clocks, power domains, and resets used by serial, I2C, and SPI devices.
- Try SCMI clocks first, and fall back to the default fixed-frequency clocks when not available, as recent firmware versions no longer restrict access to some bus clocks,
- Fall back to the non-SCMI defaults when SCMI provider support is disabled,
- Keep RESET_CONTROL_FLAGS_BIT_OPTIONAL clearing in
__fwnode_reset_control_get(),
- Return directly in __reset_control_get_from_provider(), instead of assigning to a local variable, letting us drop the latter and simplify scoped_guard() to plain guard(),
- Add Reviewed-by,
- Check for overflow when converting (u64) fwnode args to (uint32_t) OF args,
- Document that reset_control_get_from_provider_exclusive() must not be given a reference to a GPIO provider,
- Let the dummy return ERR_PTR(-ENOTSUPP) instead of NULL,
- Improve patch description,
- Let r8a78000_mdlc_attach_dev() return success when the MDLC instance is not found, to avoid breaking users referring in DT to an SCMI power-domain directly,
- Extract scmi_get_clk(),
- Add support for gateable functional clock parents,
- Propagate all reset failures, as SCP FW SDKv4.28.0 which restricted HSCIF0 reset is no longer supported.
Changes compared to v2[7]:
- New patches:
"[PATCH v3 06/12] reset: Extract __reset_control_get_from_provider()",
"[PATCH v3 08/12] clk: renesas: r8a78000: Add clk_hw to clk_map", - Move DT binding patches forward in series,
- Add "renesas" vendor prefix and "scmi-" function prefix to the "firmware" property (I still think the vendor property should be dropped, or replaced by "arm"),
- Add "of_" prefix to genpd_get_from_provider(),
- Replace reset_controller_get_provider() by reset_control_get_from_provider_exclusive(),
- Add kerneldoc,
- Rebase,
- Consistently use /* sentinel */ for zero sentinels,
- Call reset_control_*() APIs instead of internal reset_control_ops methods,
- Rename struct mod_map to struct mod_map_in,
- Add struct mod_map, which also contains a reset_control pointer,
- Add fill_mod_map() to obtain all SCMI reset_control structures up-front, as one can no longer use lazy look-up,
- Prefix DEFINE_MDLC_RESET_WRAPPER() parameters with underscores.
Changes compared to v1[8]:
- Drop SCMI quirks and SCMI mapping tables,
- Move CPG/MDLC DT bindings and minimal base drivers to a separate series,
- Add that SCMI may provide different abstractions,
- Add missing asterisk to blank kerneldoc line,
- Let scmi_get_base_info() return -EPROBE_DEFER or -EOPNOTSUPP instead of -ENOENT, and propagate these errors in callers,
- Fall back to the default support when SCMI support or firmware is not available, or when the detected SCMI firmware version is not supported by the driver,
- Improve error message on scmi_get_base_info() failure,
- Check if SCMI firmware node is available,
- Use reverse xmas ordering in r8a78000_cpg_probe(),
- Replace the scmi_*_np members of struct r8a78000_*_priv by local variables in the probe functions, and pass them to the fill_*_map() functions,
- Join split short lines,
- Move check for supported firmware version up,
- Fix DT misindentations,
- Add scmi_clk node, as it is no longer added in earlier commits.
Notes:
- In reponse of feedback on v1, I did try to use SCMI IDs in DT, and handle most issues in Linux SCMI drivers and SCMI quirks[9]. While the result worked, it did not solve everything in the issues list above.
- This series does not include actual SCMI quirks; the SCMI firmware for R-Car X5H is still under development.
For testing, I have pushed this series plus additional work to[10]. This has been tested on the Ironhide board with R-Car X5H SCP FW SDKv4.36.0 and SDKv4.39.0.
Thanks for your comments!
[1] Documentation/devicetree/bindings/firmware/arm,scmi.yaml
[2] "[PATCH net-next v11 1/7] dt-bindings: phy: document the serdes PHY on sa8255p"
https://lore.kernel.org/[email protected] [3] "Firmware ABI stability" at Linux Plumbers Conference 2025 https://lpc.events/event/19/contributions/2153/ [4] "Marrying Device Tree and SCMI" https://osselceu2026.sched.com/event/2RaWR https://www.youtube.com/watch?v=z6Apgkm3fD4 [5] "[PATCH v4 0/8] R-Car X5H Ironhide CPG/MDLC SCMI remapping support" https://lore.kernel.org/[email protected] [6] "[PATCH v3 00/12] R-Car X5H Ironhide CPG/MDLC SCMI remapping support" https://lore.kernel.org/[email protected] [7] "[PATCH v2 00/10] R-Car X5H Ironhide CPG/MDLC SCMI remapping support" https://lore.kernel.org/[email protected] [8] "[PATCH/RFC 00/14] R-Car X5H Ironhide SCMI CPG/MDLC remapping" https://lore.kernel.org/[email protected] [9] "[PATCH/RFC 0/9] R-Car X5H Ironhide pure SCMI proof-of-concept" https://lore.kernel.org/[email protected]
[10] topic/rcar-x5h-ironhide-scmi-cpg-mdlc-remapping-v5 branch of
https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
Geert Uytterhoeven (15):
clk: renesas: r8a78000: Merge debug prints in r8a78000_clk_get()
clk: renesas: r8a78000: Replace sentinel by explicit ID map size
clk: renesas: r8a78000: Shrink IDs to 16 bits
clk: renesas: r8a78000: Add clk_hw to clk_map
clk: renesas: r8a78000: Add SCMI remapping support
reset: Extract __reset_control_get_from_provider()
reset: Add reset_control_get_from_provider_exclusive()
pmdomain: Make genpd_get_from_provider() always return on first match
pmdomain: Make genpd_get_from_provider() return -EPROBE_DEFER
pmdomain: Make genpd_get_from_provider() public
pmdomain: renesas: r8a78000: Drop MDLC name comment
pmdomain: renesas: r8a78000: Replace sentinel by explicit ID map size
pmdomain: renesas: r8a78000: Shrink IDs to 16 bits
pmdomain: renesas: r8a78000: Add SCMI remapping support
arm64: dts: renesas: ironhide: Enable SCMI devpd, sys, clock, and
reset
.../boot/dts/renesas/r8a78000-ironhide.dts | 19 + drivers/clk/renesas/r8a78000-cpg.c | 237 +++++++-- drivers/pmdomain/core.c | 30 +- drivers/pmdomain/renesas/r8a78000-mdlc.c | 461 ++++++++++++++++-- drivers/reset/core.c | 115 +++-- include/linux/pm_domain.h | 7 + include/linux/reset.h | 8 + 7 files changed, 728 insertions(+), 149 deletions(-)
Signature · 12 lines
2.43.0
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH v5 1/15 clk: renesas: r8a78000: Merge debug prints in r8a78000_clk_get()
The two debug prints in r8a78000_clk_get() are very similar. Merge them into a single debug print.
While at it, unwrap the (wrongly-indented) continuation of the r8a78000_clk_get() function header, as it fits on a single line.
---
v5:
- New.
--- drivers/clk/renesas/r8a78000-cpg.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/clk/renesas/r8a78000-cpg.c +3 -6
@@ -62,8 +62,7 @@ static const struct clk_map *clk_map_find(const struct clk_map *map, u32 id)return NULL ; } -static struct clk_hw *r8a78000_clk_get (struct of_phandle_args *spec, -void *data) +static struct clk_hw *r8a78000_clk_get (struct of_phandle_args *spec,void *data) {struct r8a78000_cpg_priv *priv = data;struct device *dev = priv->dev;
@@ -82,12 +81,10 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec,return ERR_PTR (-ENOENT ); } -dev_dbg (dev,"Mapping DT clock %u to fixed clock %u\n" , id, map->fw_id); - hw = priv->fixed_hws[map->fw_id]; -dev_dbg (dev,"clock %u is %s at %lu Hz\n" , id,clk_hw_get_name (hw), -clk_hw_get_rate (hw)); +dev_dbg (dev,"Mapping DT clock %u to %s at %lu Hz\n" , id, +clk_hw_get_name (hw),clk_hw_get_rate (hw));return hw; }
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 2/15 clk: renesas: r8a78000: Replace sentinel by explicit ID map size
In reply to Geert UytterhoevenThe use of a sentinel in the clock ID mapping array will become cumbersome when the need arises to find out the actual number of elements in the array. Rework the mapping data structure to fix this, also improving naming. Add a CLK_ID_MAP() initialization macro for brevity.
While at it, drop the check for "!map" in clk_id_map_find(), as that pointer can never be NULL.
---
v5:
- New.
--- drivers/clk/renesas/r8a78000-cpg.c | 45 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 19 deletions(-)
drivers/clk/renesas/r8a78000-cpg.c +26 -19
@@ -16,11 +16,21 @@#include <dt-bindings/clock/renesas,r8a78000-cpg.h> -struct clk_map { -int dt_id;/* DT binding clock ID or -1 sentinel */ +struct clk_id_map_entry { +u32 dt_id;/* DT binding clock ID */ u32 fw_id;/* FIXED_CLK() ID */ }; +struct clk_id_map { +const struct clk_id_map_entry *entries; +unsigned int size; +}; + +#define CLK_ID_MAP (_entries) &(struct clk_id_map) { \ + .entries = _entries, \ + .size = ARRAY_SIZE(_entries), \ +} +enum fixed_clk {FIXED_CLK_66M ,FIXED_CLK_133M ,
@@ -40,23 +50,21 @@ static const unsigned long fixed_clk_rates[NUM_FIXED_CLKS] = {* struct r8a78000_cpg_priv - Clock Pulse Generator Private Data * * @dev: CPG device -* @map: Mapping from DT clock IDs to fixed-rate clocks +* @map: Mapping from DT clock IDs to fixed-rate clock IDs * @fixed_hws: Fixed rate clocks */ struct r8a78000_cpg_priv {struct device *dev; -const struct clk_map *map; +const struct clk_id_map *map;struct clk_hw *fixed_hws[NUM_FIXED_CLKS ]; }; -static const struct clk_map *clk_map_find (const struct clk_map *map,u32 id) +static const struct clk_id_map_entry *clk_id_map_find (const struct clk_id_map *map, +u32 dt_id) { -if (!map) -return NULL ; - -for (; map->dt_id >=0 ; map++) { -if (map->dt_id == id) -return map; +for (unsigned int i =0 ; i < map->size; i++) { +if (map->entries[i].dt_id == dt_id) +return &map->entries[i]; }return NULL ;
@@ -65,8 +73,8 @@ static const struct clk_map *clk_map_find(const struct clk_map *map, u32 id)static struct clk_hw *r8a78000_clk_get (struct of_phandle_args *spec,void *data) {struct r8a78000_cpg_priv *priv = data; +const struct clk_id_map_entry *entry;struct device *dev = priv->dev; -const struct clk_map *map;struct clk_hw *hw;u32 id;
@@ -75,13 +83,13 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec, void *data) id = spec->args[0 ]; - map =clk_map_find (priv->map, id); -if (!map) { + entry =clk_id_map_find (priv->map, id); +if (!entry) {dev_err (dev,"Unknown clock %u\n" , id);return ERR_PTR (-ENOENT ); } - hw = priv->fixed_hws[map->fw_id]; + hw = priv->fixed_hws[entry->fw_id];dev_dbg (dev,"Mapping DT clock %u to %s at %lu Hz\n" , id,clk_hw_get_name (hw),clk_hw_get_rate (hw));
@@ -116,7 +124,7 @@ static int r8a78000_cpg_probe(struct platform_device *pdev) {struct device *dev = &pdev->dev;struct r8a78000_cpg_priv *priv; -const struct clk_map *map; +const struct clk_id_map *map;int ret; map =of_device_get_match_data (dev);
@@ -137,17 +145,16 @@ static int r8a78000_cpg_probe(struct platform_device *pdev)return devm_of_clk_add_hw_provider (dev, r8a78000_clk_get, priv); } -static const struct clk_map r8a78000_cpg_default[] = { +static const struct clk_id_map_entry r8a78000_cpg_default[] = { { R8A78000_CPG_SGASYNCD4_PERW_BUS, FIXED_CLK(266M) }, { R8A78000_CPG_SGASYNCD8_PERW_BUS, FIXED_CLK(133M) }, { R8A78000_CPG_SGASYNCD16_PERW_BUS, FIXED_CLK(66M) }, - {-1 } };static const struct of_device_id r8a78000_cpg_match[] = { { .compatible ="renesas,r8a78000-cpg" , - .data = &r8a78000_cpg_default, + .data =CLK_ID_MAP (r8a78000_cpg_default), }, {/* sentinel */ } };
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 3/15 clk: renesas: r8a78000: Shrink IDs to 16 bits
In reply to Geert UytterhoevenReduce table size by shrinking DT and fixed-rate clock IDs from 32 to 16 bits, which is still plenty.
---
v5:
- New.
--- drivers/clk/renesas/r8a78000-cpg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/renesas/r8a78000-cpg.c +2 -2
@@ -17,8 +17,8 @@#include <dt-bindings/clock/renesas,r8a78000-cpg.h> struct clk_id_map_entry { -u32 dt_id;/* DT binding clock ID */ -u32 fw_id;/* FIXED_CLK() ID */ +u16 dt_id;/* DT binding clock ID */ +u16 fw_id;/* FIXED_CLK() ID */ };struct clk_id_map {
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 4/15 clk: renesas: r8a78000: Add clk_hw to clk_map
In reply to Geert UytterhoevenPrepare for mapping to other than fixed-rate clocks by adding an array of clk_hw pointers, indexed by the clock map entry index, and populating it up-front.
Move r8a78000_cpg_priv.fixed_hws into get_hws(), as it is no longer needed afterwards, and drop NUM_FIXED_CLKS.
---
v5:
- Add Tested-by,
- Rebase,
- Use kzalloc_objs() and __free() instead of devm_k{calloc,free}() for the temporary array of fixed clocks,
- Replace devm_kcalloc() by devm_kzalloc_objs(),
- Replace unified clk_map by keeping the original clk_id_map and adding a separate array of clk_hw pointers,
- Let clk_id_map_find() return an index,
- Replace fill_clk_map() by get_hws(),
v4:
- No changes,
v3:
- New.
--- drivers/clk/renesas/r8a78000-cpg.c | 71 ++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 23 deletions(-)
drivers/clk/renesas/r8a78000-cpg.c +48 -23
@@ -5,6 +5,7 @@* Copyright (C) 2026 Glider bv */ +#include <linux/cleanup.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/dev_printk.h>
@@ -35,10 +36,9 @@ enum fixed_clk {FIXED_CLK_66M ,FIXED_CLK_133M , FIXED_CLK_266M, -NUM_FIXED_CLKS }; -static const unsigned long fixed_clk_rates[NUM_FIXED_CLKS ] = { +static const unsigned long fixed_clk_rates[] = { [FIXED_CLK_66M ] =66666000 , [FIXED_CLK_133M ] =133330000 , [FIXED_CLK_266M] = 266660000,
@@ -51,31 +51,30 @@ static const unsigned long fixed_clk_rates[NUM_FIXED_CLKS] = {* * @dev: CPG device * @map: Mapping from DT clock IDs to fixed-rate clock IDs -* @fixed_hws: Fixed rate clocks +* @hws: Clocks, indexed by @map entry index */ struct r8a78000_cpg_priv {struct device *dev;const struct clk_id_map *map; -struct clk_hw *fixed_hws[NUM_FIXED_CLKS ]; +struct clk_hw **hws; }; -static const struct clk_id_map_entry *clk_id_map_find (const struct clk_id_map *map, -u32 dt_id) +static int clk_id_map_find (const struct clk_id_map *map,u32 dt_id) {for (unsigned int i =0 ; i < map->size; i++) {if (map->entries[i].dt_id == dt_id) -return &map->entries[i]; +return i; } -return NULL ; +return -1 ; }static struct clk_hw *r8a78000_clk_get (struct of_phandle_args *spec,void *data) {struct r8a78000_cpg_priv *priv = data; -const struct clk_id_map_entry *entry;struct device *dev = priv->dev;struct clk_hw *hw; +int idx;u32 id;if (spec->args_count !=1 )
@@ -83,13 +82,13 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec, void *data) id = spec->args[0 ]; - entry =clk_id_map_find (priv->map, id); -if (!entry) { + idx =clk_id_map_find (priv->map, id); +if (idx <0 ) {dev_err (dev,"Unknown clock %u\n" , id);return ERR_PTR (-ENOENT ); } - hw = priv->fixed_hws[entry->fw_id]; + hw = priv->hws[idx];dev_dbg (dev,"Mapping DT clock %u to %s at %lu Hz\n" , id,clk_hw_get_name (hw),clk_hw_get_rate (hw));
@@ -97,27 +96,54 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec, void *data)return hw; } -static int register_fixed_clks (struct r8a78000_cpg_priv *priv) +static struct clk_hw **register_fixed_clks (struct device *dev) { -struct device *dev = priv->dev; +unsigned int n =ARRAY_SIZE (fixed_clk_rates);unsigned long rate;struct clk_hw *hw;const char *name; -for (unsigned int i =0 ; i <ARRAY_SIZE (fixed_clk_rates); i++) { + struct clk_hw **hws __free(kfree) = kzalloc_objs(*hws, n); +if (!hws) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < n; i++) { rate = fixed_clk_rates[i]; name =devm_kasprintf (dev,GFP_KERNEL ,"cpg-%lu" , rate);if (!name) -return -ENOMEM ; +return ERR_PTR (-ENOMEM ); hw =devm_clk_hw_register_fixed_rate (dev, name,NULL ,0 , rate);if (IS_ERR (hw)) -return PTR_ERR (hw); +return ERR_CAST (hw); + + hws[i] = hw; + } + +return_ptr (hws); +} - priv->fixed_hws[i] = hw; +static struct clk_hw **get_hws (struct r8a78000_cpg_priv *priv) +{ +const struct clk_id_map *map = priv->map; +struct device *dev = priv->dev; +struct clk_hw **hws; +u16 fw_id; + + struct clk_hw **fixed_hws __free(kfree) = register_fixed_clks(dev); +if (IS_ERR (fixed_hws)) +return ERR_CAST (fixed_hws); + + hws =devm_kzalloc_objs (dev, *hws, map->size); +if (!hws) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < map->size; i++) { + fw_id = map->entries[i].fw_id; + hws[i] = fixed_hws[fw_id]; } -return 0 ; +return hws; }static int r8a78000_cpg_probe (struct platform_device *pdev)
@@ -125,7 +151,6 @@ static int r8a78000_cpg_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct r8a78000_cpg_priv *priv;const struct clk_id_map *map; -int ret; map =of_device_get_match_data (dev);if (!map)
@@ -138,9 +163,9 @@ static int r8a78000_cpg_probe(struct platform_device *pdev) priv->dev = dev; priv->map = map; - ret =register_fixed_clks (priv); -if (ret) -return ret; + priv->hws =get_hws (priv); +if (IS_ERR (priv->hws)) +return PTR_ERR (priv->hws);return devm_of_clk_add_hw_provider (dev, r8a78000_clk_get, priv); }
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 5/15 clk: renesas: r8a78000: Add SCMI remapping support
In reply to Geert UytterhoevenExtend the Clock Pulse Generator driver for R-Car X5H with SCMI support, to remap DT clock IDs to abstractions (clocks) offered by the SCMI firmware when running on a system with SCMI, and SCMI support is enabled. Take into account some peculiarities of the current SCMI firmware implementations, and fall-back to fixed-rate clocks as replacements for SCMI clocks that are not available.
Support for bus clocks used by serial, I2C, and SPI devices is included.
This lets us avoid putting SCMI IDs in DT, and allows us to use the same hardware description in SoC DTS for systems with and without SCMI firmware.
For now, it is assumed SCMI clock IDs are stable, and match SCP FW SDKv4.31.0 and later.
---
v5:
- Add Tested-by,
- Rebase,
- Shrink firmware clock IDs to 16 bits,
- Add parentheses to FIXED_CLK() macro definition,
- Extract get_fallback() and simplify fallback code,
- Rework mapping data structures,
- Add missing clk_put() after of_clk_get_from_provider() in get_hws(),
v4:
- Drop unneeded IS_ERR() check after __clk_get_hw(),
- Mark scmi_clk_np __free(device_node),
- Assume all SCMI clock IDs are stable, and drop support for handling different ID spaces,
- Include initial mapping table for SCP FW SDKv4.31.0 and later,
- Try SCMI clocks first, and fall back to the default fixed-frequency clocks when not available, as recent firmware versions no longer restrict access to some bus clocks,
- Drop renesas,scmi-firmware support, just find an arm,scmi node instead,
- Fall back to the non-SCMI defaults when SCMI clock support is disabled,
v3:
- Rebase,
- Consistently use /* sentinel */ for zero sentinels,
- s/firmware/renesas,scmi-firmware/,
- Reword,
v2:
- Spin off from "clk: renesas: Add R-Car X5H CPG SCMI remapping driver",
- Use reverse xmas ordering in r8a78000_cpg_probe(),
- Propagate error codes from scmi_get_base_info() now it can return -EPROBE_DEFER,
- Improve error message on scmi_get_base_info() failure,
- Check if SCMI firmware node is available,
- Replace the scmi_clk_np member of struct r8a78000_cpg_priv by a local variable in r8a78000_cpg_probe(), and pass it to fill_clk_map(),
- Join split short lines,
- Fall back to the default support when SCMI support or firmware is not available, or when the detected SCMI firmware version is not supported by the driver,
- Drop mapping tables.
--- drivers/clk/renesas/r8a78000-cpg.c | 138 ++++++++++++++++++++++++++--- 1 file changed, 128 insertions(+), 10 deletions(-)
drivers/clk/renesas/r8a78000-cpg.c +128 -10
@@ -13,13 +13,14 @@#include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/scmi_protocol.h> #include <linux/slab.h> #include <dt-bindings/clock/renesas,r8a78000-cpg.h> struct clk_id_map_entry {u16 dt_id;/* DT binding clock ID */ -u16 fw_id;/* FIXED_CLK() ID */ +u16 fw_id;/* SCMI firmware clock ID or FIXED_CLK() ID */ };struct clk_id_map {
@@ -32,6 +33,11 @@ struct clk_id_map { .size = ARRAY_SIZE(_entries), \ } +struct cpg_data { +const struct clk_id_map *default_map; +const struct clk_id_map *fw_map; +}; +enum fixed_clk {FIXED_CLK_66M ,FIXED_CLK_133M ,
@@ -44,13 +50,14 @@ static const unsigned long fixed_clk_rates[] = { [FIXED_CLK_266M] = 266660000, }; -#define FIXED_CLK (rate) FIXED_CLK_ ## rate +#define FIXED_CLK_OFFSET 0x8000 +#define FIXED_CLK (rate) (FIXED_CLK_OFFSET + FIXED_CLK_ ## rate)/** * struct r8a78000_cpg_priv - Clock Pulse Generator Private Data * * @dev: CPG device -* @map: Mapping from DT clock IDs to fixed-rate clock IDs +* @map: Mapping from DT clock IDs to SCMI or fixed-rate clock IDs * @hws: Clocks, indexed by @map entry index */ struct r8a78000_cpg_priv {
@@ -89,6 +96,11 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec, void *data) } hw = priv->hws[idx]; +if (!hw) { +/* CLOCK_ATTRIBUTES is not supported */ +dev_err (dev,"Clock %u is not available\n" , id); +return ERR_PTR (-ENOENT ); + }dev_dbg (dev,"Mapping DT clock %u to %s at %lu Hz\n" , id,clk_hw_get_name (hw),clk_hw_get_rate (hw));
@@ -96,6 +108,21 @@ static struct clk_hw *r8a78000_clk_get(struct of_phandle_args *spec, void *data)return hw; } +static struct device_node *scmi_find_proto (struct device_node *scmi,u32 proto) +{ +for_each_available_child_of_node_scoped (scmi, child) { +u32 reg; + +if (of_property_read_u32 (child,"reg" , ®)) +continue ; + +if (reg == proto) +return_ptr (child); + } + +return NULL ; +} +static struct clk_hw **register_fixed_clks (struct device *dev) {unsigned int n =ARRAY_SIZE (fixed_clk_rates);
@@ -123,11 +150,26 @@ static struct clk_hw **register_fixed_clks(struct device *dev)return_ptr (hws); } -static struct clk_hw **get_hws (struct r8a78000_cpg_priv *priv) +static struct clk_hw *get_fallback (const struct clk_id_map *map,u16 dt_id, +struct clk_hw **fixed_hws) +{ +for (unsigned int i =0 ; i < map->size; i++) { +if (map->entries[i].dt_id == dt_id) +return fixed_hws[map->entries[i].fw_id -FIXED_CLK_OFFSET ]; + } + +return NULL ; +} + +static struct clk_hw **get_hws (struct r8a78000_cpg_priv *priv, +const struct clk_id_map *fallback, +struct device_node *scmi_clk_np) {const struct clk_id_map *map = priv->map; +struct of_phandle_args scmi_spec;struct device *dev = priv->dev; -struct clk_hw **hws; +struct clk_hw **hws, *hw; +struct clk *clk;u16 fw_id; struct clk_hw **fixed_hws __free(kfree) = register_fixed_clks(dev);
@@ -140,7 +182,35 @@ static struct clk_hw **get_hws(struct r8a78000_cpg_priv *priv)for (unsigned int i =0 ; i < map->size; i++) { fw_id = map->entries[i].fw_id; - hws[i] = fixed_hws[fw_id]; +if (fw_id >=FIXED_CLK_OFFSET ) { + hws[i] = fixed_hws[fw_id -FIXED_CLK_OFFSET ]; +continue ; + } + + scmi_spec.np = scmi_clk_np; + scmi_spec.args_count =1 ; + scmi_spec.args[0 ] = fw_id; + + clk =of_clk_get_from_provider (&scmi_spec); +if (IS_ERR (clk)) +return dev_err_cast_probe (dev, clk, +"Failed to get SCMI clock %u\n" , fw_id); + + hw =__clk_get_hw (clk); +clk_put (clk); +if (!hw) + hw =get_fallback (fallback, map->entries[i].dt_id, + fixed_hws); +if (!hw) { +/* CLOCK_ATTRIBUTES is not supported */ +dev_warn (dev,"SCMI clock %u is NULL\n" , fw_id); +continue ; + } + +dev_dbg (priv->dev,"SCMI clock %u is %s at %lu Hz\n" , fw_id, +clk_hw_get_name (hw),clk_hw_get_rate (hw)); + + hws[i] = hw; }return hws;
@@ -148,22 +218,57 @@ static struct clk_hw **get_hws(struct r8a78000_cpg_priv *priv)static int r8a78000_cpg_probe (struct platform_device *pdev) { + struct device_node *scmi_clk_np __free(device_node) = NULL; + struct device_node *scmi __free(device_node) = NULL;struct device *dev = &pdev->dev; +const struct cpg_data *cpg_data;struct r8a78000_cpg_priv *priv;const struct clk_id_map *map; - map =of_device_get_match_data (dev); -if (!map) + cpg_data =of_device_get_match_data (dev); +if (!cpg_data)return -ENODEV ; + map = cpg_data->default_map; + priv =devm_kzalloc_obj (dev, *priv);if (!priv)return -ENOMEM ; priv->dev = dev; + +if (!IS_ENABLED (CONFIG_COMMON_CLK_SCMI )) { +dev_dbg (dev,"SCMI clock support is disabled\n" ); + goto fallback; + } + + scmi =of_find_compatible_node (NULL ,NULL ,"arm,scmi" ); +if (!scmi) { +dev_dbg (dev,"Cannot find SCMI firmware node\n" ); + goto fallback; + } + +if (!of_device_is_available (scmi)) { +dev_dbg (dev,"SCMI firmware node is not available\n" ); + goto fallback; + } + + scmi_clk_np =scmi_find_proto (scmi,SCMI_PROTOCOL_CLOCK ); +if (!scmi_clk_np) { +dev_dbg (dev,"Cannot find SCMI clock management protocol\n" ); + goto fallback; + } + + map = cpg_data->fw_map; + +fallback: priv->map = map; - priv->hws =get_hws (priv); +/* +* We cannot do lazy look-up in r8a78000_clk_get(), as that function is +* called with of_clk_mutex already held. +*/ + priv->hws =get_hws (priv, cpg_data->default_map, scmi_clk_np);if (IS_ERR (priv->hws))return PTR_ERR (priv->hws);
@@ -176,10 +281,23 @@ static const struct clk_id_map_entry r8a78000_cpg_default[] = { { R8A78000_CPG_SGASYNCD16_PERW_BUS, FIXED_CLK(66M) }, }; +static const struct clk_id_map_entry r8a78000_cpg_fw[] = { + {R8A78000_CPG_SGASYNCD4_PERW_BUS ,1661 }, + {R8A78000_CPG_SGASYNCD8_PERW_BUS ,1662 }, + {R8A78000_CPG_SGASYNCD16_PERW_BUS ,1663 }, + {R8A78000_CPG_MSO_SCP_MAIN ,1459 }, + {R8A78000_CPG_MSOCK_PERW_BUS ,1667 }, +}; + +static const struct cpg_data r8a78000_cpg_data = { + .default_map =CLK_ID_MAP (r8a78000_cpg_default), + .fw_map =CLK_ID_MAP (r8a78000_cpg_fw), +}; +static const struct of_device_id r8a78000_cpg_match[] = { { .compatible ="renesas,r8a78000-cpg" , - .data =CLK_ID_MAP (r8a78000_cpg_default), + .data = &r8a78000_cpg_data, }, {/* sentinel */ } };
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 6/15 reset: Extract __reset_control_get_from_provider()
In reply to Geert UytterhoevenExtract the code to create a reset_control structure from a given provider into its own function, so it can be reused later.
---
v5:
- Add Tested-by,
v4:
- Keep RESET_CONTROL_FLAGS_BIT_OPTIONAL clearing in
__fwnode_reset_control_get(),
- Return directly instead of assigning to a local variable, letting us drop the latter and simplify scoped_guard() to plain guard(),
- Add Reviewed-by,
v3:
- New.
--- drivers/reset/core.c | 85 +++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 40 deletions(-)
drivers/reset/core.c +45 -40
@@ -1135,6 +1135,49 @@ __reset_find_rcdev(const struct fwnode_reference_args *args, bool gpio_fallback)return NULL ; } +static struct reset_control * +__reset_control_get_from_provider (const struct fwnode_reference_args *args, +struct fwnode_handle *consumer,int index, +bool gpio_fallback, +enum reset_control_flags flags) +{ +struct reset_controller_dev *rcdev; +int rstc_id = -EINVAL ; + +guard (mutex)(&reset_list_mutex); + + rcdev =__reset_find_rcdev (args, gpio_fallback); +if (!rcdev) +return ERR_PTR (-EPROBE_DEFER ); + +if (WARN_ON (args->nargs != rcdev->fwnode_reset_n_cells)) +return ERR_PTR (-EINVAL ); + +if (rcdev->of_xlate &&is_of_node (consumer)) { +struct device_node *np =to_of_node (consumer); +struct of_phandle_args of_args; +int ret; + + ret =of_parse_phandle_with_args (np, + gpio_fallback ?"reset-gpios" :"resets" , + gpio_fallback ?"#gpio-cells" :"#reset-cells" , + gpio_fallback ?0 : index, + &of_args); +if (ret) +return ERR_PTR (ret); + + rstc_id = rcdev->of_xlate (rcdev, &of_args); +of_node_put (of_args.np); + }else if (rcdev->fwnode_xlate) { + rstc_id = rcdev->fwnode_xlate (rcdev, args); + } +if (rstc_id <0 ) +return ERR_PTR (rstc_id); + +guard (mutex)(&rcdev->lock); +return __reset_control_get_internal (rcdev, rstc_id, flags); +} +struct reset_control *__fwnode_reset_control_get (struct fwnode_handle *fwnode,const char *id,int index,enum reset_control_flags flags)
@@ -1142,10 +1185,7 @@ __fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int indbool optional = flags &RESET_CONTROL_FLAGS_BIT_OPTIONAL ;bool gpio_fallback = false;struct reset_control *rstc =ERR_PTR (-EINVAL ); -struct reset_controller_dev *rcdev;struct fwnode_reference_args args; -struct of_phandle_args of_args; -int rstc_id = -EINVAL ;int ret;if (!fwnode)
@@ -1185,46 +1225,11 @@ __fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int ind } } -guard (mutex)(&reset_list_mutex); - - rcdev =__reset_find_rcdev (&args, gpio_fallback); -if (!rcdev) { - rstc =ERR_PTR (-EPROBE_DEFER ); - goto out_put; - } - -if (WARN_ON (args.nargs != rcdev->fwnode_reset_n_cells)) { - rstc =ERR_PTR (-EINVAL ); - goto out_put; - } - -if (rcdev->of_xlate &&is_of_node (fwnode)) { - ret =of_parse_phandle_with_args (to_of_node (fwnode), - gpio_fallback ?"reset-gpios" :"resets" , - gpio_fallback ?"#gpio-cells" :"#reset-cells" , - gpio_fallback ?0 : index, - &of_args); -if (ret) { - rstc =ERR_PTR (ret); - goto out_put; - } - - rstc_id = rcdev->of_xlate (rcdev, &of_args); -of_node_put (of_args.np); - }else if (rcdev->fwnode_xlate) { - rstc_id = rcdev->fwnode_xlate (rcdev, &args); - } -if (rstc_id <0 ) { - rstc =ERR_PTR (rstc_id); - goto out_put; - } - flags &= ~RESET_CONTROL_FLAGS_BIT_OPTIONAL ; -scoped_guard (mutex, &rcdev->lock) - rstc = __reset_control_get_internal(rcdev, rstc_id, flags); + rstc =__reset_control_get_from_provider (&args, fwnode, index, + gpio_fallback, flags); -out_put:fwnode_handle_put (args.fwnode);return rstc;
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 7/15 reset: Add reset_control_get_from_provider_exclusive()
In reply to Geert UytterhoevenWhen stacking two reset controllers, the upper one should go through the proper channels: request exclusive reset controls and use them via the reset_control_*() APIs. However, unlike the clock subsystem, which has of_clk_get_from_provider(), the reset subsystem does not offer a way to lookup and obtain a reset from a reset provider.
Hence add a public helper reset_control_get_from_provider_exclusive() to lookup and obtain an exclusive reference to a reset controller, based on the recently introduced __reset_control_get_from_provider() helper. This will be used by the R-Car X5H Module Controller driver.
---
v5:
- Add Tested-by, Reviewed-by,
- Move of_node_get() after for-loop that may fail to fix device node reference leak on failure,
v4:
- Check for overflow when converting (u64) fwnode args to (uint32_t) OF args,
- Document that reset_control_get_from_provider_exclusive() must not be given a reference to a GPIO provider,
- Let the dummy return ERR_PTR(-ENOTSUPP) instead of NULL,
v3:
- Replace reset_controller_get_provider() by
reset_control_get_from_provider_exclusive(),
- Add kerneldoc,
v2:
- No changes.
--- drivers/reset/core.c | 40 +++++++++++++++++++++++++++++++++++----- include/linux/reset.h | 8 ++++++++ 2 files changed, 43 insertions(+), 5 deletions(-)
drivers/reset/core.c +35 -5
@@ -1141,6 +1141,7 @@ __reset_control_get_from_provider(const struct fwnode_reference_args *args,bool gpio_fallback, enum reset_control_flags flags) { + struct fwnode_handle *fwnode = consumer ?: args->fwnode;struct reset_controller_dev *rcdev;int rstc_id = -EINVAL ;
@@ -1153,18 +1154,29 @@ __reset_control_get_from_provider(const struct fwnode_reference_args *args,if (WARN_ON (args->nargs != rcdev->fwnode_reset_n_cells))return ERR_PTR (-EINVAL ); -if (rcdev->of_xlate &&is_of_node (consumer)) { -struct device_node *np =to_of_node (consumer); +if (rcdev->of_xlate &&is_of_node (fwnode)) { +struct device_node *np =to_of_node (fwnode);struct of_phandle_args of_args;int ret; - ret =of_parse_phandle_with_args (np, +if (consumer) { + ret =of_parse_phandle_with_args (np, gpio_fallback ?"reset-gpios" :"resets" , gpio_fallback ?"#gpio-cells" :"#reset-cells" , gpio_fallback ?0 : index, &of_args); -if (ret) -return ERR_PTR (ret); +if (ret) +return ERR_PTR (ret); + }else { +for (unsigned int i =0 ; i < args->nargs; i++) { +if (args->args[i] >U32_MAX ) +return ERR_PTR (-EINVAL ); + + of_args.args[i] = args->args[i]; + } + of_args.np =of_node_get (np); + of_args.args_count = args->nargs; + } rstc_id = rcdev->of_xlate (rcdev, &of_args);of_node_put (of_args.np);
@@ -1254,6 +1266,24 @@ struct reset_control *__reset_control_get(struct device *dev, const char *id, }EXPORT_SYMBOL_GPL (__reset_control_get); +/** +* reset_control_get_from_provider_exclusive - Lookup and obtain an exclusive +* reference to a reset controller. +* @args: Reference to the reset controller provider with all the args like +* reset number. This must not be a reference to a GPIO provider. +* +* Returns a struct reset_control or IS_ERR() condition containing errno. +* If this function is called more than once for the same reset control it will +* return -EBUSY. +*/ +struct reset_control * +reset_control_get_from_provider_exclusive (const struct fwnode_reference_args *args) +{ +return __reset_control_get_from_provider (args,NULL ,0 , false, +RESET_CONTROL_EXCLUSIVE ); +} +EXPORT_SYMBOL_GPL (reset_control_get_from_provider_exclusive); +int __reset_control_bulk_get (struct device *dev,int num_rstcs,struct reset_control_bulk_data *rstcs,enum reset_control_flags flags)
include/linux/reset.h +8 -0
@@ -90,6 +90,8 @@ struct reset_control *__fwnode_reset_control_get(struct fwnode_handle *fwnode, const char *id, int index, enum reset_control_flags flags);struct reset_control *__reset_control_get (struct device *dev,const char *id,int index,enum reset_control_flags flags); +struct reset_control *reset_control_get_from_provider_exclusive ( +const struct fwnode_reference_args *args);void reset_control_put (struct reset_control *rstc); int __reset_control_bulk_get(struct device *dev, int num_rstcs, struct reset_control_bulk_data *rstcs,
@@ -173,6 +175,12 @@ static inline struct reset_control *__reset_control_get(return optional ?NULL :ERR_PTR (-ENOTSUPP ); } +static inline struct reset_control *reset_control_get_from_provider_exclusive ( +const struct fwnode_reference_args *args) +{ +return ERR_PTR (-ENOTSUPP ); +} +static inline int reset_control_bulk_reset (int num_rstcs,struct reset_control_bulk_data *rstcs) {
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 8/15 pmdomain: Make genpd_get_from_provider() always return on first match
In reply to Geert UytterhoevenThe for-loop in genpd_get_from_provider() seems to imply that one can have multiple providers for the same node: in case a provider's callback fails to map a specifier to a PM domain, the loop continues looking for another matching provider.
While technically one can register multiple providers for the same device node, one can never safely remove one of them:of_genpd_del_provider() just considers the device node, and removes the first matching provider.
Use the same logic in genpd_get_from_provider() to avoid confusion.
---
v5:
- New.
--- drivers/pmdomain/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pmdomain/core.c +2 -2
@@ -3031,10 +3031,10 @@ static struct generic_pm_domain *genpd_get_from_provider(/* Check if we have such a provider in our array */ list_for_each_entry (provider, &of_genpd_providers, link) { -if (provider->node == genpdspec->np) +if (provider->node == genpdspec->np) { genpd = provider->xlate (genpdspec, provider->data); -if (!IS_ERR (genpd))break ; + } }mutex_unlock (&of_genpd_mutex);
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 9/15 pmdomain: Make genpd_get_from_provider() return -EPROBE_DEFER
In reply to Geert UytterhoevenUnlike provider-based look-up functions in other subsystems[1], genpd_get_from_provider() returns -ENOENT instead of -EPROBE_DEFER when the provider is not found, thus not supporting probe deferral. Currently this is worked around in of_genpd_add_subdomain() by remapping -ENOENT[2]; other callsites don't care about the actual error code.
Fix this for all current and future callers by returning -EPROBE_DEFER instead, and drop the no longer needed remapping code.
[1] of_clk_get_hw_from_clkspec(), __fwnode_reset_control_get()),
[2] Commit 18027d6f392ee8d8 ("PM: domains: Make of_genpd_add_subdomain() return -EPROBE_DEFER").
---
v5:
- Add Tested-by,
- Clarify that all other callsites should be fine.
v4:
- New.
--- drivers/pmdomain/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pmdomain/core.c +2 -2
@@ -3021,7 +3021,7 @@ EXPORT_SYMBOL_GPL(of_genpd_del_provider);static struct generic_pm_domain *genpd_get_from_provider (const struct of_phandle_args *genpdspec) { -struct generic_pm_domain *genpd =ERR_PTR (-ENOENT ); +struct generic_pm_domain *genpd =ERR_PTR (-EPROBE_DEFER );struct of_genpd_provider *provider;if (!genpdspec)
@@ -3276,7 +3276,7 @@ int of_genpd_add_subdomain(const struct of_phandle_args *parent_spec, out:mutex_unlock (&gpd_list_lock); -return ret == -ENOENT ? -EPROBE_DEFER : ret; +return ret; }EXPORT_SYMBOL_GPL (of_genpd_add_subdomain);
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 10/15 pmdomain: Make genpd_get_from_provider() public
In reply to Geert UytterhoevenUnlike the corresponding function in the clock subsystem[1], genpd_get_from_provider() is private, and thus cannot be used by PM Domain drivers.
Make it public, so the R-Car X5H Module Controller driver can call it. Add an "of_"-prefix for consistency with public genpd function naming.
[1] of_clk_get_from_provider().
---
v5:
- Add Tested-by,
v4:
- Improve patch description,
v3:
- Add "of_" prefix,
v2:
- No changes.
--- drivers/pmdomain/core.c | 22 +++++++++++----------- include/linux/pm_domain.h | 7 +++++++ 2 files changed, 18 insertions(+), 11 deletions(-)
drivers/pmdomain/core.c +11 -11
@@ -3008,7 +3008,7 @@ void of_genpd_del_provider(struct device_node *np)EXPORT_SYMBOL_GPL (of_genpd_del_provider);/** -* genpd_get_from_provider() - Look-up PM domain +* of_genpd_get_from_provider() - Look-up PM domain * @genpdspec: OF phandle args to use for look-up * * Looks for a PM domain provider under the node specified by @genpdspec and if
@@ -3018,8 +3018,7 @@ EXPORT_SYMBOL_GPL(of_genpd_del_provider);* Returns a valid pointer to struct generic_pm_domain on success or ERR_PTR() * on failure. */ -static struct generic_pm_domain *genpd_get_from_provider ( -const struct of_phandle_args *genpdspec) +struct generic_pm_domain *of_genpd_get_from_provider (const struct of_phandle_args *genpdspec) {struct generic_pm_domain *genpd =ERR_PTR (-EPROBE_DEFER );struct of_genpd_provider *provider;
@@ -3041,6 +3040,7 @@ static struct generic_pm_domain *genpd_get_from_provider(return genpd; } +EXPORT_SYMBOL_GPL (of_genpd_get_from_provider);/** * of_genpd_add_child_ids() - Parse power-domains-child-ids property
@@ -3113,7 +3113,7 @@ int of_genpd_add_child_ids(struct device_node *np, goto err_unwind;/* Get the parent domain */ - parent_genpd =genpd_get_from_provider (&parent_args); + parent_genpd =of_genpd_get_from_provider (&parent_args);of_node_put (parent_args.np);if (IS_ERR (parent_genpd)) { pr_err("Failed to get parent domain for %pOF: %ld\n",
@@ -3196,7 +3196,7 @@ int of_genpd_remove_child_ids(struct device_node *np,if (ret)continue ; - parent_genpd =genpd_get_from_provider (&parent_args); + parent_genpd =of_genpd_get_from_provider (&parent_args);of_node_put (parent_args.np);if (IS_ERR (parent_genpd))continue ;
@@ -3227,7 +3227,7 @@ int of_genpd_add_device(const struct of_phandle_args *genpdspec, struct device *mutex_lock (&gpd_list_lock); - genpd =genpd_get_from_provider (genpdspec); + genpd =of_genpd_get_from_provider (genpdspec);if (IS_ERR (genpd)) { ret =PTR_ERR (genpd); goto out;
@@ -3259,13 +3259,13 @@ int of_genpd_add_subdomain(const struct of_phandle_args *parent_spec,mutex_lock (&gpd_list_lock); - parent =genpd_get_from_provider (parent_spec); + parent =of_genpd_get_from_provider (parent_spec);if (IS_ERR (parent)) { ret =PTR_ERR (parent); goto out; } - subdomain =genpd_get_from_provider (subdomain_spec); + subdomain =of_genpd_get_from_provider (subdomain_spec);if (IS_ERR (subdomain)) { ret =PTR_ERR (subdomain); goto out;
@@ -3297,13 +3297,13 @@ int of_genpd_remove_subdomain(const struct of_phandle_args *parent_spec,mutex_lock (&gpd_list_lock); - parent =genpd_get_from_provider (parent_spec); + parent =of_genpd_get_from_provider (parent_spec);if (IS_ERR (parent)) { ret =PTR_ERR (parent); goto out; } - subdomain =genpd_get_from_provider (subdomain_spec); + subdomain =of_genpd_get_from_provider (subdomain_spec);if (IS_ERR (subdomain)) { ret =PTR_ERR (subdomain); goto out;
@@ -3491,7 +3491,7 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,return ret;mutex_lock (&gpd_list_lock); - pd =genpd_get_from_provider (&pd_args); + pd =of_genpd_get_from_provider (&pd_args);of_node_put (pd_args.np);if (IS_ERR (pd)) {mutex_unlock (&gpd_list_lock);
include/linux/pm_domain.h +7 -0
@@ -467,6 +467,7 @@ int of_genpd_add_provider_simple(struct device_node *np,int of_genpd_add_provider_onecell (struct device_node *np,struct genpd_onecell_data *data);void of_genpd_del_provider (struct device_node *np); +struct generic_pm_domain *of_genpd_get_from_provider (const struct of_phandle_args *genpdspec);int of_genpd_add_device (const struct of_phandle_args *args,struct device *dev);int of_genpd_add_subdomain (const struct of_phandle_args *parent_spec,const struct of_phandle_args *subdomain_spec);
@@ -501,6 +502,12 @@ static inline int of_genpd_add_provider_onecell(struct device_node *np,static inline void of_genpd_del_provider (struct device_node *np) {} +static inline struct generic_pm_domain *of_genpd_get_from_provider ( +const struct of_phandle_args *genpdspec) +{ +return ERR_PTR (-ENODEV ); +} +static inline int of_genpd_add_device (const struct of_phandle_args *args,struct device *dev) {
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 11/15 pmdomain: renesas: r8a78000: Drop MDLC name comment
In reply to Geert UytterhoevenThere is no need to document Module Controller base addresses in mdlc_info tables, as a mod_map initializer already contains the Module Controller's name.
---
v5:
- New.
--- drivers/pmdomain/renesas/r8a78000-mdlc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pmdomain/renesas/r8a78000-mdlc.c +1 -1
@@ -299,7 +299,7 @@ static const struct mod_map r8a78000_mdlc_perw_mod_default[] = {static const struct mdlc_info r8a78000_mdlc_default[] = { { - .base =0xc05d0000 /* mdlc_perw */ , + .base =0xc05d0000 , .mod_map = r8a78000_mdlc_perw_mod_default, }, {/* sentinel */ }
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 12/15 pmdomain: renesas: r8a78000: Replace sentinel by explicit ID map size
In reply to Geert UytterhoevenThe use of a sentinel in the module ID mapping array will become cumbersome when the need arises to find out the actual number of elements in the array. Rework the mapping data structure to fix this, also improving naming. Let mod_id_map_find() return an index, to be used for indexing additional mapping target arrays later. Add a MOD_ID_MAP() initialization macro for brevity.
While at it, drop the check for "!map" in mod_id_map_find(), as that pointer can never be NULL.
---
v5:
- New.
--- drivers/pmdomain/renesas/r8a78000-mdlc.c | 49 +++++++++++++----------- 1 file changed, 27 insertions(+), 22 deletions(-)
drivers/pmdomain/renesas/r8a78000-mdlc.c +27 -22
@@ -16,13 +16,23 @@#include <dt-bindings/power/renesas,r8a78000-mdlc.h> -struct mod_map { -int hw_id;/* Hardware module ID or -1 sentinel */ +struct mod_id_map_entry { +u32 hw_id;/* Hardware module ID */ }; +struct mod_id_map { +const struct mod_id_map_entry *entries; +unsigned int size; +}; + +#define MOD_ID_MAP (_entries) .mod_map = &(struct mod_id_map) { \ + .entries = _entries, \ + .size = ARRAY_SIZE(_entries), \ +} +struct mdlc_info {u32 base; -const struct mod_map *mod_map; +const struct mod_id_map *mod_map; };/**
@@ -41,7 +51,7 @@ struct r8a78000_mdlc_priv {struct reset_controller_dev rcdev;struct device *dev;struct device_node *np; -const struct mod_map *mod_map; +const struct mod_id_map *mod_map; };static struct generic_pm_domain *r8a78000_genpd_always_on;
@@ -77,17 +87,14 @@ static struct generic_pm_domain *r8a78000_genpd_xlate(#define rcdev_to_priv (_rcdev) \ container_of(_rcdev, struct r8a78000_mdlc_priv, rcdev) -static const struct mod_map *mod_map_find (const struct mod_map *map,u32 id) +static int mod_id_map_find (const struct mod_id_map *map,u32 hw_id) { -if (!map) -return NULL ; - -for (; map->hw_id >=0 ; map++) { -if (map->hw_id == id) -return map; +for (unsigned int i =0 ; i < map->size; i++) { +if (map->entries[i].hw_id == hw_id) +return i; } -return NULL ; +return -1 ; } static int r8a78000_mdlc_reset_xlate(struct reset_controller_dev *rcdev,
@@ -95,7 +102,7 @@ static int r8a78000_mdlc_reset_xlate(struct reset_controller_dev *rcdev, {struct r8a78000_mdlc_priv *priv =rcdev_to_priv (rcdev);struct device *dev = priv->dev; -const struct mod_map *map; +int idx;u32 id;if (spec->args_count !=1 )
@@ -103,8 +110,8 @@ static int r8a78000_mdlc_reset_xlate(struct reset_controller_dev *rcdev, id = spec->args[0 ]; - map =mod_map_find (priv->mod_map, id); -if (!map) { + idx =mod_id_map_find (priv->mod_map, id); +if (idx <0 ) {dev_err (dev,"Unknown reset 0x%x\n" , id);return -ENOENT ; }
@@ -141,9 +148,8 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain,struct device_node *np = dev->of_node;struct r8a78000_mdlc_priv *priv;struct of_phandle_args pd_spec; -const struct mod_map *map;unsigned int id; -int ret; +int ret, idx; ret =of_parse_phandle_with_args (np,"power-domains" ,"#power-domain-cells" ,0 , &pd_spec);
@@ -166,8 +172,8 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, id = pd_spec.args[1 ];of_node_put (pd_spec.np); - map =mod_map_find (priv->mod_map, id); -if (!map) { + idx =mod_id_map_find (priv->mod_map, id); +if (idx <0 ) {dev_err (dev,"Unknown module 0x%x\n" , id);return -ENOENT ; }
@@ -292,15 +298,14 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)return 0 ; } -static const struct mod_map r8a78000_mdlc_perw_mod_default[] = { +static const struct mod_id_map_entry r8a78000_mdlc_perw_mod_default[] = { {0x54 },/* HSCIF0 */ - {-1 } };static const struct mdlc_info r8a78000_mdlc_default[] = { { .base =0xc05d0000 , - .mod_map = r8a78000_mdlc_perw_mod_default, +MOD_ID_MAP (r8a78000_mdlc_perw_mod_default), }, {/* sentinel */ } };
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 13/15 pmdomain: renesas: r8a78000: Shrink IDs to 16 bits
In reply to Geert UytterhoevenReduce table size by shrinking hardware module IDs from 32 to 16 bits, which is still plenty.
While at it, use u32 to store of_phandle_args.args[1] in r8a78000_mdlc_attach_dev().
---
v5:
- New.
--- drivers/pmdomain/renesas/r8a78000-mdlc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pmdomain/renesas/r8a78000-mdlc.c +2 -2
@@ -17,7 +17,7 @@#include <dt-bindings/power/renesas,r8a78000-mdlc.h> struct mod_id_map_entry { -u32 hw_id;/* Hardware module ID */ +u16 hw_id;/* Hardware module ID */ };struct mod_id_map {
@@ -148,8 +148,8 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain,struct device_node *np = dev->of_node;struct r8a78000_mdlc_priv *priv;struct of_phandle_args pd_spec; -unsigned int id;int ret, idx; +u32 id; ret =of_parse_phandle_with_args (np,"power-domains" ,"#power-domain-cells" ,0 , &pd_spec);
Signature · 1 line
2.43.0
Geert Uytterhoeven
maintainerPATCH v5 14/15 pmdomain: renesas: r8a78000: Add SCMI remapping support
In reply to Geert UytterhoevenExtend the Module Controller driver for R-Car X5H with SCMI support, to remap hardware power domain, module, and reset IDs to abstractions (power domains, clocks, and resets) offered by the SCMI firmware when running on a system with SCMI, and SCMI support is enabled. Take into account some peculiarities of the current SCMI firmware implementations, like missing handling of gateable functional clock parents. Support for power domains, and module clocks and resets used by serial, I2C, and SPI devices is included.
Note that SCMI clocks representing hardware modules expose access to Module Standby control: they are fake clocks, with a zero clock rate, that can just be enabled and disabled. Hence they are controlled from the clock domain's start/stop callbacks, together with gateable functional clock parents.
This lets us avoid putting SCMI IDs in DT, and allows us to use the same hardware description in SoC DTS for systems with and without SCMI firmware.
For now, it is assumed SCMI power domain, clock, and reset IDs are stable, and match SCP FW SDKv4.31.0 and later.
---
v5:
- Add Tested-by,
- Rebase,
- Shrink hardware power domain IDs and firmware IDs to 16 bits,
- Replace unified power_map and mod_map by keeping the original power_id_map and mod_id_map, and adding separate arrays of genpd and reset_control pointers,
- Let power_id_map_find() and mod_id_map_find() return indices,
- Unify "Mapping HW power domain 0x%x to ..." debug prints in
r8a78000_genpd_xlate(),
- Move check for non-existent SCMI clock inside scmi_get_clk(),
- Add support for missing SCMI firmware IDs indicated by -1,
- Fix double clk_put() in pm_clk_add_clk() error handling,
- Replace devm_kcalloc() by devm_kzalloc_objs(),
- Fix reset control leaks in fill_mod_map() error path,
- Replace fill_power_map() and fill_mod_map() by get_genpds() resp.
get_rstcs(), - Fix scmi_clk_np reference leak by marking it __free(), and retaining it explicitly on probe success.
- Drop unneeded mdlc name comments from r8a78000_mdlc_fw[],
v4:
- Let r8a78000_mdlc_attach_dev() return success when the MDLC instance is not found, to avoid breaking users referring in DT to an SCMI power-domain directly,
- Mark scmi_{reset,power}_np __free(device_node),
- Extract scmi_get_clk(),
- Add support for gateable fck parents,
- Assume all SCMI clock IDs are stable, and drop support for handling different ID spaces,
- Include initial mapping table for SCP FW SDKv4.31.0 and later,
- Propagate all reset failures, as SCP FW SDKv4.28.0 which restricted HSCIF0 reset is no longer supported,
- Drop renesas,scmi-firmware support, just find an arm,scmi node instead,
- Fall back to the non-SCMI defaults when any of SCMI power domain, clock, or reset support is disabled,
v3:
- Rebase to v7.3-rc1,
- Consistently use /* sentinel */ for zero sentinels,
- s/genpd_get_from_provider/of_genpd_get_from_provider/,
- s/firmware/renesas,scmi-firmware/,
- Replace reset_controller_get_provider() by reset_control_get_from_provider_exclusive(),
- Call reset_control_*() APIs instead of internal reset_control_ops methods,
- Rename struct mod_map to struct mod_map_in,
- Add struct mod_map, which also contains a reset_control pointer,
- Add fill_mod_map() to obtain all SCMI reset_control structures up-front, as one can no longer use lazy look-up,
- Prefix DEFINE_MDLC_RESET_WRAPPER() parameters with underscores,
- Reword,
v2:
- Spin off from "pmdomain: renesas: Add R-Car X5H MDLC SCMI remapping driver".
- Propagate error codes from scmi_get_base_info() now it can return -EPROBE_DEFER,
- Improve error message on scmi_get_base_info() failure,
- Check if SCMI firmware node is available,
- Replace scmi_power_np and scmi_reset_np members of struct r8a78000_mdlc_priv by local variables in r8a78000_mdlc_probe(), and pass the former to fill_power_map(),
- Move check for supported firmware version up,
- Fall back to the default support when SCMI support or firmware is not available, or when the detected SCMI firmware version is not supported by the driver,
- Drop mapping tables.
--- drivers/pmdomain/renesas/r8a78000-mdlc.c | 408 +++++++++++++++++++++-- 1 file changed, 383 insertions(+), 25 deletions(-)
drivers/pmdomain/renesas/r8a78000-mdlc.c +383 -25
@@ -5,19 +5,41 @@* Copyright (C) 2026 Glider bv */ +#include <linux/cleanup.h> +#include <linux/clk.h> #include <linux/dev_printk.h> #include <linux/device-id/of.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> +#include <linux/pm_clock.h> #include <linux/pm_domain.h> #include <linux/reset-controller.h> +#include <linux/reset.h> +#include <linux/scmi_protocol.h> #include <linux/slab.h> #include <dt-bindings/power/renesas,r8a78000-mdlc.h> +struct power_id_map_entry { +u16 hw_id;/* Hardware power domain ID */ +u16 fw_id;/* SCMI firmware power domain ID */ +}; + +struct power_id_map { +const struct power_id_map_entry *entries; +unsigned int size; +}; + +#define POWER_ID_MAP (_entries) .power_map = &(struct power_id_map) { \ + .entries = _entries, \ + .size = ARRAY_SIZE(_entries), \ +} +struct mod_id_map_entry {u16 hw_id;/* Hardware module ID */ +s16 fw_id;/* SCMI clock (= reset) ID or -1 */ +s16 fw_fck_parent;/* SCMI functional clock parent ID or -1 */ };struct mod_id_map {
@@ -32,9 +54,15 @@ struct mod_id_map {struct mdlc_info {u32 base; +const struct power_id_map *power_map;const struct mod_id_map *mod_map; }; +struct mdlc_data { +const struct mdlc_info *default_info; +const struct mdlc_info *fw_info; +}; +/** * struct r8a78000_mdlc_priv - Module Controller Private Data *
@@ -43,7 +71,11 @@ struct mdlc_info {* @rcdev: Reset controller entity * @dev: MDLC device * @np: Device node in DT representing the MDLC -* @mod_map: Mapping from hardware module IDs +* @scmi_clk_np: Device node in DT for the SCMI firmware clock protocol +* @power_map: Mapping from hardware power domain IDs to SCMI power domain IDs +* @mod_map: Mapping from hardware module IDs to SCMI clock and reset IDs +* @genpds: Power domains, indexed by @power_map entry index +* @rstcs: Reset controls, indexed by @mod_map entry index */ struct r8a78000_mdlc_priv {struct hlist_node link;
@@ -51,7 +83,11 @@ struct r8a78000_mdlc_priv {struct reset_controller_dev rcdev;struct device *dev;struct device_node *np; +struct device_node *scmi_clk_np; +const struct power_id_map *power_map;const struct mod_id_map *mod_map; +struct generic_pm_domain **genpds; +struct reset_control **rstcs; };static struct generic_pm_domain *r8a78000_genpd_always_on;
@@ -59,12 +95,27 @@ static struct generic_pm_domain *r8a78000_genpd_always_on;static HLIST_HEAD (r8a78000_mdlc_list);static DEFINE_MUTEX (r8a78000_mdlc_lock);/* protects the list above */ +static int power_id_map_find (const struct power_id_map *map,u32 hw_id) +{ +if (!map) +return -1 ; + +for (unsigned int i =0 ; i < map->size; i++) { +if (map->entries[i].hw_id == hw_id) +return i; + } + +return -1 ; +} +static struct generic_pm_domain *r8a78000_genpd_xlate (const struct of_phandle_args *spec,void *data) {struct r8a78000_mdlc_priv *priv =container_of (data, struct r8a78000_mdlc_priv, genpd_data); +struct generic_pm_domain *genpd;struct device *dev = priv->dev; +int idx;u32 id;if (spec->args_count !=2 )
@@ -73,15 +124,22 @@ static struct generic_pm_domain *r8a78000_genpd_xlate( id = spec->args[0 ];if (id >=R8A78000_MDLC_PD_AON ) { -dev_dbg (dev, -"Mapping HW power domain 0x%x to always-on domain\n" , - id); -return r8a78000_genpd_always_on; + genpd = r8a78000_genpd_always_on; + goto found; } -/* For now only always-on domains are supported */ -dev_err (dev,"Unknown power domain 0x%x\n" , id); -return ERR_PTR (-ENOENT ); + idx =power_id_map_find (priv->power_map, id); +if (idx <0 ) { +dev_err (dev,"Unknown power domain 0x%x\n" , id); +return ERR_PTR (-ENOENT ); + } + + genpd = priv->genpds[idx]; + +found: +dev_dbg (dev,"Mapping HW power domain 0x%x to %s\n" , id, genpd->name); + +return genpd; }#define rcdev_to_priv (_rcdev) \
@@ -116,18 +174,22 @@ static int r8a78000_mdlc_reset_xlate(struct reset_controller_dev *rcdev,return -ENOENT ; } -dev_dbg (dev,"Ignoring HW reset 0x%x\n" , id); -return id; +if (!priv->rstcs[idx]) +dev_dbg (dev,"Ignoring HW reset 0x%x\n" , id); +else +dev_dbg (dev,"Mapping HW reset 0x%x to SCMI reset %d\n" , id, + priv->mod_map->entries[idx].fw_id); + +return idx; } -#define DEFINE_MDLC_RESET_WRAPPER (op) \ - static int r8a78000_mdlc_ ## op(struct reset_controller_dev *rcdev, \ - unsigned long id) \ - { \ - struct r8a78000_mdlc_priv *priv = rcdev_to_priv(rcdev); \ - \ - dev_dbg(priv->dev, "%s: Ignoring\n", __func__); \ - return 0; \ +#define DEFINE_MDLC_RESET_WRAPPER (_op) \ + static int r8a78000_mdlc_ ## _op(struct reset_controller_dev *rcdev, \ + unsigned long id) \ + { \ + struct r8a78000_mdlc_priv *priv = rcdev_to_priv(rcdev); \ + \ + return reset_control_ ## _op(priv->rstcs[id]); \ }DEFINE_MDLC_RESET_WRAPPER (reset)
@@ -142,12 +204,51 @@ static const struct reset_control_ops r8a78000_mdlc_reset_ops = { .status = r8a78000_mdlc_status, }; +static struct device_node *scmi_find_proto (struct device_node *scmi,u32 proto) +{ +for_each_available_child_of_node_scoped (scmi, child) { +u32 reg; + +if (of_property_read_u32 (child,"reg" , ®)) +continue ; + +if (reg == proto) +return_ptr (child); + } + +return NULL ; +} + +static struct clk *scmi_get_clk (struct device *dev,struct device_node *np, +s16 fw_id) +{ +struct of_phandle_args scmi_spec = { + .np = np, + .args_count =1 , + .args[0 ] = fw_id, + }; +struct clk *clk; + +if (fw_id <0 ) +return NULL ; + + clk =of_clk_get_from_provider (&scmi_spec); +if (IS_ERR (clk)) +dev_err (dev,"Cannot get SCMI clock %d: %pe\n" , fw_id, clk); +else +dev_dbg (dev,"SCMI clock %d is %pC\n" , fw_id, clk); + +return clk; +} +static int r8a78000_mdlc_attach_dev (struct generic_pm_domain *domain,struct device *dev) {struct device_node *np = dev->of_node; +const struct mod_id_map_entry *entry;struct r8a78000_mdlc_priv *priv;struct of_phandle_args pd_spec; +struct clk *clk, *parent;int ret, idx;u32 id;
@@ -164,9 +265,10 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, }if (!priv) { -dev_err (dev,"%s: MDLC %pOF not found\n" , __func__, pd_spec.np); +dev_warn (dev,"%s: Ignoring non-MDLC %pOF\n" , __func__, + pd_spec.np);of_node_put (pd_spec.np); -return -ENODEV ; +return 0 ; } id = pd_spec.args[1 ];
@@ -178,8 +280,148 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain,return -ENOENT ; } -dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +if (!priv->scmi_clk_np) { +dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +return 0 ; + } + + entry = &priv->mod_map->entries[idx]; +dev_dbg (dev,"Mapping HW module 0x%x to SCMI clock %d fck parent %d\n" , + id, entry->fw_id, entry->fw_fck_parent); + + clk =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_id); +if (IS_ERR (clk)) +return PTR_ERR (clk); + + parent =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_fck_parent); +if (IS_ERR (parent)) { + ret =PTR_ERR (parent); + goto fail_put_clk; + } + +if (!clk && !parent) { +/* Ignore missing SCMI clocks */ +return 0 ; + } + + ret =pm_clk_create (dev); +if (ret) + goto fail_put_parent; + +if (parent) { + ret =pm_clk_add_clk (dev, parent); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_parent; + } + } +if (clk) { + ret =pm_clk_add_clk (dev, clk); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_clk; + } + }return 0 ; + +fail_put_parent: +clk_put (parent); +fail_put_clk: +clk_put (clk); +return ret; +} + +static void r8a78000_mdlc_detach_dev (struct generic_pm_domain *domain, +struct device *dev) +{ +if (!pm_clk_no_clocks (dev)) +pm_clk_destroy (dev); +} + +static struct generic_pm_domain **get_genpds (struct r8a78000_mdlc_priv *priv, +struct device_node *scmi_power_np) +{ +const struct power_id_map *map = priv->power_map; +struct generic_pm_domain **genpds, *genpd; +struct of_phandle_args scmi_spec; +struct device *dev = priv->dev; +u16 fw_id; + +if (!map) +return NULL ; + + genpds =devm_kzalloc_objs (dev, *genpds, map->size); +if (!genpds) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < map->size; i++) { + fw_id = map->entries[i].fw_id; + + scmi_spec.np = scmi_power_np; + scmi_spec.args_count =1 ; + scmi_spec.args[0 ] = fw_id; + + genpd =of_genpd_get_from_provider (&scmi_spec); +if (IS_ERR (genpd)) +return dev_err_cast_probe (dev, genpd, +"Failed to get SCMI power domain %u\n" , + fw_id); + +dev_dbg (dev,"SCMI power domain %u is %s\n" , fw_id, + genpd->name); + + genpds[i] = genpd; + +/* Hook up clock domain support */ + genpd->attach_dev = r8a78000_mdlc_attach_dev; + genpd->detach_dev = r8a78000_mdlc_detach_dev; +/* Setting flags this late has no impact, but does not hurt */ + genpd->flags |=GENPD_FLAG_PM_CLK ; + genpd->dev_ops.stop = pm_clk_suspend; + genpd->dev_ops.start = pm_clk_resume; + } + +return genpds; +} + +static struct reset_control **get_rstcs (struct r8a78000_mdlc_priv *priv, +struct fwnode_handle *scmi_reset_fwnode) +{ +const struct mod_id_map *map = priv->mod_map; +struct fwnode_reference_args scmi_spec; +struct reset_control **rstcs, *rstc; +struct device *dev = priv->dev; +s16 fw_id; + +if (!map) +return NULL ; + + rstcs =devm_kzalloc_objs (dev, *rstcs, map->size); +if (!rstcs) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < map->size; i++) { + fw_id = map->entries[i].fw_id; +if (!scmi_reset_fwnode || fw_id <0 ) +continue ; + + scmi_spec.fwnode = scmi_reset_fwnode; + scmi_spec.nargs =1 ; + scmi_spec.args[0 ] = fw_id; + + rstc =reset_control_get_from_provider_exclusive (&scmi_spec); +if (IS_ERR (rstc)) { +while (i--) +reset_control_put (rstcs[i]); + +return dev_err_cast_probe (dev, rstc, +"Failed to get SCMI reset %u\n" , fw_id); + } + + rstcs[i] = rstc; + } + +return rstcs; }static void r8a78000_mdlc_unlink (void *data)
@@ -213,6 +455,8 @@ static int r8a78000_genpd_always_on_singleton(struct device *dev) genpd->name ="always-on" ; genpd->attach_dev = r8a78000_mdlc_attach_dev; + genpd->detach_dev = r8a78000_mdlc_detach_dev; + genpd->flags |=GENPD_FLAG_PM_CLK ; ret =pm_genpd_init (genpd, &pm_domain_always_on_gov, false);if (ret) {
@@ -227,8 +471,13 @@ static int r8a78000_genpd_always_on_singleton(struct device *dev)static int r8a78000_mdlc_probe (struct platform_device *pdev) { + struct device_node *scmi_reset_np __free(device_node) = NULL; + struct device_node *scmi_power_np __free(device_node) = NULL; + struct device_node *scmi_clk_np __free(device_node) = NULL; + struct device_node *scmi __free(device_node) = NULL;struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; +const struct mdlc_data *mdlc_data;struct r8a78000_mdlc_priv *priv;const struct mdlc_info *info;struct resource *res;
@@ -238,10 +487,12 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)if (ret)return ret; - info =of_device_get_match_data (dev); -if (!info) + mdlc_data =of_device_get_match_data (dev); +if (!mdlc_data)return -ENODEV ; + info = mdlc_data->default_info; + priv =devm_kzalloc_obj (dev, *priv);if (!priv)return -ENOMEM ;
@@ -249,6 +500,47 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev) priv->dev = dev; priv->np = np; +if (!IS_ENABLED (CONFIG_ARM_SCMI_POWER_DOMAIN ) || + !IS_ENABLED (CONFIG_COMMON_CLK_SCMI ) || + !IS_ENABLED (CONFIG_RESET_SCMI )) { +dev_dbg (dev,"SCMI pmdomain/clock/reset support is disabled\n" ); + goto fallback; + } + + scmi =of_find_compatible_node (NULL ,NULL ,"arm,scmi" ); +if (!scmi) { +dev_dbg (dev,"Cannot find SCMI firmware node\n" ); + goto fallback; + } + +if (!of_device_is_available (scmi)) { +dev_dbg (dev,"SCMI firmware node is not available\n" ); + goto fallback; + } + + scmi_power_np =scmi_find_proto (scmi,SCMI_PROTOCOL_POWER ); +if (!scmi_power_np) { +dev_dbg (dev, +"Cannot find SCMI power domain management protocol\n" ); + goto fallback; + } + + scmi_clk_np =scmi_find_proto (scmi,SCMI_PROTOCOL_CLOCK ); +if (!scmi_clk_np) { +dev_dbg (dev,"Cannot find SCMI clock management protocol\n" ); + goto fallback; + } + + scmi_reset_np =scmi_find_proto (scmi,SCMI_PROTOCOL_RESET ); +if (!scmi_reset_np) { +dev_dbg (dev,"Cannot find SCMI reset management protocol\n" ); + goto fallback; + } + + priv->scmi_clk_np = scmi_clk_np; + info = mdlc_data->fw_info; + +fallback: res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );if (!res)return -ENODEV ;
@@ -263,8 +555,25 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)return -ENODEV ; } + priv->power_map = info->power_map; priv->mod_map = info->mod_map; +/* +* We cannot do lazy look-up in r8a78000_genpd_xlate(), as that +* function is called with of_genpd_mutex already held. +*/ + priv->genpds =get_genpds (priv, scmi_power_np); +if (IS_ERR (priv->genpds)) +return PTR_ERR (priv->genpds); + +/* +* We cannot do lazy look-up in r8a78000_mdlc_reset_xlate(), as that +* function is called with reset_list_mutex already held. +*/ + priv->rstcs =get_rstcs (priv,of_fwnode_handle (scmi_reset_np)); +if (IS_ERR (priv->rstcs)) +return PTR_ERR (priv->rstcs); + scoped_guard(mutex, &r8a78000_mdlc_lock) {hlist_add_head (&priv->link, &r8a78000_mdlc_list); }
@@ -295,11 +604,14 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)return dev_err_probe (dev, ret,"Failed to register reset controller\n" ); +/* Retained in priv->scmi_clk_np */ +retain_and_null_ptr (scmi_clk_np); +return 0 ; }static const struct mod_id_map_entry r8a78000_mdlc_perw_mod_default[] = { - {0x54 },/* HSCIF0 */ + {0x54 ,-1 ,-1 },/* HSCIF0 */ };static const struct mdlc_info r8a78000_mdlc_default[] = {
@@ -310,10 +622,56 @@ static const struct mdlc_info r8a78000_mdlc_default[] = { {/* sentinel */ } }; +static const struct mod_id_map_entry r8a78000_mdlc_perw_mod_fw[] = { + {0x40 ,205 ,-1 },/* SCIF0 */ + {0x41 ,206 ,-1 },/* SCIF1 */ + {0x42 ,207 ,-1 },/* SCIF3 */ + {0x43 ,208 ,-1 },/* SCIF4 */ + {0x44 ,209 ,-1 },/* I2C1 */ + {0x45 ,210 ,-1 },/* I2C2 */ + {0x46 ,211 ,-1 },/* I2C3 */ + {0x47 ,212 ,-1 },/* I2C4 */ + {0x48 ,213 ,-1 },/* I2C5 */ + {0x49 ,214 ,-1 },/* I2C6 */ + {0x4a ,215 ,-1 },/* I2C7 */ + {0x4b ,216 ,-1 },/* I2C8 */ + {0x4f ,220 ,1667 },/* MSI4 / MSOCK_PERW_BUS */ + {0x50 ,221 ,1667 },/* MSI5 / MSOCK_PERW_BUS */ + {0x51 ,222 ,1667 },/* MSI6 / MSOCK_PERW_BUS */ + {0x52 ,223 ,1667 },/* MSI7 / MSOCK_PERW_BUS */ + {0x54 ,224 ,-1 },/* HSCIF0 */ + {0x55 ,225 ,-1 },/* HSCIF1 */ + {0x56 ,226 ,-1 },/* HSCIF2 */ + {0x57 ,227 ,-1 },/* HSCIF3 */ +}; + +static const struct mod_id_map_entry r8a78000_mdlc_scp_mod_fw[] = { + {0x50 ,776 ,1459 },/* MSI0 / MSO_SCP_MAIN */ + {0x51 ,777 ,1459 },/* MSI1 / MSO_SCP_MAIN */ + {0x52 ,778 ,1459 },/* MSI2 / MSO_SCP_MAIN */ + {0x53 ,779 ,1459 },/* MSI3 / MSO_SCP_MAIN */ +}; + +static const struct mdlc_info r8a78000_mdlc_fw[] = { + { + .base =0xc05d0000 , +MOD_ID_MAP (r8a78000_mdlc_perw_mod_fw), + }, { + .base =0xc1330000 , +MOD_ID_MAP (r8a78000_mdlc_scp_mod_fw), + }, + {/* sentinel */ } +}; + +static const struct mdlc_data r8a78000_mdlc_data = { + .default_info = r8a78000_mdlc_default, + .fw_info = r8a78000_mdlc_fw, +}; +static const struct of_device_id r8a78000_mdlc_match[] = { { .compatible ="renesas,r8a78000-mdlc" , - .data = &r8a78000_mdlc_default, + .data = &r8a78000_mdlc_data, }, {/* sentinel */ } };
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v5 14/15] pmdomain: renesas: r8a78000: Add SCMI remapping support
Thank you for your contribution! Sashiko AI review found 3 potential issues to consider: - [Medium] pmdomain: renesas: leak of exclusive reset controls in r8a78000_mdlc_probe() - [Medium] pmdomain…
Thank you for your contribution! Sashiko AI review found 3 potential issues to consider:
- [Medium] pmdomain: renesas: leak of exclusive reset controls in r8a78000_mdlc_probe()
- [Medium] pmdomain: renesas: leak of scmi_clk_np reference in r8a78000_mdlc_probe()
- [Low] pmdomain: renesas: mixed scoped_guard() and goto in r8a78000_mdlc_attach_dev()
--
commit 35d53b7b58584e545d3609ea7bb1ae4726d2bdc8
Author: Geert Uytterhoeven <[email protected]>
pmdomain: renesas: r8a78000: Add SCMI remapping support
This commit extends the R-Car X5H Module Controller driver to remap hardware power domain, module clock, and reset IDs to SCMI power domains, clocks, and resets when SCMI firmware support is available.
Quoted 4 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +0
-0
[ ... ]
Quoted 45 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +40
-1@@ -178,8 +280,148 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain,return -ENOENT ; } -dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +if (!priv->scmi_clk_np) { +dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +return 0 ; + } + + entry = &priv->mod_map->entries[idx]; +dev_dbg (dev,"Mapping HW module 0x%x to SCMI clock %d fck parent %d\n" , + id, entry->fw_id, entry->fw_fck_parent); + + clk =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_id); +if (IS_ERR (clk)) +return PTR_ERR (clk); + + parent =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_fck_parent); +if (IS_ERR (parent)) { + ret =PTR_ERR (parent); + goto fail_put_clk; + } + +if (!clk && !parent) { +/* Ignore missing SCMI clocks */ +return 0 ; + } + + ret =pm_clk_create (dev); +if (ret) + goto fail_put_parent; + +if (parent) { + ret =pm_clk_add_clk (dev, parent); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_parent; + } + } +if (clk) { + ret =pm_clk_add_clk (dev, clk); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_clk;
drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, · line 332
Quoted 10 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +9
-0+ } + }return 0 ; + +fail_put_parent: +clk_put (parent); +fail_put_clk: +clk_put (clk); +return ret; +}
[Severity: Low]
This isn't a bug, but r8a78000_mdlc_attach_dev() already uses scoped_guard(mutex, &r8a78000_mdlc_lock), and adding goto-based error unwinding in the same function mixes cleanup.h helpers with goto labels. Factoring either the list lookup or the PM clock setup into a helper would keep them separate.
[ ... ]
Quoted 29 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +29
-0+static struct reset_control **get_rstcs (struct r8a78000_mdlc_priv *priv, +struct fwnode_handle *scmi_reset_fwnode) +{ +const struct mod_id_map *map = priv->mod_map; +struct fwnode_reference_args scmi_spec; +struct reset_control **rstcs, *rstc; +struct device *dev = priv->dev; +s16 fw_id; + +if (!map) +return NULL ; + + rstcs =devm_kzalloc_objs (dev, *rstcs, map->size); +if (!rstcs) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < map->size; i++) { + fw_id = map->entries[i].fw_id; +if (!scmi_reset_fwnode || fw_id <0 ) +continue ; + + scmi_spec.fwnode = scmi_reset_fwnode; + scmi_spec.nargs =1 ; + scmi_spec.args[0 ] = fw_id; + + rstc =reset_control_get_from_provider_exclusive (&scmi_spec); +if (IS_ERR (rstc)) { +while (i--) +reset_control_put (rstcs[i]);
drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, · line 425
Quoted 10 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +9
-0+ +return dev_err_cast_probe (dev, rstc, +"Failed to get SCMI reset %u\n" , fw_id); + } + + rstcs[i] = rstc; + } + +return rstcs; }
[Severity: Medium]
Does r8a78000_mdlc_probe() leak the exclusive reset_control objects in priv->rstcs if a later registration step fails?
reset_control_get_from_provider_exclusive() returns unmanaged references, and get_rstcs() only calls reset_control_put() when its own loop fails. If a subsequent call in r8a78000_mdlc_probe() such as of_genpd_add_provider_onecell() or devm_reset_controller_register() fails, the reset controls are leaked and remain marked exclusively acquired, so a later probe retry will fail with -EBUSY. Registering a devm_add_action_or_reset() callback in get_rstcs() would release them on probe failure.
[ ... ]
Quoted 45 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +41
-0@@ -249,6 +500,47 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev) priv->dev = dev; priv->np = np; +if (!IS_ENABLED (CONFIG_ARM_SCMI_POWER_DOMAIN ) || + !IS_ENABLED (CONFIG_COMMON_CLK_SCMI ) || + !IS_ENABLED (CONFIG_RESET_SCMI )) { +dev_dbg (dev,"SCMI pmdomain/clock/reset support is disabled\n" ); + goto fallback; + } + + scmi =of_find_compatible_node (NULL ,NULL ,"arm,scmi" ); +if (!scmi) { +dev_dbg (dev,"Cannot find SCMI firmware node\n" ); + goto fallback; + } + +if (!of_device_is_available (scmi)) { +dev_dbg (dev,"SCMI firmware node is not available\n" ); + goto fallback; + } + + scmi_power_np =scmi_find_proto (scmi,SCMI_PROTOCOL_POWER ); +if (!scmi_power_np) { +dev_dbg (dev, +"Cannot find SCMI power domain management protocol\n" ); + goto fallback; + } + + scmi_clk_np =scmi_find_proto (scmi,SCMI_PROTOCOL_CLOCK ); +if (!scmi_clk_np) { +dev_dbg (dev,"Cannot find SCMI clock management protocol\n" ); + goto fallback; + } + + scmi_reset_np =scmi_find_proto (scmi,SCMI_PROTOCOL_RESET ); +if (!scmi_reset_np) { +dev_dbg (dev,"Cannot find SCMI reset management protocol\n" ); + goto fallback; + } + + priv->scmi_clk_np = scmi_clk_np; + info = mdlc_data->fw_info; + +fallback:
[ ... ]
drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_probe(struct platform_device *pdev) · line 611
Quoted 9 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +3
-0@@ -295,11 +604,14 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)return dev_err_probe (dev, ret,"Failed to register reset controller\n" ); +/* Retained in priv->scmi_clk_np */ +retain_and_null_ptr (scmi_clk_np); +return 0 ; }
[Severity: Medium]
Does retain_and_null_ptr(scmi_clk_np) leak the scmi_clk_np device_node reference when the fallback path is taken after scmi_clk_np has been found?
If scmi_find_proto(scmi, SCMI_PROTOCOL_CLOCK) succeeds but scmi_find_proto(scmi, SCMI_PROTOCOL_RESET) returns NULL, probe jumps to fallback before setting priv->scmi_clk_np = scmi_clk_np, and then unconditionally clears scmi_clk_np via retain_and_null_ptr(scmi_clk_np) at the end of r8a78000_mdlc_probe().
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=14
Re: [PATCH v5 14/15] pmdomain: renesas: r8a78000: Add SCMI remapping support
Hi Sashiko,
Quoted 10 lines · On Wed, 18 Nov 2026 at 21:22, <[email protected]> wrote:
Thank you for your contribution! Sashiko AI review found 3 potential issues to consider:
- [Medium] pmdomain: renesas: leak of exclusive reset controls inr8a78000_mdlc_probe()
- [Medium] pmdomain: renesas: leak ofscmi_clk_npreference inr8a78000_mdlc_probe()
- [Low] pmdomain: renesas: mixedscoped_guard()and goto inr8a78000_mdlc_attach_dev()
--
Quoted 8 lines
commit
35d53b7b58584e545d3609ea7bb1ae4726d2bdc8
Author: Geert Uytterhoeven <[email protected]>pmdomain: renesas: r8a78000: Add SCMI remapping support
This commit extends the R-Car X5H Module Controller driver to remap hardware power domain, module clock, and reset IDs to SCMI power domains, clocks, and resets when SCMI firmware support is available.
Thanks for your review!
Quoted 57 lines
Quoted 2 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +0
-0[ ... ]
Quoted 54 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +48
-1@@ -178,8 +280,148 @@ static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain,return -ENOENT ; } -dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +if (!priv->scmi_clk_np) { +dev_dbg (dev,"Ignoring HW module 0x%x\n" , id); +return 0 ; + } + + entry = &priv->mod_map->entries[idx]; +dev_dbg (dev,"Mapping HW module 0x%x to SCMI clock %d fck parent %d\n" , + id, entry->fw_id, entry->fw_fck_parent); + + clk =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_id); +if (IS_ERR (clk)) +return PTR_ERR (clk); + + parent =scmi_get_clk (dev, priv->scmi_clk_np, entry->fw_fck_parent); +if (IS_ERR (parent)) { + ret =PTR_ERR (parent); + goto fail_put_clk; + } + +if (!clk && !parent) { +/* Ignore missing SCMI clocks */ +return 0 ; + } + + ret =pm_clk_create (dev); +if (ret) + goto fail_put_parent; + +if (parent) { + ret =pm_clk_add_clk (dev, parent); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_parent; + } + } +if (clk) { + ret =pm_clk_add_clk (dev, clk); +if (ret) { +pm_clk_destroy (dev); + goto fail_put_clk; + } + }return 0 ; + +fail_put_parent: +clk_put (parent); +fail_put_clk: +clk_put (clk); +return ret;
Quoted 8 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, · line 332
Quoted 1 line
drivers/pmdomain/renesas/r8a78000-mdlc.c +1
-0+}[Severity: Low]
This isn't a bug, butr8a78000_mdlc_attach_dev()already usesscoped_guard(mutex, &r8a78000_mdlc_lock), and adding goto-based error unwinding in the same function mixescleanup.hhelpers with goto labels. Factoring either the list lookup or the PM clock setup into a helper would keep them separate.
Not a bug, will see if I get to it...
Quoted 44 lines
Quoted 29 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +29
-0+static struct reset_control **get_rstcs (struct r8a78000_mdlc_priv *priv, +struct fwnode_handle *scmi_reset_fwnode) +{ +const struct mod_id_map *map = priv->mod_map; +struct fwnode_reference_args scmi_spec; +struct reset_control **rstcs, *rstc; +struct device *dev = priv->dev; +s16 fw_id; + +if (!map) +return NULL ; + + rstcs =devm_kzalloc_objs (dev, *rstcs, map->size); +if (!rstcs) +return ERR_PTR (-ENOMEM ); + +for (unsigned int i =0 ; i < map->size; i++) { + fw_id = map->entries[i].fw_id; +if (!scmi_reset_fwnode || fw_id <0 ) +continue ; + + scmi_spec.fwnode = scmi_reset_fwnode; + scmi_spec.nargs =1 ; + scmi_spec.args[0 ] = fw_id; + + rstc =reset_control_get_from_provider_exclusive (&scmi_spec); +if (IS_ERR (rstc)) { +while (i--) +reset_control_put (rstcs[i]);drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_attach_dev(struct generic_pm_domain *domain, · line 425
Quoted 10 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +9
-0+ +return dev_err_cast_probe (dev, rstc, +"Failed to get SCMI reset %u\n" , fw_id); + } + + rstcs[i] = rstc; + } + +return rstcs; }[Severity: Medium]
Doesr8a78000_mdlc_probe()leak the exclusivereset_controlobjects inpriv->rstcsif a later registration step fails?
Quoted 8 lines
reset_control_get_from_provider_exclusive()returns unmanaged references, andget_rstcs()only callsreset_control_put()when its own loop fails. If a subsequent call inr8a78000_mdlc_probe()such asof_genpd_add_provider_onecell()ordevm_reset_controller_register()fails, the reset controls are leaked and remain marked exclusively acquired, so a later probe retry will fail with-EBUSY. Registering adevm_add_action_or_reset()callback inget_rstcs()would release them on probe failure.
Thanks, will do.
Quoted 63 lines
Quoted 45 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +41
-0@@ -249,6 +500,47 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev) priv->dev = dev; priv->np = np; +if (!IS_ENABLED (CONFIG_ARM_SCMI_POWER_DOMAIN ) || + !IS_ENABLED (CONFIG_COMMON_CLK_SCMI ) || + !IS_ENABLED (CONFIG_RESET_SCMI )) { +dev_dbg (dev,"SCMI pmdomain/clock/reset support is disabled\n" ); + goto fallback; + } + + scmi =of_find_compatible_node (NULL ,NULL ,"arm,scmi" ); +if (!scmi) { +dev_dbg (dev,"Cannot find SCMI firmware node\n" ); + goto fallback; + } + +if (!of_device_is_available (scmi)) { +dev_dbg (dev,"SCMI firmware node is not available\n" ); + goto fallback; + } + + scmi_power_np =scmi_find_proto (scmi,SCMI_PROTOCOL_POWER ); +if (!scmi_power_np) { +dev_dbg (dev, +"Cannot find SCMI power domain management protocol\n" ); + goto fallback; + } + + scmi_clk_np =scmi_find_proto (scmi,SCMI_PROTOCOL_CLOCK ); +if (!scmi_clk_np) { +dev_dbg (dev,"Cannot find SCMI clock management protocol\n" ); + goto fallback; + } + + scmi_reset_np =scmi_find_proto (scmi,SCMI_PROTOCOL_RESET ); +if (!scmi_reset_np) { +dev_dbg (dev,"Cannot find SCMI reset management protocol\n" ); + goto fallback; + } + + priv->scmi_clk_np = scmi_clk_np; + info = mdlc_data->fw_info; + +fallback:[ ... ]
drivers/pmdomain/renesas/r8a78000-mdlc.c static int r8a78000_mdlc_probe(struct platform_device *pdev) · line 611
Quoted 9 lines
drivers/pmdomain/renesas/r8a78000-mdlc.c +3
-0@@ -295,11 +604,14 @@ static int r8a78000_mdlc_probe(struct platform_device *pdev)return dev_err_probe (dev, ret,"Failed to register reset controller\n" ); +/* Retained in priv->scmi_clk_np */ +retain_and_null_ptr (scmi_clk_np); +return 0 ; }[Severity: Medium]
Doesretain_and_null_ptr(scmi_clk_np)leak thescmi_clk_npdevice_nodereference when the fallback path is taken afterscmi_clk_nphas been found?
Quoted 5 lines
If
scmi_find_proto(scmi, SCMI_PROTOCOL_CLOCK)succeeds butscmi_find_proto(scmi, SCMI_PROTOCOL_RESET)returns NULL, probe jumps to fallback before settingpriv->scmi_clk_np=scmi_clk_np, and then unconditionally clearsscmi_clk_npviaretain_and_null_ptr(scmi_clk_np)at the end ofr8a78000_mdlc_probe().
That is correct behavior, as scmi_clk_np won't be handed to priv->scmi_clk_np in the fallback case.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Geert Uytterhoeven
maintainerPATCH v5 15/15 arm64: dts: renesas: ironhide: Enable SCMI devpd, sys, clock, and reset
In reply to Geert UytterhoevenSCP FW SDKv4.28.0 and later for Renesas R-Car X5H Ironhide not only implement the SCMI base protocol, but also the SCMI power domain, system power, clock, and reset domain management protocols.
Enable support for the latter by adding the corresponding SCMI protocol subnodes.
---
v5:
- Add Tested-by,
v4:
- No changes,
v3:
- No changes,
v2:
- Fix misindentations,
- Add scmi_clk node, as it is no longer added in earlier commits.
--- .../boot/dts/renesas/r8a78000-ironhide.dts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/renesas/r8a78000-ironhide.dts +19 -0
@@ -31,6 +31,25 @@ scmi: scmi { arm,no-completion-irq; #address-cells = <1>; #size-cells = <0>; + + scmi_devpd: protocol@11 { + reg = <0x11>; + #power-domain-cells = <1>; + }; + + scmi_sys: protocol@12 { + reg = <0x12>; + }; + + scmi_clk: protocol@14 { + reg = <0x14>; + #clock-cells = <1>; + }; + + scmi_reset: protocol@16 { + reg = <0x16>; + #reset-cells = <1>; + }; }; };
Signature · 1 line
2.43.0
Hi Geert,
Quoted 6 lines · Geert Uytterhoeven
Hi all,
TL;DR:
Describe hardware in DT, and perform mapping to abstractions offered by SCMI in Linux.
A question on the approach
An SCMI variant DT could mark the CPG and MDLC status = "reserved" and point the consumers at arm,scmi, while the U-Boot IPL keeps the hardware DT. Since v4, the series assumes the SCMI ids are stable:
Quoted 3 lines
- Remove dependencies by making assumptions and dropping disputed items, to move this series forward:
- Assume all SCMI IDs are stable.
If they are, why not using them in the DT directly?
On partitioning, the cover letter says:
Quoted 7 lines
- The clock, reset, and power domain IDs are not stable by design, causing DT incompatibilities.
SCMI requires that the ID space exposed to an agent (i.e. Linux) starts at zero and is contiguous. Hence any change in system partitioning (Application CPU core vs. Realtime CPU core, virtualization, ...) may mean a renumbering of all SCMI IDs, implying a massive change to the DT.
SCMI do not mandate that renumbering. The ids start at zero and are sequential, but nothing requires them to cover only the resources of one agent. The firmware can keep a single id space for all agents and restrict per agent what each one may use, the rest returning DENIED (SCMI 4.0, section 3.2.1). For virtualization, the spec has the hypervisor grant each VM its resources this way. A new VM then changes permissions, not ids.
With a single id space, a software configuration only changes which nodes are enabled, so one DT per software configuration, a base DT plus an overlay, is enough. If managing many configurations ever becomes a nightmare, tools exist for it, such as Lopper from devicetree-org [1], which generate one DT per execution domain from a single system DT.
That leaves the missing clock domain, which is a gap in SCMI itself.
[1] https://github.com/devicetree-org/lopper
Best regards,
Clément
Quoted 12 lines · Clément Le Goffic
Quoted 6 lines · Geert Uytterhoeven
Hi all,
TL;DR:
Describe hardware in DT, and perform mapping to abstractions offered by SCMI in Linux.
A question on the approach
An SCMI variant DT could mark the CPG and MDLC status = "reserved" and point the consumers at arm,scmi, while the U-Boot IPL keeps the hardware DT. Since v4, the series assumes the SCMI ids are stable:
Quoted 5 lines
Quoted 3 lines
- Remove dependencies by making assumptions and dropping disputed items, to move this series forward:
- Assume all SCMI IDs are stable.If they are, why not using them in the DT directly?
As far as I understand, the assumption impacts the mdlc and cpg drivers only, not their DT bindings. If (or rather, let's face it, when) a firmware revision later breaks the assumption, we will be able to handle it in those drivers without affecting DT.
I don't like this remapping driver much, in the sense that I wish it wouldn't be needed, but it seems to me to be the best possible compromise given the instability introduced by SCMI.
Quoted 20 lines
On partitioning, the cover letter says:
Quoted 7 lines
- The clock, reset, and power domain IDs are not stable by design, causing DT incompatibilities.
SCMI requires that the ID space exposed to an agent (i.e. Linux) starts at zero and is contiguous. Hence any change in system partitioning (Application CPU core vs. Realtime CPU core, virtualization, ...) may mean a renumbering of all SCMI IDs, implying a massive change to the DT.SCMI do not mandate that renumbering. The ids start at zero and are sequential, but nothing requires them to cover only the resources of one agent. The firmware can keep a single id space for all agents and restrict per agent what each one may use, the rest returning DENIED (SCMI 4.0, section 3.2.1). For virtualization, the spec has the hypervisor grant each VM its resources this way. A new VM then changes permissions, not ids.
With a single id space, a software configuration only changes which nodes are enabled, so one DT per software configuration, a base DT plus an overlay, is enough. If managing many configurations ever becomes a nightmare, tools exist for it, such as Lopper from devicetree-org [1], which generate one DT per execution domain from a single system DT.
That leaves the missing clock domain, which is a gap in SCMI itself.
Signature · 3 lines
Regards, Laurent Pinchart