netdev: octeon-ethernet: Add Cavium Octeon III support.
Subsystems (4)
v8 cover netdev: octeon-ethernet: Add Cavium Octeon III support.
We are adding the Cavium OCTEON-III network driver. Since interacting with the input and output queues is done via special CPU local memory, we also need to add support to the MIPS/Octeon architecture code. The four patch set to add this prerequisite code has been split out to a seperate patch set sent to the mips-linux list.
A separate pull request was recently done by Steven Hill for the firmware required by the driver.
Changes in v8:
o Fixed locking in bgx port functions as noted by davem.
o Corrected SPDX-License-Identifier tags.
o Split driver from prerequisite patches.
Changes in v7:
o There was no v7, we go to v8 to synchronize version numbers with prerequisites.
Changes in v6:
o Added back cleanup patch for previous generation SoC "staging" driver, as Greg K-H acked it.
o Moved FPA driver to drivers/net/ethernet/cavium/octeon as it is currently only used by the octeon3-ethernet driver.
o Many code formatting fixes as noted by davem.
Changes in v5:
o Removed cleanup patch for previous generation SoC "staging" driver, as it will be sent as a follow-on.
o Fixed kernel doc formatting in all patches.
o Removed redundant licensing text boilerplate.
o Reviewed-by: header added to 2/7.
o Rewrote locking code in 3/7 to eliminate inline asm.
Changes in v4:
o Use phy_print_status() instead of open coding the equivalent.
o Print warning on phy mode mismatch.
o Improve dt-bindings and add Acked-by.
Changes in v3:
o Fix PKI (RX path) initialization to work with little endian kernel.
Changes in v2:
o Cleanup and use of standard bindings in the device tree bindings document.
o Added (hopefully) clarifying comments about several OCTEON architectural peculiarities.
o Removed unused testing code from the driver.
o Removed some module parameters that already default to the proper values.
o KConfig cleanup, including testing on x86_64, arm64 and mips.
o Fixed breakage to the driver for previous generation of OCTEON SoCs (in the staging directory still).
o Verified bisectability of the patch set.
Carlos Munoz (2):
dt-bindings: Add Cavium Octeon Common Ethernet Interface.
netdev: octeon-ethernet: Add Cavium Octeon III support.
David Daney (1):
MAINTAINERS: Add entry for
drivers/net/ethernet/cavium/octeon/octeon3-*
.../devicetree/bindings/net/cavium-bgx.txt | 61 + MAINTAINERS | 6 + drivers/net/ethernet/cavium/Kconfig | 59 +- drivers/net/ethernet/cavium/octeon/Makefile | 7 + .../net/ethernet/cavium/octeon/octeon3-bgx-nexus.c | 417 ++++ .../net/ethernet/cavium/octeon/octeon3-bgx-port.c | 2003 +++++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-core.c | 2079 ++++++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-fpa.c | 358 ++++ drivers/net/ethernet/cavium/octeon/octeon3-pki.c | 823 ++++++++ drivers/net/ethernet/cavium/octeon/octeon3-pko.c | 1688 ++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-sso.c | 301 +++ drivers/net/ethernet/cavium/octeon/octeon3.h | 430 ++++ 12 files changed, 8222 insertions(+), 10 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/cavium-bgx.txt create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-bgx-nexus.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-bgx-port.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-core.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-fpa.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-pki.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-pko.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-sso.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3.h
Signature · 1 line
2.14.3
PATCH v8 1/3 dt-bindings: Add Cavium Octeon Common Ethernet Interface.
From: Carlos Munoz <[email protected]>
Add bindings for Common Ethernet Interface (BGX) block.
--- .../devicetree/bindings/net/cavium-bgx.txt | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/cavium-bgx.txt
Documentation/devicetree/bindings/net/cavium-bgx.txt new file +61 -0
@@ -0,0 +1,61 @@ +* Common Ethernet Interface (BGX) block + +Properties: + +- compatible: "cavium,octeon-7890-bgx": Compatibility with all cn7xxx SOCs. + +- reg: The base address of the BGX block. + +- #address-cells: Must be <1>. + +- #size-cells: Must be <0>. BGX addresses have no size component. + +A BGX block has several children, each representing an Ethernet +interface. + + +* Ethernet Interface (BGX port) connects to PKI/PKO + +Properties: + +- compatible: "cavium,octeon-7890-bgx-port": Compatibility with all + cn7xxx SOCs. + + "cavium,octeon-7360-xcv": Compatibility with cn73xx SOCs + for RGMII. + +- reg: The index of the interface within the BGX block. + +Optional properties: + +- local-mac-address: Mac address for the interface. + +- phy-handle: phandle to the phy node connected to the interface. + +- phy-mode: described in ethernet.txt. + +- fixed-link: described in fixed-link.txt. + +Example: + + ethernet-mac-nexus@11800e0000000 { + compatible = "cavium,octeon-7890-bgx"; + reg = <0x00011800 0xe0000000 0x00000000 0x01000000>; + #address-cells = <1>; + #size-cells = <0>; + + ethernet@0 { + compatible = "cavium,octeon-7360-xcv"; + reg = <0>; + local-mac-address = [ 00 01 23 45 67 89 ]; + phy-handle = <&phy3>; + phy-mode = "rgmii-rxid" + }; + ethernet@1 { + compatible = "cavium,octeon-7890-bgx-port"; + reg = <1>; + local-mac-address = [ 00 01 23 45 67 8a ]; + phy-handle = <&phy4>; + phy-mode = "sgmii" + }; + };
Signature · 1 line
2.14.3
PATCH v8 2/3 netdev: octeon-ethernet: Add Cavium Octeon III support.
In reply to David DaneyFrom: Carlos Munoz <[email protected]>
The Cavium OCTEON cn78xx and cn73xx SoCs have network packet I/O hardware that is significantly different from previous generations of the family.
Add a new driver for this hardware. The Ethernet MAC is called BGX on these devices. Common code for the MAC is in octeon3-bgx-port.c. Four of these BGX MACs are grouped together and managed as a group by octeon3-bgx-nexus.c. Ingress packet classification is done by the PKI unit initialized in octeon3-pki.c. Queue management is done in the SSO, initialized by octeon3-sso.c. Egress is handled by the PKO, initialized in octeon3-pko.c.
Hardware memory buffer management is done in octeon3-fpa.c
--- drivers/net/ethernet/cavium/Kconfig | 59 +- drivers/net/ethernet/cavium/octeon/Makefile | 7 + .../net/ethernet/cavium/octeon/octeon3-bgx-nexus.c | 417 ++++ .../net/ethernet/cavium/octeon/octeon3-bgx-port.c | 2003 +++++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-core.c | 2079 ++++++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-fpa.c | 358 ++++ drivers/net/ethernet/cavium/octeon/octeon3-pki.c | 823 ++++++++ drivers/net/ethernet/cavium/octeon/octeon3-pko.c | 1688 ++++++++++++++++ drivers/net/ethernet/cavium/octeon/octeon3-sso.c | 301 +++ drivers/net/ethernet/cavium/octeon/octeon3.h | 430 ++++ 10 files changed, 8155 insertions(+), 10 deletions(-) create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-bgx-nexus.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-bgx-port.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-core.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-fpa.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-pki.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-pko.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3-sso.c create mode 100644 drivers/net/ethernet/cavium/octeon/octeon3.h
drivers/net/ethernet/cavium/Kconfig +49 -10
@@ -4,7 +4,7 @@ config NET_VENDOR_CAVIUM bool "Cavium ethernet drivers" - depends on PCI + depends on PCI || CAVIUM_OCTEON_SOC default y ---help--- Select this option if you want enable Cavium network support.
@@ -13,6 +13,12 @@ config NET_VENDOR_CAVIUM if NET_VENDOR_CAVIUM +# +# The Thunder* and LiquidIO drivers require PCI. +# + +if PCI + config THUNDER_NIC_PF tristate "Thunder Physical function driver" depends on 64BIT
@@ -77,6 +83,20 @@ config LIQUIDIO To compile this driver as a module, choose M here: the module will be called liquidio. This is recommended. +config LIQUIDIO_VF + tristate "Cavium LiquidIO VF support" + depends on 64BIT && PCI_MSI + imply PTP_1588_CLOCK + ---help--- + This driver supports Cavium LiquidIO Intelligent Server Adapter + based on CN23XX chips. + + To compile this driver as a module, choose M here: The module + will be called liquidio_vf. MSI-X interrupt support is required + for this driver to work correctly + +endif # PCI + config OCTEON_MGMT_ETHERNET tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)" depends on CAVIUM_OCTEON_SOC
@@ -88,16 +108,35 @@ config OCTEON_MGMT_ETHERNET port on Cavium Networks' Octeon CN57XX, CN56XX, CN55XX, CN54XX, CN52XX, and CN6XXX chips. -config LIQUIDIO_VF - tristate "Cavium LiquidIO VF support" - depends on 64BIT && PCI_MSI - imply PTP_1588_CLOCK +config OCTEON_FPA3 + tristate + depends on CAVIUM_OCTEON_SOC + +config OCTEON3_BGX_NEXUS + tristate + depends on CAVIUM_OCTEON_SOC + +config OCTEON3_BGX_PORT + tristate "Cavium OCTEON-III BGX port support" + depends on CAVIUM_OCTEON_SOC + select OCTEON3_BGX_NEXUS ---help--- - This driver supports Cavium LiquidIO Intelligent Server Adapter - based on CN23XX chips. + Enable the driver for Cavium Octeon III BGX ports. BGX ports + support sgmii, rgmii, xaui, rxaui, xlaui, xfi, 10KR and 40KR modes. - To compile this driver as a module, choose M here: The module - will be called liquidio_vf. MSI-X interrupt support is required - for this driver to work correctly + Say Y for support of any Octeon III SoC Ethernet port. + +config OCTEON3_ETHERNET + tristate "Cavium OCTEON-III PKI/PKO Ethernet support" + depends on CAVIUM_OCTEON_SOC + select OCTEON_BGX_PORT + select OCTEON_FPA3 + select FW_LOADER + ---help--- + Enable the driver for Cavium Octeon III Ethernet via PKI/PKO + units. No support for cn70xx chips (use OCTEON_ETHERNET for + cn70xx). + + Say Y for support of any Octeon III SoC Ethernet port. endif # NET_VENDOR_CAVIUM
drivers/net/ethernet/cavium/octeon/Makefile +7 -0
@@ -3,3 +3,10 @@ # obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon_mgmt.o +obj-$(CONFIG_OCTEON3_BGX_PORT) += octeon3-bgx-port.o +obj-$(CONFIG_OCTEON3_BGX_NEXUS) += octeon3-bgx-nexus.o +obj-$(CONFIG_OCTEON_FPA3) += octeon3-fpa.o +obj-$(CONFIG_OCTEON3_ETHERNET) += octeon3-ethernet.o + +octeon3-ethernet-objs += octeon3-core.o octeon3-pki.o octeon3-sso.o \ + octeon3-pko.o
drivers/net/ethernet/cavium/octeon/octeon3-bgx-nexus.c new file +417 -0
417 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-bgx-port.c new file +2003 -0
2,003 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-core.c new file +2079 -0
486 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-fpa.c new file +358 -0
358 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-pki.c new file +823 -0
823 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-pko.c new file +1688 -0
1,688 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3-sso.c new file +301 -0
301 lines not on this page · raw message
drivers/net/ethernet/cavium/octeon/octeon3.h new file +430 -0
430 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.14.3
Part of the diff is not shown here. View the raw message.
PATCH v8 3/3 MAINTAINERS: Add entry for drivers/net/ethernet/cavium/octeon/octeon3-*
In reply to David Daney--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -3259,6 +3259,12 @@ W: http://www.cavium.com S: Supported F: drivers/mmc/host/cavium* +CAVIUM OCTEON-III NETWORK DRIVER +M: Steven J. Hill <[email protected]> +L: [email protected] +S: Supported +F: drivers/net/ethernet/cavium/octeon/octeon3-* + CAVIUM OCTEON-TX CRYPTO DRIVER M: George Cherian <[email protected]> L: [email protected]
Signature · 1 line
2.14.3