From cddd4591404fb4c53dc0b3c0b15b942cdbed4356 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 10 Apr 2020 10:47:05 +0800 Subject: layerscape: add patches-5.4 Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu --- ...elot-break-apart-vlan-operations-into-oce.patch | 108 +++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch (limited to 'target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch') diff --git a/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch b/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch new file mode 100644 index 0000000000..d2b2cfcc67 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/701-net-0239-net-mscc-ocelot-break-apart-vlan-operations-into-oce.patch @@ -0,0 +1,108 @@ +From 829d9def89b452c4d13d15fd578dea524d9f8521 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean +Date: Sat, 9 Nov 2019 15:02:48 +0200 +Subject: [PATCH] net: mscc: ocelot: break apart vlan operations into + ocelot_vlan_{add, del} + +We need an implementation of these functions that is agnostic to the +higher layer (switchdev or dsa). + +Signed-off-by: Vladimir Oltean +Signed-off-by: David S. Miller +--- + drivers/net/ethernet/mscc/ocelot.c | 60 ++++++++++++++++++++++++++------------ + 1 file changed, 42 insertions(+), 18 deletions(-) + +--- a/drivers/net/ethernet/mscc/ocelot.c ++++ b/drivers/net/ethernet/mscc/ocelot.c +@@ -270,18 +270,11 @@ static void ocelot_port_set_pvid(struct + ocelot_port->pvid = pvid; + } + +-static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, +- bool untagged) ++static int ocelot_vlan_add(struct ocelot *ocelot, int port, u16 vid, bool pvid, ++ bool untagged) + { +- struct ocelot_port *ocelot_port = netdev_priv(dev); +- struct ocelot *ocelot = ocelot_port->ocelot; +- int port = ocelot_port->chip_port; + int ret; + +- /* Add the port MAC address to with the right VLAN information */ +- ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, vid, +- ENTRYTYPE_LOCKED); +- + /* Make the port a member of the VLAN */ + ocelot->vlan_mask[vid] |= BIT(port); + ret = ocelot_vlant_set_mask(ocelot, vid, ocelot->vlan_mask[vid]); +@@ -302,22 +295,29 @@ static int ocelot_vlan_vid_add(struct ne + return 0; + } + +-static int ocelot_vlan_vid_del(struct net_device *dev, u16 vid) ++static int ocelot_vlan_vid_add(struct net_device *dev, u16 vid, bool pvid, ++ bool untagged) + { + struct ocelot_port *ocelot_port = netdev_priv(dev); + struct ocelot *ocelot = ocelot_port->ocelot; + int port = ocelot_port->chip_port; + int ret; + +- /* 8021q removes VID 0 on module unload for all interfaces +- * with VLAN filtering feature. We need to keep it to receive +- * untagged traffic. +- */ +- if (vid == 0) +- return 0; ++ ret = ocelot_vlan_add(ocelot, port, vid, pvid, untagged); ++ if (ret) ++ return ret; + +- /* Del the port MAC address to with the right VLAN information */ +- ocelot_mact_forget(ocelot, dev->dev_addr, vid); ++ /* Add the port MAC address to with the right VLAN information */ ++ ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, vid, ++ ENTRYTYPE_LOCKED); ++ ++ return 0; ++} ++ ++static int ocelot_vlan_del(struct ocelot *ocelot, int port, u16 vid) ++{ ++ struct ocelot_port *ocelot_port = ocelot->ports[port]; ++ int ret; + + /* Stop the port from being a member of the vlan */ + ocelot->vlan_mask[vid] &= ~BIT(port); +@@ -335,6 +335,30 @@ static int ocelot_vlan_vid_del(struct ne + + return 0; + } ++ ++static int ocelot_vlan_vid_del(struct net_device *dev, u16 vid) ++{ ++ struct ocelot_port *ocelot_port = netdev_priv(dev); ++ struct ocelot *ocelot = ocelot_port->ocelot; ++ int port = ocelot_port->chip_port; ++ int ret; ++ ++ /* 8021q removes VID 0 on module unload for all interfaces ++ * with VLAN filtering feature. We need to keep it to receive ++ * untagged traffic. ++ */ ++ if (vid == 0) ++ return 0; ++ ++ ret = ocelot_vlan_del(ocelot, port, vid); ++ if (ret) ++ return ret; ++ ++ /* Del the port MAC address to with the right VLAN information */ ++ ocelot_mact_forget(ocelot, dev->dev_addr, vid); ++ ++ return 0; ++} + + static void ocelot_vlan_init(struct ocelot *ocelot) + { -- cgit v1.2.3