memory: tegra: Fix client list and add swgroups
cover memory: tegra: Fix client list and add swgroups
This series has two fixes of tegra210_mc_clients, and three changes to add missing swgroups, according to Tegra X1 TRM.
Nicolin Chen (5):
memory: tegra: Correct la.reg address of seswr
memory: tegra: Correct tegra210_mc_clients def values
memory: tegra: Sort tegra210_swgroups by reg address
dt-bindings: memory: tegra: Add missing swgroups
memory: tegra: Complete tegra210_swgroups
drivers/memory/tegra/tegra210.c | 60 ++++++++++++++---------- include/dt-bindings/memory/tegra210-mc.h | 10 ++++ 2 files changed, 45 insertions(+), 25 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/5 memory: tegra: Correct la.reg address of seswr
According to Tegra X1 TRM, ALLOWANCE_SESWR is located in field [23:16] of register at address 0x3e0 with a reset value of 0x80 at register 0x3e0, while bit-1 of register 0xb98 is for enable bit of seswr. So this patch fixes it.
--- drivers/memory/tegra/tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/tegra/tegra210.c +1 -1
@@ -897,7 +897,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .bit = 1, }, .la = { - .reg = 0xb98, + .reg = 0x3e0, .shift = 16, .mask = 0xff, .def = 0x80,
Signature · 1 line
2.17.1
Re: [PATCH 1/5] memory: tegra: Correct la.reg address of seswr
Quoted 15 lines · Nicolin Chen
According to Tegra X1 TRM,
ALLOWANCE_SESWRis located in field [23:16] of register at address0x3e0with a reset value of0x80at register0x3e0, while bit-1 of register0xb98is for enable bit of seswr. So this patch fixes it.Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/memory/tegra/tegra210.c +0
-0
drivers/memory/tegra/tegra210.c static const struct tegra_mc_client tegra210_mc_clients[] = { · line 903
Quoted 8 lines
drivers/memory/tegra/tegra210.c +1
-1@@ -897,7 +897,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .bit = 1, }, .la = { - .reg = 0xb98, + .reg = 0x3e0, .shift = 16, .mask = 0xff, .def = 0x80,
Heh, indeed. Look like I copied the reg offset from the .smmu.reg by mistake.
Re: [PATCH 1/5] memory: tegra: Correct la.reg address of seswr
In reply to Nicolin ChenQuoted 6 lines · Nicolin Chen
According to Tegra X1 TRM,
ALLOWANCE_SESWRis located in field [23:16] of register at address0x3e0with a reset value of0x80at register0x3e0, while bit-1 of register0xb98is for enable bit of seswr.So this patch fixes it.
Either use the imperative form ("Fix foo bar register address") or just skip the last sentence as it is quite obvious.
https://elixir.bootlin.com/linux/latest/source/Documentation/process/submitting-patches.rst#L151
Thanks, applied.
Best regards,
Krzysztof
PATCH 2/5 memory: tegra: Correct tegra210_mc_clients def values
In reply to Nicolin ChenSome def values are mismatched with Tegra X1 TRM, probably because being copied from tegra124.c file. So this patch fixes them.
--- drivers/memory/tegra/tegra210.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/memory/tegra/tegra210.c +14 -14
@@ -24,7 +24,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2e8, .shift = 0, .mask = 0xff, - .def = 0xc2, + .def = 0x1e, }, }, { .id = 0x02,
@@ -38,7 +38,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2f4, .shift = 0, .mask = 0xff, - .def = 0xc6, + .def = 0x1e, }, }, { .id = 0x03,
@@ -52,7 +52,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2e8, .shift = 16, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x04,
@@ -66,7 +66,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2f4, .shift = 16, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x05,
@@ -80,7 +80,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2ec, .shift = 0, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x06,
@@ -94,7 +94,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2f8, .shift = 0, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x0e,
@@ -108,7 +108,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2e0, .shift = 0, .mask = 0xff, - .def = 0x13, + .def = 0x2e, }, }, { .id = 0x0f,
@@ -136,7 +136,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2f0, .shift = 0, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x11,
@@ -150,7 +150,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2fc, .shift = 0, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x15,
@@ -380,7 +380,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x350, .shift = 16, .mask = 0xff, - .def = 0x65, + .def = 0x80, }, }, { .id = 0x44,
@@ -620,7 +620,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x2f0, .shift = 16, .mask = 0xff, - .def = 0x50, + .def = 0x1e, }, }, { .id = 0x60,
@@ -648,7 +648,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x3bc, .shift = 0, .mask = 0xff, - .def = 0x49, + .def = 0x5a, }, }, { .id = 0x62,
@@ -676,7 +676,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x3c4, .shift = 0, .mask = 0xff, - .def = 0x49, + .def = 0x5a, }, }, { .id = 0x64,
@@ -956,7 +956,7 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { .reg = 0x3ec, .shift = 16, .mask = 0xff, - .def = 0xff, + .def = 0x80, }, }, { .id = 0x86,
Signature · 1 line
2.17.1
Re: [PATCH 2/5] memory: tegra: Correct tegra210_mc_clients def values
Quoted 7 lines · Nicolin Chen
Some def values are mismatched with Tegra X1 TRM, probably because being copied from
tegra124.cfile. So this patch fixes them.Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
Looks good:
Re: [PATCH 2/5] memory: tegra: Correct tegra210_mc_clients def values
In reply to Nicolin ChenQuoted 7 lines · Nicolin Chen
Some def values are mismatched with Tegra X1 TRM, probably because being copied from
tegra124.cfile. So this patch fixes them.Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
Thanks, applied.
Best regards,
Krzysztof
PATCH 3/5 memory: tegra: Sort tegra210_swgroups by reg address
In reply to Nicolin ChenThis is a cleanup change to prepare for new swgroups.
--- drivers/memory/tegra/tegra210.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/memory/tegra/tegra210.c +10 -10
@@ -1020,32 +1020,32 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { };static const struct tegra_smmu_swgroup tegra210_swgroups[] = { - { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, - { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="afi" , .swgroup =TEGRA_SWGROUP_AFI , .reg =0x238 }, { .name ="avpc" , .swgroup =TEGRA_SWGROUP_AVPC , .reg =0x23c }, - { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, + { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="hc" , .swgroup =TEGRA_SWGROUP_HC , .reg =0x250 }, + { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="isp2" , .swgroup =TEGRA_SWGROUP_ISP2 , .reg =0x258 }, { .name ="nvenc" , .swgroup =TEGRA_SWGROUP_NVENC , .reg =0x264 }, { .name ="ppcs" , .swgroup =TEGRA_SWGROUP_PPCS , .reg =0x270 }, { .name ="sata" , .swgroup =TEGRA_SWGROUP_SATA , .reg =0x274 }, - { .name ="isp2" , .swgroup =TEGRA_SWGROUP_ISP2 , .reg =0x258 }, + { .name ="vi" , .swgroup =TEGRA_SWGROUP_VI , .reg =0x280 }, + { .name ="vic" , .swgroup =TEGRA_SWGROUP_VIC , .reg =0x284 }, { .name ="xusb_host" , .swgroup =TEGRA_SWGROUP_XUSB_HOST , .reg =0x288 }, { .name ="xusb_dev" , .swgroup =TEGRA_SWGROUP_XUSB_DEV , .reg =0x28c }, - { .name ="isp2b" , .swgroup =TEGRA_SWGROUP_ISP2B , .reg =0xaa4 }, - { .name ="tsec" , .swgroup =TEGRA_SWGROUP_TSEC , .reg =0x294 }, { .name ="a9avp" , .swgroup =TEGRA_SWGROUP_A9AVP , .reg =0x290 }, - { .name ="gpu" , .swgroup =TEGRA_SWGROUP_GPU , .reg =0xaac }, + { .name ="tsec" , .swgroup =TEGRA_SWGROUP_TSEC , .reg =0x294 }, { .name ="sdmmc1a" , .swgroup =TEGRA_SWGROUP_SDMMC1A , .reg =0xa94 }, { .name ="sdmmc2a" , .swgroup =TEGRA_SWGROUP_SDMMC2A , .reg =0xa98 }, { .name ="sdmmc3a" , .swgroup =TEGRA_SWGROUP_SDMMC3A , .reg =0xa9c }, { .name ="sdmmc4a" , .swgroup =TEGRA_SWGROUP_SDMMC4A , .reg =0xaa0 }, - { .name ="vic" , .swgroup =TEGRA_SWGROUP_VIC , .reg =0x284 }, - { .name ="vi" , .swgroup =TEGRA_SWGROUP_VI , .reg =0x280 }, + { .name ="isp2b" , .swgroup =TEGRA_SWGROUP_ISP2B , .reg =0xaa4 }, + { .name ="gpu" , .swgroup =TEGRA_SWGROUP_GPU , .reg =0xaac }, { .name ="nvdec" , .swgroup =TEGRA_SWGROUP_NVDEC , .reg =0xab4 }, { .name ="ape" , .swgroup =TEGRA_SWGROUP_APE , .reg =0xab8 }, - { .name ="nvjpg" , .swgroup =TEGRA_SWGROUP_NVJPG , .reg =0xac0 }, { .name ="se" , .swgroup =TEGRA_SWGROUP_SE , .reg =0xabc }, + { .name ="nvjpg" , .swgroup =TEGRA_SWGROUP_NVJPG , .reg =0xac0 }, { .name ="axiap" , .swgroup =TEGRA_SWGROUP_AXIAP , .reg =0xacc }, { .name ="etr" , .swgroup =TEGRA_SWGROUP_ETR , .reg =0xad0 }, { .name ="tsecb" , .swgroup =TEGRA_SWGROUP_TSECB , .reg =0xad4 },
Signature · 1 line
2.17.1
Krzysztof Kozlowski
maintainerRe: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
Quoted 1 line · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
What type of cleanup? Any functional change?
Quoted 25 lines
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/memory/tegra/tegra210.c +4
-3@@ -1020,32 +1020,32 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { };static const struct tegra_smmu_swgroup tegra210_swgroups[] = { - { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, - { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="afi" , .swgroup =TEGRA_SWGROUP_AFI , .reg =0x238 }, { .name ="avpc" , .swgroup =TEGRA_SWGROUP_AVPC , .reg =0x23c }, - { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, + { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="hc" , .swgroup =TEGRA_SWGROUP_HC , .reg =0x250 }, + { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="isp2" , .swgroup =TEGRA_SWGROUP_ISP2 , .reg =0x258 }, { .name ="nvenc" , .swgroup =TEGRA_SWGROUP_NVENC , .reg =0x264 },
drivers/memory/tegra/tegra210.c static const struct tegra_mc_client tegra210_mc_clients[] = { · line 1037
Quoted 10 lines
drivers/memory/tegra/tegra210.c +2
-3{ .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 }, { .name = "sata", .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x274 }, - { .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 }, + { .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, + { .name = "vic", .swgroup = TEGRA_SWGROUP_VIC, .reg = 0x284 }, { .name = "xusb_host", .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 }, { .name = "xusb_dev", .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c }, - { .name = "isp2b", .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 }, - { .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 }, { .name = "a9avp", .swgroup = TEGRA_SWGROUP_A9AVP, .reg = 0x290 },
I must say I cannot find the order. By name - not. By swgroup name - not. By register - not.
What is the order then?
Best regards,
Krzysztof
Quoted 21 lines
drivers/memory/tegra/tegra210.c +4
-4- { .name = "gpu", .swgroup = TEGRA_SWGROUP_GPU, .reg = 0xaac }, + { .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 }, { .name = "sdmmc1a", .swgroup = TEGRA_SWGROUP_SDMMC1A, .reg = 0xa94 }, { .name = "sdmmc2a", .swgroup = TEGRA_SWGROUP_SDMMC2A, .reg = 0xa98 }, { .name = "sdmmc3a", .swgroup = TEGRA_SWGROUP_SDMMC3A, .reg = 0xa9c }, { .name = "sdmmc4a", .swgroup = TEGRA_SWGROUP_SDMMC4A, .reg = 0xaa0 }, - { .name = "vic", .swgroup = TEGRA_SWGROUP_VIC, .reg = 0x284 }, - { .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, + { .name = "isp2b", .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 }, + { .name = "gpu", .swgroup = TEGRA_SWGROUP_GPU, .reg = 0xaac }, { .name = "nvdec", .swgroup = TEGRA_SWGROUP_NVDEC, .reg = 0xab4 }, { .name = "ape", .swgroup = TEGRA_SWGROUP_APE, .reg = 0xab8 }, - { .name = "nvjpg", .swgroup = TEGRA_SWGROUP_NVJPG, .reg = 0xac0 }, { .name = "se", .swgroup = TEGRA_SWGROUP_SE, .reg = 0xabc }, + { .name = "nvjpg", .swgroup = TEGRA_SWGROUP_NVJPG, .reg = 0xac0 }, { .name = "axiap", .swgroup = TEGRA_SWGROUP_AXIAP, .reg = 0xacc }, { .name = "etr", .swgroup = TEGRA_SWGROUP_ETR, .reg = 0xad0 }, { .name = "tsecb", .swgroup = TEGRA_SWGROUP_TSECB, .reg = 0xad4 },Signature · 1 line
2.17.1
Re: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
Hi Krzysztof,
Quoted 4 lines · Krzysztof Kozlowski
Quoted 1 line · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
What type of cleanup? Any functional change?
It's to sort the swgroup list by reg address as I mentioned in the subject. Perhaps I should have put in commit message also.
Quoted 39 lines
Quoted 25 lines
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/memory/tegra/tegra210.c +4
-3@@ -1020,32 +1020,32 @@ static const struct tegra_mc_client tegra210_mc_clients[] = { };static const struct tegra_smmu_swgroup tegra210_swgroups[] = { - { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, - { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="afi" , .swgroup =TEGRA_SWGROUP_AFI , .reg =0x238 }, { .name ="avpc" , .swgroup =TEGRA_SWGROUP_AVPC , .reg =0x23c }, - { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="dc" , .swgroup =TEGRA_SWGROUP_DC , .reg =0x240 }, + { .name ="dcb" , .swgroup =TEGRA_SWGROUP_DCB , .reg =0x244 }, { .name ="hc" , .swgroup =TEGRA_SWGROUP_HC , .reg =0x250 }, + { .name ="hda" , .swgroup =TEGRA_SWGROUP_HDA , .reg =0x254 }, + { .name ="isp2" , .swgroup =TEGRA_SWGROUP_ISP2 , .reg =0x258 }, { .name ="nvenc" , .swgroup =TEGRA_SWGROUP_NVENC , .reg =0x264 },drivers/memory/tegra/tegra210.c static const struct tegra_mc_client tegra210_mc_clients[] = { · line 1037
Quoted 10 lines
drivers/memory/tegra/tegra210.c +2
-3{ .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 }, { .name = "sata", .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x274 }, - { .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 }, + { .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 }, + { .name = "vic", .swgroup = TEGRA_SWGROUP_VIC, .reg = 0x284 }, { .name = "xusb_host", .swgroup = TEGRA_SWGROUP_XUSB_HOST, .reg = 0x288 }, { .name = "xusb_dev", .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c }, - { .name = "isp2b", .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 }, - { .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 }, { .name = "a9avp", .swgroup = TEGRA_SWGROUP_A9AVP, .reg = 0x290 },I must say I cannot find the order. By name - not. By swgroup name - not. By register - not.
Quoted 1 line
What is the order then?
It's by "reg" as I mentioned in the commit subject. Probably it's not that obvious by looking at the change itself :-/
Its following change of adding new swgroups would be easier to insert by following the same order of "reg" addresses.
Thanks
Krzysztof Kozlowski
maintainerRe: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
Quoted 10 lines · Nicolin Chen
Hi Krzysztof,
Quoted 4 lines · Krzysztof Kozlowski
Quoted 1 line · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
What type of cleanup? Any functional change?
It's to sort the swgroup list by reg address as I mentioned in the subject. Perhaps I should have put in commit message also.
Indeed it is sorted by regs, I missed some numbers... looks good. I can adjust the commit msg so no need for resend.
Best regards,
Krzysztof
Re: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
Quoted 7 lines · Krzysztof Kozlowski
Quoted 6 lines · Nicolin Chen
Hi Krzysztof,
Quoted 3 lines · Krzysztof Kozlowski
Quoted 1 line · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
What type of cleanup? Any functional change?
It's to sort the swgroup list by reg address as I mentioned in the subject. Perhaps I should have put in commit message also.
Indeed it is sorted by regs, I missed some numbers... looks good. I can adjust the commit msg so no need for resend.
Thank you!
Re: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
In reply to Nicolin ChenQuoted 6 lines · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Re: [PATCH 3/5] memory: tegra: Sort tegra210_swgroups by reg address
In reply to Nicolin ChenQuoted 6 lines · Nicolin Chen
This is a cleanup change to prepare for new swgroups.
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Thanks, applied with adjusted commit msg (use imperative mode, so "Cleanup list of ...").
Best regards,
Krzysztof
PATCH 4/5 dt-bindings: memory: tegra: Add missing swgroups
In reply to Nicolin ChenAccording to Tegra X1 TRM, there are missing swgroups in the tegra210_swgroups list. So this patch adds them in bindings.
Note that the TEGRA_SWGROUP_GPU (in list) should be actually TEGRA_SWGROUP_GPUB (in TRM), yet TEGRA_SWGROUP_GPU (in TRM) is not being used -- only TEGRA_SWGROUP_GPUB (in TRM) is. So this patch does not add TEGRA_SWGROUP_GPU (in TRM) and keeps TEGRA_SWGROUP_GPU (in list) as it is.
--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++ 1 file changed, 10 insertions(+)
include/dt-bindings/memory/tegra210-mc.h +10 -0
@@ -33,6 +33,16 @@#define TEGRA_SWGROUP_AXIAP 28#define TEGRA_SWGROUP_ETR 29#define TEGRA_SWGROUP_TSECB 30 +#define TEGRA_SWGROUP_NV 31 +#define TEGRA_SWGROUP_NV2 32 +#define TEGRA_SWGROUP_PPCS1 33 +#define TEGRA_SWGROUP_DC1 34 +#define TEGRA_SWGROUP_PPCS2 35 +#define TEGRA_SWGROUP_HC1 36 +#define TEGRA_SWGROUP_SE1 37 +#define TEGRA_SWGROUP_TSEC1 38 +#define TEGRA_SWGROUP_TSECB1 39 +#define TEGRA_SWGROUP_NVDEC1 40#define TEGRA210_MC_RESET_AFI 0#define TEGRA210_MC_RESET_AVPC 1
Signature · 1 line
2.17.1
Re: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
Quoted 22 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them in bindings.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/memory/tegra210-mc.h +0
-0@@ -33,6 +33,16 @@#define TEGRA_SWGROUP_AXIAP 28#define TEGRA_SWGROUP_ETR 29#define TEGRA_SWGROUP_TSECB 30
include/dt-bindings/memory/tegra210-mc.h line 45
Quoted 10 lines
include/dt-bindings/memory/tegra210-mc.h +10
-0+#define TEGRA_SWGROUP_NV 31 +#define TEGRA_SWGROUP_NV2 32 +#define TEGRA_SWGROUP_PPCS1 33 +#define TEGRA_SWGROUP_DC1 34 +#define TEGRA_SWGROUP_PPCS2 35 +#define TEGRA_SWGROUP_HC1 36 +#define TEGRA_SWGROUP_SE1 37 +#define TEGRA_SWGROUP_TSEC1 38 +#define TEGRA_SWGROUP_TSECB1 39 +#define TEGRA_SWGROUP_NVDEC1 40
I'm not sure this is right. The existing list is based on "Table 4:
Client to Software Name Mapping" from page 28 of the Tegra X1 TRM, and none of these new swgroups seem to be present in that table.
Where exactly did you get those from?
Thierry
Re: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
Quoted 29 lines · Thierry Reding
Quoted 28 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them in bindings.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/memory/tegra210-mc.h +6
-0@@ -33,6 +33,16 @@#define TEGRA_SWGROUP_AXIAP 28#define TEGRA_SWGROUP_ETR 29#define TEGRA_SWGROUP_TSECB 30 +#define TEGRA_SWGROUP_NV 31 +#define TEGRA_SWGROUP_NV2 32 +#define TEGRA_SWGROUP_PPCS1 33 +#define TEGRA_SWGROUP_DC1 34 +#define TEGRA_SWGROUP_PPCS2 35 +#define TEGRA_SWGROUP_HC1 36
Quoted 8 lines
include/dt-bindings/memory/tegra210-mc.h line 45
Quoted 4 lines
include/dt-bindings/memory/tegra210-mc.h +4
-0+#define TEGRA_SWGROUP_SE1 37 +#define TEGRA_SWGROUP_TSEC1 38 +#define TEGRA_SWGROUP_TSECB1 39 +#define TEGRA_SWGROUP_NVDEC1 40I'm not sure this is right. The existing list is based on "Table 4:
Client to Software Name Mapping" from page 28 of the Tegra X1 TRM, and none of these new swgroups seem to be present in that table.
I went through all the MC_SMMU_XX_ASID_0 registers. All of them have their own ASID registers that I added in PATCH-5.
Krzysztof Kozlowski
maintainerRe: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
Quoted 39 lines · Nicolin Chen
Quoted 29 lines · Thierry Reding
Quoted 28 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them in bindings.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/memory/tegra210-mc.h +6
-0@@ -33,6 +33,16 @@#define TEGRA_SWGROUP_AXIAP 28#define TEGRA_SWGROUP_ETR 29#define TEGRA_SWGROUP_TSECB 30 +#define TEGRA_SWGROUP_NV 31 +#define TEGRA_SWGROUP_NV2 32 +#define TEGRA_SWGROUP_PPCS1 33 +#define TEGRA_SWGROUP_DC1 34 +#define TEGRA_SWGROUP_PPCS2 35 +#define TEGRA_SWGROUP_HC1 36Quoted 8 lines
include/dt-bindings/memory/tegra210-mc.h line 45
Quoted 4 lines
include/dt-bindings/memory/tegra210-mc.h +4
-0+#define TEGRA_SWGROUP_SE1 37 +#define TEGRA_SWGROUP_TSEC1 38 +#define TEGRA_SWGROUP_TSECB1 39 +#define TEGRA_SWGROUP_NVDEC1 40I'm not sure this is right. The existing list is based on "Table 4:
Client to Software Name Mapping" from page 28 of the Tegra X1 TRM, and none of these new swgroups seem to be present in that table.
Quoted 2 lines
I went through all the
MC_SMMU_XX_ASID_0registers. All of them have their own ASID registers that I added in PATCH-5.
Thierry,
Any follow ups on this topic? Does it require a fix or looks correct?
Best regards,
Krzysztof
Thierry Reding
Acked-byRe: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
Quoted 40 lines · Krzysztof Kozlowski
Quoted 39 lines · Nicolin Chen
Quoted 37 lines · Thierry Reding
Quoted 22 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them in bindings.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++ 1 file changed, 10 insertions(+)include/dt-bindings/memory/tegra210-mc.h +0
-0@@ -33,6 +33,16 @@#define TEGRA_SWGROUP_AXIAP 28#define TEGRA_SWGROUP_ETR 29#define TEGRA_SWGROUP_TSECB 30include/dt-bindings/memory/tegra210-mc.h line 45
Quoted 10 lines
include/dt-bindings/memory/tegra210-mc.h +10
-0+#define TEGRA_SWGROUP_NV 31 +#define TEGRA_SWGROUP_NV2 32 +#define TEGRA_SWGROUP_PPCS1 33 +#define TEGRA_SWGROUP_DC1 34 +#define TEGRA_SWGROUP_PPCS2 35 +#define TEGRA_SWGROUP_HC1 36 +#define TEGRA_SWGROUP_SE1 37 +#define TEGRA_SWGROUP_TSEC1 38 +#define TEGRA_SWGROUP_TSECB1 39 +#define TEGRA_SWGROUP_NVDEC1 40I'm not sure this is right. The existing list is based on "Table 4:
Client to Software Name Mapping" from page 28 of the Tegra X1 TRM, and none of these new swgroups seem to be present in that table.
Quoted 6 lines
Quoted 2 lines
I went through all the
MC_SMMU_XX_ASID_0registers. All of them have their own ASID registers that I added in PATCH-5.Thierry,
Any follow ups on this topic? Does it require a fix or looks correct?
This does indeed look correct, based on what registers exist for these. It'd be good to know how Nicolin expects these to be used, since these are currently not listed in device tree. There's certainly some like TSEC or NVDEC that we don't support (yet) upstream, but things like DC1 and HC1 already have equivalents that we use, so I'm not sure how we'll integrate these new ones.
I suppose it doesn't really matter if any of these end up being unused, so:
Re: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
Quoted 3 lines · Thierry Reding
This does indeed look correct, based on what registers exist for these. It'd be good to know how Nicolin expects these to be used, since these are currently not listed in device tree. There's certainly some like
Judging from our downstream code, I don't actually expect all of them will be used, except some being used yet not got upstream.
Quoted 3 lines
TSEC or NVDEC that we don't support (yet) upstream, but things like DC1 and HC1 already have equivalents that we use, so I'm not sure how we'll integrate these new ones.
Downstream code groups those equivalents swgroups, so I think we can do similarly using tegra_smmu_group_soc like the existing one for display, if any of them gets upstream someday.
Re: [PATCH 4/5] dt-bindings: memory: tegra: Add missing swgroups
In reply to Nicolin ChenQuoted 9 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them in bindings.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.
Quoted 3 lines
Signed-off-by Nicolin Chen <[email protected]>--- include/dt-bindings/memory/tegra210-mc.h | 10 ++++++++++
Thanks, applied.
Best regards,
Krzysztof
PATCH 5/5 memory: tegra: Complete tegra210_swgroups
In reply to Nicolin ChenAccording to Tegra X1 TRM, there are missing swgroups in the tegra210_swgroups list. So this patch adds them to the list.
Note that the TEGRA_SWGROUP_GPU (in list) should be actually TEGRA_SWGROUP_GPUB (in TRM), yet TEGRA_SWGROUP_GPU (in TRM) is not being used -- only TEGRA_SWGROUP_GPUB (in TRM) is. So this patch does not add TEGRA_SWGROUP_GPU (in TRM) and keeps TEGRA_SWGROUP_GPU (in list) as it is.
--- drivers/memory/tegra/tegra210.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/memory/tegra/tegra210.c +10 -0
@@ -1028,6 +1028,8 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = { { .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 }, { .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 }, { .name = "nvenc", .swgroup = TEGRA_SWGROUP_NVENC, .reg = 0x264 }, + { .name = "nv", .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 }, + { .name = "nv2", .swgroup = TEGRA_SWGROUP_NV2, .reg = 0x26c }, { .name = "ppcs", .swgroup = TEGRA_SWGROUP_PPCS, .reg = 0x270 }, { .name = "sata", .swgroup = TEGRA_SWGROUP_SATA, .reg = 0x274 }, { .name = "vi", .swgroup = TEGRA_SWGROUP_VI, .reg = 0x280 },
@@ -1036,19 +1038,27 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = { { .name = "xusb_dev", .swgroup = TEGRA_SWGROUP_XUSB_DEV, .reg = 0x28c }, { .name = "a9avp", .swgroup = TEGRA_SWGROUP_A9AVP, .reg = 0x290 }, { .name = "tsec", .swgroup = TEGRA_SWGROUP_TSEC, .reg = 0x294 }, + { .name = "ppcs1", .swgroup = TEGRA_SWGROUP_PPCS1, .reg = 0x298 }, + { .name = "dc1", .swgroup = TEGRA_SWGROUP_DC1, .reg = 0xa88 }, { .name = "sdmmc1a", .swgroup = TEGRA_SWGROUP_SDMMC1A, .reg = 0xa94 }, { .name = "sdmmc2a", .swgroup = TEGRA_SWGROUP_SDMMC2A, .reg = 0xa98 }, { .name = "sdmmc3a", .swgroup = TEGRA_SWGROUP_SDMMC3A, .reg = 0xa9c }, { .name = "sdmmc4a", .swgroup = TEGRA_SWGROUP_SDMMC4A, .reg = 0xaa0 }, { .name = "isp2b", .swgroup = TEGRA_SWGROUP_ISP2B, .reg = 0xaa4 }, { .name = "gpu", .swgroup = TEGRA_SWGROUP_GPU, .reg = 0xaac }, + { .name = "ppcs2", .swgroup = TEGRA_SWGROUP_PPCS2, .reg = 0xab0 }, { .name = "nvdec", .swgroup = TEGRA_SWGROUP_NVDEC, .reg = 0xab4 }, { .name = "ape", .swgroup = TEGRA_SWGROUP_APE, .reg = 0xab8 }, { .name = "se", .swgroup = TEGRA_SWGROUP_SE, .reg = 0xabc }, { .name = "nvjpg", .swgroup = TEGRA_SWGROUP_NVJPG, .reg = 0xac0 }, + { .name = "hc1", .swgroup = TEGRA_SWGROUP_HC1, .reg = 0xac4 }, + { .name = "se1", .swgroup = TEGRA_SWGROUP_SE1, .reg = 0xac8 }, { .name = "axiap", .swgroup = TEGRA_SWGROUP_AXIAP, .reg = 0xacc }, { .name = "etr", .swgroup = TEGRA_SWGROUP_ETR, .reg = 0xad0 }, { .name = "tsecb", .swgroup = TEGRA_SWGROUP_TSECB, .reg = 0xad4 }, + { .name = "tsec1", .swgroup = TEGRA_SWGROUP_TSEC1, .reg = 0xad8 }, + { .name = "tsecb1", .swgroup = TEGRA_SWGROUP_TSECB1, .reg = 0xadc }, + { .name = "nvdec1", .swgroup = TEGRA_SWGROUP_NVDEC1, .reg = 0xae0 }, }; static const unsigned int tegra210_group_display[] = {
Signature · 1 line
2.17.1
Re: [PATCH 5/5] memory: tegra: Complete tegra210_swgroups
Quoted 19 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them to the list.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/memory/tegra/tegra210.c +0
-0
drivers/memory/tegra/tegra210.c static const struct tegra_smmu_swgroup tegra210_swgroups[] = { · line 1032
Quoted 5 lines
drivers/memory/tegra/tegra210.c +2
-0@@ -1028,6 +1028,8 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = { { .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 }, { .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 }, { .name = "nvenc", .swgroup = TEGRA_SWGROUP_NVENC, .reg = 0x264 }, + { .name = "nv", .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 }, + { .name = "nv2", .swgroup = TEGRA_SWGROUP_NV2, .reg = 0x26c },
Oddly enough I can see these in the TRM, but they are not in the internal reference manuals that are supposed to be the canonical reference for the TRM. Perhaps the TRM is out of date?
Thierry
Re: [PATCH 5/5] memory: tegra: Complete tegra210_swgroups
Quoted 15 lines · Thierry Reding
Quoted 14 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them to the list.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Quoted 14 lines
drivers/memory/tegra/tegra210.c static const struct tegra_smmu_swgroup tegra210_swgroups[] = { · line 1032
Quoted 10 lines
drivers/memory/tegra/tegra210.c +2
-0@@ -1028,6 +1028,8 @@ static const struct tegra_smmu_swgroup tegra210_swgroups[] = { { .name = "hda", .swgroup = TEGRA_SWGROUP_HDA, .reg = 0x254 }, { .name = "isp2", .swgroup = TEGRA_SWGROUP_ISP2, .reg = 0x258 }, { .name = "nvenc", .swgroup = TEGRA_SWGROUP_NVENC, .reg = 0x264 }, + { .name = "nv", .swgroup = TEGRA_SWGROUP_NV, .reg = 0x268 }, + { .name = "nv2", .swgroup = TEGRA_SWGROUP_NV2, .reg = 0x26c },Oddly enough I can see these in the TRM, but they are not in the internal reference manuals that are supposed to be the canonical reference for the TRM. Perhaps the TRM is out of date?
Hmm..I actually have been using the TRM from official site all the time. These two aren't being used downstream either; I put them in the patch merely because they exist in the TRM. So we may drop them if you feel that's better.
Re: [PATCH 5/5] memory: tegra: Complete tegra210_swgroups
In reply to Nicolin ChenQuoted 9 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them to the list.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.
Quoted 4 lines
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Re: [PATCH 5/5] memory: tegra: Complete tegra210_swgroups
In reply to Nicolin ChenQuoted 9 lines · Nicolin Chen
According to Tegra X1 TRM, there are missing swgroups in the
tegra210_swgroupslist. So this patch adds them to the list.Note that the
TEGRA_SWGROUP_GPU(in list) should be actuallyTEGRA_SWGROUP_GPUB(in TRM), yetTEGRA_SWGROUP_GPU(in TRM) is not being used -- onlyTEGRA_SWGROUP_GPUB(in TRM) is. So this patch does not addTEGRA_SWGROUP_GPU(in TRM) and keepsTEGRA_SWGROUP_GPU(in list) as it is.
Quoted 4 lines
Signed-off-by Nicolin Chen <[email protected]>--- drivers/memory/tegra/tegra210.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
Thanks, applied.
Best regards,
Krzysztof
Krzysztof Kozlowski
maintainerQuoted 10 lines · Nicolin Chen
This series has two fixes of
tegra210_mc_clients, and three changes to add missing swgroups, according to Tegra X1 TRM.Nicolin Chen (5):
memory: tegra: Correct la.reg address of seswr
memory: tegra: Correcttegra210_mc_clientsdef values
memory: tegra: Sorttegra210_swgroupsby reg address
dt-bindings: memory: tegra: Add missing swgroups
memory: tegra: Completetegra210_swgroups
Hi,
It's too late in the cycle for another pull request so this will wait for merge window to finish.
Best regards,
Krzysztof
Hi Krzysztof,
Quoted 12 lines · Krzysztof Kozlowski
Quoted 10 lines · Nicolin Chen
This series has two fixes of
tegra210_mc_clients, and three changes to add missing swgroups, according to Tegra X1 TRM.Nicolin Chen (5):
memory: tegra: Correct la.reg address of seswr
memory: tegra: Correcttegra210_mc_clientsdef values
memory: tegra: Sorttegra210_swgroupsby reg address
dt-bindings: memory: tegra: Add missing swgroups
memory: tegra: Completetegra210_swgroups
Quoted 4 lines
Hi,
It's too late in the cycle for another pull request so this will wait for merge window to finish.
I see. Thanks for telling me this!