Skip to content

mips: octeon: Add ethernet support

Stefan Roese u-boot 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest44 of 52 patches 3 repliesIn review
  2. v148 of 52 patches 3 repliesSuperseded

Changes in v2 from the cover letter

- As suggested by Daniel, remove all unreferenced functions from the source code by manually inspecting u-boot.map [1]
- Rebased on latest TOT

[1] Here the diffstat comarison between v1 and v2:

44 of 52 patches are in this archive. The cover letter announces 52.

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/52mips: octeon: Add misc cvmx-* header filesarch/mips/mach-octeon/include/mach/cvmx-agl.h arch/mips/mach-octeon/include/mach/cvmx-config.h arch/mips/mach-octeon/include/mach/cvmx-fau.h +6 more+2937 -00 replies
2/52mips: octeon: Add cvmx-ilk-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-ilk-defs.h+2269 -00 replies
3/52mips: octeon: Add cvmx-iob-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-iob-defs.h+1328 -00 replies
4/52mips: octeon: Add cvmx-lbk-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-lbk-defs.h+157 -00 replies
5/52mips: octeon: Add cvmx-npei-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-npei-defs.h+3550 -00 replies
6/52mips: octeon: Add cvmx-pcsxx-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-pcsxx-defs.h+787 -00 replies
7/52mips: octeon: Add cvmx-xcv-defs.h header filearch/mips/mach-octeon/include/mach/cvmx-xcv-defs.h+226 -00 replies
8/52mips: octeon: Misc changes to existing headers for upcoming eth supportarch/mips/mach-octeon/include/mach/cvmx-bootmem.h arch/mips/mach-octeon/include/mach/cvmx-fpa.h arch/mips/mach-octeon/include/mach/cvmx-fpa3.h +6 more+166 -990 replies
9/52mips: octeon: Add cvmx-helper-agl.carch/mips/mach-octeon/cvmx-helper-agl.c+231 -00 replies
10/52mips: octeon: Add cvmx-helper-bgx.carch/mips/mach-octeon/cvmx-helper-bgx.c+2737 -00 replies
11/52mips: octeon: Add cvmx-helper-board.carch/mips/mach-octeon/cvmx-helper-board.c+1824 -00 replies
12/52mips: octeon: Add cvmx-helper-fpa.carch/mips/mach-octeon/cvmx-helper-fpa.c+76 -00 replies
13/52mips: octeon: Add cvmx-helper-ilk.carch/mips/mach-octeon/cvmx-helper-ilk.c+902 -00 replies
14/52mips: octeon: Add cvmx-helper-ipd.carch/mips/mach-octeon/cvmx-helper-ipd.c+286 -00 replies
15/52mips: octeon: Add cvmx-helper-loop.carch/mips/mach-octeon/cvmx-helper-loop.c+178 -00 replies
16/52mips: octeon: Add cvmx-helper-npi.carch/mips/mach-octeon/cvmx-helper-npi.c+137 -00 replies
17/52mips: octeon: Add cvmx-helper-pki.carch/mips/mach-octeon/cvmx-helper-pki.c+549 -00 replies
18/52mips: octeon: Add cvmx-helper-pko.carch/mips/mach-octeon/cvmx-helper-pko.c+203 -00 replies
19/52mips: octeon: Add cvmx-helper-pko3.carch/mips/mach-octeon/cvmx-helper-pko3.c+1088 -00 replies
20/52mips: octeon: Add cvmx-helper-rgmii.carch/mips/mach-octeon/cvmx-helper-rgmii.c+398 -00 replies
21/52mips: octeon: Add cvmx-helper-sgmii.carch/mips/mach-octeon/cvmx-helper-sgmii.c+781 -00 replies
23/52mips: octeon: Add cvmx-helper-xaui.carch/mips/mach-octeon/cvmx-helper-xaui.c+518 -00 replies
24/52mips: octeon: Add cvmx-agl.carch/mips/mach-octeon/cvmx-agl.c+216 -00 replies
26/52mips: octeon: Add cvmx-fau-compat.carch/mips/mach-octeon/cvmx-fau-compat.c+53 -00 replies
27/52mips: octeon: Add cvmx-fpa.carch/mips/mach-octeon/cvmx-fpa.c+1127 -00 replies
30/52mips: octeon: Add cvmx-ilk.carch/mips/mach-octeon/cvmx-ilk.c+1199 -00 replies
33/52mips: octeon: Add cvmx-pki-resources.carch/mips/mach-octeon/cvmx-pki-resources.c+285 -00 replies
34/52mips: octeon: Add cvmx-pko.carch/mips/mach-octeon/cvmx-pko.c+788 -00 replies
35/52mips: octeon: Add cvmx-pko3.carch/mips/mach-octeon/cvmx-pko3.c+786 -00 replies
37/52mips: octeon: Add cvmx-pko3-compat.carch/mips/mach-octeon/cvmx-pko3-compat.c+656 -00 replies
38/52mips: octeon: Add cvmx-pko3-resources.carch/mips/mach-octeon/cvmx-pko3-resources.c+213 -00 replies
39/52mips: octeon: Add cvmx-pko-internal-ports-range.carch/mips/mach-octeon/cvmx-pko-internal-ports-range.c+99 -00 replies
40/52mips: octeon: Add cvmx-qlm-tables.carch/mips/mach-octeon/cvmx-qlm-tables.c+292 -00 replies
42/52mips: octeon: Misc changes to existing C files for upcoming eth supportarch/mips/mach-octeon/cvmx-bootmem.c arch/mips/mach-octeon/cvmx-helper-cfg.c arch/mips/mach-octeon/cvmx-helper-fdt.c +2 more+230 -24190 replies
43/52mips: octeon: Makefile: Enable building of the newly added C filesarch/mips/mach-octeon/Makefile+34 -10 replies
44/52mips: octeon: cpu.c: Move bootmem init to arch_early_init_r()arch/mips/Kconfig arch/mips/mach-octeon/cpu.c+13 -10 replies
45/52mips: octeon: cpu.c: Implement configure_lmtdma_window()arch/mips/mach-octeon/cpu.c+33 -10 replies
46/52mips: octeon: octeon_common.h: Move init SP because of increased image sizeinclude/configs/octeon_common.h+1 -10 replies
47/52mips: octeon: mrvl, cn73xx.dtsi: Add ethernet (BGX) and SMI DT nodesarch/mips/dts/mrvl,cn73xx.dtsi+35 -00 replies
48/52mips: octeon: mrvl, octeon-ebb7304.dts: Add ethernet DT supportarch/mips/dts/mrvl,octeon-ebb7304.dts+45 -00 replies
49/52mips: octeon: mrvl, octeon-nic23.dts: Add ethernet DT supportarch/mips/dts/mrvl,octeon-nic23.dts+238 -00 replies
50/52net: Add ethernet support for MIPS Octeondrivers/net/Kconfig drivers/net/Makefile drivers/net/octeon/Makefile +2 more+1300 -00 replies
51/52mips: octeon: ebb7304: Enable ethernet supportconfigs/octeon_ebb7304_defconfig include/configs/octeon_ebb7304.h+9 -00 replies
52/52mips: octeon: nic23: Enable ethernet supportboard/Marvell/octeon_nic23/board.c configs/octeon_nic23_defconfig+95 -20 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/52] mips: octeon: Add ethernet support

This patchset adds the networking files and drivers including device helper headers and C files. Please excuse the massive amount of files in this patch series. Also the sometimes huge files (mostly headers with register definitions) that I needed to include.

The infrastructure code with all the headers is ported mistly without any intended functional changes from the 2013 Cavium / Marvell U-Boot version. It has undergone many hours of extensive code cleanup and reformatting. Some of it done by using tools (checkpatch, Lindent, clang format etc) and also some of it done manually, as I couldn't find some tools that could do the needed work in a reliable and functional way. The result is that checkpatch now only throws a "few" warnings that are left. Some of those can't be removed without an even more extensive cleanup / rewrite of the code, like the addition of typedefs.

The added header, helper and infrastructure files in the first part of the patch-series (patches 1-43) are the foundation, that is used by the main Octeon U-Boot ethernet driver (patch 50/52). Patches 47-49 add the DT nodes and properties to the corresponding dtsi / dts files. Patches 51 & 52 finally enable the ethernet support both MIPS Octeon boards, EBB7304 & NIC23.

All this is tested on the 2 Cavium / Marvell MIPS Octeon boards:
EBB7304 & NIC23

This patchset including the small Marvell PHY patches is available in this gitlab branch:

https://source.denx.de/u-boot/custodians/u-boot-marvell/-/tree/mips-octeon-ethernet-v2-2022-04-07

Changes in v2:
- As suggested by Daniel, remove all unreferenced functions from the source code by manually inspecting u-boot.map [1]
- Rebased on latest TOT

[1] Here the diffstat comarison between v1 and v2:

v1:  77 files changed, 42315 insertions(+), 586 deletions(-)
v2:  78 files changed, 33672 insertions(+), 2524 deletions(-)

Thanks,
Stefan

Aaron Williams (40):
mips: octeon: Add misc cvmx-* header files
mips: octeon: Add cvmx-ilk-defs.h header file
mips: octeon: Add cvmx-iob-defs.h header file
mips: octeon: Add cvmx-lbk-defs.h header file
mips: octeon: Add cvmx-npei-defs.h header file
mips: octeon: Add cvmx-pcsxx-defs.h header file
mips: octeon: Add cvmx-xcv-defs.h header file
mips: octeon: Add cvmx-helper-agl.c
mips: octeon: Add cvmx-helper-bgx.c
mips: octeon: Add cvmx-helper-board.c
mips: octeon: Add cvmx-helper-fpa.c
mips: octeon: Add cvmx-helper-ilk.c
mips: octeon: Add cvmx-helper-ipd.c
mips: octeon: Add cvmx-helper-loop.c
mips: octeon: Add cvmx-helper-npi.c
mips: octeon: Add cvmx-helper-pki.c
mips: octeon: Add cvmx-helper-pko.c
mips: octeon: Add cvmx-helper-pko3.c
mips: octeon: Add cvmx-helper-rgmii.c
mips: octeon: Add cvmx-helper-sgmii.c
mips: octeon: Add cvmx-helper-sfp.c
mips: octeon: Add cvmx-helper-xaui.c
mips: octeon: Add cvmx-agl.c
mips: octeon: Add cvmx-cmd-queue.c
mips: octeon: Add cvmx-fau-compat.c
mips: octeon: Add cvmx-fpa.c
mips: octeon: Add cvmx-fpa-resource.c
mips: octeon: Add cvmx-global-resource.c
mips: octeon: Add cvmx-ilk.c
mips: octeon: Add cvmx-ipd.c
mips: octeon: Add cvmx-pki.c
mips: octeon: Add cvmx-pki-resources.c
mips: octeon: Add cvmx-pko.c
mips: octeon: Add cvmx-pko3.c
mips: octeon: Add cvmx-pko3-queue.c
mips: octeon: Add cvmx-pko3-compat.c
mips: octeon: Add cvmx-pko3-resources.c
mips: octeon: Add cvmx-pko-internal-ports-range.c
mips: octeon: Add cvmx-qlm-tables.c
mips: octeon: Add cvmx-range.c

Stefan Roese (12):
mips: octeon: Misc changes to existing headers for upcoming eth
support
mips: octeon: Misc changes to existing C files for upcoming eth
support
mips: octeon: Makefile: Enable building of the newly added C files
mips: octeon: cpu.c: Move bootmem init to arch_early_init_r()
mips: octeon: cpu.c: Implement configure_lmtdma_window()
mips: octeon: octeon_common.h: Move init SP because of increased image
size
mips: octeon: mrvl,cn73xx.dtsi: Add ethernet (BGX) and SMI DT nodes
mips: octeon: mrvl,octeon-ebb7304.dts: Add ethernet DT support
mips: octeon: mrvl,octeon-nic23.dts: Add ethernet DT support
net: Add ethernet support for MIPS Octeon
mips: octeon: ebb7304: Enable ethernet support
mips: octeon: nic23: Enable ethernet support

 arch/mips/Kconfig                             |    1 +
 arch/mips/dts/mrvl,cn73xx.dtsi                |   35 +
 arch/mips/dts/mrvl,octeon-ebb7304.dts         |   45 +
 arch/mips/dts/mrvl,octeon-nic23.dts           |  238 ++
 arch/mips/mach-octeon/Makefile                |   35 +-
 arch/mips/mach-octeon/cpu.c                   |   47 +-
 arch/mips/mach-octeon/cvmx-agl.c              |  216 +
 arch/mips/mach-octeon/cvmx-bootmem.c          |    3 +-
 arch/mips/mach-octeon/cvmx-cmd-queue.c        |  355 ++
 arch/mips/mach-octeon/cvmx-fau-compat.c       |   53 +
 arch/mips/mach-octeon/cvmx-fpa-resource.c     |  219 +
 arch/mips/mach-octeon/cvmx-fpa.c              | 1127 ++++++
 arch/mips/mach-octeon/cvmx-global-resources.c |  517 +++
 arch/mips/mach-octeon/cvmx-helper-agl.c       |  231 ++
 arch/mips/mach-octeon/cvmx-helper-bgx.c       | 2737 +++++++++++++
 arch/mips/mach-octeon/cvmx-helper-board.c     | 1824 +++++++++
 arch/mips/mach-octeon/cvmx-helper-cfg.c       |  655 +--
 arch/mips/mach-octeon/cvmx-helper-fdt.c       |  898 +----
 arch/mips/mach-octeon/cvmx-helper-fpa.c       |   76 +
 arch/mips/mach-octeon/cvmx-helper-ilk.c       |  902 +++++
 arch/mips/mach-octeon/cvmx-helper-ipd.c       |  286 ++
 arch/mips/mach-octeon/cvmx-helper-loop.c      |  178 +
 arch/mips/mach-octeon/cvmx-helper-npi.c       |  137 +
 arch/mips/mach-octeon/cvmx-helper-pki.c       |  549 +++
 arch/mips/mach-octeon/cvmx-helper-pko.c       |  203 +
 arch/mips/mach-octeon/cvmx-helper-pko3.c      | 1088 +++++
 arch/mips/mach-octeon/cvmx-helper-rgmii.c     |  398 ++
 arch/mips/mach-octeon/cvmx-helper-sfp.c       | 1309 ++++++
 arch/mips/mach-octeon/cvmx-helper-sgmii.c     |  781 ++++
 arch/mips/mach-octeon/cvmx-helper-util.c      |  248 --
 arch/mips/mach-octeon/cvmx-helper-xaui.c      |  518 +++
 arch/mips/mach-octeon/cvmx-helper.c           |  845 +---
 arch/mips/mach-octeon/cvmx-ilk.c              | 1199 ++++++
 arch/mips/mach-octeon/cvmx-ipd.c              |  149 +
 arch/mips/mach-octeon/cvmx-pki-resources.c    |  285 ++
 arch/mips/mach-octeon/cvmx-pki.c              |  910 +++++
 .../cvmx-pko-internal-ports-range.c           |   99 +
 arch/mips/mach-octeon/cvmx-pko.c              |  788 ++++
 arch/mips/mach-octeon/cvmx-pko3-compat.c      |  656 +++
 arch/mips/mach-octeon/cvmx-pko3-queue.c       |  879 ++++
 arch/mips/mach-octeon/cvmx-pko3-resources.c   |  213 +
 arch/mips/mach-octeon/cvmx-pko3.c             |  786 ++++
 arch/mips/mach-octeon/cvmx-qlm-tables.c       |  292 ++
 arch/mips/mach-octeon/cvmx-range.c            |  259 ++
 arch/mips/mach-octeon/include/mach/cvmx-agl.h |   45 +
 .../mach-octeon/include/mach/cvmx-bootmem.h   |    3 +-
 .../mach-octeon/include/mach/cvmx-config.h    |  128 +
 arch/mips/mach-octeon/include/mach/cvmx-fau.h |  581 +++
 arch/mips/mach-octeon/include/mach/cvmx-fpa.h |    3 +-
 .../mips/mach-octeon/include/mach/cvmx-fpa3.h |   37 -
 .../include/mach/cvmx-helper-board.h          |    6 +-
 .../include/mach/cvmx-helper-fdt.h            |   40 +-
 .../include/mach/cvmx-helper-pko.h            |    2 +-
 .../mach-octeon/include/mach/cvmx-helper.h    |   20 +
 .../mach-octeon/include/mach/cvmx-ilk-defs.h  | 2269 +++++++++++
 .../mach-octeon/include/mach/cvmx-iob-defs.h  | 1328 ++++++
 .../mach-octeon/include/mach/cvmx-lbk-defs.h  |  157 +
 .../mips/mach-octeon/include/mach/cvmx-mdio.h |  516 +++
 .../mach-octeon/include/mach/cvmx-npei-defs.h | 3550 +++++++++++++++++
 .../include/mach/cvmx-pcsxx-defs.h            |  787 ++++
 .../include/mach/cvmx-pki-cluster.h           |  343 ++
 arch/mips/mach-octeon/include/mach/cvmx-pko.h |  213 +
 .../include/mach/cvmx-pko3-resources.h        |   36 +
 .../mips/mach-octeon/include/mach/cvmx-pko3.h | 1052 +++++
 .../mach-octeon/include/mach/cvmx-range.h     |   23 +
 .../mips/mach-octeon/include/mach/cvmx-regs.h |  100 +-
 .../mach-octeon/include/mach/cvmx-xcv-defs.h  |  226 ++
 .../mach-octeon/include/mach/octeon_eth.h     |   54 +-
 board/Marvell/octeon_nic23/board.c            |   87 +-
 configs/octeon_ebb7304_defconfig              |    7 +
 configs/octeon_nic23_defconfig                |   10 +-
 drivers/net/Kconfig                           |    7 +
 drivers/net/Makefile                          |    1 +
 drivers/net/octeon/Makefile                   |    6 +
 drivers/net/octeon/octeon_eth.c               | 1060 +++++
 drivers/net/octeon/octeon_mdio.c              |  226 ++
 include/configs/octeon_common.h               |    2 +-
 include/configs/octeon_ebb7304.h              |    2 +
 78 files changed, 33672 insertions(+), 2524 deletions(-)
 create mode 100644 arch/mips/mach-octeon/cvmx-agl.c
 create mode 100644 arch/mips/mach-octeon/cvmx-cmd-queue.c
 create mode 100644 arch/mips/mach-octeon/cvmx-fau-compat.c
 create mode 100644 arch/mips/mach-octeon/cvmx-fpa-resource.c
 create mode 100644 arch/mips/mach-octeon/cvmx-fpa.c
 create mode 100644 arch/mips/mach-octeon/cvmx-global-resources.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-agl.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-bgx.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-board.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-fpa.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-ilk.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-ipd.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-loop.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-npi.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-pki.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko3.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-rgmii.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-sfp.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-sgmii.c
 create mode 100644 arch/mips/mach-octeon/cvmx-helper-xaui.c
 create mode 100644 arch/mips/mach-octeon/cvmx-ilk.c
 create mode 100644 arch/mips/mach-octeon/cvmx-ipd.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pki-resources.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pki.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko-internal-ports-range.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko3-compat.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko3-queue.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko3-resources.c
 create mode 100644 arch/mips/mach-octeon/cvmx-pko3.c
 create mode 100644 arch/mips/mach-octeon/cvmx-qlm-tables.c
 create mode 100644 arch/mips/mach-octeon/cvmx-range.c
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-agl.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-config.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-fau.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-ilk-defs.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-iob-defs.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-lbk-defs.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-mdio.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-npei-defs.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pcsxx-defs.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pki-cluster.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3-resources.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-range.h
 create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-xcv-defs.h
 create mode 100644 drivers/net/octeon/Makefile
 create mode 100644 drivers/net/octeon/octeon_eth.c
 create mode 100644 drivers/net/octeon/octeon_mdio.c
Signature · 1 line
2.35.1