memory: tegra: Add dummy implementation on Tegra194
Subsystems (2)
PATCH 1/1 memory: tegra: Add dummy implementation on Tegra194
From: Thierry Reding <[email protected]>
With the introduction of commit 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.
Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
--- drivers/memory/tegra/mc.c | 37 +++++++++++++++++++++++++++++++++ drivers/memory/tegra/tegra194.c | 1 + drivers/memory/tegra/tegra234.c | 23 +------------------- include/soc/tegra/mc.h | 3 +++ 4 files changed, 42 insertions(+), 22 deletions(-)
drivers/memory/tegra/mc.c +37 -0
@@ -755,6 +755,43 @@ const char *const tegra_mc_error_names[8] = { [6] = "SMMU translation error", }; +struct icc_node *tegra_mc_icc_xlate (struct of_phandle_args *spec,void *data) +{ +struct tegra_mc *mc =icc_provider_to_tegra_mc (data); +struct icc_node *node; + +list_for_each_entry (node, &mc->provider.nodes, node_list) { +if (node->id == spec->args[0 ]) +return node; + } + +/* +* If a client driver calls devm_of_icc_get() before the MC driver +* is probed, then return EPROBE_DEFER to the client driver. +*/ +return ERR_PTR (-EPROBE_DEFER ); +} + +static int tegra_mc_icc_get (struct icc_node *node,u32 *average,u32 *peak) +{ + *average =0 ; + *peak =0 ; + +return 0 ; +} + +static int tegra_mc_icc_set (struct icc_node *src,struct icc_node *dst) +{ +return 0 ; +} + +const struct tegra_mc_icc_ops tegra_mc_icc_ops = { + .xlate = tegra_mc_icc_xlate, + .aggregate = icc_std_aggregate, + .get_bw = tegra_mc_icc_get, + .set = tegra_mc_icc_set, +}; +/* * Memory Controller (MC) has few Memory Clients that are issuing memory * bandwidth allocation requests to the MC interconnect provider. The MC
drivers/memory/tegra/tegra194.c +1 -0
@@ -1355,6 +1355,7 @@ const struct tegra_mc_soc tegra194_mc_soc = { MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, + .icc_ops = &tegra_mc_icc_ops, .ch_intmask = 0x00000f00, .global_intstatus_channel_shift = 8, };
drivers/memory/tegra/tegra234.c +1 -22
@@ -909,27 +909,6 @@ static int tegra234_mc_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw,return 0 ; } -static struct icc_node * -tegra234_mc_of_icc_xlate (struct of_phandle_args *spec,void *data) -{ -struct tegra_mc *mc =icc_provider_to_tegra_mc (data); -unsigned int cl_id = spec->args[0 ]; -struct icc_node *node; - -list_for_each_entry (node, &mc->provider.nodes, node_list) { -if (node->id != cl_id) -continue ; - -return node; - } - -/* -* If a client driver calls devm_of_icc_get() before the MC driver -* is probed, then return EPROBE_DEFER to the client driver. -*/ -return ERR_PTR (-EPROBE_DEFER ); -} -static int tegra234_mc_icc_get_init_bw (struct icc_node *node,u32 *avg,u32 *peak) { *avg =0 ;
@@ -939,7 +918,7 @@ static int tegra234_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pea }static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = { - .xlate = tegra234_mc_of_icc_xlate, + .xlate = tegra_mc_icc_xlate, .aggregate = tegra234_mc_icc_aggregate, .get_bw = tegra234_mc_icc_get_init_bw, .set = tegra234_mc_icc_set,
include/soc/tegra/mc.h +3 -0
@@ -175,6 +175,9 @@ struct tegra_mc_icc_ops {int (*get_bw)(struct icc_node *node,u32 *avg,u32 *peak); }; +struct icc_node *tegra_mc_icc_xlate (struct of_phandle_args *spec,void *data); +extern const struct tegra_mc_icc_ops tegra_mc_icc_ops; +struct tegra_mc_ops {/* * @probe: Callback to set up SoC-specific bits of the memory controller. This is called
Signature · 1 line
2.41.0
Quoted 11 lines · Thierry Reding
External email: Use caution opening links or attachments
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.
Quoted 8 lines
Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>Signed-off-by Thierry Reding <[email protected]>---
Thank you,
Sumit Gupta
Krzysztof Kozlowski
AppliedQuoted 11 lines · Thierry Reding
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
[...]
Applied, thanks!
[1/1] memory: tegra: Add dummy implementation on Tegra194
https://git.kernel.org/krzk/linux-mem-ctrl/c/d1478aea649e739a0a0e4890cd8b049ae5d08c13
Best regards,
Signature · 1 line
Krzysztof Kozlowski <[email protected]>
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.
Quoted 6 lines
Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>
Applied with checkpatch warning. Please be sure you run checkpatch before sending the patches.
Best regards,
Krzysztof
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Thierry Reding
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Quoted 5 lines
Quoted 2 lines
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>Applied with checkpatch warning. Please be sure you run checkpatch before sending the patches.
Are you referring to the Reported-by/Closes complaint? I didn't include a URL here because this came from an internal test report and there's no corresponding public reference.
I suppose I could've left out the Reported-by altogether.
Thierry
Quoted 14 lines · Thierry Reding
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Thierry Reding
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>Applied with checkpatch warning. Please be sure you run checkpatch before sending the patches.
Are you referring to the Reported-by/Closes complaint?
Yes.
Quoted 3 lines
I didn't include
a URL here because this came from an internal test report and there's no corresponding public reference.
Ah, ok, apologies for pickiness then. :)
Quoted 2 lines
I suppose I could've left out the Reported-by altogether.
I think it is fine. Checkpatch warning is just advisory.
Best regards,
Krzysztof
Jon Hunter
maintainerHi Krzysztof,
Quoted 29 lines · Krzysztof Kozlowski
Quoted 14 lines · Thierry Reding
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Thierry Reding
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>Applied with checkpatch warning. Please be sure you run checkpatch before sending the patches.
Are you referring to the Reported-by/Closes complaint?
Yes.
Quoted 3 lines
I didn't include
a URL here because this came from an internal test report and there's no corresponding public reference.
Quoted 6 lines
Ah, ok, apologies for pickiness then. :)
Quoted 2 lines
I suppose I could've left out the Reported-by altogether.
I think it is fine. Checkpatch warning is just advisory.
We need this in v6.5 as a fix, because without this change PCIe support is broken on Tegra194 devices. Would you be able to send as a fix for v6.5?
Thanks!
Jon
Signature · 1 line
nvpublic
Quoted 35 lines · Jon Hunter
Hi Krzysztof,
Quoted 32 lines · Krzysztof Kozlowski
Quoted 14 lines · Thierry Reding
Quoted 13 lines · Krzysztof Kozlowski
Quoted 12 lines · Thierry Reding
From: Thierry Reding <[email protected]>
With the introduction of commit
9365bf006f53("PCI: tegra194: Add interconnect support in Tegra234"), the PCI driver on Tegra194 and later requires an interconnect provider. However, a provider is currently only exposed on Tegra234 and this causes PCI on Tegra194 to defer probe indefinitely.Fix this by adding a dummy implementation on Tegra194. This allows nodes to be provided to interconnect consumers, but doesn't do any bandwidth accounting or frequency scaling.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Fixes 9365bf006f53 ("PCI: tegra194: Add interconnect support in Tegra234")Reported-by Jon Hunter <[email protected]>Applied with checkpatch warning. Please be sure you run checkpatch before sending the patches.
Are you referring to the Reported-by/Closes complaint?
Yes.
Quoted 3 lines
I didn't include
a URL here because this came from an internal test report and there's no corresponding public reference.Ah, ok, apologies for pickiness then. :)
Quoted 1 line
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
I suppose I could've left out the Reported-by altogether.
I think it is fine. Checkpatch warning is just advisory.
We need this in v6.5 as a fix, because without this change PCIe support is broken on Tegra194 devices. Would you be able to send as a fix for v6.5?
Thanks for letting me know. I'll send it soon.
Best regards,
Krzysztof