linux-toradex.git/net/dsa, branch v5.5

net: dsa: tag_qca: fix doubled Tx statistics

2020-01-16T12:59:40+00:00

DSA subsystem takes care of netdev statistics since commit 4ed70ce9f01c
("net: dsa: Refactor transmit path to eliminate duplication"), so
any accounting inside tagger callbacks is redundant and can lead to
messing up the stats.
This bug is present in Qualcomm tagger since day 0.

Fixes: cafdc45c949b ("net-next: dsa: add Qualcomm tag RX/TX handler")
Reviewed-by: Andrew Lunn 
Signed-off-by: Alexander Lobakin 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: tag_gswip: fix typo in tagger name

2020-01-16T12:58:26+00:00

The correct name is GSWIP (Gigabit Switch IP). Typo was introduced in
875138f81d71a ("dsa: Move tagger name into its ops structure") while
moving tagger names to their structures.

Fixes: 875138f81d71a ("dsa: Move tagger name into its ops structure")
Reviewed-by: Andrew Lunn 
Signed-off-by: Alexander Lobakin 
Reviewed-by: Florian Fainelli 
Acked-by: Hauke Mehrtens 
Signed-off-by: David S. Miller

net: dsa: ksz: use common define for tag len

2019-12-21T05:06:49+00:00

Remove special taglen define KSZ8795_INGRESS_TAG_LEN
and use generic KSZ_INGRESS_TAG_LEN instead.

Signed-off-by: Michael Grzeschik 
Reviewed-by: Andrew Lunn 
Signed-off-by: David S. Miller

net: dsa: make unexported dsa_link_touch() static

2019-12-18T06:40:39+00:00

dsa_link_touch() is not exported, or defined outside of the
file it is in so make it static to avoid the following warning:

net/dsa/dsa2.c:127:17: warning: symbol 'dsa_link_touch' was not declared. Should it be static?

Signed-off-by: Ben Dooks (Codethink) 
Signed-off-by: David S. Miller

net: phylink: rename mac_link_state() op to mac_pcs_get_state()

2019-11-24T00:13:39+00:00

Rename the mac_link_state() method to mac_pcs_get_state() to make it
clear that it should be returning the MACs PCS current state, which
is used for inband negotiation rather than just reading back what the
MAC has been configured for. Update the documentation to explicitly
mention that this is for inband.

We drop the return value as well; most of phylink doesn't check the
return value and it is not clear what it should do on error - instead
arrange for state->link to be false.

Signed-off-by: Russell King 
Signed-off-by: Jakub Kicinski

net: dsa: ocelot: add hardware timestamping support for Felix

2019-11-21T22:39:02+00:00

This patch is to reuse ocelot functions as possible to enable PTP
clock and to support hardware timestamping on Felix.
On TX path, timestamping works on packet which requires timestamp.
The injection header will be configured accordingly, and skb clone
requires timestamp will be added into a list. The TX timestamp
is final handled in threaded interrupt handler when PTP timestamp
FIFO is ready.
On RX path, timestamping is always working. The RX timestamp could
be got from extraction header.

Signed-off-by: Yangbo Lu 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-11-17T05:51:42+00:00

Lots of overlapping changes and parallel additions, stuff
like that.

Signed-off-by: David S. Miller

net: dsa: tag_8021q: Fix dsa_8021q_restore_pvid for an absent pvid

2019-11-16T20:23:53+00:00

This sequence of operations:
ip link set dev br0 type bridge vlan_filtering 1
bridge vlan del dev swp2 vid 1
ip link set dev br0 type bridge vlan_filtering 1
ip link set dev br0 type bridge vlan_filtering 0

apparently fails with the message:

[   31.305716] sja1105 spi0.1: Reset switch and programmed static config. Reason: VLAN filtering
[   31.322161] sja1105 spi0.1: Couldn't determine PVID attributes (pvid 0)
[   31.328939] sja1105 spi0.1: Failed to setup VLAN tagging for port 1: -2
[   31.335599] ------------[ cut here ]------------
[   31.340215] WARNING: CPU: 1 PID: 194 at net/switchdev/switchdev.c:157 switchdev_port_attr_set_now+0x9c/0xa4
[   31.349981] br0: Commit of attribute (id=6) failed.
[   31.354890] Modules linked in:
[   31.357942] CPU: 1 PID: 194 Comm: ip Not tainted 5.4.0-rc6-01792-gf4f632e07665-dirty #2062
[   31.366167] Hardware name: Freescale LS1021A
[   31.370437] [] (unwind_backtrace) from [] (show_stack+0x10/0x14)
[   31.378153] [] (show_stack) from [] (dump_stack+0xe0/0x10c)
[   31.385437] [] (dump_stack) from [] (__warn+0xf4/0x10c)
[   31.392373] [] (__warn) from [] (warn_slowpath_fmt+0x74/0xb8)
[   31.399827] [] (warn_slowpath_fmt) from [] (switchdev_port_attr_set_now+0x9c/0xa4)
[   31.409097] [] (switchdev_port_attr_set_now) from [] (__br_vlan_filter_toggle+0x6c/0x118)
[   31.418971] [] (__br_vlan_filter_toggle) from [] (br_changelink+0xf8/0x518)
[   31.427637] [] (br_changelink) from [] (__rtnl_newlink+0x3f4/0x76c)
[   31.435613] [] (__rtnl_newlink) from [] (rtnl_newlink+0x44/0x60)
[   31.443329] [] (rtnl_newlink) from [] (rtnetlink_rcv_msg+0x2cc/0x51c)
[   31.451477] [] (rtnetlink_rcv_msg) from [] (netlink_rcv_skb+0xb8/0x110)
[   31.459796] [] (netlink_rcv_skb) from [] (netlink_unicast+0x17c/0x1f8)
[   31.468026] [] (netlink_unicast) from [] (netlink_sendmsg+0x2bc/0x3b4)
[   31.476261] [] (netlink_sendmsg) from [] (___sys_sendmsg+0x230/0x250)
[   31.484408] [] (___sys_sendmsg) from [] (__sys_sendmsg+0x50/0x8c)
[   31.492209] [] (__sys_sendmsg) from [] (ret_fast_syscall+0x0/0x28)
[   31.500090] Exception stack(0xedf47fa8 to 0xedf47ff0)
[   31.505122] 7fa0:                   00000002 b6f2e060 00000003 beabd6a4 00000000 00000000
[   31.513265] 7fc0: 00000002 b6f2e060 5d6e3213 00000128 00000000 00000001 00000006 000619c4
[   31.521405] 7fe0: 00086078 beabd658 0005edbc b6e7ce68

The reason is the implementation of br_get_pvid:

static inline u16 br_get_pvid(const struct net_bridge_vlan_group *vg)
{
	if (!vg)
		return 0;

	smp_rmb();
	return vg->pvid;
}

Since VID 0 is an invalid pvid from the bridge's point of view, let's
add this check in dsa_8021q_restore_pvid to avoid restoring a pvid that
doesn't really exist.

Fixes: 5f33183b7fdf ("net: dsa: tag_8021q: Restore bridge VLANs when enabling vlan_filtering")
Signed-off-by: Vladimir Oltean 
Reviewed-by: Andrew Lunn 
Signed-off-by: David S. Miller

net: dsa: ocelot: add tagger for Ocelot/Felix switches

2019-11-15T20:32:16+00:00

While it is entirely possible that this tagger format is in fact more
generic than just these 2 switch families, I don't have that knowledge.
The Seville switch in NXP T1040 has a similar frame format, but there
are enough differences (e.g. DEST field starts at bit 57 instead of 56)
that calling this file tag_vitesse.c is a bit of a stretch at the
moment. The frame format has been listed in a comment so that people who
add support for further Vitesse switches can rework this tagger while
keeping compatibility with Felix.

The "ocelot" name was chosen instead of "felix" because even the Ocelot
switch can act as a DSA device when it is used in NPI mode, and the Felix
tagger format is almost identical. Currently it is only used for the
Felix switch embedded in the NXP LS1028A chip.

The ABI for this tagger should be considered "not stable" at the moment.
The DSA tag is always placed before the Ethernet header and therefore,
we are using the long prefix for RX tags to avoid putting the DSA master
port in promiscuous mode. Once there will be an API in DSA for drivers
to request DSA masters to be in promiscuous mode unconditionally, we
will switch to the "no prefix" extraction frame header, which will save
16 padding bytes for each RX frame.

Signed-off-by: Vladimir Oltean 
Reviewed-by: Florian Fainelli 
Signed-off-by: David S. Miller

net: dsa: Prevent usage of NET_DSA_TAG_8021Q as tagging protocol

2019-11-13T03:46:27+00:00

It is possible for a switch driver to use NET_DSA_TAG_8021Q as a valid
DSA tagging protocol since it registers itself as such, unfortunately
since there are not xmit or rcv functions provided, the lack of a xmit()
function will lead to a NPD in dsa_slave_xmit() to start with.

net/dsa/tag_8021q.c is only comprised of a set of helper functions at
the moment, but is not a fully autonomous or functional tagging "driver"
(though it could become later on). We do not have any users of
NET_DSA_TAG_8021Q so now is a good time to make sure there are not
issues being encountered by making this file strictly a place holder for
helper functions.

Reviewed-by: Vladimir Oltean 
Signed-off-by: Florian Fainelli 
Signed-off-by: David S. Miller