| Message ID | c1ef1ba7cd9153d607e6130277e560b139056fd9.1710226514.git.andrea.porta@suse.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | dmaengine: bcm2835: add BCM2711 40-bit DMA support | expand |
On 12/03/2024 10:12, Andrea della Porta wrote: > BCM2711 has 4 DMA channels with a 40-bit address range, allowing them > to access the full 4GB of memory on a Pi 4. Adding a new node to make > use of the DMA channels capable of 40 bit addressing. > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > Signed-off-by: Andrea della Porta <andrea.porta@suse.com> > --- > arch/arm/boot/dts/broadcom/bcm2711.dtsi | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi > index 22c7f1561344..d98e3cf0c569 100644 > --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi > +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi > @@ -552,6 +552,22 @@ scb { > ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>, > <0x6 0x00000000 0x6 0x00000000 0x40000000>; > > + dma40: dma-controller@7e007b00 { > + compatible = "brcm,bcm2711-dma"; > + reg = <0x0 0x7e007b00 0x400>; > + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */ > + <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */ > + <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, /* dma4 13 */ > + <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; /* dma4 14 */ > + interrupt-names = "dma11", > + "dma12", > + "dma13", > + "dma14"; > + #dma-cells = <1>; > + /* The VPU firmware uses DMA channel 11 for VCHIQ */ > + brcm,dma-channel-mask = <0x7000>; Isn't one of your commits saying - this property is replaced? Best regards, Krzysztof
On 08:26 Sun 14 Apr , Krzysztof Kozlowski wrote: > On 12/03/2024 10:12, Andrea della Porta wrote: > > BCM2711 has 4 DMA channels with a 40-bit address range, allowing them > > to access the full 4GB of memory on a Pi 4. Adding a new node to make > > use of the DMA channels capable of 40 bit addressing. > > > > Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> > > Signed-off-by: Andrea della Porta <andrea.porta@suse.com> > > --- > > arch/arm/boot/dts/broadcom/bcm2711.dtsi | 16 ++++++++++++++++ > > 1 file changed, 16 insertions(+) > > > > diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi > > index 22c7f1561344..d98e3cf0c569 100644 > > --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi > > +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi > > @@ -552,6 +552,22 @@ scb { > > ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>, > > <0x6 0x00000000 0x6 0x00000000 0x40000000>; > > > > + dma40: dma-controller@7e007b00 { > > + compatible = "brcm,bcm2711-dma"; > > + reg = <0x0 0x7e007b00 0x400>; > > + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */ > > + <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */ > > + <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, /* dma4 13 */ > > + <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; /* dma4 14 */ > > + interrupt-names = "dma11", > > + "dma12", > > + "dma13", > > + "dma14"; > > + #dma-cells = <1>; > > + /* The VPU firmware uses DMA channel 11 for VCHIQ */ > > + brcm,dma-channel-mask = <0x7000>; > > Isn't one of your commits saying - this property is replaced? True. The next patchset revision will drop 'brcm,' prefix. Many thanks for pointing that out. Andrea > > Best regards, > Krzysztof >
diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi index 22c7f1561344..d98e3cf0c569 100644 --- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi @@ -552,6 +552,22 @@ scb { ranges = <0x0 0x7c000000 0x0 0xfc000000 0x03800000>, <0x6 0x00000000 0x6 0x00000000 0x40000000>; + dma40: dma-controller@7e007b00 { + compatible = "brcm,bcm2711-dma"; + reg = <0x0 0x7e007b00 0x400>; + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>, /* dma4 11 */ + <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>, /* dma4 12 */ + <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>, /* dma4 13 */ + <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>; /* dma4 14 */ + interrupt-names = "dma11", + "dma12", + "dma13", + "dma14"; + #dma-cells = <1>; + /* The VPU firmware uses DMA channel 11 for VCHIQ */ + brcm,dma-channel-mask = <0x7000>; + }; + pcie0: pcie@7d500000 { compatible = "brcm,bcm2711-pcie"; reg = <0x0 0x7d500000 0x9310>;