cddd459140
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 <yangbo.lu@nxp.com>
90 lines
2.7 KiB
Diff
90 lines
2.7 KiB
Diff
From 66f4bb358787f4f52de0614a92f9e4130d1e0e01 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Date: Sat, 9 Nov 2019 15:02:56 +0200
|
|
Subject: [PATCH] net: mscc: ocelot: move port initialization into separate
|
|
function
|
|
|
|
We need a function for the DSA front-end that does none of the
|
|
net_device registration, but initializes the hardware ports.
|
|
|
|
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mscc/ocelot.c | 45 ++++++++++++++++++++------------------
|
|
1 file changed, 24 insertions(+), 21 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mscc/ocelot.c
|
|
+++ b/drivers/net/ethernet/mscc/ocelot.c
|
|
@@ -2137,6 +2137,28 @@ static int ocelot_init_timestamp(struct
|
|
return 0;
|
|
}
|
|
|
|
+static void ocelot_init_port(struct ocelot *ocelot, int port)
|
|
+{
|
|
+ struct ocelot_port *ocelot_port = ocelot->ports[port];
|
|
+
|
|
+ INIT_LIST_HEAD(&ocelot_port->skbs);
|
|
+
|
|
+ /* Basic L2 initialization */
|
|
+
|
|
+ /* Drop frames with multicast source address */
|
|
+ ocelot_rmw_gix(ocelot, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
|
|
+ ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
|
|
+ ANA_PORT_DROP_CFG, port);
|
|
+
|
|
+ /* Set default VLAN and tag type to 8021Q. */
|
|
+ ocelot_rmw_gix(ocelot, REW_PORT_VLAN_CFG_PORT_TPID(ETH_P_8021Q),
|
|
+ REW_PORT_VLAN_CFG_PORT_TPID_M,
|
|
+ REW_PORT_VLAN_CFG, port);
|
|
+
|
|
+ /* Enable vcap lookups */
|
|
+ ocelot_vcap_enable(ocelot, port);
|
|
+}
|
|
+
|
|
int ocelot_probe_port(struct ocelot *ocelot, u8 port,
|
|
void __iomem *regs,
|
|
struct phy_device *phy)
|
|
@@ -2144,7 +2166,6 @@ int ocelot_probe_port(struct ocelot *oce
|
|
struct ocelot_port_private *priv;
|
|
struct ocelot_port *ocelot_port;
|
|
struct net_device *dev;
|
|
- u32 val;
|
|
int err;
|
|
|
|
dev = alloc_etherdev(sizeof(struct ocelot_port_private));
|
|
@@ -2172,32 +2193,14 @@ int ocelot_probe_port(struct ocelot *oce
|
|
ocelot_mact_learn(ocelot, PGID_CPU, dev->dev_addr, ocelot_port->pvid,
|
|
ENTRYTYPE_LOCKED);
|
|
|
|
- INIT_LIST_HEAD(&ocelot_port->skbs);
|
|
+ ocelot_init_port(ocelot, port);
|
|
|
|
err = register_netdev(dev);
|
|
if (err) {
|
|
dev_err(ocelot->dev, "register_netdev failed\n");
|
|
- goto err_register_netdev;
|
|
+ free_netdev(dev);
|
|
}
|
|
|
|
- /* Basic L2 initialization */
|
|
-
|
|
- /* Drop frames with multicast source address */
|
|
- val = ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA;
|
|
- ocelot_rmw_gix(ocelot, val, val, ANA_PORT_DROP_CFG, port);
|
|
-
|
|
- /* Set default VLAN and tag type to 8021Q. */
|
|
- ocelot_rmw_gix(ocelot, REW_PORT_VLAN_CFG_PORT_TPID(ETH_P_8021Q),
|
|
- REW_PORT_VLAN_CFG_PORT_TPID_M,
|
|
- REW_PORT_VLAN_CFG, port);
|
|
-
|
|
- /* Enable vcap lookups */
|
|
- ocelot_vcap_enable(ocelot, port);
|
|
-
|
|
- return 0;
|
|
-
|
|
-err_register_netdev:
|
|
- free_netdev(dev);
|
|
return err;
|
|
}
|
|
EXPORT_SYMBOL(ocelot_probe_port);
|