Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a62b70dd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'switchdev_spring_cleanup' 



Scott Feldman says:

====================
switchdev: spring cleanup

v7:

Address review comments:

 - [Jiri] split the br_setlink and br_dellink reverts into their own patches
 - [Jiri] some parameter cleanup of rocker's memory allocators
 - [Jiri] pass trans mode as formal parameter rather than hanging off of
     rocker_port.

v6:

Address review comments:

 - [Jiri] split a couple of patches into one-logical-change per patch
 - [Joe Perches] revert checkpatch -f changes for wrapped lines with long
     symbols.

v5:

Address review comments:

 - [Jiri] include Jiri's s/swdev/switchdev rename patches up front.
 - [Jiri] squash some patches.  Now setlink/dellink/getlink patches are in
     three parts: new implementation, convert drivers to new, delete old impl.
 - [Jiri] some minor variable renames
 - [Jiri] use BUG_ON rather than WARN when COMMIT phase fails when PREPARE
     phase said it was safe to come into the water.
 - [Simon] rocker: fix a few transaction prepare-commit cases that were wrong.
     This was the bulk of the changes in v5.

v4:

Well, it was a lot of work, but now prepare-commit transaction model is how
davem advises: if prepare fails, abort the transaction.  The driver must do
resource reservations up front in prepare phase and return those resources if
aborting.  Commit phase would use reserved resources.  The good news is the
driver code (for rocker) now handles resource allocation failures better by not
leaving partially device or driver states.  This is a side-effect of the
prepare phase where state isn't modified; only validation of inputs and
resource reservations happen in the prepare phase.  Since we're supporting
setting attrs and add objs across lower devs in the stacked case, we need to
hold rtnl_lock (or ensure rtnl_lock is held) so lower devs don't move on us
during the prepare-commit transaction.  DSA driver code skips the prepare phase
and goes straight for the commit phase since no up-front allocations are done
and no device failures (that could be detected in the prepare phase) can
happen.

Remove NETIF_F_HW_SWITCH_OFFLOAD from rocker and the swdev_attr_set/get
wrappers.  DSA doesn't set NETIF_F_HW_SWITCH_OFFLOAD, so it can't be in
swdev_attr_set/get.  rocker doesn't need it; or rather can't support
NETIF_F_HW_SWITCH_OFFLOAD being set/cleared at run-time after the device
port is already up and offloading L2/L3.  NETIF_F_HW_SWITCH_OFFLOAD is still
left as a feature flag for drivers that can use it.

Drop the renaming patch for netdev_switch_notifier.  Other renames are a
result of moving to the attr get/set or obj add/del model.  Everything
but the netdev_switch_notifier is still prefixed with "swdev_".

v3:

Move to two-phase prepare-commit transaction model for attr set and obj add.
Driver gets a change in prepare phase to NACK transaction if lack of resources
or support in device.

v2:

Address review comments:

 - [Jiri] squash a few related patches
 - [Roopa] don't remove NETIF_F_HW_SWITCH_OFFLOAD
 - [Roopa] address VLAN setlink/dellink
 - [Ronen] print warning is attr set revert fails

Not address:

 - Using something other than "swdev_" prefix
 - Vendor extentions

The patch set grew a bit to not only support port attr get/set but also add
support for port obj add/del.  Example of port objs are VLAN, FDB entries, and
FIB entries.  The VLAN support now allows the swdev driver to get VLAN ranges
and flags like PVID and "untagged".  Sridhar will be adding FDB obj support
in follow-on patch.

v1:

The main theme of this patch set is to cleanup swdev in preparation for
new features or fixes to be added soon.  We have a pretty good idea now how
to handle stacked drivers in swdev, but there where some loose ends.  For
example, if a set failed in the middle of walking the lower devs, we would
leave the system in an undefined state...there was no way to recover back to
the previous state.  Speaking of sets, also recognize a pattern that most
swdev API accesses are gets or sets of port attributes, so go ahead and make
port attr get/set the central swdev API, and convert everything that is
set-ish/get-ish to this new API.

Features/fixes that should follow from this cleanup:

 - solve the duplicate pkt forwarding issue
 - get/set bridge attrs, like ageing_time, from/to device
 - get/set more bridge port attrs from/to device

There are some rename cleanups tagging along at the end, to give swdev
consistent naming.

And finally, some much needed updates to the switchdev.txt documentation to
hopefully capture the state-of-the-art of swdev.  Hopefully, we can do a better
job keeping this document up-to-date.

Tested with rocker, of course, to make sure nothing functional broke.  There
are a couple minor tweaks to DSA code for getting switch ID and setting STP
updates to use new API, but not expecting amy breakage there.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a3eb95f8 4ceec22d

Documentation/networking/switchdev.txt

+355 −59
Original line number Diff line number Diff line 
Switch (and switch-ish) device drivers HOWTO

===========================



Please note that the word "switch" is here used in very generic meaning.

This include devices supporting L2/L3 but also various flow offloading chips,

including switches embedded into SR-IOV NICs.



Lets describe a topology a bit. Imagine the following example:



       +----------------------------+    +---------------+

       |     SOME switch chip       |    |      CPU      |

       +----------------------------+    +---------------+

       port1 port2 port3 port4 MNGMNT    |     PCI-E     |

         |     |     |     |     |       +---------------+

        PHY   PHY    |     |     |         |  NIC0 NIC1

                     |     |     |         |   |    |

                     |     |     +- PCI-E -+   |    |

                     |     +------- MII -------+    |

                     +------------- MII ------------+



In this example, there are two independent lines between the switch silicon

and CPU. NIC0 and NIC1 drivers are not aware of a switch presence. They are

separate from the switch driver. SOME switch chip is by managed by a driver

via PCI-E device MNGMNT. Note that MNGMNT device, NIC0 and NIC1 may be

connected to some other type of bus.



Now, for the previous example show the representation in kernel:



       +----------------------------+    +---------------+

       |     SOME switch chip       |    |      CPU      |

       +----------------------------+    +---------------+

       sw0p0 sw0p1 sw0p2 sw0p3 MNGMNT    |     PCI-E     |

         |     |     |     |     |       +---------------+

        PHY   PHY    |     |     |         |  eth0 eth1

                     |     |     |         |   |    |

                     |     |     +- PCI-E -+   |    |

                     |     +------- MII -------+    |

                     +------------- MII ------------+



Lets call the example switch driver for SOME switch chip "SOMEswitch". This

driver takes care of PCI-E device MNGMNT. There is a netdevice instance sw0pX

created for each port of a switch. These netdevices are instances

of "SOMEswitch" driver. sw0pX netdevices serve as a "representation"

of the switch chip. eth0 and eth1 are instances of some other existing driver.



The only difference of the switch-port netdevice from the ordinary netdevice

is that is implements couple more NDOs:



  ndo_switch_parent_id_get - This returns the same ID for two port netdevices

			     of the same physical switch chip. This is

			     mandatory to be implemented by all switch drivers

			     and serves the caller for recognition of a port

			     netdevice.

  ndo_switch_parent_* - Functions that serve for a manipulation of the switch

			chip itself (it can be though of as a "parent" of the

			port, therefore the name). They are not port-specific.

			Caller might use arbitrary port netdevice of the same

			switch and it will make no difference.

  ndo_switch_port_* - Functions that serve for a port-specific manipulation.
 
Ethernet switch device driver model (switchdev)

===============================================

Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>

Copyright (c) 2014-2015 Scott Feldman <sfeldma@gmail.com>





The Ethernet switch device driver model (switchdev) is an in-kernel driver

model for switch devices which offload the forwarding (data) plane from the

kernel.



Figure 1 is a block diagram showing the components of the switchdev model for

an example setup using a data-center-class switch ASIC chip.  Other setups

with SR-IOV or soft switches, such as OVS, are possible.





                             User-space tools                                 

                                                                              

       user space                   |                                         

      +-------------------------------------------------------------------+   

       kernel                       | Netlink                                 

                                    |                                         

                     +--------------+-------------------------------+         

                     |         Network stack                        |         

                     |           (Linux)                            |         

                     |                                              |         

                     +----------------------------------------------+         

                                                                              

                           sw1p2     sw1p4     sw1p6

                      sw1p1  +  sw1p3  +  sw1p5  +          eth1             

                        +    |    +    |    +    |            +               

                        |    |    |    |    |    |            |               

                     +--+----+----+----+-+--+----+---+  +-----+-----+         

                     |         Switch driver         |  |    mgmt   |         

                     |        (this document)        |  |   driver  |         

                     |                               |  |           |         

                     +--------------+----------------+  +-----------+         

                                    |                                         

       kernel                       | HW bus (eg PCI)                         

      +-------------------------------------------------------------------+   

       hardware                     |                                         

                     +--------------+---+------------+                        

                     |         Switch device (sw1)   |                        

                     |  +----+                       +--------+               

                     |  |    v offloaded data path   | mgmt port              

                     |  |    |                       |                        

                     +--|----|----+----+----+----+---+                        

                        |    |    |    |    |    |                            

                        +    +    +    +    +    +                            

                       p1   p2   p3   p4   p5   p6

                                       

                             front-panel ports                                

                                                                              



                                    Fig 1.





Include Files

-------------



#include <linux/netdevice.h>

#include <net/switchdev.h>





Configuration

-------------



Use "depends NET_SWITCHDEV" in driver's Kconfig to ensure switchdev model

support is built for driver.





Switch Ports

------------



On switchdev driver initialization, the driver will allocate and register a

struct net_device (using register_netdev()) for each enumerated physical switch

port, called the port netdev.  A port netdev is the software representation of

the physical port and provides a conduit for control traffic to/from the

controller (the kernel) and the network, as well as an anchor point for higher

level constructs such as bridges, bonds, VLANs, tunnels, and L3 routers.  Using

standard netdev tools (iproute2, ethtool, etc), the port netdev can also

provide to the user access to the physical properties of the switch port such

as PHY link state and I/O statistics.



There is (currently) no higher-level kernel object for the switch beyond the

port netdevs.  All of the switchdev driver ops are netdev ops or switchdev ops.



A switch management port is outside the scope of the switchdev driver model.

Typically, the management port is not participating in offloaded data plane and

is loaded with a different driver, such as a NIC driver, on the management port

device.



Port Netdev Naming

^^^^^^^^^^^^^^^^^^



Udev rules should be used for port netdev naming, using some unique attribute

of the port as a key, for example the port MAC address or the port PHYS name.

Hard-coding of kernel netdev names within the driver is discouraged; let the

kernel pick the default netdev name, and let udev set the final name based on a

port attribute.



Using port PHYS name (ndo_get_phys_port_name) for the key is particularly

useful for dynically-named ports where the device names it's ports based on

external configuration.  For example, if a physical 40G port is split logically

into 4 10G ports, resulting in 4 port netdevs, the device can give a unique

name for each port using port PHYS name.  The udev rule would be:



SUBSYSTEM=="net", ACTION=="add", DRIVER="<driver>", ATTR{phys_port_name}!="", \

	NAME="$attr{phys_port_name}"



Suggested naming convention is "swXpYsZ", where X is the switch name or ID, Y

is the port name or ID, and Z is the sub-port name or ID.  For example, sw1p1s0

would be sub-port 0 on port 1 on switch 1.



Switch ID

^^^^^^^^^



The switchdev driver must implement the switchdev op switchdev_port_attr_get for

SWITCHDEV_ATTR_PORT_PARENT_ID for each port netdev, returning the same physical ID

for each port of a switch.  The ID must be unique between switches on the same

system.  The ID does not need to be unique between switches on different

systems.



The switch ID is used to locate ports on a switch and to know if aggregated

ports belong to the same switch.



Port Features

^^^^^^^^^^^^^



NETIF_F_NETNS_LOCAL



If the switchdev driver (and device) only supports offloading of the default

network namespace (netns), the driver should set this feature flag to prevent

the port netdev from being moved out of the default netns.  A netns-aware

driver/device would not set this flag and be resposible for partitioning

hardware to preserve netns containment.  This means hardware cannot forward

traffic from a port in one namespace to another port in another namespace.



Port Topology

^^^^^^^^^^^^^



The port netdevs representing the physical switch ports can be organized into

higher-level switching constructs.  The default construct is a standalone

router port, used to offload L3 forwarding.  Two or more ports can be bonded

together to form a LAG.  Two or more ports (or LAGs) can be bridged to bridge

to L2 networks.  VLANs can be applied to sub-divide L2 networks.  L2-over-L3

tunnels can be built on ports.  These constructs are built using standard Linux

tools such as the bridge driver, the bonding/team drivers, and netlink-based

tools such as iproute2.



The switchdev driver can know a particular port's position in the topology by

monitoring NETDEV_CHANGEUPPER notifications.  For example, a port moved into a

bond will see it's upper master change.  If that bond is moved into a bridge,

the bond's upper master will change.  And so on.  The driver will track such

movements to know what position a port is in in the overall topology by

registering for netdevice events and acting on NETDEV_CHANGEUPPER.



L2 Forwarding Offload

---------------------



The idea is to offload the L2 data forwarding (switching) path from the kernel

to the switchdev device by mirroring bridge FDB entries down to the device.  An

FDB entry is the {port, MAC, VLAN} tuple forwarding destination.



To offloading L2 bridging, the switchdev driver/device should support:



	- Static FDB entries installed on a bridge port

	- Notification of learned/forgotten src mac/vlans from device

	- STP state changes on the port

	- VLAN flooding of multicast/broadcast and unknown unicast packets



Static FDB Entries

^^^^^^^^^^^^^^^^^^



The switchdev driver should implement ndo_fdb_add, ndo_fdb_del and ndo_fdb_dump

to support static FDB entries installed to the device.  Static bridge FDB

entries are installed, for example, using iproute2 bridge cmd:



	bridge fdb add ADDR dev DEV [vlan VID] [self]



Note: by default, the bridge does not filter on VLAN and only bridges untagged

traffic.  To enable VLAN support, turn on VLAN filtering:



	echo 1 >/sys/class/net/<bridge>/bridge/vlan_filtering



Notification of Learned/Forgotten Source MAC/VLANs

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



The switch device will learn/forget source MAC address/VLAN on ingress packets

and notify the switch driver of the mac/vlan/port tuples.  The switch driver,

in turn, will notify the bridge driver using the switchdev notifier call:



	err = call_switchdev_notifiers(val, dev, info);



Where val is SWITCHDEV_FDB_ADD when learning and SWITCHDEV_FDB_DEL when forgetting, and

info points to a struct switchdev_notifier_fdb_info.  On SWITCHDEV_FDB_ADD, the bridge

driver will install the FDB entry into the bridge's FDB and mark the entry as

NTF_EXT_LEARNED.  The iproute2 bridge command will label these entries

"offload":



	$ bridge fdb

	52:54:00:12:35:01 dev sw1p1 master br0 permanent

	00:02:00:00:02:00 dev sw1p1 master br0 offload

	00:02:00:00:02:00 dev sw1p1 self

	52:54:00:12:35:02 dev sw1p2 master br0 permanent

	00:02:00:00:03:00 dev sw1p2 master br0 offload

	00:02:00:00:03:00 dev sw1p2 self

	33:33:00:00:00:01 dev eth0 self permanent

	01:00:5e:00:00:01 dev eth0 self permanent

	33:33:ff:00:00:00 dev eth0 self permanent

	01:80:c2:00:00:0e dev eth0 self permanent

	33:33:00:00:00:01 dev br0 self permanent

	01:00:5e:00:00:01 dev br0 self permanent

	33:33:ff:12:35:01 dev br0 self permanent



Learning on the port should be disabled on the bridge using the bridge command:



	bridge link set dev DEV learning off



Learning on the device port should be enabled, as well as learning_sync:



	bridge link set dev DEV learning on self

	bridge link set dev DEV learning_sync on self



Learning_sync attribute enables syncing of the learned/forgotton FDB entry to

the bridge's FDB.  It's possible, but not optimal, to enable learning on the

device port and on the bridge port, and disable learning_sync.



To support learning and learning_sync port attributes, the driver implements

switchdev op switchdev_port_attr_get/set for SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS.  The driver

should initialize the attributes to the hardware defaults.



FDB Ageing

^^^^^^^^^^



There are two FDB ageing models supported: 1) ageing by the device, and 2)

ageing by the kernel.  Ageing by the device is preferred if many FDB entries

are supported.  The driver calls call_switchdev_notifiers(SWITCHDEV_FDB_DEL, ...) to

age out the FDB entry.  In this model, ageing by the kernel should be turned

off.  XXX: how to turn off ageing in kernel on a per-port basis or otherwise

prevent the kernel from ageing out the FDB entry?



In the kernel ageing model, the standard bridge ageing mechanism is used to age

out stale FDB entries.  To keep an FDB entry "alive", the driver should refresh

the FDB entry by calling call_switchdev_notifiers(SWITCHDEV_FDB_ADD, ...).  The

notification will reset the FDB entry's last-used time to now.  The driver

should rate limit refresh notifications, for example, no more than once a

second.  If the FDB entry expires, ndo_fdb_del is called to remove entry from

the device.  XXX: this last part isn't currently correct: ndo_fdb_del isn't

called, so the stale entry remains in device...this need to get fixed.



FDB Flush

^^^^^^^^^



XXX: Unimplemented.  Need to support FDB flush by bridge driver for port and

remove both static and learned FDB entries.



STP State Change on Port

^^^^^^^^^^^^^^^^^^^^^^^^



Internally or with a third-party STP protocol implementation (e.g. mstpd), the

bridge driver maintains the STP state for ports, and will notify the switch

driver of STP state change on a port using the switchdev op switchdev_attr_port_set for

SWITCHDEV_ATTR_PORT_STP_UPDATE.



State is one of BR_STATE_*.  The switch driver can use STP state updates to

update ingress packet filter list for the port.  For example, if port is

DISABLED, no packets should pass, but if port moves to BLOCKED, then STP BPDUs

and other IEEE 01:80:c2:xx:xx:xx link-local multicast packets can pass.



Note that STP BDPUs are untagged and STP state applies to all VLANs on the port

so packet filters should be applied consistently across untagged and tagged

VLANs on the port.



Flooding L2 domain

^^^^^^^^^^^^^^^^^^



For a given L2 VLAN domain, the switch device should flood multicast/broadcast

and unknown unicast packets to all ports in domain, if allowed by port's

current STP state.  The switch driver, knowing which ports are within which

vlan L2 domain, can program the switch device for flooding.  The packet should

also be sent to the port netdev for processing by the bridge driver.  The

bridge should not reflood the packet to the same ports the device flooded.

XXX: the mechanism to avoid duplicate flood packets is being discuseed.



It is possible for the switch device to not handle flooding and push the

packets up to the bridge driver for flooding.  This is not ideal as the number

of ports scale in the L2 domain as the device is much more efficient at

flooding packets that software.



IGMP Snooping

^^^^^^^^^^^^^



XXX: complete this section





L3 routing

----------



Offloading L3 routing requires that device be programmed with FIB entries from

the kernel, with the device doing the FIB lookup and forwarding.  The device

does a longest prefix match (LPM) on FIB entries matching route prefix and

forwards the packet to the matching FIB entry's nexthop(s) egress ports.  To

program the device, the switchdev driver is called with add/delete ops for IPv4

and IPv6 FIB entries.  For IPv4, the driver implements switchdev ops:



	int (*switchdev_fib_ipv4_add)(struct net_device *dev,

				  __be32 dst, int dst_len,

				  struct fib_info *fi,

				  u8 tos, u8 type,

				  u32 nlflags, u32 tb_id);



	int (*switchdev_fib_ipv4_del)(struct net_device *dev,

				  __be32 dst, int dst_len,

				  struct fib_info *fi,

				  u8 tos, u8 type,

				  u32 tb_id);



to add/delete IPv4 dst/dest_len prefix on table tb_id.  The *fi structure holds

details on the route and route's nexthops.  *dev is one of the port netdevs

mentioned in the routes next hop list.  If the output port netdevs referenced

in the route's nexthop list don't all have the same switch ID, the driver is

not called to add/delete the FIB entry.



Routes offloaded to the device are labeled with "offload" in the ip route

listing:



	$ ip route show

	default via 192.168.0.2 dev eth0

	11.0.0.0/30 dev sw1p1  proto kernel  scope link  src 11.0.0.2 offload

	11.0.0.4/30 via 11.0.0.1 dev sw1p1  proto zebra  metric 20 offload

	11.0.0.8/30 dev sw1p2  proto kernel  scope link  src 11.0.0.10 offload

	11.0.0.12/30 via 11.0.0.9 dev sw1p2  proto zebra  metric 20 offload

	12.0.0.2  proto zebra  metric 30 offload

		nexthop via 11.0.0.1  dev sw1p1 weight 1

		nexthop via 11.0.0.9  dev sw1p2 weight 1

	12.0.0.3 via 11.0.0.1 dev sw1p1  proto zebra  metric 20 offload

	12.0.0.4 via 11.0.0.9 dev sw1p2  proto zebra  metric 20 offload

	192.168.0.0/24 dev eth0  proto kernel  scope link  src 192.168.0.15



XXX: add/del IPv6 FIB API



Nexthop Resolution

^^^^^^^^^^^^^^^^^^



The FIB entry's nexthop list contains the nexthop tuple (gateway, dev), but for

the switch device to forward the packet with the correct dst mac address, the

nexthop gateways must be resolved to the neighbor's mac address.  Neighbor mac

address discovery comes via the ARP (or ND) process and is available via the

arp_tbl neighbor table.  To resolve the routes nexthop gateways, the driver

should trigger the kernel's neighbor resolution process.  See the rocker

driver's rocker_port_ipv4_resolve() for an example.



The driver can monitor for updates to arp_tbl using the netevent notifier

NETEVENT_NEIGH_UPDATE.  The device can be programmed with resolved nexthops

for the routes as arp_tbl updates.

drivers/net/bonding/bond_main.c

+4 −6
Original line number Diff line number Diff line
@@ -1015,10 +1015,7 @@ static netdev_features_t bond_fix_features(struct net_device *dev, 
	netdev_features_t mask;

	struct slave *slave;



	/* If any slave has the offload feature flag set,

	 * set the offload flag on the bond.

	 */

	mask = features | NETIF_F_HW_SWITCH_OFFLOAD;

	mask = features;



	features &= ~NETIF_F_ONE_FOR_ALL;

	features |= NETIF_F_ALL_FOR_ALL;
@@ -4039,8 +4036,9 @@ static const struct net_device_ops bond_netdev_ops = { 
	.ndo_add_slave		= bond_enslave,

	.ndo_del_slave		= bond_release,

	.ndo_fix_features	= bond_fix_features,

	.ndo_bridge_setlink	= ndo_dflt_netdev_switch_port_bridge_setlink,

	.ndo_bridge_dellink	= ndo_dflt_netdev_switch_port_bridge_dellink,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};

drivers/net/ethernet/rocker/rocker.c

+626 −346

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/rocker/rocker.h

+14 −14
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ enum { 
#define ROCKER_TEST_DMA_CTRL		0x0034



/* Rocker test register ctrl */

#define ROCKER_TEST_DMA_CTRL_CLEAR	(1 << 0)

#define ROCKER_TEST_DMA_CTRL_FILL	(1 << 1)

#define ROCKER_TEST_DMA_CTRL_INVERT	(1 << 2)

#define ROCKER_TEST_DMA_CTRL_CLEAR	BIT(0)

#define ROCKER_TEST_DMA_CTRL_FILL	BIT(1)

#define ROCKER_TEST_DMA_CTRL_INVERT	BIT(2)



/* Rocker DMA ring register offsets */

#define ROCKER_DMA_DESC_ADDR(x)		(0x1000 + (x) * 32)  /* 8-byte */
@@ -79,7 +79,7 @@ enum { 
#define ROCKER_DMA_DESC_RES1(x)		(0x101c + (x) * 32)



/* Rocker dma ctrl register bits */

#define ROCKER_DMA_DESC_CTRL_RESET	(1 << 0)

#define ROCKER_DMA_DESC_CTRL_RESET	BIT(0)



/* Rocker DMA ring types */

enum rocker_dma_type {
@@ -111,7 +111,7 @@ struct rocker_desc { 
	u16 comp_err;

};



#define ROCKER_DMA_DESC_COMP_ERR_GEN	(1 << 15)

#define ROCKER_DMA_DESC_COMP_ERR_GEN	BIT(15)



/* Rocker DMA TLV struct */

struct rocker_tlv {
@@ -237,14 +237,14 @@ enum { 
	ROCKER_TLV_RX_MAX = __ROCKER_TLV_RX_MAX - 1,

};



#define ROCKER_RX_FLAGS_IPV4			(1 << 0)

#define ROCKER_RX_FLAGS_IPV6			(1 << 1)

#define ROCKER_RX_FLAGS_CSUM_CALC		(1 << 2)

#define ROCKER_RX_FLAGS_IPV4_CSUM_GOOD		(1 << 3)

#define ROCKER_RX_FLAGS_IP_FRAG			(1 << 4)

#define ROCKER_RX_FLAGS_TCP			(1 << 5)

#define ROCKER_RX_FLAGS_UDP			(1 << 6)

#define ROCKER_RX_FLAGS_TCP_UDP_CSUM_GOOD	(1 << 7)

#define ROCKER_RX_FLAGS_IPV4			BIT(0)

#define ROCKER_RX_FLAGS_IPV6			BIT(1)

#define ROCKER_RX_FLAGS_CSUM_CALC		BIT(2)

#define ROCKER_RX_FLAGS_IPV4_CSUM_GOOD		BIT(3)

#define ROCKER_RX_FLAGS_IP_FRAG			BIT(4)

#define ROCKER_RX_FLAGS_TCP			BIT(5)

#define ROCKER_RX_FLAGS_UDP			BIT(6)

#define ROCKER_RX_FLAGS_TCP_UDP_CSUM_GOOD	BIT(7)



enum {

	ROCKER_TLV_TX_UNSPEC,
@@ -460,6 +460,6 @@ enum rocker_of_dpa_overlay_type { 
#define ROCKER_SWITCH_ID		0x0320 /* 8-byte */



/* Rocker control bits */

#define ROCKER_CONTROL_RESET		(1 << 0)

#define ROCKER_CONTROL_RESET		BIT(0)



#endif

drivers/net/team/team.c

+4 −3
Original line number Diff line number Diff line
@@ -1924,7 +1924,7 @@ static netdev_features_t team_fix_features(struct net_device *dev, 
	struct team *team = netdev_priv(dev);

	netdev_features_t mask;



	mask = features | NETIF_F_HW_SWITCH_OFFLOAD;

	mask = features;

	features &= ~NETIF_F_ONE_FOR_ALL;

	features |= NETIF_F_ALL_FOR_ALL;
@@ -1977,8 +1977,9 @@ static const struct net_device_ops team_netdev_ops = { 
	.ndo_del_slave		= team_del_slave,

	.ndo_fix_features	= team_fix_features,

	.ndo_change_carrier     = team_change_carrier,

	.ndo_bridge_setlink     = ndo_dflt_netdev_switch_port_bridge_setlink,

	.ndo_bridge_dellink     = ndo_dflt_netdev_switch_port_bridge_dellink,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_features_check	= passthru_features_check,

};