Commit f48298d3 authored Mar 10, 2021 by Ioana Ciornei Committed by David S. Miller Mar 10, 2021

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>

parent 1c4928fc

MAINTAINERS

+3 −3

Original line number	Diff line number	Diff line
		@@ -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>

drivers/net/ethernet/freescale/dpaa2/Kconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -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.

drivers/net/ethernet/freescale/dpaa2/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c→drivers/net/ethernet/freescale/dpaa2/dpaa2-switch-ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@

		#include <linux/ethtool.h>

		#include "ethsw.h"
		#include "dpaa2-switch.h"

		static struct {
		enum dpsw_counter id;

drivers/staging/fsl-dpaa2/ethsw/ethsw.c→drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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