* [PATCH v2 00/13] memory: tegra: Several cleanups
@ 2025-09-11 9:43 Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init() Krzysztof Kozlowski
` (14 more replies)
0 siblings, 15 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Changes in v2:
- Fix commit msg copy-paste in the last commits - proper number for
"tegraXXX_emc".
- Link to v1: https://lore.kernel.org/r/20250910-memory-tegra-cleanup-v1-0-023c33a2d997@linaro.org
Few cleanups for Tegra MC/EMC drivers:
Deferred probe, few simplifyings and function name unification.
Best regards,
Krzysztof
---
Krzysztof Kozlowski (13):
memory: tegra124-emc: Simplify return of emc_init()
memory: tegra124-emc: Do not print error on icc_node_create() failure
memory: tegra186-emc: Do not print error on icc_node_create() failure
memory: tegra20-emc: Do not print error on icc_node_create() failure
memory: tegra30-emc: Do not print error on icc_node_create() failure
memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe()
memory: tegra20-emc: Simplify and handle deferred probe with dev_err_probe()
memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()
memory: tegra124-emc: Simplify and handle deferred probe with dev_err_probe()
memory: tegra124-emc: Add the SoC model prefix to functions
memory: tegra186-emc: Add the SoC model prefix to functions
memory: tegra20-emc: Add the SoC model prefix to functions
memory: tegra30-emc: Add the SoC model prefix to functions
drivers/memory/tegra/tegra124-emc.c | 140 +++++++++++++++------------------
drivers/memory/tegra/tegra186-emc.c | 39 ++++------
drivers/memory/tegra/tegra20-emc.c | 150 +++++++++++++++++-------------------
drivers/memory/tegra/tegra30-emc.c | 119 +++++++++++++---------------
4 files changed, 207 insertions(+), 241 deletions(-)
---
base-commit: 8b8040499c8ab3076edc9115c9de2b248f266279
change-id: 20250910-memory-tegra-cleanup-1ba0d5f86ba3
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init()
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-17 13:12 ` Jon Hunter
2025-09-11 9:43 ` [PATCH v2 02/13] memory: tegra124-emc: Do not print error on icc_node_create() failure Krzysztof Kozlowski
` (13 subsequent siblings)
14 siblings, 1 reply; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
emc_init() returns always success, so just drop return valye to simplify
it.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra124-emc.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index 03f1daa2d132a81d28705ec7c62d640d7d25a894..9aad02901613f1b2ed855c11bcd76fef153034af 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -896,7 +896,7 @@ static void emc_read_current_timing(struct tegra_emc *emc,
timing->emc_mode_reset = 0;
}
-static int emc_init(struct tegra_emc *emc)
+static void emc_init(struct tegra_emc *emc)
{
emc->dram_type = readl(emc->regs + EMC_FBIO_CFG5);
@@ -913,8 +913,6 @@ static int emc_init(struct tegra_emc *emc)
emc->dram_num = tegra_mc_get_emem_device_count(emc->mc);
emc_read_current_timing(emc, &emc->last_timing);
-
- return 0;
}
static int load_one_timing_from_dt(struct tegra_emc *emc,
@@ -1472,11 +1470,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
ram_code);
}
- err = emc_init(emc);
- if (err) {
- dev_err(&pdev->dev, "EMC initialization failed: %d\n", err);
- return err;
- }
+ emc_init(emc);
platform_set_drvdata(pdev, emc);
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 02/13] memory: tegra124-emc: Do not print error on icc_node_create() failure
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init() Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 03/13] memory: tegra186-emc: " Krzysztof Kozlowski
` (12 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
icc_node_create() is alloc-like function, so no need to print error
messages on its failure. Dropping one label makes the code a bit
simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra124-emc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index 9aad02901613f1b2ed855c11bcd76fef153034af..f3372bd78ce8db666015a7844cba4e6aad79e61c 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -1350,10 +1350,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
/* create External Memory Controller node */
node = icc_node_create(TEGRA_ICC_EMC);
- if (IS_ERR(node)) {
- err = PTR_ERR(node);
- goto err_msg;
- }
+ if (IS_ERR(node))
+ return PTR_ERR(node);
node->name = "External Memory Controller";
icc_node_add(node, &emc->provider);
@@ -1381,7 +1379,6 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
-err_msg:
dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
return err;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 03/13] memory: tegra186-emc: Do not print error on icc_node_create() failure
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init() Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 02/13] memory: tegra124-emc: Do not print error on icc_node_create() failure Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 04/13] memory: tegra20-emc: " Krzysztof Kozlowski
` (11 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
icc_node_create() is alloc-like function, so no need to print error
messages on its failure. Dropping one label makes the code a bit
simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra186-emc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
index d6cd90c7ad5380a9ff9052a60f62c9bcc4fdac5f..00baa7ab89214b1a151ab0c0a9ab76f90f922478 100644
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@ -273,10 +273,8 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
/* create External Memory Controller node */
node = icc_node_create(TEGRA_ICC_EMC);
- if (IS_ERR(node)) {
- err = PTR_ERR(node);
- goto err_msg;
- }
+ if (IS_ERR(node))
+ return PTR_ERR(node);
node->name = "External Memory Controller";
icc_node_add(node, &emc->provider);
@@ -304,7 +302,6 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
-err_msg:
dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
return err;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 04/13] memory: tegra20-emc: Do not print error on icc_node_create() failure
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (2 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 03/13] memory: tegra186-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 05/13] memory: tegra30-emc: " Krzysztof Kozlowski
` (10 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
icc_node_create() is alloc-like function, so no need to print error
messages on its failure. Dropping one label makes the code a bit
simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra20-emc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index 44ac55feacd3eef0bd095271bd3dceec60c34bb7..a34636a1c4c55419c323eabfe96c5f27375df344 100644
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -1022,10 +1022,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
/* create External Memory Controller node */
node = icc_node_create(TEGRA_ICC_EMC);
- if (IS_ERR(node)) {
- err = PTR_ERR(node);
- goto err_msg;
- }
+ if (IS_ERR(node))
+ return PTR_ERR(node);
node->name = "External Memory Controller";
icc_node_add(node, &emc->provider);
@@ -1053,7 +1051,6 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
-err_msg:
dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
return err;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 05/13] memory: tegra30-emc: Do not print error on icc_node_create() failure
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (3 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 04/13] memory: tegra20-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 06/13] memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe() Krzysztof Kozlowski
` (9 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
icc_node_create() is alloc-like function, so no need to print error
messages on its failure. Dropping one label makes the code a bit
simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra30-emc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index 921dce1b8bc6382ea66d70ad0f2a12283316ad90..c96aa63a5aa085a409ae7ec901d2a210748f5bcb 100644
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1534,10 +1534,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
/* create External Memory Controller node */
node = icc_node_create(TEGRA_ICC_EMC);
- if (IS_ERR(node)) {
- err = PTR_ERR(node);
- goto err_msg;
- }
+ if (IS_ERR(node))
+ return PTR_ERR(node);
node->name = "External Memory Controller";
icc_node_add(node, &emc->provider);
@@ -1565,7 +1563,6 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
-err_msg:
dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
return err;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 06/13] memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe()
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (4 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 05/13] memory: tegra30-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 07/13] memory: tegra20-emc: " Krzysztof Kozlowski
` (8 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Certain calls, like clk_get, can cause probe deferral and driver should
handle it. Use dev_err_probe() to fix that and also change other
non-deferred errors cases to make the code simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra30-emc.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index c96aa63a5aa085a409ae7ec901d2a210748f5bcb..cca386af423e9647266878ce6cd1bcec09c8eba4 100644
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1563,9 +1563,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
- dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
- return err;
+ return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
static void devm_tegra_emc_unset_callback(void *data)
@@ -1592,16 +1591,13 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
return err;
emc->clk = devm_clk_get(emc->dev, NULL);
- if (IS_ERR(emc->clk)) {
- dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk);
- return PTR_ERR(emc->clk);
- }
+ if (IS_ERR(emc->clk))
+ return dev_err_probe(emc->dev, PTR_ERR(emc->clk),
+ "failed to get EMC clock\n");
err = clk_notifier_register(emc->clk, &emc->clk_nb);
- if (err) {
- dev_err(emc->dev, "failed to register clk notifier: %d\n", err);
- return err;
- }
+ if (err)
+ return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
err = devm_add_action_or_reset(emc->dev,
devm_tegra_emc_unreg_clk_notifier, emc);
@@ -1654,10 +1650,8 @@ static int tegra_emc_probe(struct platform_device *pdev)
err = devm_request_irq(&pdev->dev, emc->irq, tegra_emc_isr, 0,
dev_name(&pdev->dev), emc);
- if (err) {
- dev_err(&pdev->dev, "failed to request irq: %d\n", err);
- return err;
- }
+ if (err)
+ return dev_err_probe(&pdev->dev, err, "failed to request irq\n");
err = tegra_emc_init_clk(emc);
if (err)
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 07/13] memory: tegra20-emc: Simplify and handle deferred probe with dev_err_probe()
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (5 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 06/13] memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe() Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 08/13] memory: tegra186-emc: " Krzysztof Kozlowski
` (7 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Certain calls, like clk_get, can cause probe deferral and driver should
handle it. Use dev_err_probe() to fix that and also change other
non-deferred errors cases to make the code simpler.
Also fix missing new line in error message of devm_devfreq_add_device().
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra20-emc.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index a34636a1c4c55419c323eabfe96c5f27375df344..18e266dde5d2a0fb962fadc04161b03fb79f76cb 100644
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -1051,9 +1051,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
- dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
- return err;
+ return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
static void devm_tegra_emc_unset_callback(void *data)
@@ -1080,16 +1079,13 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
return err;
emc->clk = devm_clk_get(emc->dev, NULL);
- if (IS_ERR(emc->clk)) {
- dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk);
- return PTR_ERR(emc->clk);
- }
+ if (IS_ERR(emc->clk))
+ return dev_err_probe(emc->dev, PTR_ERR(emc->clk),
+ "failed to get EMC clock\n");
err = clk_notifier_register(emc->clk, &emc->clk_nb);
- if (err) {
- dev_err(emc->dev, "failed to register clk notifier: %d\n", err);
- return err;
- }
+ if (err)
+ return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
err = devm_add_action_or_reset(emc->dev,
devm_tegra_emc_unreg_clk_notifier, emc);
@@ -1172,10 +1168,9 @@ static int tegra_emc_devfreq_init(struct tegra_emc *emc)
devfreq = devm_devfreq_add_device(emc->dev, &tegra_emc_devfreq_profile,
DEVFREQ_GOV_SIMPLE_ONDEMAND,
&emc->ondemand_data);
- if (IS_ERR(devfreq)) {
- dev_err(emc->dev, "failed to initialize devfreq: %pe", devfreq);
- return PTR_ERR(devfreq);
- }
+ if (IS_ERR(devfreq))
+ return dev_err_probe(emc->dev, PTR_ERR(devfreq),
+ "failed to initialize devfreq\n");
return 0;
}
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 08/13] memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (6 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 07/13] memory: tegra20-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 09/13] memory: tegra124-emc: " Krzysztof Kozlowski
` (6 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Certain calls, like clk_get, can cause probe deferral and driver should
handle it. Use dev_err_probe() to fix that and also change other
non-deferred errors cases to make the code simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra186-emc.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
index 00baa7ab89214b1a151ab0c0a9ab76f90f922478..a0de80afe3e90531fcfb29d20773aed0d04478c5 100644
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@ -302,9 +302,8 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
- dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
- return err;
+ return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
static int tegra186_emc_probe(struct platform_device *pdev)
@@ -319,14 +318,13 @@ static int tegra186_emc_probe(struct platform_device *pdev)
emc->bpmp = tegra_bpmp_get(&pdev->dev);
if (IS_ERR(emc->bpmp))
- return dev_err_probe(&pdev->dev, PTR_ERR(emc->bpmp), "failed to get BPMP\n");
+ return dev_err_probe(&pdev->dev, PTR_ERR(emc->bpmp),
+ "failed to get BPMP\n");
emc->clk = devm_clk_get(&pdev->dev, "emc");
- if (IS_ERR(emc->clk)) {
- err = PTR_ERR(emc->clk);
- dev_err(&pdev->dev, "failed to get EMC clock: %d\n", err);
- goto put_bpmp;
- }
+ if (IS_ERR(emc->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
+ "failed to get EMC clock\n");
platform_set_drvdata(pdev, emc);
emc->dev = &pdev->dev;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 09/13] memory: tegra124-emc: Simplify and handle deferred probe with dev_err_probe()
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (7 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 08/13] memory: tegra186-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 10/13] memory: tegra124-emc: Add the SoC model prefix to functions Krzysztof Kozlowski
` (5 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Certain calls, like clk_get, can cause probe deferral and driver should
handle it. Use dev_err_probe() to fix that and also change other
non-deferred errors cases to make the code simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra124-emc.c | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index f3372bd78ce8db666015a7844cba4e6aad79e61c..f4d703103d9ca155eca92331ee762cecd4e01302 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -1379,9 +1379,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes:
icc_nodes_remove(&emc->provider);
- dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
- return err;
+ return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
static int tegra_emc_opp_table_init(struct tegra_emc *emc)
@@ -1390,18 +1389,18 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc)
int opp_token, err;
err = dev_pm_opp_set_supported_hw(emc->dev, &hw_version, 1);
- if (err < 0) {
- dev_err(emc->dev, "failed to set OPP supported HW: %d\n", err);
- return err;
- }
+ if (err < 0)
+ return dev_err_probe(emc->dev, err, "failed to set OPP supported HW\n");
+
opp_token = err;
err = dev_pm_opp_of_add_table(emc->dev);
if (err) {
if (err == -ENODEV)
- dev_err(emc->dev, "OPP table not found, please update your device tree\n");
+ dev_err_probe(emc->dev, err,
+ "OPP table not found, please update your device tree\n");
else
- dev_err(emc->dev, "failed to add OPP table: %d\n", err);
+ dev_err_probe(emc->dev, err, "failed to add OPP table\n");
goto put_hw_table;
}
@@ -1412,7 +1411,7 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc)
/* first dummy rate-set initializes voltage state */
err = dev_pm_opp_set_rate(emc->dev, clk_get_rate(emc->clk));
if (err) {
- dev_err(emc->dev, "failed to initialize OPP clock: %d\n", err);
+ dev_err_probe(emc->dev, err, "failed to initialize OPP clock\n");
goto remove_table;
}
@@ -1480,11 +1479,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
return err;
emc->clk = devm_clk_get(&pdev->dev, "emc");
- if (IS_ERR(emc->clk)) {
- err = PTR_ERR(emc->clk);
- dev_err(&pdev->dev, "failed to get EMC clock: %d\n", err);
- return err;
- }
+ if (IS_ERR(emc->clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
+ "failed to get EMC clock\n");
err = tegra_emc_opp_table_init(emc);
if (err)
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 10/13] memory: tegra124-emc: Add the SoC model prefix to functions
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (8 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 09/13] memory: tegra124-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 11/13] memory: tegra186-emc: " Krzysztof Kozlowski
` (4 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Replace "tegra_emc" with "tegra124_emc" in all functions to:
1. Avoid name clashing with other Tegra EMC drivers which makes it
easier to jump to function definitions,
2. Decode the calltraces a bit easier,
3. Unify with other Tegra MC and EMC drivers, which use the SoC model
prefixes.
No functional impact.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra124-emc.c | 98 ++++++++++++++++++-------------------
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
index f4d703103d9ca155eca92331ee762cecd4e01302..9978ff911c4790b30423064c8fe0d3d53e8efcef 100644
--- a/drivers/memory/tegra/tegra124-emc.c
+++ b/drivers/memory/tegra/tegra124-emc.c
@@ -571,8 +571,8 @@ static void emc_seq_wait_clkchange(struct tegra_emc *emc)
dev_err(emc->dev, "clock change timed out\n");
}
-static struct emc_timing *tegra_emc_find_timing(struct tegra_emc *emc,
- unsigned long rate)
+static struct emc_timing *tegra124_emc_find_timing(struct tegra_emc *emc,
+ unsigned long rate)
{
struct emc_timing *timing = NULL;
unsigned int i;
@@ -592,10 +592,10 @@ static struct emc_timing *tegra_emc_find_timing(struct tegra_emc *emc,
return timing;
}
-static int tegra_emc_prepare_timing_change(struct tegra_emc *emc,
- unsigned long rate)
+static int tegra124_emc_prepare_timing_change(struct tegra_emc *emc,
+ unsigned long rate)
{
- struct emc_timing *timing = tegra_emc_find_timing(emc, rate);
+ struct emc_timing *timing = tegra124_emc_find_timing(emc, rate);
struct emc_timing *last = &emc->last_timing;
enum emc_dll_change dll_change;
unsigned int pre_wait = 0;
@@ -820,10 +820,10 @@ static int tegra_emc_prepare_timing_change(struct tegra_emc *emc,
return 0;
}
-static void tegra_emc_complete_timing_change(struct tegra_emc *emc,
- unsigned long rate)
+static void tegra124_emc_complete_timing_change(struct tegra_emc *emc,
+ unsigned long rate)
{
- struct emc_timing *timing = tegra_emc_find_timing(emc, rate);
+ struct emc_timing *timing = tegra124_emc_find_timing(emc, rate);
struct emc_timing *last = &emc->last_timing;
u32 val;
@@ -986,8 +986,8 @@ static int cmp_timings(const void *_a, const void *_b)
return 1;
}
-static int tegra_emc_load_timings_from_dt(struct tegra_emc *emc,
- struct device_node *node)
+static int tegra124_emc_load_timings_from_dt(struct tegra_emc *emc,
+ struct device_node *node)
{
int child_count = of_get_child_count(node);
struct emc_timing *timing;
@@ -1015,15 +1015,15 @@ static int tegra_emc_load_timings_from_dt(struct tegra_emc *emc,
return 0;
}
-static const struct of_device_id tegra_emc_of_match[] = {
+static const struct of_device_id tegra124_emc_of_match[] = {
{ .compatible = "nvidia,tegra124-emc" },
{ .compatible = "nvidia,tegra132-emc" },
{}
};
-MODULE_DEVICE_TABLE(of, tegra_emc_of_match);
+MODULE_DEVICE_TABLE(of, tegra124_emc_of_match);
static struct device_node *
-tegra_emc_find_node_by_ram_code(struct device_node *node, u32 ram_code)
+tegra124_emc_find_node_by_ram_code(struct device_node *node, u32 ram_code)
{
struct device_node *np;
int err;
@@ -1041,7 +1041,7 @@ tegra_emc_find_node_by_ram_code(struct device_node *node, u32 ram_code)
return NULL;
}
-static void tegra_emc_rate_requests_init(struct tegra_emc *emc)
+static void tegra124_emc_rate_requests_init(struct tegra_emc *emc)
{
unsigned int i;
@@ -1143,7 +1143,7 @@ static int emc_set_max_rate(struct tegra_emc *emc, unsigned long rate,
* valid range.
*/
-static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
+static bool tegra124_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
{
unsigned int i;
@@ -1154,8 +1154,8 @@ static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
return false;
}
-static int tegra_emc_debug_available_rates_show(struct seq_file *s,
- void *data)
+static int tegra124_emc_debug_available_rates_show(struct seq_file *s,
+ void *data)
{
struct tegra_emc *emc = s->private;
const char *prefix = "";
@@ -1171,9 +1171,9 @@ static int tegra_emc_debug_available_rates_show(struct seq_file *s,
return 0;
}
-DEFINE_SHOW_ATTRIBUTE(tegra_emc_debug_available_rates);
+DEFINE_SHOW_ATTRIBUTE(tegra124_emc_debug_available_rates);
-static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
+static int tegra124_emc_debug_min_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -1182,12 +1182,12 @@ static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
+static int tegra124_emc_debug_min_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra124_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_min_rate(emc, rate, EMC_RATE_DEBUG);
@@ -1199,11 +1199,11 @@ static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_min_rate_fops,
- tegra_emc_debug_min_rate_get,
- tegra_emc_debug_min_rate_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(tegra124_emc_debug_min_rate_fops,
+ tegra124_emc_debug_min_rate_get,
+ tegra124_emc_debug_min_rate_set, "%llu\n");
-static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
+static int tegra124_emc_debug_max_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -1212,12 +1212,12 @@ static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
+static int tegra124_emc_debug_max_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra124_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_max_rate(emc, rate, EMC_RATE_DEBUG);
@@ -1229,9 +1229,9 @@ static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_max_rate_fops,
- tegra_emc_debug_max_rate_get,
- tegra_emc_debug_max_rate_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(tegra124_emc_debug_max_rate_fops,
+ tegra124_emc_debug_max_rate_get,
+ tegra124_emc_debug_max_rate_set, "%llu\n");
static void emc_debugfs_init(struct device *dev, struct tegra_emc *emc)
{
@@ -1266,11 +1266,11 @@ static void emc_debugfs_init(struct device *dev, struct tegra_emc *emc)
emc->debugfs.root = debugfs_create_dir("emc", NULL);
debugfs_create_file("available_rates", 0444, emc->debugfs.root, emc,
- &tegra_emc_debug_available_rates_fops);
+ &tegra124_emc_debug_available_rates_fops);
debugfs_create_file("min_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_min_rate_fops);
+ emc, &tegra124_emc_debug_min_rate_fops);
debugfs_create_file("max_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_max_rate_fops);
+ emc, &tegra124_emc_debug_max_rate_fops);
}
static inline struct tegra_emc *
@@ -1334,7 +1334,7 @@ static int emc_icc_set(struct icc_node *src, struct icc_node *dst)
return 0;
}
-static int tegra_emc_interconnect_init(struct tegra_emc *emc)
+static int tegra124_emc_interconnect_init(struct tegra_emc *emc)
{
const struct tegra_mc_soc *soc = emc->mc->soc;
struct icc_node *node;
@@ -1383,7 +1383,7 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
-static int tegra_emc_opp_table_init(struct tegra_emc *emc)
+static int tegra124_emc_opp_table_init(struct tegra_emc *emc)
{
u32 hw_version = BIT(tegra_sku_info.soc_speedo_id);
int opp_token, err;
@@ -1425,12 +1425,12 @@ static int tegra_emc_opp_table_init(struct tegra_emc *emc)
return err;
}
-static void devm_tegra_emc_unset_callback(void *data)
+static void devm_tegra124_emc_unset_callback(void *data)
{
tegra124_clk_set_emc_callbacks(NULL, NULL);
}
-static int tegra_emc_probe(struct platform_device *pdev)
+static int tegra124_emc_probe(struct platform_device *pdev)
{
struct device_node *np;
struct tegra_emc *emc;
@@ -1454,9 +1454,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
ram_code = tegra_read_ram_code();
- np = tegra_emc_find_node_by_ram_code(pdev->dev.of_node, ram_code);
+ np = tegra124_emc_find_node_by_ram_code(pdev->dev.of_node, ram_code);
if (np) {
- err = tegra_emc_load_timings_from_dt(emc, np);
+ err = tegra124_emc_load_timings_from_dt(emc, np);
of_node_put(np);
if (err)
return err;
@@ -1470,10 +1470,10 @@ static int tegra_emc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, emc);
- tegra124_clk_set_emc_callbacks(tegra_emc_prepare_timing_change,
- tegra_emc_complete_timing_change);
+ tegra124_clk_set_emc_callbacks(tegra124_emc_prepare_timing_change,
+ tegra124_emc_complete_timing_change);
- err = devm_add_action_or_reset(&pdev->dev, devm_tegra_emc_unset_callback,
+ err = devm_add_action_or_reset(&pdev->dev, devm_tegra124_emc_unset_callback,
NULL);
if (err)
return err;
@@ -1483,16 +1483,16 @@ static int tegra_emc_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(emc->clk),
"failed to get EMC clock\n");
- err = tegra_emc_opp_table_init(emc);
+ err = tegra124_emc_opp_table_init(emc);
if (err)
return err;
- tegra_emc_rate_requests_init(emc);
+ tegra124_emc_rate_requests_init(emc);
if (IS_ENABLED(CONFIG_DEBUG_FS))
emc_debugfs_init(&pdev->dev, emc);
- tegra_emc_interconnect_init(emc);
+ tegra124_emc_interconnect_init(emc);
/*
* Don't allow the kernel module to be unloaded. Unloading adds some
@@ -1504,16 +1504,16 @@ static int tegra_emc_probe(struct platform_device *pdev)
return 0;
};
-static struct platform_driver tegra_emc_driver = {
- .probe = tegra_emc_probe,
+static struct platform_driver tegra124_emc_driver = {
+ .probe = tegra124_emc_probe,
.driver = {
.name = "tegra-emc",
- .of_match_table = tegra_emc_of_match,
+ .of_match_table = tegra124_emc_of_match,
.suppress_bind_attrs = true,
.sync_state = icc_sync_state,
},
};
-module_platform_driver(tegra_emc_driver);
+module_platform_driver(tegra124_emc_driver);
MODULE_AUTHOR("Mikko Perttunen <mperttunen@nvidia.com>");
MODULE_DESCRIPTION("NVIDIA Tegra124 EMC driver");
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 11/13] memory: tegra186-emc: Add the SoC model prefix to functions
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (9 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 10/13] memory: tegra124-emc: Add the SoC model prefix to functions Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 12/13] memory: tegra20-emc: " Krzysztof Kozlowski
` (3 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Replace "tegra_emc" with "tegra186_emc" in all functions to:
1. Avoid name clashing with other Tegra EMC drivers which makes it
easier to jump to function definitions,
2. Decode the calltraces a bit easier,
3. Unify with other Tegra MC and EMC drivers, which use the SoC model
prefixes.
No functional impact.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra186-emc.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c
index a0de80afe3e90531fcfb29d20773aed0d04478c5..9959ad5804b444b269456d1fbae87b4bc111661b 100644
--- a/drivers/memory/tegra/tegra186-emc.c
+++ b/drivers/memory/tegra/tegra186-emc.c
@@ -218,20 +218,20 @@ static int tegra186_emc_get_emc_dvfs_latency(struct tegra186_emc *emc)
}
/*
- * tegra_emc_icc_set_bw() - Set BW api for EMC provider
+ * tegra186_emc_icc_set_bw() - Set BW api for EMC provider
* @src: ICC node for External Memory Controller (EMC)
* @dst: ICC node for External Memory (DRAM)
*
* Do nothing here as info to BPMP-FW is now passed in the BW set function
* of the MC driver. BPMP-FW sets the final Freq based on the passed values.
*/
-static int tegra_emc_icc_set_bw(struct icc_node *src, struct icc_node *dst)
+static int tegra186_emc_icc_set_bw(struct icc_node *src, struct icc_node *dst)
{
return 0;
}
static struct icc_node *
-tegra_emc_of_icc_xlate(const struct of_phandle_args *spec, void *data)
+tegra186_emc_of_icc_xlate(const struct of_phandle_args *spec, void *data)
{
struct icc_provider *provider = data;
struct icc_node *node;
@@ -247,7 +247,7 @@ tegra_emc_of_icc_xlate(const struct of_phandle_args *spec, void *data)
return ERR_PTR(-EPROBE_DEFER);
}
-static int tegra_emc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *peak)
+static int tegra186_emc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *peak)
{
*avg = 0;
*peak = 0;
@@ -255,7 +255,7 @@ static int tegra_emc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *peak)
return 0;
}
-static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
+static int tegra186_emc_interconnect_init(struct tegra186_emc *emc)
{
struct tegra_mc *mc = dev_get_drvdata(emc->dev->parent);
const struct tegra_mc_soc *soc = mc->soc;
@@ -263,11 +263,11 @@ static int tegra_emc_interconnect_init(struct tegra186_emc *emc)
int err;
emc->provider.dev = emc->dev;
- emc->provider.set = tegra_emc_icc_set_bw;
+ emc->provider.set = tegra186_emc_icc_set_bw;
emc->provider.data = &emc->provider;
emc->provider.aggregate = soc->icc_ops->aggregate;
- emc->provider.xlate = tegra_emc_of_icc_xlate;
- emc->provider.get_bw = tegra_emc_icc_get_init_bw;
+ emc->provider.xlate = tegra186_emc_of_icc_xlate;
+ emc->provider.get_bw = tegra186_emc_icc_get_init_bw;
icc_provider_init(&emc->provider);
@@ -354,7 +354,7 @@ static int tegra186_emc_probe(struct platform_device *pdev)
* EINVAL instead of passing the request to BPMP-FW later when the BW
* request is made by client with 'icc_set_bw()' call.
*/
- err = tegra_emc_interconnect_init(emc);
+ err = tegra186_emc_interconnect_init(emc);
if (err) {
mc->bpmp = NULL;
goto put_bpmp;
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 12/13] memory: tegra20-emc: Add the SoC model prefix to functions
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (10 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 11/13] memory: tegra186-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 13/13] memory: tegra30-emc: " Krzysztof Kozlowski
` (2 subsequent siblings)
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Replace "tegra_emc" with "tegra20_emc" in all functions to:
1. Avoid name clashing with other Tegra EMC drivers which makes it
easier to jump to function definitions,
2. Decode the calltraces a bit easier,
3. Unify with other Tegra MC and EMC drivers, which use the SoC model
prefixes.
No functional impact.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra20-emc.c | 120 ++++++++++++++++++-------------------
1 file changed, 60 insertions(+), 60 deletions(-)
diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c
index 18e266dde5d2a0fb962fadc04161b03fb79f76cb..398cb8ae2e38736fcac04d71738b11b3d5b75f4e 100644
--- a/drivers/memory/tegra/tegra20-emc.c
+++ b/drivers/memory/tegra/tegra20-emc.c
@@ -232,7 +232,7 @@ struct tegra_emc {
bool mrr_error;
};
-static irqreturn_t tegra_emc_isr(int irq, void *data)
+static irqreturn_t tegra20_emc_isr(int irq, void *data)
{
struct tegra_emc *emc = data;
u32 intmask = EMC_REFRESH_OVERFLOW_INT;
@@ -253,8 +253,8 @@ static irqreturn_t tegra_emc_isr(int irq, void *data)
return IRQ_HANDLED;
}
-static struct emc_timing *tegra_emc_find_timing(struct tegra_emc *emc,
- unsigned long rate)
+static struct emc_timing *tegra20_emc_find_timing(struct tegra_emc *emc,
+ unsigned long rate)
{
struct emc_timing *timing = NULL;
unsigned int i;
@@ -276,7 +276,7 @@ static struct emc_timing *tegra_emc_find_timing(struct tegra_emc *emc,
static int emc_prepare_timing_change(struct tegra_emc *emc, unsigned long rate)
{
- struct emc_timing *timing = tegra_emc_find_timing(emc, rate);
+ struct emc_timing *timing = tegra20_emc_find_timing(emc, rate);
unsigned int i;
if (!timing)
@@ -321,8 +321,8 @@ static int emc_complete_timing_change(struct tegra_emc *emc, bool flush)
return 0;
}
-static int tegra_emc_clk_change_notify(struct notifier_block *nb,
- unsigned long msg, void *data)
+static int tegra20_emc_clk_change_notify(struct notifier_block *nb,
+ unsigned long msg, void *data)
{
struct tegra_emc *emc = container_of(nb, struct tegra_emc, clk_nb);
struct clk_notifier_data *cnd = data;
@@ -407,8 +407,8 @@ static int cmp_timings(const void *_a, const void *_b)
return 0;
}
-static int tegra_emc_load_timings_from_dt(struct tegra_emc *emc,
- struct device_node *node)
+static int tegra20_emc_load_timings_from_dt(struct tegra_emc *emc,
+ struct device_node *node)
{
struct emc_timing *timing;
int child_count;
@@ -452,7 +452,7 @@ static int tegra_emc_load_timings_from_dt(struct tegra_emc *emc,
}
static struct device_node *
-tegra_emc_find_node_by_ram_code(struct tegra_emc *emc)
+tegra20_emc_find_node_by_ram_code(struct tegra_emc *emc)
{
struct device *dev = emc->dev;
struct device_node *np;
@@ -710,7 +710,7 @@ static long emc_round_rate(unsigned long rate,
return timing->rate;
}
-static void tegra_emc_rate_requests_init(struct tegra_emc *emc)
+static void tegra20_emc_rate_requests_init(struct tegra_emc *emc)
{
unsigned int i;
@@ -812,7 +812,7 @@ static int emc_set_max_rate(struct tegra_emc *emc, unsigned long rate,
* valid range.
*/
-static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
+static bool tegra20_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
{
unsigned int i;
@@ -823,7 +823,7 @@ static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
return false;
}
-static int tegra_emc_debug_available_rates_show(struct seq_file *s, void *data)
+static int tegra20_emc_debug_available_rates_show(struct seq_file *s, void *data)
{
struct tegra_emc *emc = s->private;
const char *prefix = "";
@@ -838,9 +838,9 @@ static int tegra_emc_debug_available_rates_show(struct seq_file *s, void *data)
return 0;
}
-DEFINE_SHOW_ATTRIBUTE(tegra_emc_debug_available_rates);
+DEFINE_SHOW_ATTRIBUTE(tegra20_emc_debug_available_rates);
-static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
+static int tegra20_emc_debug_min_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -849,12 +849,12 @@ static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
+static int tegra20_emc_debug_min_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra20_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_min_rate(emc, rate, EMC_RATE_DEBUG);
@@ -866,11 +866,11 @@ static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_SIMPLE_ATTRIBUTE(tegra_emc_debug_min_rate_fops,
- tegra_emc_debug_min_rate_get,
- tegra_emc_debug_min_rate_set, "%llu\n");
+DEFINE_SIMPLE_ATTRIBUTE(tegra20_emc_debug_min_rate_fops,
+ tegra20_emc_debug_min_rate_get,
+ tegra20_emc_debug_min_rate_set, "%llu\n");
-static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
+static int tegra20_emc_debug_max_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -879,12 +879,12 @@ static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
+static int tegra20_emc_debug_max_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra20_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_max_rate(emc, rate, EMC_RATE_DEBUG);
@@ -896,11 +896,11 @@ static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_SIMPLE_ATTRIBUTE(tegra_emc_debug_max_rate_fops,
- tegra_emc_debug_max_rate_get,
- tegra_emc_debug_max_rate_set, "%llu\n");
+DEFINE_SIMPLE_ATTRIBUTE(tegra20_emc_debug_max_rate_fops,
+ tegra20_emc_debug_max_rate_get,
+ tegra20_emc_debug_max_rate_set, "%llu\n");
-static void tegra_emc_debugfs_init(struct tegra_emc *emc)
+static void tegra20_emc_debugfs_init(struct tegra_emc *emc)
{
struct device *dev = emc->dev;
unsigned int i;
@@ -933,11 +933,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc)
emc->debugfs.root = debugfs_create_dir("emc", NULL);
debugfs_create_file("available_rates", 0444, emc->debugfs.root,
- emc, &tegra_emc_debug_available_rates_fops);
+ emc, &tegra20_emc_debug_available_rates_fops);
debugfs_create_file("min_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_min_rate_fops);
+ emc, &tegra20_emc_debug_min_rate_fops);
debugfs_create_file("max_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_max_rate_fops);
+ emc, &tegra20_emc_debug_max_rate_fops);
}
static inline struct tegra_emc *
@@ -1000,7 +1000,7 @@ static int emc_icc_set(struct icc_node *src, struct icc_node *dst)
return 0;
}
-static int tegra_emc_interconnect_init(struct tegra_emc *emc)
+static int tegra20_emc_interconnect_init(struct tegra_emc *emc)
{
const struct tegra_mc_soc *soc;
struct icc_node *node;
@@ -1055,25 +1055,25 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
-static void devm_tegra_emc_unset_callback(void *data)
+static void devm_tegra20_emc_unset_callback(void *data)
{
tegra20_clk_set_emc_round_callback(NULL, NULL);
}
-static void devm_tegra_emc_unreg_clk_notifier(void *data)
+static void devm_tegra20_emc_unreg_clk_notifier(void *data)
{
struct tegra_emc *emc = data;
clk_notifier_unregister(emc->clk, &emc->clk_nb);
}
-static int tegra_emc_init_clk(struct tegra_emc *emc)
+static int tegra20_emc_init_clk(struct tegra_emc *emc)
{
int err;
tegra20_clk_set_emc_round_callback(emc_round_rate, emc);
- err = devm_add_action_or_reset(emc->dev, devm_tegra_emc_unset_callback,
+ err = devm_add_action_or_reset(emc->dev, devm_tegra20_emc_unset_callback,
NULL);
if (err)
return err;
@@ -1088,15 +1088,15 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
err = devm_add_action_or_reset(emc->dev,
- devm_tegra_emc_unreg_clk_notifier, emc);
+ devm_tegra20_emc_unreg_clk_notifier, emc);
if (err)
return err;
return 0;
}
-static int tegra_emc_devfreq_target(struct device *dev, unsigned long *freq,
- u32 flags)
+static int tegra20_emc_devfreq_target(struct device *dev, unsigned long *freq,
+ u32 flags)
{
struct tegra_emc *emc = dev_get_drvdata(dev);
struct dev_pm_opp *opp;
@@ -1114,8 +1114,8 @@ static int tegra_emc_devfreq_target(struct device *dev, unsigned long *freq,
return emc_set_min_rate(emc, rate, EMC_RATE_DEVFREQ);
}
-static int tegra_emc_devfreq_get_dev_status(struct device *dev,
- struct devfreq_dev_status *stat)
+static int tegra20_emc_devfreq_get_dev_status(struct device *dev,
+ struct devfreq_dev_status *stat)
{
struct tegra_emc *emc = dev_get_drvdata(dev);
@@ -1137,13 +1137,13 @@ static int tegra_emc_devfreq_get_dev_status(struct device *dev,
return 0;
}
-static struct devfreq_dev_profile tegra_emc_devfreq_profile = {
+static struct devfreq_dev_profile tegra20_emc_devfreq_profile = {
.polling_ms = 30,
- .target = tegra_emc_devfreq_target,
- .get_dev_status = tegra_emc_devfreq_get_dev_status,
+ .target = tegra20_emc_devfreq_target,
+ .get_dev_status = tegra20_emc_devfreq_get_dev_status,
};
-static int tegra_emc_devfreq_init(struct tegra_emc *emc)
+static int tegra20_emc_devfreq_init(struct tegra_emc *emc)
{
struct devfreq *devfreq;
@@ -1165,7 +1165,7 @@ static int tegra_emc_devfreq_init(struct tegra_emc *emc)
writel_relaxed(0x00000000, emc->regs + EMC_STAT_LLMC_CONTROL);
writel_relaxed(0xffffffff, emc->regs + EMC_STAT_PWR_CLOCK_LIMIT);
- devfreq = devm_devfreq_add_device(emc->dev, &tegra_emc_devfreq_profile,
+ devfreq = devm_devfreq_add_device(emc->dev, &tegra20_emc_devfreq_profile,
DEVFREQ_GOV_SIMPLE_ONDEMAND,
&emc->ondemand_data);
if (IS_ERR(devfreq))
@@ -1175,7 +1175,7 @@ static int tegra_emc_devfreq_init(struct tegra_emc *emc)
return 0;
}
-static int tegra_emc_probe(struct platform_device *pdev)
+static int tegra20_emc_probe(struct platform_device *pdev)
{
struct tegra_core_opp_params opp_params = {};
struct device_node *np;
@@ -1191,7 +1191,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
return -ENOMEM;
mutex_init(&emc->rate_lock);
- emc->clk_nb.notifier_call = tegra_emc_clk_change_notify;
+ emc->clk_nb.notifier_call = tegra20_emc_clk_change_notify;
emc->dev = &pdev->dev;
emc->regs = devm_platform_ioremap_resource(pdev, 0);
@@ -1202,22 +1202,22 @@ static int tegra_emc_probe(struct platform_device *pdev)
if (err)
return err;
- np = tegra_emc_find_node_by_ram_code(emc);
+ np = tegra20_emc_find_node_by_ram_code(emc);
if (np) {
- err = tegra_emc_load_timings_from_dt(emc, np);
+ err = tegra20_emc_load_timings_from_dt(emc, np);
of_node_put(np);
if (err)
return err;
}
- err = devm_request_irq(&pdev->dev, irq, tegra_emc_isr, 0,
+ err = devm_request_irq(&pdev->dev, irq, tegra20_emc_isr, 0,
dev_name(&pdev->dev), emc);
if (err) {
dev_err(&pdev->dev, "failed to request IRQ: %d\n", err);
return err;
}
- err = tegra_emc_init_clk(emc);
+ err = tegra20_emc_init_clk(emc);
if (err)
return err;
@@ -1228,10 +1228,10 @@ static int tegra_emc_probe(struct platform_device *pdev)
return err;
platform_set_drvdata(pdev, emc);
- tegra_emc_rate_requests_init(emc);
- tegra_emc_debugfs_init(emc);
- tegra_emc_interconnect_init(emc);
- tegra_emc_devfreq_init(emc);
+ tegra20_emc_rate_requests_init(emc);
+ tegra20_emc_debugfs_init(emc);
+ tegra20_emc_interconnect_init(emc);
+ tegra20_emc_devfreq_init(emc);
/*
* Don't allow the kernel module to be unloaded. Unloading adds some
@@ -1243,22 +1243,22 @@ static int tegra_emc_probe(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id tegra_emc_of_match[] = {
+static const struct of_device_id tegra20_emc_of_match[] = {
{ .compatible = "nvidia,tegra20-emc", },
{},
};
-MODULE_DEVICE_TABLE(of, tegra_emc_of_match);
+MODULE_DEVICE_TABLE(of, tegra20_emc_of_match);
-static struct platform_driver tegra_emc_driver = {
- .probe = tegra_emc_probe,
+static struct platform_driver tegra20_emc_driver = {
+ .probe = tegra20_emc_probe,
.driver = {
.name = "tegra20-emc",
- .of_match_table = tegra_emc_of_match,
+ .of_match_table = tegra20_emc_of_match,
.suppress_bind_attrs = true,
.sync_state = icc_sync_state,
},
};
-module_platform_driver(tegra_emc_driver);
+module_platform_driver(tegra20_emc_driver);
MODULE_AUTHOR("Dmitry Osipenko <digetx@gmail.com>");
MODULE_DESCRIPTION("NVIDIA Tegra20 EMC driver");
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 13/13] memory: tegra30-emc: Add the SoC model prefix to functions
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (11 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 12/13] memory: tegra20-emc: " Krzysztof Kozlowski
@ 2025-09-11 9:43 ` Krzysztof Kozlowski
2025-09-17 13:13 ` [PATCH v2 00/13] memory: tegra: Several cleanups Jon Hunter
2025-10-13 0:23 ` Krzysztof Kozlowski
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-09-11 9:43 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter
Cc: linux-kernel, linux-tegra, Aaron Kling, Krzysztof Kozlowski
Replace "tegra_emc" with "tegra30_emc" in all functions to:
1. Avoid name clashing with other Tegra EMC drivers which makes it
easier to jump to function definitions,
2. Decode the calltraces a bit easier,
3. Unify with other Tegra MC and EMC drivers, which use the SoC model
prefixes.
No functional impact.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
drivers/memory/tegra/tegra30-emc.c | 90 +++++++++++++++++++-------------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index cca386af423e9647266878ce6cd1bcec09c8eba4..914116d8ec16d0d52180c7fadd1843adc139ceaf 100644
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -413,7 +413,7 @@ static int emc_seq_update_timing(struct tegra_emc *emc)
return 0;
}
-static irqreturn_t tegra_emc_isr(int irq, void *data)
+static irqreturn_t tegra30_emc_isr(int irq, void *data)
{
struct tegra_emc *emc = data;
u32 intmask = EMC_REFRESH_OVERFLOW_INT;
@@ -1228,7 +1228,7 @@ static long emc_round_rate(unsigned long rate,
return timing->rate;
}
-static void tegra_emc_rate_requests_init(struct tegra_emc *emc)
+static void tegra30_emc_rate_requests_init(struct tegra_emc *emc)
{
unsigned int i;
@@ -1330,7 +1330,7 @@ static int emc_set_max_rate(struct tegra_emc *emc, unsigned long rate,
* valid range.
*/
-static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
+static bool tegra30_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
{
unsigned int i;
@@ -1341,7 +1341,7 @@ static bool tegra_emc_validate_rate(struct tegra_emc *emc, unsigned long rate)
return false;
}
-static int tegra_emc_debug_available_rates_show(struct seq_file *s, void *data)
+static int tegra30_emc_debug_available_rates_show(struct seq_file *s, void *data)
{
struct tegra_emc *emc = s->private;
const char *prefix = "";
@@ -1356,9 +1356,9 @@ static int tegra_emc_debug_available_rates_show(struct seq_file *s, void *data)
return 0;
}
-DEFINE_SHOW_ATTRIBUTE(tegra_emc_debug_available_rates);
+DEFINE_SHOW_ATTRIBUTE(tegra30_emc_debug_available_rates);
-static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
+static int tegra30_emc_debug_min_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -1367,12 +1367,12 @@ static int tegra_emc_debug_min_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
+static int tegra30_emc_debug_min_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra30_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_min_rate(emc, rate, EMC_RATE_DEBUG);
@@ -1384,11 +1384,11 @@ static int tegra_emc_debug_min_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_min_rate_fops,
- tegra_emc_debug_min_rate_get,
- tegra_emc_debug_min_rate_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(tegra30_emc_debug_min_rate_fops,
+ tegra30_emc_debug_min_rate_get,
+ tegra30_emc_debug_min_rate_set, "%llu\n");
-static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
+static int tegra30_emc_debug_max_rate_get(void *data, u64 *rate)
{
struct tegra_emc *emc = data;
@@ -1397,12 +1397,12 @@ static int tegra_emc_debug_max_rate_get(void *data, u64 *rate)
return 0;
}
-static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
+static int tegra30_emc_debug_max_rate_set(void *data, u64 rate)
{
struct tegra_emc *emc = data;
int err;
- if (!tegra_emc_validate_rate(emc, rate))
+ if (!tegra30_emc_validate_rate(emc, rate))
return -EINVAL;
err = emc_set_max_rate(emc, rate, EMC_RATE_DEBUG);
@@ -1414,11 +1414,11 @@ static int tegra_emc_debug_max_rate_set(void *data, u64 rate)
return 0;
}
-DEFINE_DEBUGFS_ATTRIBUTE(tegra_emc_debug_max_rate_fops,
- tegra_emc_debug_max_rate_get,
- tegra_emc_debug_max_rate_set, "%llu\n");
+DEFINE_DEBUGFS_ATTRIBUTE(tegra30_emc_debug_max_rate_fops,
+ tegra30_emc_debug_max_rate_get,
+ tegra30_emc_debug_max_rate_set, "%llu\n");
-static void tegra_emc_debugfs_init(struct tegra_emc *emc)
+static void tegra30_emc_debugfs_init(struct tegra_emc *emc)
{
struct device *dev = emc->dev;
unsigned int i;
@@ -1451,11 +1451,11 @@ static void tegra_emc_debugfs_init(struct tegra_emc *emc)
emc->debugfs.root = debugfs_create_dir("emc", NULL);
debugfs_create_file("available_rates", 0444, emc->debugfs.root,
- emc, &tegra_emc_debug_available_rates_fops);
+ emc, &tegra30_emc_debug_available_rates_fops);
debugfs_create_file("min_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_min_rate_fops);
+ emc, &tegra30_emc_debug_min_rate_fops);
debugfs_create_file("max_rate", 0644, emc->debugfs.root,
- emc, &tegra_emc_debug_max_rate_fops);
+ emc, &tegra30_emc_debug_max_rate_fops);
}
static inline struct tegra_emc *
@@ -1518,7 +1518,7 @@ static int emc_icc_set(struct icc_node *src, struct icc_node *dst)
return 0;
}
-static int tegra_emc_interconnect_init(struct tegra_emc *emc)
+static int tegra30_emc_interconnect_init(struct tegra_emc *emc)
{
const struct tegra_mc_soc *soc = emc->mc->soc;
struct icc_node *node;
@@ -1567,25 +1567,25 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
}
-static void devm_tegra_emc_unset_callback(void *data)
+static void devm_tegra30_emc_unset_callback(void *data)
{
tegra20_clk_set_emc_round_callback(NULL, NULL);
}
-static void devm_tegra_emc_unreg_clk_notifier(void *data)
+static void devm_tegra30_emc_unreg_clk_notifier(void *data)
{
struct tegra_emc *emc = data;
clk_notifier_unregister(emc->clk, &emc->clk_nb);
}
-static int tegra_emc_init_clk(struct tegra_emc *emc)
+static int tegra30_emc_init_clk(struct tegra_emc *emc)
{
int err;
tegra20_clk_set_emc_round_callback(emc_round_rate, emc);
- err = devm_add_action_or_reset(emc->dev, devm_tegra_emc_unset_callback,
+ err = devm_add_action_or_reset(emc->dev, devm_tegra30_emc_unset_callback,
NULL);
if (err)
return err;
@@ -1600,14 +1600,14 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
err = devm_add_action_or_reset(emc->dev,
- devm_tegra_emc_unreg_clk_notifier, emc);
+ devm_tegra30_emc_unreg_clk_notifier, emc);
if (err)
return err;
return 0;
}
-static int tegra_emc_probe(struct platform_device *pdev)
+static int tegra30_emc_probe(struct platform_device *pdev)
{
struct tegra_core_opp_params opp_params = {};
struct device_node *np;
@@ -1648,12 +1648,12 @@ static int tegra_emc_probe(struct platform_device *pdev)
emc->irq = err;
- err = devm_request_irq(&pdev->dev, emc->irq, tegra_emc_isr, 0,
+ err = devm_request_irq(&pdev->dev, emc->irq, tegra30_emc_isr, 0,
dev_name(&pdev->dev), emc);
if (err)
return dev_err_probe(&pdev->dev, err, "failed to request irq\n");
- err = tegra_emc_init_clk(emc);
+ err = tegra30_emc_init_clk(emc);
if (err)
return err;
@@ -1664,9 +1664,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
return err;
platform_set_drvdata(pdev, emc);
- tegra_emc_rate_requests_init(emc);
- tegra_emc_debugfs_init(emc);
- tegra_emc_interconnect_init(emc);
+ tegra30_emc_rate_requests_init(emc);
+ tegra30_emc_debugfs_init(emc);
+ tegra30_emc_interconnect_init(emc);
/*
* Don't allow the kernel module to be unloaded. Unloading adds some
@@ -1678,7 +1678,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
return 0;
}
-static int tegra_emc_suspend(struct device *dev)
+static int tegra30_emc_suspend(struct device *dev)
{
struct tegra_emc *emc = dev_get_drvdata(dev);
int err;
@@ -1699,7 +1699,7 @@ static int tegra_emc_suspend(struct device *dev)
return 0;
}
-static int tegra_emc_resume(struct device *dev)
+static int tegra30_emc_resume(struct device *dev)
{
struct tegra_emc *emc = dev_get_drvdata(dev);
@@ -1711,28 +1711,28 @@ static int tegra_emc_resume(struct device *dev)
return 0;
}
-static const struct dev_pm_ops tegra_emc_pm_ops = {
- .suspend = tegra_emc_suspend,
- .resume = tegra_emc_resume,
+static const struct dev_pm_ops tegra30_emc_pm_ops = {
+ .suspend = tegra30_emc_suspend,
+ .resume = tegra30_emc_resume,
};
-static const struct of_device_id tegra_emc_of_match[] = {
+static const struct of_device_id tegra30_emc_of_match[] = {
{ .compatible = "nvidia,tegra30-emc", },
{},
};
-MODULE_DEVICE_TABLE(of, tegra_emc_of_match);
+MODULE_DEVICE_TABLE(of, tegra30_emc_of_match);
-static struct platform_driver tegra_emc_driver = {
- .probe = tegra_emc_probe,
+static struct platform_driver tegra30_emc_driver = {
+ .probe = tegra30_emc_probe,
.driver = {
.name = "tegra30-emc",
- .of_match_table = tegra_emc_of_match,
- .pm = &tegra_emc_pm_ops,
+ .of_match_table = tegra30_emc_of_match,
+ .pm = &tegra30_emc_pm_ops,
.suppress_bind_attrs = true,
.sync_state = icc_sync_state,
},
};
-module_platform_driver(tegra_emc_driver);
+module_platform_driver(tegra30_emc_driver);
MODULE_AUTHOR("Dmitry Osipenko <digetx@gmail.com>");
MODULE_DESCRIPTION("NVIDIA Tegra30 EMC driver");
--
2.48.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init()
2025-09-11 9:43 ` [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init() Krzysztof Kozlowski
@ 2025-09-17 13:12 ` Jon Hunter
0 siblings, 0 replies; 17+ messages in thread
From: Jon Hunter @ 2025-09-17 13:12 UTC (permalink / raw)
To: Krzysztof Kozlowski, Krzysztof Kozlowski, Thierry Reding
Cc: linux-kernel, linux-tegra, Aaron Kling
On 11/09/2025 10:43, Krzysztof Kozlowski wrote:
> emc_init() returns always success, so just drop return valye to simplify
s/valye/value/
> it.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> ---
> drivers/memory/tegra/tegra124-emc.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/memory/tegra/tegra124-emc.c b/drivers/memory/tegra/tegra124-emc.c
> index 03f1daa2d132a81d28705ec7c62d640d7d25a894..9aad02901613f1b2ed855c11bcd76fef153034af 100644
> --- a/drivers/memory/tegra/tegra124-emc.c
> +++ b/drivers/memory/tegra/tegra124-emc.c
> @@ -896,7 +896,7 @@ static void emc_read_current_timing(struct tegra_emc *emc,
> timing->emc_mode_reset = 0;
> }
>
> -static int emc_init(struct tegra_emc *emc)
> +static void emc_init(struct tegra_emc *emc)
> {
> emc->dram_type = readl(emc->regs + EMC_FBIO_CFG5);
>
> @@ -913,8 +913,6 @@ static int emc_init(struct tegra_emc *emc)
> emc->dram_num = tegra_mc_get_emem_device_count(emc->mc);
>
> emc_read_current_timing(emc, &emc->last_timing);
> -
> - return 0;
> }
>
> static int load_one_timing_from_dt(struct tegra_emc *emc,
> @@ -1472,11 +1470,7 @@ static int tegra_emc_probe(struct platform_device *pdev)
> ram_code);
> }
>
> - err = emc_init(emc);
> - if (err) {
> - dev_err(&pdev->dev, "EMC initialization failed: %d\n", err);
> - return err;
> - }
> + emc_init(emc);
>
> platform_set_drvdata(pdev, emc);
>
Otherwise looks good to me.
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Cheers
Jon
--
nvpublic
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 00/13] memory: tegra: Several cleanups
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (12 preceding siblings ...)
2025-09-11 9:43 ` [PATCH v2 13/13] memory: tegra30-emc: " Krzysztof Kozlowski
@ 2025-09-17 13:13 ` Jon Hunter
2025-10-13 0:23 ` Krzysztof Kozlowski
14 siblings, 0 replies; 17+ messages in thread
From: Jon Hunter @ 2025-09-17 13:13 UTC (permalink / raw)
To: Krzysztof Kozlowski, Krzysztof Kozlowski, Thierry Reding
Cc: linux-kernel, linux-tegra, Aaron Kling
Hi Krzysztof,
On 11/09/2025 10:43, Krzysztof Kozlowski wrote:
> Changes in v2:
> - Fix commit msg copy-paste in the last commits - proper number for
> "tegraXXX_emc".
> - Link to v1: https://lore.kernel.org/r/20250910-memory-tegra-cleanup-v1-0-023c33a2d997@linaro.org
>
> Few cleanups for Tegra MC/EMC drivers:
> Deferred probe, few simplifyings and function name unification.
>
> Best regards,
> Krzysztof
>
> ---
> Krzysztof Kozlowski (13):
> memory: tegra124-emc: Simplify return of emc_init()
> memory: tegra124-emc: Do not print error on icc_node_create() failure
> memory: tegra186-emc: Do not print error on icc_node_create() failure
> memory: tegra20-emc: Do not print error on icc_node_create() failure
> memory: tegra30-emc: Do not print error on icc_node_create() failure
> memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe()
> memory: tegra20-emc: Simplify and handle deferred probe with dev_err_probe()
> memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()
> memory: tegra124-emc: Simplify and handle deferred probe with dev_err_probe()
> memory: tegra124-emc: Add the SoC model prefix to functions
> memory: tegra186-emc: Add the SoC model prefix to functions
> memory: tegra20-emc: Add the SoC model prefix to functions
> memory: tegra30-emc: Add the SoC model prefix to functions
Thanks for the series and updates. I have been through them and so feel
free to add my ...
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Jon
--
nvpublic
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 00/13] memory: tegra: Several cleanups
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
` (13 preceding siblings ...)
2025-09-17 13:13 ` [PATCH v2 00/13] memory: tegra: Several cleanups Jon Hunter
@ 2025-10-13 0:23 ` Krzysztof Kozlowski
14 siblings, 0 replies; 17+ messages in thread
From: Krzysztof Kozlowski @ 2025-10-13 0:23 UTC (permalink / raw)
To: Krzysztof Kozlowski, Thierry Reding, Jonathan Hunter,
Krzysztof Kozlowski
Cc: linux-kernel, linux-tegra, Aaron Kling
On Thu, 11 Sep 2025 11:43:11 +0200, Krzysztof Kozlowski wrote:
> Changes in v2:
> - Fix commit msg copy-paste in the last commits - proper number for
> "tegraXXX_emc".
> - Link to v1: https://lore.kernel.org/r/20250910-memory-tegra-cleanup-v1-0-023c33a2d997@linaro.org
>
> Few cleanups for Tegra MC/EMC drivers:
> Deferred probe, few simplifyings and function name unification.
>
> [...]
Applied, thanks!
[01/13] memory: tegra124-emc: Simplify return of emc_init()
https://git.kernel.org/krzk/linux-mem-ctrl/c/da722f1c9d605dffaabe2526e3e4cae3ff53401d
[02/13] memory: tegra124-emc: Do not print error on icc_node_create() failure
https://git.kernel.org/krzk/linux-mem-ctrl/c/1c9cce8a0e0bd4f383a04655bd3a4f650fc1f20f
[03/13] memory: tegra186-emc: Do not print error on icc_node_create() failure
https://git.kernel.org/krzk/linux-mem-ctrl/c/515498a3f58485321a1fa03b4eb5e6208a816e06
[04/13] memory: tegra20-emc: Do not print error on icc_node_create() failure
https://git.kernel.org/krzk/linux-mem-ctrl/c/e215d91d66a2c8c7ed8524ce6b261340149c10f0
[05/13] memory: tegra30-emc: Do not print error on icc_node_create() failure
https://git.kernel.org/krzk/linux-mem-ctrl/c/c0ca941c93527a9e96f3ba58c0970cdf94670203
[06/13] memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe()
https://git.kernel.org/krzk/linux-mem-ctrl/c/db2bd7ab1ae8c1f32a553b6eb36d6fecea41aab5
[07/13] memory: tegra20-emc: Simplify and handle deferred probe with dev_err_probe()
https://git.kernel.org/krzk/linux-mem-ctrl/c/57c9f6e29ccd44db882b943df2e72a4e54ebe0e3
[08/13] memory: tegra186-emc: Simplify and handle deferred probe with dev_err_probe()
https://git.kernel.org/krzk/linux-mem-ctrl/c/a52ddb98a674b01b6b5f2da1ed70a9f30d539f6b
[09/13] memory: tegra124-emc: Simplify and handle deferred probe with dev_err_probe()
https://git.kernel.org/krzk/linux-mem-ctrl/c/f398631b769c43fd3c575ad6270bb0109a04b85a
[10/13] memory: tegra124-emc: Add the SoC model prefix to functions
https://git.kernel.org/krzk/linux-mem-ctrl/c/e6e50496b7e77613ed5b610877f34e1197ce62da
[11/13] memory: tegra186-emc: Add the SoC model prefix to functions
https://git.kernel.org/krzk/linux-mem-ctrl/c/4ebcacbb4447cd3b05289e1e0e199a5e8ea0c6de
[12/13] memory: tegra20-emc: Add the SoC model prefix to functions
https://git.kernel.org/krzk/linux-mem-ctrl/c/5c8c19417c9777aba1bc9a1d93c95edec48d8b19
[13/13] memory: tegra30-emc: Add the SoC model prefix to functions
https://git.kernel.org/krzk/linux-mem-ctrl/c/50c833c5cd9450c8c67d32883ea290dcbd633ea0
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2025-10-13 0:23 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-11 9:43 [PATCH v2 00/13] memory: tegra: Several cleanups Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 01/13] memory: tegra124-emc: Simplify return of emc_init() Krzysztof Kozlowski
2025-09-17 13:12 ` Jon Hunter
2025-09-11 9:43 ` [PATCH v2 02/13] memory: tegra124-emc: Do not print error on icc_node_create() failure Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 03/13] memory: tegra186-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 04/13] memory: tegra20-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 05/13] memory: tegra30-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 06/13] memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe() Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 07/13] memory: tegra20-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 08/13] memory: tegra186-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 09/13] memory: tegra124-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 10/13] memory: tegra124-emc: Add the SoC model prefix to functions Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 11/13] memory: tegra186-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 12/13] memory: tegra20-emc: " Krzysztof Kozlowski
2025-09-11 9:43 ` [PATCH v2 13/13] memory: tegra30-emc: " Krzysztof Kozlowski
2025-09-17 13:13 ` [PATCH v2 00/13] memory: tegra: Several cleanups Jon Hunter
2025-10-13 0:23 ` Krzysztof Kozlowski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).