[PATCH 1/2] dt-bindings: memory: Fix typos and definitions for Tegra

[PATCH 1/2] dt-bindings: memory: Fix typos and definitions for Tegra

[Jon Hunter]

Fix the spelling of 'clients' in the memory dt-bindings for Tegra and
fix the name for the DLA write client that should have the suffix 'WRB'
and not 'WDB'.

Fixes: ea4777f67150 ("dt-bindings: tegra: Update headers for Tegra234")
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 include/dt-bindings/memory/tegra234-mc.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h
index 7d49880e7faa..347e55e89a2a 100644
--- a/include/dt-bindings/memory/tegra234-mc.h
+++ b/include/dt-bindings/memory/tegra234-mc.h
@@ -232,13 +232,13 @@
 /* PCIE7 read clients */
 #define TEGRA234_MEMORY_CLIENT_PCIE7AR 0x2a
 #define TEGRA234_MEMORY_CLIENT_NVENCSWR 0x2b
-/* DLA0ARDB read clinets */
+/* DLA0ARDB read clients */
 #define TEGRA234_MEMORY_CLIENT_DLA0RDB 0x2c
-/* DLA0ARDB1 read clinets */
+/* DLA0ARDB1 read clients */
 #define TEGRA234_MEMORY_CLIENT_DLA0RDB1 0x2d
 /* DLA0 writes */
-#define TEGRA234_MEMORY_CLIENT_DLA0WDB 0x2e
-/* DLA1ARDB read clinets */
+#define TEGRA234_MEMORY_CLIENT_DLA0WRB 0x2e
+/* DLA1ARDB read clients */
 #define TEGRA234_MEMORY_CLIENT_DLA1RDB 0x2f
 /* PCIE7 write clients */
 #define TEGRA234_MEMORY_CLIENT_PCIE7AW 0x30
@@ -322,11 +322,11 @@
 #define TEGRA234_MEMORY_CLIENT_SUE1WR 0x69
 #define TEGRA234_MEMORY_CLIENT_VICSRD 0x6c
 #define TEGRA234_MEMORY_CLIENT_VICSWR 0x6d
-/* DLA1ARDB1 read clinets */
+/* DLA1ARDB1 read clients */
 #define TEGRA234_MEMORY_CLIENT_DLA1RDB1 0x6e
 /* DLA1 writes */
 #define TEGRA234_MEMORY_CLIENT_DLA1WRB 0x6f
-/* VI FLACON read clinets */
+/* VI FLACON read clients */
 #define TEGRA234_MEMORY_CLIENT_VI2FALR 0x71
 /* VI Write client */
 #define TEGRA234_MEMORY_CLIENT_VI2W 0x70
-- 
2.25.1

[PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Jon Hunter]

Add the memory clients on Tegra234 which are needed for initialising the
SMMU for the Deep Learning Accelerator (DLA).

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
 1 file changed, 160 insertions(+)

diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
index a9e8fd99730f..9bdaf8af8c97 100644
--- a/drivers/memory/tegra/tegra234.c
+++ b/drivers/memory/tegra/tegra234.c
@@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
 				.security = 0x504,
 			},
 		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
+		.name = "dla0rda",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x5f0,
+				.security = 0x5f4,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0FALRDB,
+		.name = "dla0falrdb",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x5f8,
+				.security = 0x5fc,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0WRA,
+		.name = "dla0wra",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x600,
+				.security = 0x604,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0RDB,
+		.name = "dla0rdb",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x160,
+				.security = 0x164,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA1,
+		.name = "dla0rda1",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x748,
+				.security = 0x74c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0FALWRB,
+		.name = "dla0falwrb",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x608,
+				.security = 0x60c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0RDB1,
+		.name = "dla0rdb1",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x168,
+				.security = 0x16c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA0WRB,
+		.name = "dla0wrb",
+		.sid = TEGRA234_SID_NVDLA0,
+		.regs = {
+			.sid = {
+				.override = 0x170,
+				.security = 0x174,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1RDA,
+		.name = "dla0rda",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x610,
+				.security = 0x614,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1FALRDB,
+		.name = "dla0falrdb",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x618,
+				.security = 0x61c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1WRA,
+		.name = "dla0wra",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x620,
+				.security = 0x624,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1RDB,
+		.name = "dla0rdb",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x178,
+				.security = 0x17c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1RDA1,
+		.name = "dla0rda1",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x750,
+				.security = 0x754,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1FALWRB,
+		.name = "dla0falwrb",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x628,
+				.security = 0x62c,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1RDB1,
+		.name = "dla0rdb1",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x370,
+				.security = 0x374,
+			},
+		},
+	}, {
+		.id = TEGRA234_MEMORY_CLIENT_DLA1WRB,
+		.name = "dla0wrb",
+		.sid = TEGRA234_SID_NVDLA1,
+		.regs = {
+			.sid = {
+				.override = 0x378,
+				.security = 0x37c,
+			},
+		},
 	},
 };
 
-- 
2.25.1

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Krzysztof Kozlowski]

On 28/10/2022 08:37, Jon Hunter wrote:
> Add the memory clients on Tegra234 which are needed for initialising the
> SMMU for the Deep Learning Accelerator (DLA).
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
>  1 file changed, 160 insertions(+)
> 
> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
> index a9e8fd99730f..9bdaf8af8c97 100644
> --- a/drivers/memory/tegra/tegra234.c
> +++ b/drivers/memory/tegra/tegra234.c
> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
>  				.security = 0x504,
>  			},
>  		},
> +	}, {
> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
> +		.name = "dla0rda",
> +		.sid = TEGRA234_SID_NVDLA0,

This is now not applicable because you sent dependencies separate, mixed
with other subsystems... Split pieces based on subsystems.

Best regards,
Krzysztof

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Jon Hunter]

On 28/10/2022 13:46, Krzysztof Kozlowski wrote:
> On 28/10/2022 08:37, Jon Hunter wrote:
>> Add the memory clients on Tegra234 which are needed for initialising the
>> SMMU for the Deep Learning Accelerator (DLA).
>>
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>> ---
>>   drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
>>   1 file changed, 160 insertions(+)
>>
>> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
>> index a9e8fd99730f..9bdaf8af8c97 100644
>> --- a/drivers/memory/tegra/tegra234.c
>> +++ b/drivers/memory/tegra/tegra234.c
>> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
>>   				.security = 0x504,
>>   			},
>>   		},
>> +	}, {
>> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
>> +		.name = "dla0rda",
>> +		.sid = TEGRA234_SID_NVDLA0,
> 
> This is now not applicable because you sent dependencies separate, mixed
> with other subsystems... Split pieces based on subsystems.

Sorry I don't understand. This patch is dependent upon the first. I have 
not sent anything separate.

Jon

-- 
nvpublic

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Krzysztof Kozlowski]

On 28/10/2022 08:51, Jon Hunter wrote:
> 
> On 28/10/2022 13:46, Krzysztof Kozlowski wrote:
>> On 28/10/2022 08:37, Jon Hunter wrote:
>>> Add the memory clients on Tegra234 which are needed for initialising the
>>> SMMU for the Deep Learning Accelerator (DLA).
>>>
>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>> ---
>>>   drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
>>>   1 file changed, 160 insertions(+)
>>>
>>> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
>>> index a9e8fd99730f..9bdaf8af8c97 100644
>>> --- a/drivers/memory/tegra/tegra234.c
>>> +++ b/drivers/memory/tegra/tegra234.c
>>> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
>>>   				.security = 0x504,
>>>   			},
>>>   		},
>>> +	}, {
>>> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
>>> +		.name = "dla0rda",
>>> +		.sid = TEGRA234_SID_NVDLA0,
>>
>> This is now not applicable because you sent dependencies separate, mixed
>> with other subsystems... Split pieces based on subsystems.
> 
> Sorry I don't understand. This patch is dependent upon the first. I have 
> not sent anything separate.

You sent mixed between subsystems patches adding TEGRA234_SID_NVDLA0.
That one should have been sent separate so maintainers can pick it up.

Now, it's not possible for me to pick this patch.

Best regards,
Krzysztof

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Jon Hunter]

On 28/10/2022 13:52, Krzysztof Kozlowski wrote:
> On 28/10/2022 08:51, Jon Hunter wrote:
>>
>> On 28/10/2022 13:46, Krzysztof Kozlowski wrote:
>>> On 28/10/2022 08:37, Jon Hunter wrote:
>>>> Add the memory clients on Tegra234 which are needed for initialising the
>>>> SMMU for the Deep Learning Accelerator (DLA).
>>>>
>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>> ---
>>>>    drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
>>>>    1 file changed, 160 insertions(+)
>>>>
>>>> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
>>>> index a9e8fd99730f..9bdaf8af8c97 100644
>>>> --- a/drivers/memory/tegra/tegra234.c
>>>> +++ b/drivers/memory/tegra/tegra234.c
>>>> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
>>>>    				.security = 0x504,
>>>>    			},
>>>>    		},
>>>> +	}, {
>>>> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
>>>> +		.name = "dla0rda",
>>>> +		.sid = TEGRA234_SID_NVDLA0,
>>>
>>> This is now not applicable because you sent dependencies separate, mixed
>>> with other subsystems... Split pieces based on subsystems.
>>
>> Sorry I don't understand. This patch is dependent upon the first. I have
>> not sent anything separate.
> 
> You sent mixed between subsystems patches adding TEGRA234_SID_NVDLA0.
> That one should have been sent separate so maintainers can pick it up.

The original patch [0] I sent had no dependencies and so Thierry picked 
this up. However, when adding patch 2/2 here, I noticed a typo in the 
definition for TEGRA234_MEMORY_CLIENT_DLA0WRB so thought I would fix 
this up while I am at it.

> Now, it's not possible for me to pick this patch.

Yes now you cannot simply pick this up. We have had similar problems 
before. I am not sure if it is easiest for Thierry to pick these up.

Jon

[0] 
https://lore.kernel.org/linux-tegra/20221003125141.123759-1-jonathanh@nvidia.com/
-- 
nvpublic

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Krzysztof Kozlowski]

On 28/10/2022 09:05, Jon Hunter wrote:
> 
> On 28/10/2022 13:52, Krzysztof Kozlowski wrote:
>> On 28/10/2022 08:51, Jon Hunter wrote:
>>>
>>> On 28/10/2022 13:46, Krzysztof Kozlowski wrote:
>>>> On 28/10/2022 08:37, Jon Hunter wrote:
>>>>> Add the memory clients on Tegra234 which are needed for initialising the
>>>>> SMMU for the Deep Learning Accelerator (DLA).
>>>>>
>>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>>>>> ---
>>>>>    drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
>>>>>    1 file changed, 160 insertions(+)
>>>>>
>>>>> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
>>>>> index a9e8fd99730f..9bdaf8af8c97 100644
>>>>> --- a/drivers/memory/tegra/tegra234.c
>>>>> +++ b/drivers/memory/tegra/tegra234.c
>>>>> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
>>>>>    				.security = 0x504,
>>>>>    			},
>>>>>    		},
>>>>> +	}, {
>>>>> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
>>>>> +		.name = "dla0rda",
>>>>> +		.sid = TEGRA234_SID_NVDLA0,
>>>>
>>>> This is now not applicable because you sent dependencies separate, mixed
>>>> with other subsystems... Split pieces based on subsystems.
>>>
>>> Sorry I don't understand. This patch is dependent upon the first. I have
>>> not sent anything separate.
>>
>> You sent mixed between subsystems patches adding TEGRA234_SID_NVDLA0.
>> That one should have been sent separate so maintainers can pick it up.
> 
> The original patch [0] I sent had no dependencies and so Thierry picked 
> this up. However, when adding patch 2/2 here, I noticed a typo in the 
> definition for TEGRA234_MEMORY_CLIENT_DLA0WRB so thought I would fix 
> this up while I am at it.
> 
>> Now, it's not possible for me to pick this patch.
> 
> Yes now you cannot simply pick this up. We have had similar problems 
> before. I am not sure if it is easiest for Thierry to pick these up.
> 

And there is simple solution as I said - split the patches per
subsystem. Why the dependency was combining multiple subsystems into one?

Best regards,
Krzysztof

Re: [PATCH 2/2] memory: tegra: Add DLA clients for Tegra234

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 3229 bytes --]

On Fri, Oct 28, 2022 at 09:07:28AM -0400, Krzysztof Kozlowski wrote:
> On 28/10/2022 09:05, Jon Hunter wrote:
> > 
> > On 28/10/2022 13:52, Krzysztof Kozlowski wrote:
> >> On 28/10/2022 08:51, Jon Hunter wrote:
> >>>
> >>> On 28/10/2022 13:46, Krzysztof Kozlowski wrote:
> >>>> On 28/10/2022 08:37, Jon Hunter wrote:
> >>>>> Add the memory clients on Tegra234 which are needed for initialising the
> >>>>> SMMU for the Deep Learning Accelerator (DLA).
> >>>>>
> >>>>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> >>>>> ---
> >>>>>    drivers/memory/tegra/tegra234.c | 160 ++++++++++++++++++++++++++++++++
> >>>>>    1 file changed, 160 insertions(+)
> >>>>>
> >>>>> diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c
> >>>>> index a9e8fd99730f..9bdaf8af8c97 100644
> >>>>> --- a/drivers/memory/tegra/tegra234.c
> >>>>> +++ b/drivers/memory/tegra/tegra234.c
> >>>>> @@ -170,6 +170,166 @@ static const struct tegra_mc_client tegra234_mc_clients[] = {
> >>>>>    				.security = 0x504,
> >>>>>    			},
> >>>>>    		},
> >>>>> +	}, {
> >>>>> +		.id = TEGRA234_MEMORY_CLIENT_DLA0RDA,
> >>>>> +		.name = "dla0rda",
> >>>>> +		.sid = TEGRA234_SID_NVDLA0,
> >>>>
> >>>> This is now not applicable because you sent dependencies separate, mixed
> >>>> with other subsystems... Split pieces based on subsystems.
> >>>
> >>> Sorry I don't understand. This patch is dependent upon the first. I have
> >>> not sent anything separate.
> >>
> >> You sent mixed between subsystems patches adding TEGRA234_SID_NVDLA0.
> >> That one should have been sent separate so maintainers can pick it up.
> > 
> > The original patch [0] I sent had no dependencies and so Thierry picked 
> > this up. However, when adding patch 2/2 here, I noticed a typo in the 
> > definition for TEGRA234_MEMORY_CLIENT_DLA0WRB so thought I would fix 
> > this up while I am at it.
> > 
> >> Now, it's not possible for me to pick this patch.
> > 
> > Yes now you cannot simply pick this up. We have had similar problems 
> > before. I am not sure if it is easiest for Thierry to pick these up.
> > 
> 
> And there is simple solution as I said - split the patches per
> subsystem. Why the dependency was combining multiple subsystems into one?

Splitting per subsystem doesn't really work in this case. The main
problem is that the dt-bindings headers are used by multiple subsystems,
and the content is not generated in a git-friendly way. So even if we
were to split things up, at some point there would be conflicts between
the various branches that these changes end up in.

The easiest solution for this is to simply take this through a single
tree. Normally this wouldn't be a problem because the symbols defined in
these headers are only used in device trees. However, for the memory
clients it is slightly complicated by the fact that the memory
controller driver also needs access to these symbols, so it creates an
interdependency between the dt-bindings, DT and memory controller
branches.

One of the reasons why Jon originally sent the larger patch, adding all
the missing IDs in one go, was precisely so we could avoid this hassle
in the future.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]