mirror of https://gitee.com/openkylin/linux.git
staging: dpaa2-switch: move the driver out of staging
Now that the dpaa2-switch driver has basic I/O capabilities on the switch port net_devices and multiple bridging domains are supported, move the driver out of staging. The dpaa2-switch driver is placed right next to the dpaa2-eth driver since, in the near future, they will be sharing most of the data path. I didn't implement code reuse in this patch series because I wanted to keep it as small as possible. Also, the README is removed from staging with the intention to add proper rst documentation afterwards to actually match was is supported by the driver. Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ioana Ciornei
David S. Miller
parent
1c4928fc29
commit
f48298d3fb
|
|
@ -5473,11 +5473,11 @@ F: drivers/net/ethernet/freescale/dpaa2/dpmac*
|
|||
F: drivers/net/ethernet/freescale/dpaa2/dpni*
|
||||
|
||||
DPAA2 ETHERNET SWITCH DRIVER
|
||||
M: Ioana Radulescu <ruxandra.radulescu@nxp.com>
|
||||
M: Ioana Ciornei <ioana.ciornei@nxp.com>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
L: netdev@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/staging/fsl-dpaa2/ethsw
|
||||
F: drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
|
||||
F: drivers/net/ethernet/freescale/dpaa2/dpsw*
|
||||
|
||||
DPT_I2O SCSI RAID DRIVER
|
||||
M: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
|
||||
|
|
|
|||
|
|
@ -29,3 +29,11 @@ config FSL_DPAA2_PTP_CLOCK
|
|||
help
|
||||
This driver adds support for using the DPAA2 1588 timer module
|
||||
as a PTP clock.
|
||||
|
||||
config FSL_DPAA2_SWITCH
|
||||
tristate "Freescale DPAA2 Ethernet Switch"
|
||||
depends on BRIDGE || BRIDGE=n
|
||||
depends on NET_SWITCHDEV
|
||||
help
|
||||
Driver for Freescale DPAA2 Ethernet Switch. This driver manages
|
||||
switch objects discovered on the Freeescale MC bus.
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@
|
|||
|
||||
obj-$(CONFIG_FSL_DPAA2_ETH) += fsl-dpaa2-eth.o
|
||||
obj-$(CONFIG_FSL_DPAA2_PTP_CLOCK) += fsl-dpaa2-ptp.o
|
||||
obj-$(CONFIG_FSL_DPAA2_SWITCH) += fsl-dpaa2-switch.o
|
||||
|
||||
fsl-dpaa2-eth-objs := dpaa2-eth.o dpaa2-ethtool.o dpni.o dpaa2-mac.o dpmac.o dpaa2-eth-devlink.o
|
||||
fsl-dpaa2-eth-${CONFIG_FSL_DPAA2_ETH_DCB} += dpaa2-eth-dcb.o
|
||||
fsl-dpaa2-eth-${CONFIG_DEBUG_FS} += dpaa2-eth-debugfs.o
|
||||
fsl-dpaa2-ptp-objs := dpaa2-ptp.o dprtc.o
|
||||
fsl-dpaa2-switch-objs := dpaa2-switch.o dpaa2-switch-ethtool.o dpsw.o
|
||||
|
||||
# Needed by the tracing framework
|
||||
CFLAGS_dpaa2-eth.o := -I$(src)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
#include <linux/ethtool.h>
|
||||
|
||||
#include "ethsw.h"
|
||||
#include "dpaa2-switch.h"
|
||||
|
||||
static struct {
|
||||
enum dpsw_counter id;
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include <linux/fsl/mc.h>
|
||||
|
||||
#include "ethsw.h"
|
||||
#include "dpaa2-switch.h"
|
||||
|
||||
/* Minimal supported DPSW version */
|
||||
#define DPSW_MIN_VER_MAJOR 8
|
||||
|
|
@ -78,8 +78,6 @@ source "drivers/staging/clocking-wizard/Kconfig"
|
|||
|
||||
source "drivers/staging/fbtft/Kconfig"
|
||||
|
||||
source "drivers/staging/fsl-dpaa2/Kconfig"
|
||||
|
||||
source "drivers/staging/most/Kconfig"
|
||||
|
||||
source "drivers/staging/ks7010/Kconfig"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/
|
|||
obj-$(CONFIG_UNISYSSPAR) += unisys/
|
||||
obj-$(CONFIG_COMMON_CLK_XLNX_CLKWZRD) += clocking-wizard/
|
||||
obj-$(CONFIG_FB_TFT) += fbtft/
|
||||
obj-$(CONFIG_FSL_DPAA2) += fsl-dpaa2/
|
||||
obj-$(CONFIG_MOST) += most/
|
||||
obj-$(CONFIG_KS7010) += ks7010/
|
||||
obj-$(CONFIG_GREYBUS) += greybus/
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
|
||||
#
|
||||
|
||||
config FSL_DPAA2
|
||||
bool "Freescale DPAA2 devices"
|
||||
depends on FSL_MC_BUS
|
||||
help
|
||||
Build drivers for Freescale DataPath Acceleration
|
||||
Architecture (DPAA2) family of SoCs.
|
||||
|
||||
config FSL_DPAA2_ETHSW
|
||||
tristate "Freescale DPAA2 Ethernet Switch"
|
||||
depends on BRIDGE || BRIDGE=n
|
||||
depends on FSL_DPAA2
|
||||
depends on NET_SWITCHDEV
|
||||
help
|
||||
Driver for Freescale DPAA2 Ethernet Switch. Select
|
||||
BRIDGE to have support for bridge tools.
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Freescale DataPath Acceleration Architecture Gen2 (DPAA2) drivers
|
||||
#
|
||||
|
||||
obj-$(CONFIG_FSL_DPAA2_ETHSW) += ethsw/
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for the Freescale DPAA2 Ethernet Switch
|
||||
#
|
||||
# Copyright 2014-2017 Freescale Semiconductor Inc.
|
||||
# Copyright 2017-2018 NXP
|
||||
|
||||
obj-$(CONFIG_FSL_DPAA2_ETHSW) += dpaa2-ethsw.o
|
||||
|
||||
dpaa2-ethsw-objs := ethsw.o ethsw-ethtool.o dpsw.o
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
DPAA2 Ethernet Switch driver
|
||||
============================
|
||||
|
||||
This file provides documentation for the DPAA2 Ethernet Switch driver
|
||||
|
||||
|
||||
Contents
|
||||
========
|
||||
Supported Platforms
|
||||
Architecture Overview
|
||||
Creating an Ethernet Switch
|
||||
Features
|
||||
|
||||
|
||||
Supported Platforms
|
||||
===================
|
||||
This driver provides networking support for Freescale LS2085A, LS2088A
|
||||
DPAA2 SoCs.
|
||||
|
||||
|
||||
Architecture Overview
|
||||
=====================
|
||||
The Ethernet Switch in the DPAA2 architecture consists of several hardware
|
||||
resources that provide the functionality. These are allocated and
|
||||
configured via the Management Complex (MC) portals. MC abstracts most of
|
||||
these resources as DPAA2 objects and exposes ABIs through which they can
|
||||
be configured and controlled.
|
||||
|
||||
For a more detailed description of the DPAA2 architecture and its object
|
||||
abstractions see:
|
||||
drivers/staging/fsl-mc/README.txt
|
||||
|
||||
The Ethernet Switch is built on top of a Datapath Switch (DPSW) object.
|
||||
|
||||
Configuration interface:
|
||||
|
||||
---------------------
|
||||
| DPAA2 Switch driver |
|
||||
---------------------
|
||||
.
|
||||
.
|
||||
----------
|
||||
| DPSW API |
|
||||
----------
|
||||
. software
|
||||
================= . ==============
|
||||
. hardware
|
||||
---------------------
|
||||
| MC hardware portals |
|
||||
---------------------
|
||||
.
|
||||
.
|
||||
------
|
||||
| DPSW |
|
||||
------
|
||||
|
||||
Driver uses the switch device driver model and exposes each switch port as
|
||||
a network interface, which can be included in a bridge. Traffic switched
|
||||
between ports is offloaded into the hardware. Exposed network interfaces
|
||||
are not used for I/O, they are used just for configuration. This
|
||||
limitation is going to be addressed in the future.
|
||||
|
||||
The DPSW can have ports connected to DPNIs or to PHYs via DPMACs.
|
||||
|
||||
|
||||
[ethA] [ethB] [ethC] [ethD] [ethE] [ethF]
|
||||
: : : : : :
|
||||
: : : : : :
|
||||
[eth drv] [eth drv] [ ethsw drv ]
|
||||
: : : : : : kernel
|
||||
========================================================================
|
||||
: : : : : : hardware
|
||||
[DPNI] [DPNI] [============= DPSW =================]
|
||||
| | | | | |
|
||||
| ---------- | [DPMAC] [DPMAC]
|
||||
------------------------------- | |
|
||||
| |
|
||||
[PHY] [PHY]
|
||||
|
||||
For a more detailed description of the Ethernet switch device driver model
|
||||
see:
|
||||
Documentation/networking/switchdev.rst
|
||||
|
||||
Creating an Ethernet Switch
|
||||
===========================
|
||||
A device is created for the switch objects probed on the MC bus. Each DPSW
|
||||
has a number of properties which determine the configuration options and
|
||||
associated hardware resources.
|
||||
|
||||
A DPSW object (and the other DPAA2 objects needed for a DPAA2 switch) can
|
||||
be added to a container on the MC bus in one of two ways: statically,
|
||||
through a Datapath Layout Binary file (DPL) that is parsed by MC at boot
|
||||
time; or created dynamically at runtime, via the DPAA2 objects APIs.
|
||||
|
||||
Features
|
||||
========
|
||||
Driver configures DPSW to perform hardware switching offload of
|
||||
unicast/multicast/broadcast (VLAN tagged or untagged) traffic between its
|
||||
ports.
|
||||
|
||||
It allows configuration of hardware learning, flooding, multicast groups,
|
||||
port VLAN configuration and STP state.
|
||||
|
||||
Static entries can be added/removed from the FDB.
|
||||
|
||||
Hardware statistics for each port are provided through ethtool -S option.
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
* Add I/O capabilities on switch port netdevices. This will allow control
|
||||
traffic to reach the CPU.
|
||||
* Add ACL to redirect control traffic to CPU.
|
||||
* Add support for multiple FDBs and switch port partitioning
|
||||
* MC firmware uprev; the DPAA2 objects used by the Ethernet Switch driver
|
||||
need to be kept in sync with binary interface changes in MC
|
||||
* refine README file
|
||||
* cleanup
|
||||
|
||||
NOTE: At least first three of the above are required before getting the
|
||||
DPAA2 Ethernet Switch driver out of staging. Another requirement is that
|
||||
dpio driver is moved to drivers/soc (this is required for I/O).
|
||||
|
||||
Loading…
Reference in New Issue