Skip to contentSkip to conversation

clk: keystone: syscon-clk: Do not use syscon helper to build regmap

PATCH Applied Andrew Davis 3 participants 5 messages Jan 23, 2025 – Mar 4, 2025

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: keystone: syscon-clk: Do not use syscon helper to build regmap

The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.

This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.

---
 drivers/clk/keystone/syscon-clk.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clk/keystone/syscon-clk.c +13 -1
index 935d9a2d8c2b3..073c2ebcdf6af 100644
@@ -105,6 +105,12 @@ static struct clk_hw
 	return &priv->hw;
 }
 
+static const struct regmap_config ti_syscon_regmap_cfg = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_stride = 4,
+};
+
 static int ti_syscon_gate_clk_probe(struct platform_device *pdev)
 {
 	const struct ti_syscon_gate_clk_data *data, *p;
@@ -113,12 +119,18 @@ static int ti_syscon_gate_clk_probe(struct platform_device *pdev)
 	int num_clks, num_parents, i;
 	const char *parent_name;
 	struct regmap *regmap;
+	void __iomem *base;
 
 	data = device_get_match_data(dev);
 	if (!data)
 		return -EINVAL;
 
-	regmap = device_node_to_regmap(dev->of_node);
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(base))
+		return dev_err_probe(dev, PTR_ERR(base),
+				     "failed to get base memory resource\n");
+
+	regmap = regmap_init_mmio(dev, base, &ti_syscon_regmap_cfg);
 	if (IS_ERR(regmap))
 		return dev_err_probe(dev, PTR_ERR(regmap),
 				     "failed to get regmap\n");
Signature · 1 line
2.39.2
Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Andrew Davis

The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.

Quoted 5 lines

This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.

Could we get this routed to master as fixes asap please to get a sane 6.14?

This is part of the fixes TI K3 platforms boot issues reported in
https://lore.kernel.org/all/[email protected]/

on the latest linus master v6.13-5001-gd0d106a2bd21 + linux next-20250123

Total set of patches tested with:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]

Cc Rob and Lee

Quoted 44 lines
---
 drivers/clk/keystone/syscon-clk.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/clk/keystone/syscon-clk.c +13 -1
index 935d9a2d8c2b3..073c2ebcdf6af 100644
@@ -105,6 +105,12 @@ static struct clk_hw
 	return &priv->hw;
 }
 
+static const struct regmap_config ti_syscon_regmap_cfg = {
+	.reg_bits = 32,
+	.val_bits = 32,
+	.reg_stride = 4,
+};
+
 static int ti_syscon_gate_clk_probe(struct platform_device *pdev)
 {
 	const struct ti_syscon_gate_clk_data *data, *p;
@@ -113,12 +119,18 @@ static int ti_syscon_gate_clk_probe(struct platform_device *pdev)
 	int num_clks, num_parents, i;
 	const char *parent_name;
 	struct regmap *regmap;
+	void __iomem *base;
 
 	data = device_get_match_data(dev);
 	if (!data)
 		return -EINVAL;
 
-	regmap = device_node_to_regmap(dev->of_node);
+	base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(base))
+		return dev_err_probe(dev, PTR_ERR(base),
+				     "failed to get base memory resource\n");
+
+	regmap = regmap_init_mmio(dev, base, &ti_syscon_regmap_cfg);
 	if (IS_ERR(regmap))
 		return dev_err_probe(dev, PTR_ERR(regmap),
 				     "failed to get regmap\n");
Signature · 1 line
2.39.2
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
maintainer
#2 lore raw

Quoting Nishanth Menon (2025-01-23 12:02:09)

Quoted 9 lines · Andrew Davis
Quoted 8 lines

The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.

This will not work going forward and so we should create our regmap

Please reference the commit where this won't work anymore. It's hard to know the urgency without this information.

Quoted 9 lines
Quoted 4 lines

the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.

Could we get this routed to master as fixes asap please to get a sane 6.14?

Sure. Can you resend with a Fixes tag?

Quoted 13 lines

This is part of the fixes TI K3 platforms boot issues reported in
https://lore.kernel.org/all/[email protected]/

on the latest linus master v6.13-5001-gd0d106a2bd21 + linux next-20250123

Total set of patches tested with:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]

#3 lore raw
Quoted 17 lines · Stephen Boyd

Quoting Nishanth Menon (2025-01-23 12:02:09)

Quoted 9 lines · Andrew Davis
Quoted 8 lines

The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.

This will not work going forward and so we should create our regmap

Please reference the commit where this won't work anymore. It's hard to know the urgency without this information.

Quoted 3 lines
Quoted 3 lines

the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

Could we get this routed to master as fixes asap please to get a sane 6.14?

Sure. Can you resend with a Fixes tag?

I think it is less urgent for immediate window given Rob has posted a restoration of behavior fixup[1]. This patch is still good to be merged based on [2].

[1] https://lore.kernel.org/all/[email protected]/
[2] https://lore.kernel.org/all/CAL_JsqKVydDqmr-gyn1wt=1PO_p1NMze+1D+4qXWxGiGVLV9EA@mail.gmail.com/

Quoted 14 lines
Quoted 14 lines

This is part of the fixes TI K3 platforms boot issues reported in
https://lore.kernel.org/all/[email protected]/

on the latest linus master v6.13-5001-gd0d106a2bd21 + linux next-20250123

Total set of patches tested with:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]
https://lore.kernel.org/r/[email protected]

Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
maintainer Applied
#4 lore raw
In reply to Andrew Davis

Quoting Andrew Davis (2025-01-23 10:19:13)

Quoted 7 lines

The syscon helper device_node_to_regmap() is used to fetch a regmap registered to a device node. It also currently creates this regmap if the node did not already have a regmap associated with it. This should only be used on "syscon" nodes. This driver is not such a device and instead uses device_node_to_regmap() on its own node as a hacky way to create a regmap for itself.

Quoted 6 lines

This will not work going forward and so we should create our regmap the normal way by defining our regmap_config, fetching our memory resource, then using the normal regmap_init_mmio() function.

---

Applied to clk-next