arm64: dts: renesas: rcar-gen4: Correct avb[01] reg sizes
Subsystems (2)
Geert Uytterhoeven
maintainercover arm64: dts: renesas: rcar-gen4: Correct avb[01] reg sizes
Hi all,
All Ethernet AVB instances on R-Car Gen4 SoCs have registers related to UDP/IP support, starting at offset 0x800. However, the register blocks for some (but not all) instances are too small to cover them.
This patch series fixes this by extending the register block sizes where needed. Note that this has no immediate impact on actual operation, as the Linux driver does not use the UDP/IP registers. Besides, ioremap() granulatity is PAGE_SIZE, so the registers are accessible anyway.
I also considered introducing a new reg tuplet to cover the UDP/IP registers. However, that would complicate handling as some instances (on some R-Car Gen2/3 SoCs) already have two reg tuplets, and there are no reg-names defined:
reg:
items:
- description: MAC register block
- description: Stream buffer
So I think just enlarging the first register block would be fine.
To be queued in renesas-devel for v6.9, if you agree.
Thanks for your comments!
Geert Uytterhoeven (2):
arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes
arm64: dts: renesas: r8a779g0: Correct avb[01] reg sizes
arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 4 ++-- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 12 lines
2.34.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsGeert Uytterhoeven
maintainerPATCH 1/2 arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes
All Ethernet AVB instances on R-Car V3U have registers related to UDP/IP support, but the declared register blocks for the first two instances are too small to cover them.
Fix this by extending the register block sizes.
--- arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a779a0.dtsi +2 -2
@@ -667,7 +667,7 @@ channel7 { avb0: ethernet@e6800000 { compatible = "renesas,etheravb-r8a779a0", "renesas,etheravb-rcar-gen4"; - reg = <0 0xe6800000 0 0x800>; + reg = <0 0xe6800000 0 0x1000>; interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>,
@@ -715,7 +715,7 @@ avb0: ethernet@e6800000 { avb1: ethernet@e6810000 { compatible = "renesas,etheravb-r8a779a0", "renesas,etheravb-rcar-gen4"; - reg = <0 0xe6810000 0 0x800>; + reg = <0 0xe6810000 0 0x1000>; interrupts = <GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 283 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.34.1
Geert Uytterhoeven
maintainerPATCH 2/2 arm64: dts: renesas: r8a779g0: Correct avb[01] reg sizes
In reply to Geert UytterhoevenAll Ethernet AVB instances on R-Car V4H have registers related to UDP/IP support, but the declared register blocks for the first two instances are too small to cover them.
Fix this by extending the register block sizes.
--- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a779g0.dtsi +2 -2
@@ -776,7 +776,7 @@ channel7 { avb0: ethernet@e6800000 { compatible = "renesas,etheravb-r8a779g0", "renesas,etheravb-rcar-gen4"; - reg = <0 0xe6800000 0 0x800>; + reg = <0 0xe6800000 0 0x1000>; interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
@@ -823,7 +823,7 @@ avb0: ethernet@e6800000 { avb1: ethernet@e6810000 { compatible = "renesas,etheravb-r8a779g0", "renesas,etheravb-rcar-gen4"; - reg = <0 0xe6810000 0 0x800>; + reg = <0 0xe6810000 0 0x1000>; interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 362 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.34.1
Quoted 4 lines · Geert Uytterhoeven
Hi all,
All Ethernet AVB instances on R-Car Gen4 SoCs have registers related to UDP/IP support, starting at offset
0x800. However, the register blocks
TCP/UDP/ICMP, actually.
Quoted 5 lines
for some (but not all) instances are too small to cover them.
This patch series fixes this by extending the register block sizes where needed. Note that this has no immediate impact on actual operation, as the Linux driver does not use the UDP/IP registers. Besides,
ioremap()
In fact, it does write to CSR0 at offset 0x800... and in the net-next.git
the checksum offload is now used.
Quoted 1 line
granulatity is
PAGE_SIZE, so the registers are accessible anyway.
Ah, indeed, PAGE_SIZE is not less than 0x1000. :-)
Quoted 11 lines
I also considered introducing a new reg tuplet to cover the UDP/IP registers. However, that would complicate handling as some instances (on some R-Car Gen2/3 SoCs) already have two reg tuplets, and there are no reg-names defined:
reg:
items:
- description: MAC register block
- description: Stream bufferSo I think just enlarging the first register block would be fine.
Yep, thanks! :-)
Quoted 11 lines
To be queued in renesas-devel for v6.9, if you agree.
Thanks for your comments!
Geert Uytterhoeven (2):
arm64: dts: renesas: r8a779a0: Correct avb[01] reg sizes
arm64: dts: renesas: r8a779g0: Correct avb[01] reg sizesarch/arm64/boot/dts/renesas/r8a779a0.dtsi | 4 ++-- arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
MBR, Sergey
Hi Sergey,
Quoted 5 lines · Sergey Shtylyov
Quoted 2 lines · Geert Uytterhoeven
All Ethernet AVB instances on R-Car Gen4 SoCs have registers related to UDP/IP support, starting at offset
0x800. However, the register blocksTCP/UDP/ICMP, actually.
I think you are mixing up Ether AVB on R-Car and GbEth on RZ/G2L...
Quoted 8 lines
Quoted 5 lines
for some (but not all) instances are too small to cover them.
This patch series fixes this by extending the register block sizes where needed. Note that this has no immediate impact on actual operation, as the Linux driver does not use the UDP/IP registers. Besides,
ioremap()In fact, it does write to CSR0 at offset
0x800... and in the net-next.git
the checksum offload is now used.
It only does so on GbEth.
While Ether AVB on R-Car Gen4 has both CSR0 and CSR2 (but no CSR1), and the register descriptions are the same, the documentation for the bits is completely different. And later registers differ even more...
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds