[PATCH 0/2] More DT fixes for arm,pl022

[PATCH 0/2] More DT fixes for arm,pl022

[Kuldeep Singh]

As per spi pl022 binding, spear and lpc18 platform require fix in dma
properties to resolve dtbs_check warning.

Patch 1(spear): just reorder entries to resolve warning.
Patch 2(lpc): require reorder of dma pairs, and also within pairs.
In general, dmas follow below convention:
<rx,tx> = <x+1,x>
Keeping this mind, I updated entries for dma pairs.

This patchset is based on
git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git, arm/dt

Kuldeep Singh (2):
  ARM: dts: spear13xx: Update SPI dma properties
  ARM: dts: lpc18xx: Update SPI dma properties

 arch/arm/boot/dts/lpc18xx.dtsi   | 19 +++++++------------
 arch/arm/boot/dts/spear13xx.dtsi |  5 ++---
 2 files changed, 9 insertions(+), 15 deletions(-)

-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Kuldeep Singh]

Reorder dmas and dma-names property for spi controller node to make it
compliant with bindings.

Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
 arch/arm/boot/dts/spear13xx.dtsi | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index c87b881b2c8b..45f0b2a33e02 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -284,9 +284,8 @@ spi0: spi@e0100000 {
 				#size-cells = <0>;
 				interrupts = <0 31 0x4>;
 				status = "disabled";
-				dmas = <&dwdma0 4 0 0>,
-					<&dwdma0 5 0 0>;
-				dma-names = "tx", "rx";
+				dmas = <&dwdma0 5 0 0>, <&dwdma0 4 0 0>;
+				dma-names = "rx", "tx";
 			};
 
 			rtc@e0580000 {
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] ARM: dts: lpc18xx: Update SPI dma properties

[Kuldeep Singh]

SPI pl022 describes dma-names as RX,TX.
Reorder dmas and dma-names properties to follow specified convention.
And while at it, also fix entries order within dma pairs.

Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
CC: soc@kernel.org
---
 arch/arm/boot/dts/lpc18xx.dtsi | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/arch/arm/boot/dts/lpc18xx.dtsi b/arch/arm/boot/dts/lpc18xx.dtsi
index 10b8249b8ab6..b3070cc927b7 100644
--- a/arch/arm/boot/dts/lpc18xx.dtsi
+++ b/arch/arm/boot/dts/lpc18xx.dtsi
@@ -317,8 +317,7 @@ ssp0: spi@40083000 {
 			clocks = <&ccu2 CLK_APB0_SSP0>, <&ccu1 CLK_CPU_SSP0>;
 			clock-names = "sspclk", "apb_pclk";
 			resets = <&rgu 50>;
-			dmas = <&dmamux  9 0 2
-				&dmamux 10 0 2>;
+			dmas = <&dmamux  10 0 2>, <&dmamux 9 0 2>;
 			dma-names = "rx", "tx";
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -424,16 +423,12 @@ ssp1: spi@400c5000 {
 			clocks = <&ccu2 CLK_APB2_SSP1>, <&ccu1 CLK_CPU_SSP1>;
 			clock-names = "sspclk", "apb_pclk";
 			resets = <&rgu 51>;
-			dmas = <&dmamux 11 2 2
-				&dmamux 12 2 2
-				&dmamux  3 3 2
-				&dmamux  4 3 2
-				&dmamux  5 2 2
-				&dmamux  6 2 2
-				&dmamux 13 2 2
-				&dmamux 14 2 2>;
-			dma-names = "rx", "tx", "tx", "rx",
-				    "tx", "rx", "rx", "tx";
+			dmas = <&dmamux 12 2 2>, <&dmamux 11 2 2>,
+					<&dmamux  4 3 2>, <&dmamux  3 3 2>,
+					<&dmamux  6 2 2>, <&dmamux  5 2 2>,
+					<&dmamux 14 2 2>, <&dmamux 13 2 2>;
+			dma-names = "rx", "tx", "rx", "tx",
+						"rx", "tx", "rx", "tx";
 			#address-cells = <1>;
 			#size-cells = <0>;
 			status = "disabled";
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Viresh Kumar]

On 12-03-22, 23:36, Kuldeep Singh wrote:
> Reorder dmas and dma-names property for spi controller node to make it
> compliant with bindings.
> 
> Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>

What about a fixes tag ?

> ---
>  arch/arm/boot/dts/spear13xx.dtsi | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
> index c87b881b2c8b..45f0b2a33e02 100644
> --- a/arch/arm/boot/dts/spear13xx.dtsi
> +++ b/arch/arm/boot/dts/spear13xx.dtsi
> @@ -284,9 +284,8 @@ spi0: spi@e0100000 {
>  				#size-cells = <0>;
>  				interrupts = <0 31 0x4>;
>  				status = "disabled";
> -				dmas = <&dwdma0 4 0 0>,
> -					<&dwdma0 5 0 0>;
> -				dma-names = "tx", "rx";
> +				dmas = <&dwdma0 5 0 0>, <&dwdma0 4 0 0>;
> +				dma-names = "rx", "tx";

Why does the order matter here since we have dma-names anyway, which
was correct earlier ?

>  			};
>  
>  			rtc@e0580000 {
> -- 
> 2.25.1

-- 
viresh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Kuldeep Singh]

On Mon, Mar 14, 2022 at 09:21:18AM +0530, Viresh Kumar wrote:
> On 12-03-22, 23:36, Kuldeep Singh wrote:
> > Reorder dmas and dma-names property for spi controller node to make it
> > compliant with bindings.
> > 
> > Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
> 
> What about a fixes tag ?

Sure, will add one.

> > ---
> >  arch/arm/boot/dts/spear13xx.dtsi | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
> > index c87b881b2c8b..45f0b2a33e02 100644
> > --- a/arch/arm/boot/dts/spear13xx.dtsi
> > +++ b/arch/arm/boot/dts/spear13xx.dtsi
> > @@ -284,9 +284,8 @@ spi0: spi@e0100000 {
> >  				#size-cells = <0>;
> >  				interrupts = <0 31 0x4>;
> >  				status = "disabled";
> > -				dmas = <&dwdma0 4 0 0>,
> > -					<&dwdma0 5 0 0>;
> > -				dma-names = "tx", "rx";
> > +				dmas = <&dwdma0 5 0 0>, <&dwdma0 4 0 0>;
> > +				dma-names = "rx", "tx";
> 
> Why does the order matter here since we have dma-names anyway, which
> was correct earlier ?

Dma-names order matters here.
As per pl022 binding, dma-names order specify rx,tx and all DTs which
have tx,rx as order start raising dtbs_chek warning. Thus, need to
reverse this order. Please note, no functional change in this patch
apart from just fixing warning.

Warning:
'rx' was expected
'tx' was expected

Regards
Kuldeep

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Viresh Kumar]

On 14-03-22, 12:24, Kuldeep Singh wrote:
> Dma-names order matters here.
> As per pl022 binding, dma-names order specify rx,tx and all DTs which
> have tx,rx as order start raising dtbs_chek warning. Thus, need to
> reverse this order. Please note, no functional change in this patch
> apart from just fixing warning.
> 
> Warning:
> 'rx' was expected
> 'tx' was expected

Hmm. I see your point now.

  dma-names:
    description:
      There must be at least one channel named "tx" for transmit and named "rx"
      for receive.
    minItems: 2
    maxItems: 32
    additionalItems: true
    items:
      - const: rx
      - const: tx


I was expecting above to allow adding the items in any order, but
looks like the order is fixed with this.

-- 
viresh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Arnd Bergmann]

On Mon, Mar 14, 2022 at 8:31 AM Viresh Kumar <viresh.kumar@linaro.org> wrote:
>
> On 14-03-22, 12:24, Kuldeep Singh wrote:
> > Dma-names order matters here.
> > As per pl022 binding, dma-names order specify rx,tx and all DTs which
> > have tx,rx as order start raising dtbs_chek warning. Thus, need to
> > reverse this order. Please note, no functional change in this patch
> > apart from just fixing warning.
> >
> > Warning:
> > 'rx' was expected
> > 'tx' was expected
>
> Hmm. I see your point now.
>
>   dma-names:
>     description:
>       There must be at least one channel named "tx" for transmit and named "rx"
>       for receive.
>     minItems: 2
>     maxItems: 32
>     additionalItems: true
>     items:
>       - const: rx
>       - const: tx
>
>
> I was expecting above to allow adding the items in any order, but
> looks like the order is fixed with this.

I don't think that it was meant to have a fixed order: unlike the other
bindings that define xxx-names properties, dmas require giving
names to allow the DT to specify more than one possible DMA
specifier for a given name. This means that nothing may ever just
rely on an index but has to use the name for lookup.

OTOH, while fixing the order in the binding does not add any
value, it's also harmless as this should never be able to break
anything that worked for any combination of old/new dtb and
kernel, and it's probably easier to express in the binding.

       Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: spear13xx: Update SPI dma properties

[Viresh Kumar]

On 14-03-22, 11:27, Arnd Bergmann wrote:
> I don't think that it was meant to have a fixed order: unlike the other
> bindings that define xxx-names properties, dmas require giving
> names to allow the DT to specify more than one possible DMA
> specifier for a given name. This means that nothing may ever just
> rely on an index but has to use the name for lookup.

Is there a way to update the yaml or tooling in that case so it doesn't expect a
fixed order ?

> OTOH, while fixing the order in the binding does not add any
> value, it's also harmless as this should never be able to break
> anything that worked for any combination of old/new dtb and
> kernel, and it's probably easier to express in the binding.

I agree, but such a patch shouldn't be required at all, which caught my
attention. It is fine to merge it and won't break anything, but it shouldn't be
required as well.

-- 
viresh

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/2] ARM: dts: lpc18xx: Update SPI dma properties

[Kuldeep Singh]

On Sat, Mar 12, 2022 at 11:36:15PM +0530, Kuldeep Singh wrote:
> SPI pl022 describes dma-names as RX,TX.
> Reorder dmas and dma-names properties to follow specified convention.
> And while at it, also fix entries order within dma pairs.
> 
> Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>

Kindly consider this patch obsolete as it's not required.
Thanks for your time and patience.

Regards
Kuldeep

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel