Merge tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from Jakub Kicinski: "Current release - regressions: - dsa: bcm_sf2: fix array overrun in bcm_sf2_num_active_ports() Previous releases - regressions: - introduce a shutdown method to mdio device drivers, and make DSA switch drivers compatible with masters disappearing on shutdown; preventing infinite reference wait - fix issues in mdiobus users related to ->shutdown vs ->remove - virtio-net: fix pages leaking when building skb in big mode - xen-netback: correct success/error reporting for the SKB-with-fraglist - dsa: tear down devlink port regions when tearing down the devlink port on error - nexthop: fix division by zero while replacing a resilient group - hns3: check queue, vf, vlan ids range before using Previous releases - always broken: - napi: fix race against netpoll causing NAPI getting stuck - mlx4_en: ensure link operstate is updated even if link comes up before netdev registration - bnxt_en: fix TX timeout when TX ring size is set to the smallest - enetc: fix illegal access when reading affinity_hint; prevent oops on sysfs access - mtk_eth_soc: avoid creating duplicate offload entries Misc: - core: correct the sock::sk_lock.owned lockdep annotations" * tag 'net-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (51 commits) atlantic: Fix issue in the pm resume flow. net/mlx4_en: Don't allow aRFS for encapsulated packets net: mscc: ocelot: fix forwarding from BLOCKING ports remaining enabled net: ethernet: mtk_eth_soc: avoid creating duplicate offload entries nfc: st-nci: Add SPI ID matching DT compatible MAINTAINERS: remove Guvenc Gulce as net/smc maintainer nexthop: Fix memory leaks in nexthop notification chain listeners mptcp: ensure tx skbs always have the MPTCP ext qed: rdma - don't wait for resources under hw error recovery flow s390/qeth: fix deadlock during failing recovery s390/qeth: Fix deadlock in remove_discipline s390/qeth: fix NULL deref in qeth_clear_working_pool_list() net: dsa: realtek: register the MDIO bus under devres net: dsa: don't allocate the slave_mii_bus using devres Doc: networking: Fox a typo in ice.rst net: dsa: fix dsa_tree_setup error path net/smc: fix 'workqueue leaked lock' in smc_conn_abort_work net/smc: add missing error check in smc_clc_prfx_set() net: hns3: fix a return value error in hclge_get_reset_status() net: hns3: check vlan id before using it ...

Linus Torvalds committed 5 years ago

Commit 9bc62af2 parents 1f82822 4d88c33105 files · +931 −284Browse files

Unified · Split

105 files

Documentation/networking/device_drivers/ethernet/intel/ice.rst +1 −1
MAINTAINERS +0 −1
arch/s390/include/asm/ccwgroup.h +1 −1
drivers/net/dsa/b53/b53_mdio.c +19 −2
drivers/net/dsa/b53/b53_mmap.c +13 −0
drivers/net/dsa/b53/b53_priv.h +5 −0
drivers/net/dsa/b53/b53_spi.c +13 −0
drivers/net/dsa/b53/b53_srab.c +19 −2
drivers/net/dsa/bcm_sf2.c +13 −1
drivers/net/dsa/dsa_loop.c +21 −1
drivers/net/dsa/hirschmann/hellcreek.c +16 −0
drivers/net/dsa/lan9303-core.c +6 −0
drivers/net/dsa/lan9303.h +1 −0
drivers/net/dsa/lan9303_i2c.c +20 −4
drivers/net/dsa/lan9303_mdio.c +15 −0
drivers/net/dsa/lantiq_gswip.c +18 −0
drivers/net/dsa/microchip/ksz8795_spi.c +10 −1
drivers/net/dsa/microchip/ksz8863_smi.c +13 −0
drivers/net/dsa/microchip/ksz9477_i2c.c +12 −2
drivers/net/dsa/microchip/ksz9477_spi.c +6 −2
drivers/net/dsa/mt7530.c +18 −0
drivers/net/dsa/mv88e6060.c +18 −0
drivers/net/dsa/mv88e6xxx/chip.c +35 −3
drivers/net/dsa/mv88e6xxx/devlink.c +9 −64
drivers/net/dsa/mv88e6xxx/devlink.h +4 −2
drivers/net/dsa/ocelot/felix.c +1 −1
drivers/net/dsa/ocelot/felix.h +1 −1
drivers/net/dsa/ocelot/felix_vsc9959.c +19 −3
drivers/net/dsa/ocelot/seville_vsc9953.c +18 −2
drivers/net/dsa/qca/ar9331.c +18 −0
drivers/net/dsa/qca8k.c +18 −0
drivers/net/dsa/realtek-smi-core.c +20 −2
drivers/net/dsa/sja1105/sja1105_clocking.c +1 −1
drivers/net/dsa/sja1105/sja1105_devlink.c +1 −1
drivers/net/dsa/sja1105/sja1105_flower.c +1 −1
drivers/net/dsa/sja1105/sja1105_main.c +19 −2
drivers/net/dsa/sja1105/sja1105_mdio.c +1 −1
drivers/net/dsa/sja1105/sja1105_spi.c +1 −1
drivers/net/dsa/sja1105/sja1105_static_config.c +1 −1
drivers/net/dsa/sja1105/sja1105_static_config.h +1 −1
drivers/net/dsa/sja1105/sja1105_vl.c +1 −1
drivers/net/dsa/sja1105/sja1105_vl.h +1 −1
drivers/net/dsa/vitesse-vsc73xx-core.c +6 −0
drivers/net/dsa/vitesse-vsc73xx-platform.c +21 −1
drivers/net/dsa/vitesse-vsc73xx-spi.c +21 −1
drivers/net/dsa/vitesse-vsc73xx.h +1 −0
drivers/net/dsa/xrs700x/xrs700x.c +6 −0
drivers/net/dsa/xrs700x/xrs700x.h +1 −0
drivers/net/dsa/xrs700x/xrs700x_i2c.c +18 −0
drivers/net/dsa/xrs700x/xrs700x_mdio.c +18 −0
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +2 −2
drivers/net/ethernet/broadcom/bgmac-bcma.c +2 −0
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 −4
drivers/net/ethernet/broadcom/bnxt/bnxt.h +5 −0
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 −1
drivers/net/ethernet/freescale/enetc/enetc.c +2 −5
drivers/net/ethernet/freescale/enetc/enetc_ierb.c +1 −1
drivers/net/ethernet/freescale/enetc/enetc_ierb.h +1 −1
drivers/net/ethernet/freescale/fec_main.c +0 −1
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c +4 −4
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +55 −25
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c +9 −1
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c +1 −1
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +34 −18
drivers/net/ethernet/intel/Kconfig +1 −0
drivers/net/ethernet/mediatek/mtk_ppe_offload.c +3 −0
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +32 −18
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +0 −1
drivers/net/ethernet/mscc/ocelot.c +8 −13
drivers/net/ethernet/mscc/ocelot_devlink.c +1 −1
drivers/net/ethernet/mscc/ocelot_mrp.c +1 −1
drivers/net/ethernet/mscc/ocelot_net.c +1 −1
drivers/net/ethernet/qlogic/qed/qed_iwarp.c +8 −0
drivers/net/ethernet/qlogic/qed/qed_roce.c +8 −0
drivers/net/pcs/pcs-xpcs-nxp.c +1 −1
drivers/net/phy/mdio_device.c +11 −0
drivers/net/usb/hso.c +5 −7
drivers/net/virtio_net.c +4 −0
drivers/net/vxlan.c +1 −1
drivers/net/xen-netback/netback.c +1 −1
drivers/nfc/st-nci/spi.c +1 −0
drivers/ptp/Kconfig +1 −0
drivers/s390/cio/ccwgroup.c +8 −2
drivers/s390/net/qeth_core.h +0 −1
drivers/s390/net/qeth_core_main.c +9 −13
drivers/s390/net/qeth_l2_main.c +0 −1
drivers/s390/net/qeth_l3_main.c +0 −1
include/linux/dsa/ocelot.h +1 −1
include/linux/mdio.h +3 −0
include/linux/packing.h +1 −1
include/net/dsa.h +9 −0
include/net/sock.h +1 −0
lib/packing.c +1 −1
net/core/dev.c +10 −6
net/core/sock.c +23 −14
net/dsa/dsa2.c +106 −8
net/dsa/tag_ocelot.c +1 −1
net/dsa/tag_ocelot_8021q.c +1 −1
net/ipv4/nexthop.c +16 −5
net/mptcp/protocol.c +2 −2
net/smc/smc_clc.c +2 −1
net/smc/smc_core.c +2 −0
tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh +1 −1
tools/testing/selftests/net/af_unix/Makefile +1 −4
tools/testing/selftests/net/af_unix/test_unix_oob.c +3 −2

Documentation/networking/device_drivers/ethernet/intel/ice.rst+1−1

@@ -851,7 +851,7 @@ NOTES: · 850 unmodified lines
851	- 0x88A8 traffic will not be received unless VLAN stripping is disabled with	851	- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
852	the following command::	852	the following command::
853		853
854	# ethool -K <ethX> rxvlan off	854	# ethtool -K <ethX> rxvlan off
855		855
856	- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS	856	- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
857	configured on the same port. 0x88a8/0x8100 traffic will not be received if	857	configured on the same port. 0x88a8/0x8100 traffic will not be received if

MAINTAINERS+0−1

@@ -16955,7 +16955,6 @@ F: drivers/misc/sgi-xp/ · 16954 unmodified lines
16955		16955
16956	SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS	16956	SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
16957	M: Karsten Graul <kgraul@linux.ibm.com>	16957	M: Karsten Graul <kgraul@linux.ibm.com>
16958	M: Guvenc Gulce <guvenc@linux.ibm.com>
16959	L: linux-s390@vger.kernel.org	16958	L: linux-s390@vger.kernel.org
16960	S: Supported	16959	S: Supported
16961	W: http://www.ibm.com/developerworks/linux/linux390/	16960	W: http://www.ibm.com/developerworks/linux/linux390/

arch/s390/include/asm/ccwgroup.h+1−1

@@ -55,7 +55,7 @@ int ccwgroup_create_dev(struct device root, struct ccwgroup_driver gdrv, · 54 unmodified lines
55	int num_devices, const char *buf);	55	int num_devices, const char *buf);
56		56
57	extern int ccwgroup_set_online(struct ccwgroup_device *gdev);	57	extern int ccwgroup_set_online(struct ccwgroup_device *gdev);
58	extern int ccwgroup_set_offline(struct ccwgroup_device *gdev);	58	int ccwgroup_set_offline(struct ccwgroup_device *gdev, bool call_gdrv);
59		59
60	extern int ccwgroup_probe_ccwdev(struct ccw_device *cdev);	60	extern int ccwgroup_probe_ccwdev(struct ccw_device *cdev);
61	extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev);	61	extern void ccwgroup_remove_ccwdev(struct ccw_device *cdev);

drivers/net/dsa/b53/b53_mdio.c+19−2

@@ -351,9 +351,25 @@ static int b53_mdio_probe(struct mdio_device *mdiodev) · 350 unmodified lines
351	static void b53_mdio_remove(struct mdio_device *mdiodev)	351	static void b53_mdio_remove(struct mdio_device *mdiodev)
352	{	352	{
353	struct b53_device *dev = dev_get_drvdata(&mdiodev->dev);	353	struct b53_device *dev = dev_get_drvdata(&mdiodev->dev);
354	struct dsa_switch *ds = dev->ds;
355		354
356	dsa_unregister_switch(ds);	355	if (!dev)
		356	return;
		357
		358	b53_switch_remove(dev);
		359
		360	dev_set_drvdata(&mdiodev->dev, NULL);
		361	}
		362
		363	static void b53_mdio_shutdown(struct mdio_device *mdiodev)
		364	{
		365	struct b53_device *dev = dev_get_drvdata(&mdiodev->dev);
		366
		367	if (!dev)
		368	return;
		369
		370	b53_switch_shutdown(dev);
		371
		372	dev_set_drvdata(&mdiodev->dev, NULL);
357	}	373	}
358		374
359	static const struct of_device_id b53_of_match[] = {	375	static const struct of_device_id b53_of_match[] = {
@@ -373,6 +389,7 @@ MODULE_DEVICE_TABLE(of, b53_of_match); · 13 unmodified lines
373	static struct mdio_driver b53_mdio_driver = {	389	static struct mdio_driver b53_mdio_driver = {
374	.probe = b53_mdio_probe,	390	.probe = b53_mdio_probe,
375	.remove = b53_mdio_remove,	391	.remove = b53_mdio_remove,
		392	.shutdown = b53_mdio_shutdown,
376	.mdiodrv.driver = {	393	.mdiodrv.driver = {
377	.name = "bcm53xx",	394	.name = "bcm53xx",
378	.of_match_table = b53_of_match,	395	.of_match_table = b53_of_match,

drivers/net/dsa/b53/b53_mmap.c+13−0

 	if (dev)
 		b53_switch_remove(dev);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
+static void b53_mmap_shutdown(struct platform_device *pdev)
+{
+	struct b53_device *dev = platform_get_drvdata(pdev);
+	if (dev)
+		b53_switch_shutdown(dev);
+	platform_set_drvdata(pdev, NULL);
+}
 static const struct of_device_id b53_mmap_of_table[] = {
 	{ .compatible = "brcm,bcm3384-switch" },
 	{ .compatible = "brcm,bcm6328-switch" },
 static struct platform_driver b53_mmap_driver = {
 	.probe = b53_mmap_probe,
 	.remove = b53_mmap_remove,
+	.shutdown = b53_mmap_shutdown,
 	.driver = {
 		.name = "b53-switch",
 		.of_match_table = b53_mmap_of_table,

drivers/net/dsa/b53/b53_priv.h+5−0

 	dsa_unregister_switch(dev->ds);
 }
+static inline void b53_switch_shutdown(struct b53_device *dev)
+{
+	dsa_switch_shutdown(dev->ds);
+}
 #define b53_build_op(type_op_size, val_type)				\
 static inline int b53_##type_op_size(struct b53_device *dev, u8 page,	\
 				     u8 reg, val_type val)		\

drivers/net/dsa/b53/b53_spi.c+13−0

 	if (dev)
 		b53_switch_remove(dev);
+	spi_set_drvdata(spi, NULL);
 	return 0;
 }
+static void b53_spi_shutdown(struct spi_device *spi)
+{
+	struct b53_device *dev = spi_get_drvdata(spi);
+	if (dev)
+		b53_switch_shutdown(dev);
+	spi_set_drvdata(spi, NULL);
+}
 static const struct of_device_id b53_spi_of_match[] = {
 	{ .compatible = "brcm,bcm5325" },
 	{ .compatible = "brcm,bcm5365" },
 	},
 	.probe	= b53_spi_probe,
 	.remove	= b53_spi_remove,
+	.shutdown = b53_spi_shutdown,
 };
 module_spi_driver(b53_spi_driver);

drivers/net/dsa/b53/b53_srab.c+19−2

@@ -629,17 +629,34 @@ static int b53_srab_probe(struct platform_device *pdev) · 628 unmodified lines
629	static int b53_srab_remove(struct platform_device *pdev)	629	static int b53_srab_remove(struct platform_device *pdev)
630	{	630	{
631	struct b53_device *dev = platform_get_drvdata(pdev);	631	struct b53_device *dev = platform_get_drvdata(pdev);
632	struct b53_srab_priv *priv = dev->priv;
633		632
634	b53_srab_intr_set(priv, false);	633	if (!dev)
		634	return 0;
		635
		636	b53_srab_intr_set(dev->priv, false);
635	b53_switch_remove(dev);	637	b53_switch_remove(dev);
636		638
		639	platform_set_drvdata(pdev, NULL);
		640
637	return 0;	641	return 0;
638	}	642	}
639		643
		644	static void b53_srab_shutdown(struct platform_device *pdev)
		645	{
		646	struct b53_device *dev = platform_get_drvdata(pdev);
		647
		648	if (!dev)
		649	return;
		650
		651	b53_switch_shutdown(dev);
		652
		653	platform_set_drvdata(pdev, NULL);
		654	}
		655
640	static struct platform_driver b53_srab_driver = {	656	static struct platform_driver b53_srab_driver = {
641	.probe = b53_srab_probe,	657	.probe = b53_srab_probe,
642	.remove = b53_srab_remove,	658	.remove = b53_srab_remove,
		659	.shutdown = b53_srab_shutdown,
643	.driver = {	660	.driver = {
644	.name = "b53-srab-switch",	661	.name = "b53-srab-switch",
645	.of_match_table = b53_srab_of_match,	662	.of_match_table = b53_srab_of_match,

drivers/net/dsa/bcm_sf2.c+13−1

 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
 	unsigned int port, count = 0;
-	for (port = 0; port < ARRAY_SIZE(priv->port_sts); port++) {
+	for (port = 0; port < ds->num_ports; port++) {
 		if (dsa_is_cpu_port(ds, port))
 			continue;
 		if (priv->port_sts[port].enabled)
 {
 	struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
+	if (!priv)
+		return 0;
 	priv->wol_ports_mask = 0;
 	/* Disable interrupts */
 	bcm_sf2_intr_disable(priv);
 	if (priv->type == BCM7278_DEVICE_ID)
 		reset_control_assert(priv->rcdev);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 {
 	struct bcm_sf2_priv *priv = platform_get_drvdata(pdev);
+	if (!priv)
+		return;
 	/* For a kernel about to be kexec'd we want to keep the GPHY on for a
 	 * successful MDIO bus scan to occur. If we did turn off the GPHY
 	 * before (e.g: port_disable), this will also power it back on.
 	 */
 	if (priv->hw_params.num_gphy == 1)
 		bcm_sf2_gphy_enable_set(priv->dev->ds, true);
+	dsa_switch_shutdown(priv->dev->ds);
+	platform_set_drvdata(pdev, NULL);
 }
 #ifdef CONFIG_PM_SLEEP

drivers/net/dsa/dsa_loop.c+21−1

@@ -340,10 +340,29 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev) · 339 unmodified lines
340	static void dsa_loop_drv_remove(struct mdio_device *mdiodev)	340	static void dsa_loop_drv_remove(struct mdio_device *mdiodev)
341	{	341	{
342	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);	342	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
343	struct dsa_loop_priv *ps = ds->priv;	343	struct dsa_loop_priv *ps;
		344
		345	if (!ds)
		346	return;
		347
		348	ps = ds->priv;
344		349
345	dsa_unregister_switch(ds);	350	dsa_unregister_switch(ds);
346	dev_put(ps->netdev);	351	dev_put(ps->netdev);
		352
		353	dev_set_drvdata(&mdiodev->dev, NULL);
		354	}
		355
		356	static void dsa_loop_drv_shutdown(struct mdio_device *mdiodev)
		357	{
		358	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
		359
		360	if (!ds)
		361	return;
		362
		363	dsa_switch_shutdown(ds);
		364
		365	dev_set_drvdata(&mdiodev->dev, NULL);
347	}	366	}
348		367
349	static struct mdio_driver dsa_loop_drv = {	368	static struct mdio_driver dsa_loop_drv = {
@@ -352,6 +371,7 @@ static struct mdio_driver dsa_loop_drv = { · 2 unmodified lines
352	},	371	},
353	.probe = dsa_loop_drv_probe,	372	.probe = dsa_loop_drv_probe,
354	.remove = dsa_loop_drv_remove,	373	.remove = dsa_loop_drv_remove,
		374	.shutdown = dsa_loop_drv_shutdown,
355	};	375	};
356		376
357	#define NUM_FIXED_PHYS (DSA_LOOP_NUM_PORTS - 2)	377	#define NUM_FIXED_PHYS (DSA_LOOP_NUM_PORTS - 2)

drivers/net/dsa/hirschmann/hellcreek.c+16−0

 {
 	struct hellcreek *hellcreek = platform_get_drvdata(pdev);
+	if (!hellcreek)
+		return 0;
 	hellcreek_hwtstamp_free(hellcreek);
 	hellcreek_ptp_free(hellcreek);
 	dsa_unregister_switch(hellcreek->ds);
 	return 0;
 }
+static void hellcreek_shutdown(struct platform_device *pdev)
+{
+	struct hellcreek *hellcreek = platform_get_drvdata(pdev);
+	if (!hellcreek)
+		return;
+	dsa_switch_shutdown(hellcreek->ds);
+	platform_set_drvdata(pdev, NULL);
+}
 static const struct hellcreek_platform_data de1soc_r1_pdata = {
 	.name		 = "r4c30",
 	.num_ports	 = 4,
 static struct platform_driver hellcreek_driver = {
 	.probe	= hellcreek_probe,
 	.remove = hellcreek_remove,
+	.shutdown = hellcreek_shutdown,
 	.driver = {
 		.name = "hellcreek",
 		.of_match_table = hellcreek_of_match,

drivers/net/dsa/lan9303-core.c+6−0

 }
 EXPORT_SYMBOL(lan9303_remove);
+void lan9303_shutdown(struct lan9303 *chip)
+{
+	dsa_switch_shutdown(chip->ds);
+}
+EXPORT_SYMBOL(lan9303_shutdown);
 MODULE_AUTHOR("Juergen Borleis <kernel@pengutronix.de>");
 MODULE_DESCRIPTION("Core driver for SMSC/Microchip LAN9303 three port ethernet switch");
 MODULE_LICENSE("GPL v2");

drivers/net/dsa/lan9303.h+1−0

@@ -10,3 +10,4 @@ extern const struct lan9303_phy_ops lan9303_indirect_phy_ops; · 9 unmodified lines
10		10
11	int lan9303_probe(struct lan9303 chip, struct device_node np);	11	int lan9303_probe(struct lan9303 chip, struct device_node np);
12	int lan9303_remove(struct lan9303 *chip);	12	int lan9303_remove(struct lan9303 *chip);
		13	void lan9303_shutdown(struct lan9303 *chip);

drivers/net/dsa/lan9303_i2c.c+20−4

 static int lan9303_i2c_remove(struct i2c_client *client)
 {
-	struct lan9303_i2c *sw_dev;
+	struct lan9303_i2c *sw_dev = i2c_get_clientdata(client);
-	sw_dev = i2c_get_clientdata(client);
 	if (!sw_dev)
-		return -ENODEV;
+		return 0;
+	lan9303_remove(&sw_dev->chip);
+	i2c_set_clientdata(client, NULL);
+	return 0;
+}
+static void lan9303_i2c_shutdown(struct i2c_client *client)
+{
+	struct lan9303_i2c *sw_dev = i2c_get_clientdata(client);
+	if (!sw_dev)
+		return;
+	lan9303_shutdown(&sw_dev->chip);
-	return lan9303_remove(&sw_dev->chip);
+	i2c_set_clientdata(client, NULL);
 }
 /*-------------------------------------------------------------------------*/
 	},
 	.probe = lan9303_i2c_probe,
 	.remove = lan9303_i2c_remove,
+	.shutdown = lan9303_i2c_shutdown,
 	.id_table = lan9303_i2c_id,
 };
 module_i2c_driver(lan9303_i2c_driver);

drivers/net/dsa/lan9303_mdio.c+15−0

@@ -138,6 +138,20 @@ static void lan9303_mdio_remove(struct mdio_device *mdiodev) · 137 unmodified lines
138	return;	138	return;
139		139
140	lan9303_remove(&sw_dev->chip);	140	lan9303_remove(&sw_dev->chip);
		141
		142	dev_set_drvdata(&mdiodev->dev, NULL);
		143	}
		144
		145	static void lan9303_mdio_shutdown(struct mdio_device *mdiodev)
		146	{
		147	struct lan9303_mdio *sw_dev = dev_get_drvdata(&mdiodev->dev);
		148
		149	if (!sw_dev)
		150	return;
		151
		152	lan9303_shutdown(&sw_dev->chip);
		153
		154	dev_set_drvdata(&mdiodev->dev, NULL);
141	}	155	}
142		156
143	/-------------------------------------------------------------------------/	157	/-------------------------------------------------------------------------/
@@ -155,6 +169,7 @@ static struct mdio_driver lan9303_mdio_driver = { · 11 unmodified lines
155	},	169	},
156	.probe = lan9303_mdio_probe,	170	.probe = lan9303_mdio_probe,
157	.remove = lan9303_mdio_remove,	171	.remove = lan9303_mdio_remove,
		172	.shutdown = lan9303_mdio_shutdown,
158	};	173	};
159	mdio_module_driver(lan9303_mdio_driver);	174	mdio_module_driver(lan9303_mdio_driver);
160		175

drivers/net/dsa/lantiq_gswip.c+18−0

 	struct gswip_priv *priv = platform_get_drvdata(pdev);
 	int i;
+	if (!priv)
+		return 0;
 	/* disable the switch */
 	gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
 	for (i = 0; i < priv->num_gphy_fw; i++)
 		gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
+static void gswip_shutdown(struct platform_device *pdev)
+{
+	struct gswip_priv *priv = platform_get_drvdata(pdev);
+	if (!priv)
+		return;
+	dsa_switch_shutdown(priv->ds);
+	platform_set_drvdata(pdev, NULL);
+}
 static const struct gswip_hw_info gswip_xrx200 = {
 	.max_ports = 7,
 	.cpu_port = 6,
 static struct platform_driver gswip_driver = {
 	.probe = gswip_probe,
 	.remove = gswip_remove,
+	.shutdown = gswip_shutdown,
 	.driver = {
 		.name = "gswip",
 		.of_match_table = gswip_of_match,

drivers/net/dsa/microchip/ksz8795_spi.c+10−1

 	if (dev)
 		ksz_switch_remove(dev);
+	spi_set_drvdata(spi, NULL);
 	return 0;
 }
 {
 	struct ksz_device *dev = spi_get_drvdata(spi);
-	if (dev && dev->dev_ops->shutdown)
+	if (!dev)
+		return;
+	if (dev->dev_ops->shutdown)
 		dev->dev_ops->shutdown(dev);
+	dsa_switch_shutdown(dev->ds);
+	spi_set_drvdata(spi, NULL);
 }
 static const struct of_device_id ksz8795_dt_ids[] = {

drivers/net/dsa/microchip/ksz8863_smi.c+13−0

@@ -191,6 +191,18 @@ static void ksz8863_smi_remove(struct mdio_device *mdiodev) · 190 unmodified lines
191		191
192	if (dev)	192	if (dev)
193	ksz_switch_remove(dev);	193	ksz_switch_remove(dev);
		194
		195	dev_set_drvdata(&mdiodev->dev, NULL);
		196	}
		197
		198	static void ksz8863_smi_shutdown(struct mdio_device *mdiodev)
		199	{
		200	struct ksz_device *dev = dev_get_drvdata(&mdiodev->dev);
		201
		202	if (dev)
		203	dsa_switch_shutdown(dev->ds);
		204
		205	dev_set_drvdata(&mdiodev->dev, NULL);
194	}	206	}
195		207
196	static const struct of_device_id ksz8863_dt_ids[] = {	208	static const struct of_device_id ksz8863_dt_ids[] = {
@@ -203,6 +215,7 @@ MODULE_DEVICE_TABLE(of, ksz8863_dt_ids); · 6 unmodified lines
203	static struct mdio_driver ksz8863_driver = {	215	static struct mdio_driver ksz8863_driver = {
204	.probe = ksz8863_smi_probe,	216	.probe = ksz8863_smi_probe,
205	.remove = ksz8863_smi_remove,	217	.remove = ksz8863_smi_remove,
		218	.shutdown = ksz8863_smi_shutdown,
206	.mdiodrv.driver = {	219	.mdiodrv.driver = {
207	.name = "ksz8863-switch",	220	.name = "ksz8863-switch",
208	.of_match_table = ksz8863_dt_ids,	221	.of_match_table = ksz8863_dt_ids,

drivers/net/dsa/microchip/ksz9477_i2c.c+12−2

 {
 	struct ksz_device *dev = i2c_get_clientdata(i2c);
-	ksz_switch_remove(dev);
+	if (dev)
+		ksz_switch_remove(dev);
+	i2c_set_clientdata(i2c, NULL);
 	return 0;
 }
 {
 	struct ksz_device *dev = i2c_get_clientdata(i2c);
-	if (dev && dev->dev_ops->shutdown)
+	if (!dev)
+		return;
+	if (dev->dev_ops->shutdown)
 		dev->dev_ops->shutdown(dev);
+	dsa_switch_shutdown(dev->ds);
+	i2c_set_clientdata(i2c, NULL);
 }
 static const struct i2c_device_id ksz9477_i2c_id[] = {

drivers/net/dsa/microchip/ksz9477_spi.c+6−2

 	if (dev)
 		ksz_switch_remove(dev);
+	spi_set_drvdata(spi, NULL);
 	return 0;
 }
 {
 	struct ksz_device *dev = spi_get_drvdata(spi);
-	if (dev && dev->dev_ops->shutdown)
+	if (dev)
-		dev->dev_ops->shutdown(dev);
+		dsa_switch_shutdown(dev->ds);
+	spi_set_drvdata(spi, NULL);
 }
 static const struct of_device_id ksz9477_dt_ids[] = {

drivers/net/dsa/mt7530.c+18−0

@@ -3286,6 +3286,9 @@ mt7530_remove(struct mdio_device *mdiodev) · 3285 unmodified lines
3286	struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);	3286	struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
3287	int ret = 0;	3287	int ret = 0;
3288		3288
		3289	if (!priv)
		3290	return;
		3291
3289	ret = regulator_disable(priv->core_pwr);	3292	ret = regulator_disable(priv->core_pwr);
3290	if (ret < 0)	3293	if (ret < 0)
3291	dev_err(priv->dev,	3294	dev_err(priv->dev,
@@ -3301,11 +3304,26 @@ mt7530_remove(struct mdio_device *mdiodev) · 9 unmodified lines
3301		3304
3302	dsa_unregister_switch(priv->ds);	3305	dsa_unregister_switch(priv->ds);
3303	mutex_destroy(&priv->reg_mutex);	3306	mutex_destroy(&priv->reg_mutex);
		3307
		3308	dev_set_drvdata(&mdiodev->dev, NULL);
		3309	}
		3310
		3311	static void mt7530_shutdown(struct mdio_device *mdiodev)
		3312	{
		3313	struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
		3314
		3315	if (!priv)
		3316	return;
		3317
		3318	dsa_switch_shutdown(priv->ds);
		3319
		3320	dev_set_drvdata(&mdiodev->dev, NULL);
3304	}	3321	}
3305		3322
3306	static struct mdio_driver mt7530_mdio_driver = {	3323	static struct mdio_driver mt7530_mdio_driver = {
3307	.probe = mt7530_probe,	3324	.probe = mt7530_probe,
3308	.remove = mt7530_remove,	3325	.remove = mt7530_remove,
		3326	.shutdown = mt7530_shutdown,
3309	.mdiodrv.driver = {	3327	.mdiodrv.driver = {
3310	.name = "mt7530",	3328	.name = "mt7530",
3311	.of_match_table = mt7530_of_match,	3329	.of_match_table = mt7530_of_match,

drivers/net/dsa/mv88e6060.c+18−0

@@ -290,7 +290,24 @@ static void mv88e6060_remove(struct mdio_device *mdiodev) · 289 unmodified lines
290	{	290	{
291	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);	291	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
292		292
		293	if (!ds)
		294	return;
		295
293	dsa_unregister_switch(ds);	296	dsa_unregister_switch(ds);
		297
		298	dev_set_drvdata(&mdiodev->dev, NULL);
		299	}
		300
		301	static void mv88e6060_shutdown(struct mdio_device *mdiodev)
		302	{
		303	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
		304
		305	if (!ds)
		306	return;
		307
		308	dsa_switch_shutdown(ds);
		309
		310	dev_set_drvdata(&mdiodev->dev, NULL);
294	}	311	}
295		312
296	static const struct of_device_id mv88e6060_of_match[] = {	313	static const struct of_device_id mv88e6060_of_match[] = {
@@ -303,6 +320,7 @@ static const struct of_device_id mv88e6060_of_match[] = { · 6 unmodified lines
303	static struct mdio_driver mv88e6060_driver = {	320	static struct mdio_driver mv88e6060_driver = {
304	.probe = mv88e6060_probe,	321	.probe = mv88e6060_probe,
305	.remove = mv88e6060_remove,	322	.remove = mv88e6060_remove,
		323	.shutdown = mv88e6060_shutdown,
306	.mdiodrv.driver = {	324	.mdiodrv.driver = {
307	.name = "mv88e6060",	325	.name = "mv88e6060",
308	.of_match_table = mv88e6060_of_match,	326	.of_match_table = mv88e6060_of_match,

drivers/net/dsa/mv88e6xxx/chip.c+35−3

 {
 	mv88e6xxx_teardown_devlink_params(ds);
 	dsa_devlink_resources_unregister(ds);
-	mv88e6xxx_teardown_devlink_regions(ds);
+	mv88e6xxx_teardown_devlink_regions_global(ds);
 }
 static int mv88e6xxx_setup(struct dsa_switch *ds)
 	if (err)
 		goto out_resources;
-	err = mv88e6xxx_setup_devlink_regions(ds);
+	err = mv88e6xxx_setup_devlink_regions_global(ds);
 	if (err)
 		goto out_params;
 	return err;
 }
+static int mv88e6xxx_port_setup(struct dsa_switch *ds, int port)
+{
+	return mv88e6xxx_setup_devlink_regions_port(ds, port);
+}
+static void mv88e6xxx_port_teardown(struct dsa_switch *ds, int port)
+{
+	mv88e6xxx_teardown_devlink_regions_port(ds, port);
+}
 /* prod_id for switch families which do not have a PHY model number */
 static const u16 family_prod_id_table[] = {
 	[MV88E6XXX_FAMILY_6341] = MV88E6XXX_PORT_SWITCH_ID_PROD_6341,
 	.change_tag_protocol	= mv88e6xxx_change_tag_protocol,
 	.setup			= mv88e6xxx_setup,
 	.teardown		= mv88e6xxx_teardown,
+	.port_setup		= mv88e6xxx_port_setup,
+	.port_teardown		= mv88e6xxx_port_teardown,
 	.phylink_validate	= mv88e6xxx_validate,
 	.phylink_mac_link_state	= mv88e6xxx_serdes_pcs_get_state,
 	.phylink_mac_config	= mv88e6xxx_mac_config,
 static void mv88e6xxx_remove(struct mdio_device *mdiodev)
 {
 	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
-	struct mv88e6xxx_chip *chip = ds->priv;
+	struct mv88e6xxx_chip *chip;
+	if (!ds)
+		return;
+	chip = ds->priv;
 	if (chip->info->ptp_support) {
 		mv88e6xxx_hwtstamp_free(chip);
 		mv88e6xxx_g1_irq_free(chip);
 	else
 		mv88e6xxx_irq_poll_free(chip);
+	dev_set_drvdata(&mdiodev->dev, NULL);
+}
+static void mv88e6xxx_shutdown(struct mdio_device *mdiodev)
+{
+	struct dsa_switch *ds = dev_get_drvdata(&mdiodev->dev);
+	if (!ds)
+		return;
+	dsa_switch_shutdown(ds);
+	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 static const struct of_device_id mv88e6xxx_of_match[] = {
 static struct mdio_driver mv88e6xxx_driver = {
 	.probe	= mv88e6xxx_probe,
 	.remove = mv88e6xxx_remove,
+	.shutdown = mv88e6xxx_shutdown,
 	.mdiodrv.driver = {
 		.name = "mv88e6085",
 		.of_match_table = mv88e6xxx_of_match,

drivers/net/dsa/mv88e6xxx/devlink.c+9−64

@@ -647,26 +647,25 @@ static struct mv88e6xxx_region mv88e6xxx_regions[] = { · 646 unmodified lines
647	},	647	},
648	};	648	};
649		649
650	static void	650	void mv88e6xxx_teardown_devlink_regions_global(struct dsa_switch *ds)
651	mv88e6xxx_teardown_devlink_regions_global(struct mv88e6xxx_chip *chip)
652	{	651	{
		652	struct mv88e6xxx_chip *chip = ds->priv;
653	int i;	653	int i;
654		654
655	for (i = 0; i < ARRAY_SIZE(mv88e6xxx_regions); i++)	655	for (i = 0; i < ARRAY_SIZE(mv88e6xxx_regions); i++)
656	dsa_devlink_region_destroy(chip->regions[i]);	656	dsa_devlink_region_destroy(chip->regions[i]);
657	}	657	}
658		658
659	static void	659	void mv88e6xxx_teardown_devlink_regions_port(struct dsa_switch *ds, int port)
660	mv88e6xxx_teardown_devlink_regions_port(struct mv88e6xxx_chip *chip,
661	int port)
662	{	660	{
		661	struct mv88e6xxx_chip *chip = ds->priv;
		662
663	dsa_devlink_region_destroy(chip->ports[port].region);	663	dsa_devlink_region_destroy(chip->ports[port].region);
664	}	664	}
665		665
666	static int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds,	666	int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds, int port)
667	struct mv88e6xxx_chip *chip,
668	int port)
669	{	667	{
		668	struct mv88e6xxx_chip *chip = ds->priv;
670	struct devlink_region *region;	669	struct devlink_region *region;
671		670
672	region = dsa_devlink_port_region_create(ds,	671	region = dsa_devlink_port_region_create(ds,
@@ -681,40 +680,10 @@ static int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds, · 8 unmodified lines
681	return 0;	680	return 0;
682	}	681	}
683		682
684	static void	683	int mv88e6xxx_setup_devlink_regions_global(struct dsa_switch *ds)
685	mv88e6xxx_teardown_devlink_regions_ports(struct mv88e6xxx_chip *chip)
686	{
687	int port;
688
689	for (port = 0; port < mv88e6xxx_num_ports(chip); port++)
690	mv88e6xxx_teardown_devlink_regions_port(chip, port);
691	}
692
693	static int mv88e6xxx_setup_devlink_regions_ports(struct dsa_switch *ds,
694	struct mv88e6xxx_chip *chip)
695	{
696	int port;
697	int err;
698
699	for (port = 0; port < mv88e6xxx_num_ports(chip); port++) {
700	err = mv88e6xxx_setup_devlink_regions_port(ds, chip, port);
701	if (err)
702	goto out;
703	}
704
705	return 0;
706
707	out:
708	while (port-- > 0)
709	mv88e6xxx_teardown_devlink_regions_port(chip, port);
710
711	return err;
712	}
713
714	static int mv88e6xxx_setup_devlink_regions_global(struct dsa_switch *ds,
715	struct mv88e6xxx_chip *chip)
716	{	684	{
717	bool (cond)(struct mv88e6xxx_chip chip);	685	bool (cond)(struct mv88e6xxx_chip chip);
		686	struct mv88e6xxx_chip *chip = ds->priv;
718	struct devlink_region_ops *ops;	687	struct devlink_region_ops *ops;
719	struct devlink_region *region;	688	struct devlink_region *region;
720	u64 size;	689	u64 size;
@@ -753,30 +722,6 @@ out: · 32 unmodified lines
753	return PTR_ERR(region);	722	return PTR_ERR(region);
754	}	723	}
755		724
756	int mv88e6xxx_setup_devlink_regions(struct dsa_switch *ds)
757	{
758	struct mv88e6xxx_chip *chip = ds->priv;
759	int err;
760
761	err = mv88e6xxx_setup_devlink_regions_global(ds, chip);
762	if (err)
763	return err;
764
765	err = mv88e6xxx_setup_devlink_regions_ports(ds, chip);
766	if (err)
767	mv88e6xxx_teardown_devlink_regions_global(chip);
768
769	return err;
770	}
771
772	void mv88e6xxx_teardown_devlink_regions(struct dsa_switch *ds)
773	{
774	struct mv88e6xxx_chip *chip = ds->priv;
775
776	mv88e6xxx_teardown_devlink_regions_ports(chip);
777	mv88e6xxx_teardown_devlink_regions_global(chip);
778	}
779
780	int mv88e6xxx_devlink_info_get(struct dsa_switch *ds,	725	int mv88e6xxx_devlink_info_get(struct dsa_switch *ds,
781	struct devlink_info_req *req,	726	struct devlink_info_req *req,
782	struct netlink_ext_ack *extack)	727	struct netlink_ext_ack *extack)

drivers/net/dsa/mv88e6xxx/devlink.h+4−2

 				struct devlink_param_gset_ctx *ctx);
 int mv88e6xxx_devlink_param_set(struct dsa_switch *ds, u32 id,
 				struct devlink_param_gset_ctx *ctx);
-int mv88e6xxx_setup_devlink_regions(struct dsa_switch *ds);
+int mv88e6xxx_setup_devlink_regions_global(struct dsa_switch *ds);
-void mv88e6xxx_teardown_devlink_regions(struct dsa_switch *ds);
+void mv88e6xxx_teardown_devlink_regions_global(struct dsa_switch *ds);
+int mv88e6xxx_setup_devlink_regions_port(struct dsa_switch *ds, int port);
+void mv88e6xxx_teardown_devlink_regions_port(struct dsa_switch *ds, int port);
 int mv88e6xxx_devlink_info_get(struct dsa_switch *ds,
 			       struct devlink_info_req *req,

drivers/net/dsa/ocelot/felix.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2019-2021 NXP Semiconductors	2	/* Copyright 2019-2021 NXP
3	*	3	*
4	* This is an umbrella module for all network switches that are	4	* This is an umbrella module for all network switches that are
5	* register-compatible with Ocelot and that perform I/O to their host CPU	5	* register-compatible with Ocelot and that perform I/O to their host CPU

drivers/net/dsa/ocelot/felix.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 */
2	/* Copyright 2019 NXP Semiconductors	2	/* Copyright 2019 NXP
3	*/	3	*/
4	#ifndef _MSCC_FELIX_H	4	#ifndef _MSCC_FELIX_H
5	#define _MSCC_FELIX_H	5	#define _MSCC_FELIX_H

drivers/net/dsa/ocelot/felix_vsc9959.c+19−3

 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
 /* Copyright 2017 Microsemi Corporation
- * Copyright 2018-2019 NXP Semiconductors
+ * Copyright 2018-2019 NXP
  */
 #include <linux/fsl/enetc_mdio.h>
 #include <soc/mscc/ocelot_qsys.h>
 static void felix_pci_remove(struct pci_dev *pdev)
 {
-	struct felix *felix;
+	struct felix *felix = pci_get_drvdata(pdev);
-	felix = pci_get_drvdata(pdev);
+	if (!felix)
+		return;
 	dsa_unregister_switch(felix->ds);
 	kfree(felix);
 	pci_disable_device(pdev);
+	pci_set_drvdata(pdev, NULL);
+}
+static void felix_pci_shutdown(struct pci_dev *pdev)
+{
+	struct felix *felix = pci_get_drvdata(pdev);
+	if (!felix)
+		return;
+	dsa_switch_shutdown(felix->ds);
+	pci_set_drvdata(pdev, NULL);
 }
 static struct pci_device_id felix_ids[] = {
 	.id_table	= felix_ids,
 	.probe		= felix_pci_probe,
 	.remove		= felix_pci_remove,
+	.shutdown	= felix_pci_shutdown,
 };
 module_pci_driver(felix_vsc9959_pci_driver);

drivers/net/dsa/ocelot/seville_vsc9953.c+18−2

 static int seville_remove(struct platform_device *pdev)
 {
-	struct felix *felix;
+	struct felix *felix = platform_get_drvdata(pdev);
-	felix = platform_get_drvdata(pdev);
+	if (!felix)
+		return 0;
 	dsa_unregister_switch(felix->ds);
 	kfree(felix->ds);
 	kfree(felix);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
+static void seville_shutdown(struct platform_device *pdev)
+{
+	struct felix *felix = platform_get_drvdata(pdev);
+	if (!felix)
+		return;
+	dsa_switch_shutdown(felix->ds);
+	platform_set_drvdata(pdev, NULL);
+}
 static const struct of_device_id seville_of_match[] = {
 	{ .compatible = "mscc,vsc9953-switch" },
 	{ },
 static struct platform_driver seville_vsc9953_driver = {
 	.probe		= seville_probe,
 	.remove		= seville_remove,
+	.shutdown	= seville_shutdown,
 	.driver = {
 		.name		= "mscc_seville",
 		.of_match_table	= of_match_ptr(seville_of_match),

drivers/net/dsa/qca/ar9331.c+18−0

 	struct ar9331_sw_priv *priv = dev_get_drvdata(&mdiodev->dev);
 	unsigned int i;
+	if (!priv)
+		return;
 	for (i = 0; i < ARRAY_SIZE(priv->port); i++) {
 		struct ar9331_sw_port *port = &priv->port[i];
 	dsa_unregister_switch(&priv->ds);
 	reset_control_assert(priv->sw_reset);
+	dev_set_drvdata(&mdiodev->dev, NULL);
+}
+static void ar9331_sw_shutdown(struct mdio_device *mdiodev)
+{
+	struct ar9331_sw_priv *priv = dev_get_drvdata(&mdiodev->dev);
+	if (!priv)
+		return;
+	dsa_switch_shutdown(&priv->ds);
+	dev_set_drvdata(&mdiodev->dev, NULL);
 }
 static const struct of_device_id ar9331_sw_of_match[] = {
 static struct mdio_driver ar9331_sw_mdio_driver = {
 	.probe = ar9331_sw_probe,
 	.remove = ar9331_sw_remove,
+	.shutdown = ar9331_sw_shutdown,
 	.mdiodrv.driver = {
 		.name = AR9331_SW_NAME,
 		.of_match_table = ar9331_sw_of_match,

drivers/net/dsa/qca8k.c+18−0

@@ -1880,10 +1880,27 @@ qca8k_sw_remove(struct mdio_device *mdiodev) · 1879 unmodified lines
1880	struct qca8k_priv *priv = dev_get_drvdata(&mdiodev->dev);	1880	struct qca8k_priv *priv = dev_get_drvdata(&mdiodev->dev);
1881	int i;	1881	int i;
1882		1882
		1883	if (!priv)
		1884	return;
		1885
1883	for (i = 0; i < QCA8K_NUM_PORTS; i++)	1886	for (i = 0; i < QCA8K_NUM_PORTS; i++)
1884	qca8k_port_set_status(priv, i, 0);	1887	qca8k_port_set_status(priv, i, 0);
1885		1888
1886	dsa_unregister_switch(priv->ds);	1889	dsa_unregister_switch(priv->ds);
		1890
		1891	dev_set_drvdata(&mdiodev->dev, NULL);
		1892	}
		1893
		1894	static void qca8k_sw_shutdown(struct mdio_device *mdiodev)
		1895	{
		1896	struct qca8k_priv *priv = dev_get_drvdata(&mdiodev->dev);
		1897
		1898	if (!priv)
		1899	return;
		1900
		1901	dsa_switch_shutdown(priv->ds);
		1902
		1903	dev_set_drvdata(&mdiodev->dev, NULL);
1887	}	1904	}
1888		1905
1889	#ifdef CONFIG_PM_SLEEP	1906	#ifdef CONFIG_PM_SLEEP
@@ -1940,6 +1957,7 @@ static const struct of_device_id qca8k_of_match[] = { · 50 unmodified lines
1940	static struct mdio_driver qca8kmdio_driver = {	1957	static struct mdio_driver qca8kmdio_driver = {
1941	.probe = qca8k_sw_probe,	1958	.probe = qca8k_sw_probe,
1942	.remove = qca8k_sw_remove,	1959	.remove = qca8k_sw_remove,
		1960	.shutdown = qca8k_sw_shutdown,
1943	.mdiodrv.driver = {	1961	.mdiodrv.driver = {
1944	.name = "qca8k",	1962	.name = "qca8k",
1945	.of_match_table = qca8k_of_match,	1963	.of_match_table = qca8k_of_match,

drivers/net/dsa/realtek-smi-core.c+20−2

 	smi->slave_mii_bus->parent = smi->dev;
 	smi->ds->slave_mii_bus = smi->slave_mii_bus;
-	ret = of_mdiobus_register(smi->slave_mii_bus, mdio_np);
+	ret = devm_of_mdiobus_register(smi->dev, smi->slave_mii_bus, mdio_np);
 	if (ret) {
 		dev_err(smi->dev, "unable to register MDIO bus %s\n",
 			smi->slave_mii_bus->id);
 static int realtek_smi_remove(struct platform_device *pdev)
 {
-	struct realtek_smi *smi = dev_get_drvdata(&pdev->dev);
+	struct realtek_smi *smi = platform_get_drvdata(pdev);
+	if (!smi)
+		return 0;
 	dsa_unregister_switch(smi->ds);
 	if (smi->slave_mii_bus)
 		of_node_put(smi->slave_mii_bus->dev.of_node);
 	gpiod_set_value(smi->reset, 1);
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
+static void realtek_smi_shutdown(struct platform_device *pdev)
+{
+	struct realtek_smi *smi = platform_get_drvdata(pdev);
+	if (!smi)
+		return;
+	dsa_switch_shutdown(smi->ds);
+	platform_set_drvdata(pdev, NULL);
+}
 static const struct of_device_id realtek_smi_of_match[] = {
 	{
 		.compatible = "realtek,rtl8366rb",
 	},
 	.probe  = realtek_smi_probe,
 	.remove = realtek_smi_remove,
+	.shutdown = realtek_smi_shutdown,
 };
 module_platform_driver(realtek_smi_driver);

drivers/net/dsa/sja1105/sja1105_clocking.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: BSD-3-Clause	1	// SPDX-License-Identifier: BSD-3-Clause
2	/* Copyright (c) 2016-2018, NXP Semiconductors	2	/* Copyright 2016-2018 NXP
3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
4	*/	4	*/
5	#include <linux/packing.h>	5	#include <linux/packing.h>

drivers/net/dsa/sja1105/sja1105_devlink.c+1−1

@@ -1,6 +1,6 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	2	/* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
3	* Copyright 2020 NXP Semiconductors	3	* Copyright 2020 NXP
4	*/	4	*/
5	#include "sja1105.h"	5	#include "sja1105.h"
6		6

drivers/net/dsa/sja1105/sja1105_flower.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2020, NXP Semiconductors	2	/* Copyright 2020 NXP
3	*/	3	*/
4	#include "sja1105.h"	4	#include "sja1105.h"
5	#include "sja1105_vl.h"	5	#include "sja1105_vl.h"

drivers/net/dsa/sja1105/sja1105_main.c+19−2

 static int sja1105_remove(struct spi_device *spi)
 {
 	struct sja1105_private *priv = spi_get_drvdata(spi);
-	struct dsa_switch *ds = priv->ds;
-	dsa_unregister_switch(ds);
+	if (!priv)
+		return 0;
+	dsa_unregister_switch(priv->ds);
+	spi_set_drvdata(spi, NULL);
 	return 0;
 }
+static void sja1105_shutdown(struct spi_device *spi)
+{
+	struct sja1105_private *priv = spi_get_drvdata(spi);
+	if (!priv)
+		return;
+	dsa_switch_shutdown(priv->ds);
+	spi_set_drvdata(spi, NULL);
+}
 static const struct of_device_id sja1105_dt_ids[] = {
 	{ .compatible = "nxp,sja1105e", .data = &sja1105e_info },
 	{ .compatible = "nxp,sja1105t", .data = &sja1105t_info },
 	},
 	.probe  = sja1105_probe,
 	.remove = sja1105_remove,
+	.shutdown = sja1105_shutdown,
 };
 module_spi_driver(sja1105_driver);

drivers/net/dsa/sja1105/sja1105_mdio.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2021, NXP Semiconductors	2	/* Copyright 2021 NXP
3	*/	3	*/
4	#include <linux/pcs/pcs-xpcs.h>	4	#include <linux/pcs/pcs-xpcs.h>
5	#include <linux/of_mdio.h>	5	#include <linux/of_mdio.h>

drivers/net/dsa/sja1105/sja1105_spi.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: BSD-3-Clause	1	// SPDX-License-Identifier: BSD-3-Clause
2	/* Copyright (c) 2016-2018, NXP Semiconductors	2	/* Copyright 2016-2018 NXP
3	* Copyright (c) 2018, Sensor-Technik Wiedemann GmbH	3	* Copyright (c) 2018, Sensor-Technik Wiedemann GmbH
4	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	4	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
5	*/	5	*/

drivers/net/dsa/sja1105/sja1105_static_config.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: BSD-3-Clause	1	// SPDX-License-Identifier: BSD-3-Clause
2	/* Copyright (c) 2016-2018, NXP Semiconductors	2	/* Copyright 2016-2018 NXP
3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
4	*/	4	*/
5	#include "sja1105_static_config.h"	5	#include "sja1105_static_config.h"

drivers/net/dsa/sja1105/sja1105_static_config.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: BSD-3-Clause */	1	/* SPDX-License-Identifier: BSD-3-Clause */
2	/* Copyright (c) 2016-2018, NXP Semiconductors	2	/* Copyright 2016-2018 NXP
3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
4	*/	4	*/
5	#ifndef _SJA1105_STATIC_CONFIG_H	5	#ifndef _SJA1105_STATIC_CONFIG_H

drivers/net/dsa/sja1105/sja1105_vl.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2020, NXP Semiconductors	2	/* Copyright 2020 NXP
3	*/	3	*/
4	#include <net/tc_act/tc_gate.h>	4	#include <net/tc_act/tc_gate.h>
5	#include <linux/dsa/8021q.h>	5	#include <linux/dsa/8021q.h>

drivers/net/dsa/sja1105/sja1105_vl.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0 */
2	/* Copyright 2020, NXP Semiconductors	2	/* Copyright 2020 NXP
3	*/	3	*/
4	#ifndef _SJA1105_VL_H	4	#ifndef _SJA1105_VL_H
5	#define _SJA1105_VL_H	5	#define _SJA1105_VL_H

drivers/net/dsa/vitesse-vsc73xx-core.c+6−0

 }
 EXPORT_SYMBOL(vsc73xx_remove);
+void vsc73xx_shutdown(struct vsc73xx *vsc)
+{
+	dsa_switch_shutdown(vsc->ds);
+}
+EXPORT_SYMBOL(vsc73xx_shutdown);
 MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
 MODULE_DESCRIPTION("Vitesse VSC7385/7388/7395/7398 driver");
 MODULE_LICENSE("GPL v2");

drivers/net/dsa/vitesse-vsc73xx-platform.c+21−1

@@ -116,7 +116,26 @@ static int vsc73xx_platform_remove(struct platform_device *pdev) · 115 unmodified lines
116	{	116	{
117	struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);	117	struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);
118		118
119	return vsc73xx_remove(&vsc_platform->vsc);	119	if (!vsc_platform)
		120	return 0;
		121
		122	vsc73xx_remove(&vsc_platform->vsc);
		123
		124	platform_set_drvdata(pdev, NULL);
		125
		126	return 0;
		127	}
		128
		129	static void vsc73xx_platform_shutdown(struct platform_device *pdev)
		130	{
		131	struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);
		132
		133	if (!vsc_platform)
		134	return;
		135
		136	vsc73xx_shutdown(&vsc_platform->vsc);
		137
		138	platform_set_drvdata(pdev, NULL);
120	}	139	}
121		140
122	static const struct vsc73xx_ops vsc73xx_platform_ops = {	141	static const struct vsc73xx_ops vsc73xx_platform_ops = {
@@ -144,6 +163,7 @@ MODULE_DEVICE_TABLE(of, vsc73xx_of_match); · 21 unmodified lines
144	static struct platform_driver vsc73xx_platform_driver = {	163	static struct platform_driver vsc73xx_platform_driver = {
145	.probe = vsc73xx_platform_probe,	164	.probe = vsc73xx_platform_probe,
146	.remove = vsc73xx_platform_remove,	165	.remove = vsc73xx_platform_remove,
		166	.shutdown = vsc73xx_platform_shutdown,
147	.driver = {	167	.driver = {
148	.name = "vsc73xx-platform",	168	.name = "vsc73xx-platform",
149	.of_match_table = vsc73xx_of_match,	169	.of_match_table = vsc73xx_of_match,

drivers/net/dsa/vitesse-vsc73xx-spi.c+21−1

@@ -163,7 +163,26 @@ static int vsc73xx_spi_remove(struct spi_device *spi) · 162 unmodified lines
163	{	163	{
164	struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi);	164	struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi);
165		165
166	return vsc73xx_remove(&vsc_spi->vsc);	166	if (!vsc_spi)
		167	return 0;
		168
		169	vsc73xx_remove(&vsc_spi->vsc);
		170
		171	spi_set_drvdata(spi, NULL);
		172
		173	return 0;
		174	}
		175
		176	static void vsc73xx_spi_shutdown(struct spi_device *spi)
		177	{
		178	struct vsc73xx_spi *vsc_spi = spi_get_drvdata(spi);
		179
		180	if (!vsc_spi)
		181	return;
		182
		183	vsc73xx_shutdown(&vsc_spi->vsc);
		184
		185	spi_set_drvdata(spi, NULL);
167	}	186	}
168		187
169	static const struct vsc73xx_ops vsc73xx_spi_ops = {	188	static const struct vsc73xx_ops vsc73xx_spi_ops = {
@@ -191,6 +210,7 @@ MODULE_DEVICE_TABLE(of, vsc73xx_of_match); · 21 unmodified lines
191	static struct spi_driver vsc73xx_spi_driver = {	210	static struct spi_driver vsc73xx_spi_driver = {
192	.probe = vsc73xx_spi_probe,	211	.probe = vsc73xx_spi_probe,
193	.remove = vsc73xx_spi_remove,	212	.remove = vsc73xx_spi_remove,
		213	.shutdown = vsc73xx_spi_shutdown,
194	.driver = {	214	.driver = {
195	.name = "vsc73xx-spi",	215	.name = "vsc73xx-spi",
196	.of_match_table = vsc73xx_of_match,	216	.of_match_table = vsc73xx_of_match,

drivers/net/dsa/vitesse-vsc73xx.h+1−0

@@ -27,3 +27,4 @@ struct vsc73xx_ops { · 26 unmodified lines
27	int vsc73xx_is_addr_valid(u8 block, u8 subblock);	27	int vsc73xx_is_addr_valid(u8 block, u8 subblock);
28	int vsc73xx_probe(struct vsc73xx *vsc);	28	int vsc73xx_probe(struct vsc73xx *vsc);
29	int vsc73xx_remove(struct vsc73xx *vsc);	29	int vsc73xx_remove(struct vsc73xx *vsc);
		30	void vsc73xx_shutdown(struct vsc73xx *vsc);

drivers/net/dsa/xrs700x/xrs700x.c+6−0

 }
 EXPORT_SYMBOL(xrs700x_switch_remove);
+void xrs700x_switch_shutdown(struct xrs700x *priv)
+{
+	dsa_switch_shutdown(priv->ds);
+}
+EXPORT_SYMBOL(xrs700x_switch_shutdown);
 MODULE_AUTHOR("George McCollister <george.mccollister@gmail.com>");
 MODULE_DESCRIPTION("Arrow SpeedChips XRS700x DSA driver");
 MODULE_LICENSE("GPL v2");

drivers/net/dsa/xrs700x/xrs700x.h+1−0

@@ -40,3 +40,4 @@ struct xrs700x { · 39 unmodified lines
40	struct xrs700x xrs700x_switch_alloc(struct device base, void *devpriv);	40	struct xrs700x xrs700x_switch_alloc(struct device base, void *devpriv);
41	int xrs700x_switch_register(struct xrs700x *priv);	41	int xrs700x_switch_register(struct xrs700x *priv);
42	void xrs700x_switch_remove(struct xrs700x *priv);	42	void xrs700x_switch_remove(struct xrs700x *priv);
		43	void xrs700x_switch_shutdown(struct xrs700x *priv);

drivers/net/dsa/xrs700x/xrs700x_i2c.c+18−0

@@ -109,11 +109,28 @@ static int xrs700x_i2c_remove(struct i2c_client *i2c) · 108 unmodified lines
109	{	109	{
110	struct xrs700x *priv = i2c_get_clientdata(i2c);	110	struct xrs700x *priv = i2c_get_clientdata(i2c);
111		111
		112	if (!priv)
		113	return 0;
		114
112	xrs700x_switch_remove(priv);	115	xrs700x_switch_remove(priv);
113		116
		117	i2c_set_clientdata(i2c, NULL);
		118
114	return 0;	119	return 0;
115	}	120	}
116		121
		122	static void xrs700x_i2c_shutdown(struct i2c_client *i2c)
		123	{
		124	struct xrs700x *priv = i2c_get_clientdata(i2c);
		125
		126	if (!priv)
		127	return;
		128
		129	xrs700x_switch_shutdown(priv);
		130
		131	i2c_set_clientdata(i2c, NULL);
		132	}
		133
117	static const struct i2c_device_id xrs700x_i2c_id[] = {	134	static const struct i2c_device_id xrs700x_i2c_id[] = {
118	{ "xrs700x-switch", 0 },	135	{ "xrs700x-switch", 0 },
119	{},	136	{},
@@ -137,6 +154,7 @@ static struct i2c_driver xrs700x_i2c_driver = { · 17 unmodified lines
137	},	154	},
138	.probe = xrs700x_i2c_probe,	155	.probe = xrs700x_i2c_probe,
139	.remove = xrs700x_i2c_remove,	156	.remove = xrs700x_i2c_remove,
		157	.shutdown = xrs700x_i2c_shutdown,
140	.id_table = xrs700x_i2c_id,	158	.id_table = xrs700x_i2c_id,
141	};	159	};
142		160

drivers/net/dsa/xrs700x/xrs700x_mdio.c+18−0

@@ -136,7 +136,24 @@ static void xrs700x_mdio_remove(struct mdio_device *mdiodev) · 135 unmodified lines
136	{	136	{
137	struct xrs700x *priv = dev_get_drvdata(&mdiodev->dev);	137	struct xrs700x *priv = dev_get_drvdata(&mdiodev->dev);
138		138
		139	if (!priv)
		140	return;
		141
139	xrs700x_switch_remove(priv);	142	xrs700x_switch_remove(priv);
		143
		144	dev_set_drvdata(&mdiodev->dev, NULL);
		145	}
		146
		147	static void xrs700x_mdio_shutdown(struct mdio_device *mdiodev)
		148	{
		149	struct xrs700x *priv = dev_get_drvdata(&mdiodev->dev);
		150
		151	if (!priv)
		152	return;
		153
		154	xrs700x_switch_shutdown(priv);
		155
		156	dev_set_drvdata(&mdiodev->dev, NULL);
140	}	157	}
141		158
142	static const struct of_device_id __maybe_unused xrs700x_mdio_dt_ids[] = {	159	static const struct of_device_id __maybe_unused xrs700x_mdio_dt_ids[] = {
@@ -155,6 +172,7 @@ static struct mdio_driver xrs700x_mdio_driver = { · 12 unmodified lines
155	},	172	},
156	.probe = xrs700x_mdio_probe,	173	.probe = xrs700x_mdio_probe,
157	.remove = xrs700x_mdio_remove,	174	.remove = xrs700x_mdio_remove,
		175	.shutdown = xrs700x_mdio_shutdown,
158	};	176	};
159		177
160	mdio_module_driver(xrs700x_mdio_driver);	178	mdio_module_driver(xrs700x_mdio_driver);

drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c+2−2

 	if (deep) {
 		/* Reinitialize Nic/Vecs objects */
 		aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
+	}
+	if (netif_running(nic->ndev)) {
 		ret = aq_nic_init(nic);
 		if (ret)
 			goto err_exit;
-	}
-	if (netif_running(nic->ndev)) {
 		ret = aq_nic_start(nic);
 		if (ret)
 			goto err_exit;

drivers/net/ethernet/broadcom/bgmac-bcma.c+2−0

@@ -129,6 +129,8 @@ static int bgmac_probe(struct bcma_device *core) · 128 unmodified lines
129	bcma_set_drvdata(core, bgmac);	129	bcma_set_drvdata(core, bgmac);
130		130
131	err = of_get_mac_address(bgmac->dev->of_node, bgmac->net_dev->dev_addr);	131	err = of_get_mac_address(bgmac->dev->of_node, bgmac->net_dev->dev_addr);
		132	if (err == -EPROBE_DEFER)
		133	return err;
132		134
133	/* If no MAC address assigned via device tree, check SPROM */	135	/* If no MAC address assigned via device tree, check SPROM */
134	if (err) {	136	if (err) {

drivers/net/ethernet/broadcom/bnxt/bnxt.c+4−4

@@ -391,7 +391,7 @@ static bool bnxt_txr_netif_try_stop_queue(struct bnxt *bp, · 390 unmodified lines
391	* netif_tx_queue_stopped().	391	* netif_tx_queue_stopped().
392	*/	392	*/
393	smp_mb();	393	smp_mb();
394	if (bnxt_tx_avail(bp, txr) > bp->tx_wake_thresh) {	394	if (bnxt_tx_avail(bp, txr) >= bp->tx_wake_thresh) {
395	netif_tx_wake_queue(txq);	395	netif_tx_wake_queue(txq);
396	return false;	396	return false;
397	}	397	}
@@ -764,7 +764,7 @@ next_tx_int: · 366 unmodified lines
764	smp_mb();	764	smp_mb();
765		765
766	if (unlikely(netif_tx_queue_stopped(txq)) &&	766	if (unlikely(netif_tx_queue_stopped(txq)) &&
767	bnxt_tx_avail(bp, txr) > bp->tx_wake_thresh &&	767	bnxt_tx_avail(bp, txr) >= bp->tx_wake_thresh &&
768	READ_ONCE(txr->dev_state) != BNXT_DEV_STATE_CLOSING)	768	READ_ONCE(txr->dev_state) != BNXT_DEV_STATE_CLOSING)
769	netif_tx_wake_queue(txq);	769	netif_tx_wake_queue(txq);
770	}	770	}
@@ -2416,7 +2416,7 @@ static int __bnxt_poll_work(struct bnxt bp, struct bnxt_cp_ring_info cpr, · 1645 unmodified lines
2416	if (TX_CMP_TYPE(txcmp) == CMP_TYPE_TX_L2_CMP) {	2416	if (TX_CMP_TYPE(txcmp) == CMP_TYPE_TX_L2_CMP) {
2417	tx_pkts++;	2417	tx_pkts++;
2418	/* return full budget so NAPI will complete. */	2418	/* return full budget so NAPI will complete. */
2419	if (unlikely(tx_pkts > bp->tx_wake_thresh)) {	2419	if (unlikely(tx_pkts >= bp->tx_wake_thresh)) {
2420	rx_pkts = budget;	2420	rx_pkts = budget;
2421	raw_cons = NEXT_RAW_CMP(raw_cons);	2421	raw_cons = NEXT_RAW_CMP(raw_cons);
2422	if (budget)	2422	if (budget)
@@ -3640,7 +3640,7 @@ static int bnxt_init_tx_rings(struct bnxt *bp) · 1217 unmodified lines
3640	u16 i;	3640	u16 i;
3641		3641
3642	bp->tx_wake_thresh = max_t(int, bp->tx_ring_size / 2,	3642	bp->tx_wake_thresh = max_t(int, bp->tx_ring_size / 2,
3643	MAX_SKB_FRAGS + 1);	3643	BNXT_MIN_TX_DESC_CNT);
3644		3644
3645	for (i = 0; i < bp->tx_nr_rings; i++) {	3645	for (i = 0; i < bp->tx_nr_rings; i++) {
3646	struct bnxt_tx_ring_info *txr = &bp->tx_ring[i];	3646	struct bnxt_tx_ring_info *txr = &bp->tx_ring[i];

drivers/net/ethernet/broadcom/bnxt/bnxt.h+5−0

 #define BNXT_MAX_RX_JUM_DESC_CNT	(RX_DESC_CNT * MAX_RX_AGG_PAGES - 1)
 #define BNXT_MAX_TX_DESC_CNT		(TX_DESC_CNT * MAX_TX_PAGES - 1)
+/* Minimum TX BDs for a TX packet with MAX_SKB_FRAGS + 1.  We need one extra
+ * BD because the first TX BD is always a long BD.
+ */
+#define BNXT_MIN_TX_DESC_CNT		(MAX_SKB_FRAGS + 2)
 #define RX_RING(x)	(((x) & ~(RX_DESC_CNT - 1)) >> (BNXT_PAGE_SHIFT - 4))
 #define RX_IDX(x)	((x) & (RX_DESC_CNT - 1))

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c+1−1

@@ -798,7 +798,7 @@ static int bnxt_set_ringparam(struct net_device *dev, · 797 unmodified lines
798		798
799	if ((ering->rx_pending > BNXT_MAX_RX_DESC_CNT) \|\|	799	if ((ering->rx_pending > BNXT_MAX_RX_DESC_CNT) \|\|
800	(ering->tx_pending > BNXT_MAX_TX_DESC_CNT) \|\|	800	(ering->tx_pending > BNXT_MAX_TX_DESC_CNT) \|\|
801	(ering->tx_pending <= MAX_SKB_FRAGS))	801	(ering->tx_pending < BNXT_MIN_TX_DESC_CNT))
802	return -EINVAL;	802	return -EINVAL;
803		803
804	if (netif_running(dev))	804	if (netif_running(dev))

drivers/net/ethernet/freescale/enetc/enetc.c+2−5

 static void enetc_rx_net_dim(struct enetc_int_vector *v)
 {
-	struct dim_sample dim_sample;
+	struct dim_sample dim_sample = {};
 	v->comp_cnt++;
 static int enetc_setup_irqs(struct enetc_ndev_priv *priv)
 {
 	struct pci_dev *pdev = priv->si->pdev;
-	cpumask_t cpu_mask;
 	int i, j, err;
 	for (i = 0; i < priv->bdr_int_num; i++) {
 			enetc_wr(hw, ENETC_SIMSITRV(idx), entry);
 		}
-		cpumask_clear(&cpu_mask);
+		irq_set_affinity_hint(irq, get_cpu_mask(i % num_online_cpus()));
-		cpumask_set_cpu(i % num_online_cpus(), &cpu_mask);
-		irq_set_affinity_hint(irq, &cpu_mask);
 	}
 	return 0;

drivers/net/ethernet/freescale/enetc/enetc_ierb.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)	1	// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
2	/* Copyright 2021 NXP Semiconductors	2	/* Copyright 2021 NXP
3	*	3	*
4	* The Integrated Endpoint Register Block (IERB) is configured by pre-boot	4	* The Integrated Endpoint Register Block (IERB) is configured by pre-boot
5	* software and is supposed to be to ENETC what a NVRAM is to a 'real' PCIe	5	* software and is supposed to be to ENETC what a NVRAM is to a 'real' PCIe

drivers/net/ethernet/freescale/enetc/enetc_ierb.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */	1	/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
2	/* Copyright 2021 NXP Semiconductors */	2	/* Copyright 2021 NXP */
3		3
4	#include <linux/pci.h>	4	#include <linux/pci.h>
5	#include <linux/platform_device.h>	5	#include <linux/platform_device.h>

drivers/net/ethernet/freescale/fec_main.c+0−1

@@ -4176,5 +4176,4 @@ static struct platform_driver fec_driver = { · 4175 unmodified lines
4176		4176
4177	module_platform_driver(fec_driver);	4177	module_platform_driver(fec_driver);
4178		4178
4179	MODULE_ALIAS("platform:"DRIVER_NAME);
4180	MODULE_LICENSE("GPL");	4179	MODULE_LICENSE("GPL");

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c+4−4

@@ -2445,12 +2445,12 @@ static void hclge_handle_over_8bd_err(struct hclge_dev *hdev, · 2444 unmodified lines
2445	return;	2445	return;
2446	}	2446	}
2447		2447
2448	dev_err(dev, "PPU_PF_ABNORMAL_INT_ST over_8bd_no_fe found, vf_id(%u), queue_id(%u)\n",	2448	dev_err(dev, "PPU_PF_ABNORMAL_INT_ST over_8bd_no_fe found, vport(%u), queue_id(%u)\n",
2449	vf_id, q_id);	2449	vf_id, q_id);
2450		2450
2451	if (vf_id) {	2451	if (vf_id) {
2452	if (vf_id >= hdev->num_alloc_vport) {	2452	if (vf_id >= hdev->num_alloc_vport) {
2453	dev_err(dev, "invalid vf id(%u)\n", vf_id);	2453	dev_err(dev, "invalid vport(%u)\n", vf_id);
2454	return;	2454	return;
2455	}	2455	}
2456		2456
@@ -2463,8 +2463,8 @@ static void hclge_handle_over_8bd_err(struct hclge_dev *hdev, · 6 unmodified lines
2463		2463
2464	ret = hclge_inform_reset_assert_to_vf(&hdev->vport[vf_id]);	2464	ret = hclge_inform_reset_assert_to_vf(&hdev->vport[vf_id]);
2465	if (ret)	2465	if (ret)
2466	dev_err(dev, "inform reset to vf(%u) failed %d!\n",	2466	dev_err(dev, "inform reset to vport(%u) failed %d!\n",
2467	hdev->vport->vport_id, ret);	2467	vf_id, ret);
2468	} else {	2468	} else {
2469	set_bit(HNAE3_FUNC_RESET, reset_requests);	2469	set_bit(HNAE3_FUNC_RESET, reset_requests);
2470	}	2470	}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c+55−25

 		if (ret) {
 			dev_err(&hdev->pdev->dev,
 				"set vf(%u) rst failed %d!\n",
-				vport->vport_id, ret);
+				vport->vport_id - HCLGE_VF_VPORT_START_NUM,
+				ret);
 			return ret;
 		}
 		if (ret)
 			dev_warn(&hdev->pdev->dev,
 				 "inform reset to vf(%u) failed %d!\n",
-				 vport->vport_id, ret);
+				 vport->vport_id - HCLGE_VF_VPORT_START_NUM,
+				 ret);
 	}
 	return 0;
 	return 0;
 }
+static int hclge_parse_rss_hfunc(struct hclge_vport *vport, const u8 hfunc,
+				 u8 *hash_algo)
+{
+	switch (hfunc) {
+	case ETH_RSS_HASH_TOP:
+		*hash_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ;
+		return 0;
+	case ETH_RSS_HASH_XOR:
+		*hash_algo = HCLGE_RSS_HASH_ALGO_SIMPLE;
+		return 0;
+	case ETH_RSS_HASH_NO_CHANGE:
+		*hash_algo = vport->rss_algo;
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
 static int hclge_set_rss(struct hnae3_handle *handle, const u32 *indir,
 			 const  u8 *key, const  u8 hfunc)
 {
 	u8 hash_algo;
 	int ret, i;
+	ret = hclge_parse_rss_hfunc(vport, hfunc, &hash_algo);
+	if (ret) {
+		dev_err(&hdev->pdev->dev, "invalid hfunc type %u\n", hfunc);
+		return ret;
+	}
 	/* Set the RSS Hash Key if specififed by the user */
 	if (key) {
-		switch (hfunc) {
-		case ETH_RSS_HASH_TOP:
-			hash_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ;
-			break;
-		case ETH_RSS_HASH_XOR:
-			hash_algo = HCLGE_RSS_HASH_ALGO_SIMPLE;
-			break;
-		case ETH_RSS_HASH_NO_CHANGE:
-			hash_algo = vport->rss_algo;
-			break;
-		default:
-			return -EINVAL;
-		}
 		ret = hclge_set_rss_algo_key(hdev, hash_algo, key);
 		if (ret)
 			return ret;
 		/* Update the shadow RSS key with user specified qids */
 		memcpy(vport->rss_hash_key, key, HCLGE_RSS_KEY_SIZE);
-		vport->rss_algo = hash_algo;
+	} else {
+		ret = hclge_set_rss_algo_key(hdev, hash_algo,
+					     vport->rss_hash_key);
+		if (ret)
+			return ret;
 	}
+	vport->rss_algo = hash_algo;
 	/* Update the shadow RSS table with user specified qids */
 	for (i = 0; i < ae_dev->dev_specs.rss_ind_tbl_size; i++)
 		u8 vf = ethtool_get_flow_spec_ring_vf(ring_cookie);
 		u16 tqps;
+		/* To keep consistent with user's configuration, minus 1 when
+		 * printing 'vf', because vf id from ethtool is added 1 for vf.
+		 */
 		if (vf > hdev->num_req_vfs) {
 			dev_err(&hdev->pdev->dev,
-				"Error: vf id (%u) > max vf num (%u)\n",
+				"Error: vf id (%u) should be less than %u\n",
-				vf, hdev->num_req_vfs);
+				vf - 1, hdev->num_req_vfs);
 			return -EINVAL;
 		}
 	if (is_kill && !vlan_id)
 		return 0;
+	if (vlan_id >= VLAN_N_VID)
+		return -EINVAL;
 	ret = hclge_set_vf_vlan_common(hdev, vport_id, is_kill, vlan_id);
 	if (ret) {
 		dev_err(&hdev->pdev->dev,
 	return 0;
 }
-static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id)
+static int hclge_get_reset_status(struct hclge_dev *hdev, u16 queue_id,
+				  u8 *reset_status)
 {
 	struct hclge_reset_tqp_queue_cmd *req;
 	struct hclge_desc desc;
 		return ret;
 	}
-	return hnae3_get_bit(req->ready_to_reset, HCLGE_TQP_RESET_B);
+	*reset_status = hnae3_get_bit(req->ready_to_reset, HCLGE_TQP_RESET_B);
+	return 0;
 }
 u16 hclge_covert_handle_qid_global(struct hnae3_handle *handle, u16 queue_id)
 	struct hclge_vport *vport = hclge_get_vport(handle);
 	struct hclge_dev *hdev = vport->back;
 	u16 reset_try_times = 0;
-	int reset_status;
+	u8 reset_status;
 	u16 queue_gid;
 	int ret;
 	u16 i;
 		}
 		while (reset_try_times++ < HCLGE_TQP_RESET_TRY_TIMES) {
-			reset_status = hclge_get_reset_status(hdev, queue_gid);
+			ret = hclge_get_reset_status(hdev, queue_gid,
+						     &reset_status);
+			if (ret)
+				return ret;
 			if (reset_status)
 				break;
 		struct hclge_vport *vport = &hdev->vport[i];
 		int ret;
-		 /* Send cmd to clear VF's FUNC_RST_ING */
+		 /* Send cmd to clear vport's FUNC_RST_ING */
 		ret = hclge_set_vf_rst(hdev, vport->vport_id, false);
 		if (ret)
 			dev_warn(&hdev->pdev->dev,
-				 "clear vf(%u) rst failed %d!\n",
+				 "clear vport(%u) rst failed %d!\n",
 				 vport->vport_id, ret);
 	}
 }

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c+9−1

 	struct hclge_dev *hdev = vport->back;
 	dev_warn(&hdev->pdev->dev, "PF received VF reset request from VF %u!",
-		 vport->vport_id);
+		 vport->vport_id - HCLGE_VF_VPORT_START_NUM);
 	return hclge_func_reset_cmd(hdev, vport->vport_id);
 }
 				     struct hclge_mbx_vf_to_pf_cmd *mbx_req,
 				     struct hclge_respond_to_vf_msg *resp_msg)
 {
+	struct hnae3_handle *handle = &vport->nic;
+	struct hclge_dev *hdev = vport->back;
 	u16 queue_id, qid_in_pf;
 	memcpy(&queue_id, mbx_req->msg.data, sizeof(queue_id));
+	if (queue_id >= handle->kinfo.num_tqps) {
+		dev_err(&hdev->pdev->dev, "Invalid queue id(%u) from VF %u\n",
+			queue_id, mbx_req->mbx_src_vfid);
+		return;
+	}
 	qid_in_pf = hclge_covert_handle_qid_global(&vport->nic, queue_id);
 	memcpy(resp_msg->data, &qid_in_pf, sizeof(qid_in_pf));
 	resp_msg->len = sizeof(qid_in_pf);

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c+1−1

@@ -581,7 +581,7 @@ int hclge_tm_qs_shaper_cfg(struct hclge_vport *vport, int max_tx_rate) · 580 unmodified lines
581	ret = hclge_cmd_send(&hdev->hw, &desc, 1);	581	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
582	if (ret) {	582	if (ret) {
583	dev_err(&hdev->pdev->dev,	583	dev_err(&hdev->pdev->dev,
584	"vf%u, qs%u failed to set tx_rate:%d, ret=%d\n",	584	"vport%u, qs%u failed to set tx_rate:%d, ret=%d\n",
585	vport->vport_id, shap_cfg_cmd->qs_id,	585	vport->vport_id, shap_cfg_cmd->qs_id,
586	max_tx_rate, ret);	586	max_tx_rate, ret);
587	return ret;	587	return ret;

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c+34−18

 	return 0;
 }
+static int hclgevf_parse_rss_hfunc(struct hclgevf_dev *hdev, const u8 hfunc,
+				   u8 *hash_algo)
+{
+	switch (hfunc) {
+	case ETH_RSS_HASH_TOP:
+		*hash_algo = HCLGEVF_RSS_HASH_ALGO_TOEPLITZ;
+		return 0;
+	case ETH_RSS_HASH_XOR:
+		*hash_algo = HCLGEVF_RSS_HASH_ALGO_SIMPLE;
+		return 0;
+	case ETH_RSS_HASH_NO_CHANGE:
+		*hash_algo = hdev->rss_cfg.hash_algo;
+		return 0;
+	default:
+		return -EINVAL;
+	}
+}
 static int hclgevf_set_rss(struct hnae3_handle *handle, const u32 *indir,
 			   const u8 *key, const u8 hfunc)
 {
 	struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
 	struct hclgevf_rss_cfg *rss_cfg = &hdev->rss_cfg;
+	u8 hash_algo;
 	int ret, i;
 	if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) {
+		ret = hclgevf_parse_rss_hfunc(hdev, hfunc, &hash_algo);
+		if (ret)
+			return ret;
 		/* Set the RSS Hash Key if specififed by the user */
 		if (key) {
-			switch (hfunc) {
+			ret = hclgevf_set_rss_algo_key(hdev, hash_algo, key);
-			case ETH_RSS_HASH_TOP:
+			if (ret) {
-				rss_cfg->hash_algo =
+				dev_err(&hdev->pdev->dev,
-					HCLGEVF_RSS_HASH_ALGO_TOEPLITZ;
+					"invalid hfunc type %u\n", hfunc);
-				break;
-			case ETH_RSS_HASH_XOR:
-				rss_cfg->hash_algo =
-					HCLGEVF_RSS_HASH_ALGO_SIMPLE;
-				break;
-			case ETH_RSS_HASH_NO_CHANGE:
-				break;
-			default:
-				return -EINVAL;
-			}
-			ret = hclgevf_set_rss_algo_key(hdev, rss_cfg->hash_algo,
-						       key);
-			if (ret)
 				return ret;
+			}
 			/* Update the shadow RSS key with user specified qids */
 			memcpy(rss_cfg->rss_hash_key, key,
 			       HCLGEVF_RSS_KEY_SIZE);
+		} else {
+			ret = hclgevf_set_rss_algo_key(hdev, hash_algo,
+						       rss_cfg->rss_hash_key);
+			if (ret)
+				return ret;
 		}
+		rss_cfg->hash_algo = hash_algo;
 	}
 	/* update the shadow RSS table with user specified qids */

drivers/net/ethernet/intel/Kconfig+1−0

@@ -335,6 +335,7 @@ config IGC · 334 unmodified lines
335	tristate "Intel(R) Ethernet Controller I225-LM/I225-V support"	335	tristate "Intel(R) Ethernet Controller I225-LM/I225-V support"
336	default n	336	default n
337	depends on PCI	337	depends on PCI
		338	depends on PTP_1588_CLOCK_OPTIONAL
338	help	339	help
339	This driver supports Intel(R) Ethernet Controller I225-LM/I225-V	340	This driver supports Intel(R) Ethernet Controller I225-LM/I225-V
340	family of adapters.	341	family of adapters.

drivers/net/ethernet/mediatek/mtk_ppe_offload.c+3−0

@@ -186,6 +186,9 @@ mtk_flow_offload_replace(struct mtk_eth eth, struct flow_cls_offload f) · 185 unmodified lines
186	int hash;	186	int hash;
187	int i;	187	int i;
188		188
		189	if (rhashtable_lookup(&eth->flow_table, &f->cookie, mtk_flow_ht_params))
		190	return -EEXIST;
		191
189	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) {	192	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) {
190	struct flow_match_meta match;	193	struct flow_match_meta match;
191		194

drivers/net/ethernet/mellanox/mlx4/en_netdev.c+32−18

@@ -372,6 +372,9 @@ mlx4_en_filter_rfs(struct net_device net_dev, const struct sk_buff skb, · 371 unmodified lines
372	int nhoff = skb_network_offset(skb);	372	int nhoff = skb_network_offset(skb);
373	int ret = 0;	373	int ret = 0;
374		374
		375	if (skb->encapsulation)
		376	return -EPROTONOSUPPORT;
		377
375	if (skb->protocol != htons(ETH_P_IP))	378	if (skb->protocol != htons(ETH_P_IP))
376	return -EPROTONOSUPPORT;	379	return -EPROTONOSUPPORT;
377		380
@@ -1269,7 +1272,6 @@ static void mlx4_en_do_set_rx_mode(struct work_struct *work) · 891 unmodified lines
1269	if (!netif_carrier_ok(dev)) {	1272	if (!netif_carrier_ok(dev)) {
1270	if (!mlx4_en_QUERY_PORT(mdev, priv->port)) {	1273	if (!mlx4_en_QUERY_PORT(mdev, priv->port)) {
1271	if (priv->port_state.link_state) {	1274	if (priv->port_state.link_state) {
1272	priv->last_link_state = MLX4_DEV_EVENT_PORT_UP;
1273	netif_carrier_on(dev);	1275	netif_carrier_on(dev);
1274	en_dbg(LINK, priv, "Link Up\n");	1276	en_dbg(LINK, priv, "Link Up\n");
1275	}	1277	}
@@ -1557,26 +1559,36 @@ static void mlx4_en_service_task(struct work_struct *work) · 281 unmodified lines
1557	mutex_unlock(&mdev->state_lock);	1559	mutex_unlock(&mdev->state_lock);
1558	}	1560	}
1559		1561
1560	static void mlx4_en_linkstate(struct work_struct *work)	1562	static void mlx4_en_linkstate(struct mlx4_en_priv *priv)
		1563	{
		1564	struct mlx4_en_port_state *port_state = &priv->port_state;
		1565	struct mlx4_en_dev *mdev = priv->mdev;
		1566	struct net_device *dev = priv->dev;
		1567	bool up;
		1568
		1569	if (mlx4_en_QUERY_PORT(mdev, priv->port))
		1570	port_state->link_state = MLX4_PORT_STATE_DEV_EVENT_PORT_DOWN;
		1571
		1572	up = port_state->link_state == MLX4_PORT_STATE_DEV_EVENT_PORT_UP;
		1573	if (up == netif_carrier_ok(dev))
		1574	netif_carrier_event(dev);
		1575	if (!up) {
		1576	en_info(priv, "Link Down\n");
		1577	netif_carrier_off(dev);
		1578	} else {
		1579	en_info(priv, "Link Up\n");
		1580	netif_carrier_on(dev);
		1581	}
		1582	}
		1583
		1584	static void mlx4_en_linkstate_work(struct work_struct *work)
1561	{	1585	{
1562	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,	1586	struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
1563	linkstate_task);	1587	linkstate_task);
1564	struct mlx4_en_dev *mdev = priv->mdev;	1588	struct mlx4_en_dev *mdev = priv->mdev;
1565	int linkstate = priv->link_state;
1566		1589
1567	mutex_lock(&mdev->state_lock);	1590	mutex_lock(&mdev->state_lock);
1568	/* If observable port state changed set carrier state and	1591	mlx4_en_linkstate(priv);
1569	* report to system log */
1570	if (priv->last_link_state != linkstate) {
1571	if (linkstate == MLX4_DEV_EVENT_PORT_DOWN) {
1572	en_info(priv, "Link Down\n");
1573	netif_carrier_off(priv->dev);
1574	} else {
1575	en_info(priv, "Link Up\n");
1576	netif_carrier_on(priv->dev);
1577	}
1578	}
1579	priv->last_link_state = linkstate;
1580	mutex_unlock(&mdev->state_lock);	1592	mutex_unlock(&mdev->state_lock);
1581	}	1593	}
1582		1594
@@ -2079,9 +2091,11 @@ static int mlx4_en_open(struct net_device *dev) · 496 unmodified lines
2079	mlx4_en_clear_stats(dev);	2091	mlx4_en_clear_stats(dev);
2080		2092
2081	err = mlx4_en_start_port(dev);	2093	err = mlx4_en_start_port(dev);
2082	if (err)	2094	if (err) {
2083	en_err(priv, "Failed starting port:%d\n", priv->port);	2095	en_err(priv, "Failed starting port:%d\n", priv->port);
2084		2096	goto out;
		2097	}
		2098	mlx4_en_linkstate(priv);
2085	out:	2099	out:
2086	mutex_unlock(&mdev->state_lock);	2100	mutex_unlock(&mdev->state_lock);
2087	return err;	2101	return err;
@@ -3168,7 +3182,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, · 1080 unmodified lines
3168	spin_lock_init(&priv->stats_lock);	3182	spin_lock_init(&priv->stats_lock);
3169	INIT_WORK(&priv->rx_mode_task, mlx4_en_do_set_rx_mode);	3183	INIT_WORK(&priv->rx_mode_task, mlx4_en_do_set_rx_mode);
3170	INIT_WORK(&priv->restart_task, mlx4_en_restart);	3184	INIT_WORK(&priv->restart_task, mlx4_en_restart);
3171	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);	3185	INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate_work);
3172	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);	3186	INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
3173	INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);	3187	INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);
3174	#ifdef CONFIG_RFS_ACCEL	3188	#ifdef CONFIG_RFS_ACCEL

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h+0−1

@@ -552,7 +552,6 @@ struct mlx4_en_priv { · 551 unmodified lines
552		552
553	struct mlx4_hwq_resources res;	553	struct mlx4_hwq_resources res;
554	int link_state;	554	int link_state;
555	int last_link_state;
556	bool port_up;	555	bool port_up;
557	int port;	556	int port;
558	int registered;	557	int registered;

drivers/net/ethernet/mscc/ocelot.c+8−13

 	ocelot_port_writel(ocelot_port, DEV_MAC_ENA_CFG_RX_ENA |
 			   DEV_MAC_ENA_CFG_TX_ENA, DEV_MAC_ENA_CFG);
-	/* Take MAC, Port, Phy (intern) and PCS (SGMII/Serdes) clock out of
-	 * reset
-	 */
-	ocelot_port_writel(ocelot_port, DEV_CLOCK_CFG_LINK_SPEED(speed),
-			   DEV_CLOCK_CFG);
-	/* No PFC */
-	ocelot_write_gix(ocelot, ANA_PFC_PFC_CFG_FC_LINK_SPEED(speed),
-			 ANA_PFC_PFC_CFG, port);
 	/* Core: Enable port for frame transfer */
 	ocelot_fields_write(ocelot, port,
 			    QSYS_SWITCH_PORT_MODE_PORT_ENA, 1);
 	return mask;
 }
-static u32 ocelot_get_bridge_fwd_mask(struct ocelot *ocelot,
+static u32 ocelot_get_bridge_fwd_mask(struct ocelot *ocelot, int src_port,
 				      struct net_device *bridge)
 {
+	struct ocelot_port *ocelot_port = ocelot->ports[src_port];
 	u32 mask = 0;
 	int port;
+	if (!ocelot_port || ocelot_port->bridge != bridge ||
+	    ocelot_port->stp_state != BR_STATE_FORWARDING)
+		return 0;
 	for (port = 0; port < ocelot->num_phys_ports; port++) {
-		struct ocelot_port *ocelot_port = ocelot->ports[port];
+		ocelot_port = ocelot->ports[port];
 		if (!ocelot_port)
 			continue;
 			struct net_device *bridge = ocelot_port->bridge;
 			struct net_device *bond = ocelot_port->bond;
-			mask = ocelot_get_bridge_fwd_mask(ocelot, bridge);
+			mask = ocelot_get_bridge_fwd_mask(ocelot, port, bridge);
 			mask |= cpu_fwd_mask;
 			mask &= ~BIT(port);
 			if (bond) {

drivers/net/ethernet/mscc/ocelot_devlink.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: (GPL-2.0 OR MIT)	1	// SPDX-License-Identifier: (GPL-2.0 OR MIT)
2	/* Copyright 2020-2021 NXP Semiconductors	2	/* Copyright 2020-2021 NXP
3	*/	3	*/
4	#include <net/devlink.h>	4	#include <net/devlink.h>
5	#include "ocelot.h"	5	#include "ocelot.h"

drivers/net/ethernet/mscc/ocelot_mrp.c+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	/* Microsemi Ocelot Switch driver	2	/* Microsemi Ocelot Switch driver
3	*	3	*
4	* Copyright (c) 2017, 2019 Microsemi Corporation	4	* Copyright (c) 2017, 2019 Microsemi Corporation
5	* Copyright 2020-2021 NXP Semiconductors	5	* Copyright 2020-2021 NXP
6	*/	6	*/
7		7
8	#include <linux/if_bridge.h>	8	#include <linux/if_bridge.h>

drivers/net/ethernet/mscc/ocelot_net.c+1−1

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	* mscc_ocelot_switch_lib.	5	* mscc_ocelot_switch_lib.
6	*	6	*
7	* Copyright (c) 2017, 2019 Microsemi Corporation	7	* Copyright (c) 2017, 2019 Microsemi Corporation
8	* Copyright 2020-2021 NXP Semiconductors	8	* Copyright 2020-2021 NXP
9	*/	9	*/
10		10
11	#include <linux/if_bridge.h>	11	#include <linux/if_bridge.h>

drivers/net/ethernet/qlogic/qed/qed_iwarp.c+8−0

@@ -1297,6 +1297,14 @@ qed_iwarp_wait_cid_map_cleared(struct qed_hwfn p_hwfn, struct qed_bmap bmap) · 1296 unmodified lines
1297	prev_weight = weight;	1297	prev_weight = weight;
1298		1298
1299	while (weight) {	1299	while (weight) {
		1300	/* If the HW device is during recovery, all resources are
		1301	* immediately reset without receiving a per-cid indication
		1302	* from HW. In this case we don't expect the cid_map to be
		1303	* cleared.
		1304	*/
		1305	if (p_hwfn->cdev->recov_in_prog)
		1306	return 0;
		1307
1300	msleep(QED_IWARP_MAX_CID_CLEAN_TIME);	1308	msleep(QED_IWARP_MAX_CID_CLEAN_TIME);
1301		1309
1302	weight = bitmap_weight(bmap->bitmap, bmap->max_count);	1310	weight = bitmap_weight(bmap->bitmap, bmap->max_count);

drivers/net/ethernet/qlogic/qed/qed_roce.c+8−0

@@ -77,6 +77,14 @@ void qed_roce_stop(struct qed_hwfn *p_hwfn) · 76 unmodified lines
77	* Beyond the added delay we clear the bitmap anyway.	77	* Beyond the added delay we clear the bitmap anyway.
78	*/	78	*/
79	while (bitmap_weight(rcid_map->bitmap, rcid_map->max_count)) {	79	while (bitmap_weight(rcid_map->bitmap, rcid_map->max_count)) {
		80	/* If the HW device is during recovery, all resources are
		81	* immediately reset without receiving a per-cid indication
		82	* from HW. In this case we don't expect the cid bitmap to be
		83	* cleared.
		84	*/
		85	if (p_hwfn->cdev->recov_in_prog)
		86	return;
		87
80	msleep(100);	88	msleep(100);
81	if (wait_count++ > 20) {	89	if (wait_count++ > 20) {
82	DP_NOTICE(p_hwfn, "cid bitmap wait timed out\n");	90	DP_NOTICE(p_hwfn, "cid bitmap wait timed out\n");

drivers/net/pcs/pcs-xpcs-nxp.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2021 NXP Semiconductors	2	/* Copyright 2021 NXP
3	*/	3	*/
4	#include <linux/pcs/pcs-xpcs.h>	4	#include <linux/pcs/pcs-xpcs.h>
5	#include "pcs-xpcs.h"	5	#include "pcs-xpcs.h"

drivers/net/phy/mdio_device.c+11−0

 	return 0;
 }
+static void mdio_shutdown(struct device *dev)
+{
+	struct mdio_device *mdiodev = to_mdio_device(dev);
+	struct device_driver *drv = mdiodev->dev.driver;
+	struct mdio_driver *mdiodrv = to_mdio_driver(drv);
+	if (mdiodrv->shutdown)
+		mdiodrv->shutdown(mdiodev);
+}
 /**
  * mdio_driver_register - register an mdio_driver with the MDIO layer
  * @drv: new mdio_driver to register
 	mdiodrv->driver.bus = &mdio_bus_type;
 	mdiodrv->driver.probe = mdio_probe;
 	mdiodrv->driver.remove = mdio_remove;
+	mdiodrv->driver.shutdown = mdio_shutdown;
 	retval = driver_register(&mdiodrv->driver);
 	if (retval) {

drivers/net/usb/hso.c+5−7

 	serial = kzalloc(sizeof(*serial), GFP_KERNEL);
 	if (!serial)
-		goto exit;
+		goto err_free_dev;
 	hso_dev->port_data.dev_serial = serial;
 	serial->parent = hso_dev;
 	if (hso_serial_common_create
 	    (serial, 1, CTRL_URB_RX_SIZE, CTRL_URB_TX_SIZE))
-		goto exit;
+		goto err_free_serial;
 	serial->tx_data_length--;
 	serial->write_data = hso_mux_serial_write_data;
 	/* done, return it */
 	return hso_dev;
-exit:
+err_free_serial:
-	if (serial) {
+	kfree(serial);
-		tty_unregister_device(tty_drv, serial->minor);
+err_free_dev:
-		kfree(serial);
-	}
 	kfree(hso_dev);
 	return NULL;

drivers/net/virtio_net.c+4−0

@@ -423,6 +423,10 @@ static struct sk_buff page_to_skb(struct virtnet_info vi, · 422 unmodified lines
423		423
424	skb_reserve(skb, p - buf);	424	skb_reserve(skb, p - buf);
425	skb_put(skb, len);	425	skb_put(skb, len);
		426
		427	page = (struct page *)page->private;
		428	if (page)
		429	give_pages(rq, page);
426	goto ok;	430	goto ok;
427	}	431	}
428		432

drivers/net/vxlan.c+1−1

 	LIST_HEAD(list);
 	unsigned int h;
-	rtnl_lock();
 	list_for_each_entry(net, net_list, exit_list) {
 		struct vxlan_net *vn = net_generic(net, vxlan_net_id);
 		unregister_nexthop_notifier(net, &vn->nexthop_notifier_block);
 	}
+	rtnl_lock();
 	list_for_each_entry(net, net_list, exit_list)
 		vxlan_destroy_tunnels(net, &list);

drivers/net/xen-netback/netback.c+1−1

@@ -499,7 +499,7 @@ check_frags: · 498 unmodified lines
499	* the header's copy failed, and they are	499	* the header's copy failed, and they are
500	* sharing a slot, send an error	500	* sharing a slot, send an error
501	*/	501	*/
502	if (i == 0 && sharedslot)	502	if (i == 0 && !first_shinfo && sharedslot)
503	xenvif_idx_release(queue, pending_idx,	503	xenvif_idx_release(queue, pending_idx,
504	XEN_NETIF_RSP_ERROR);	504	XEN_NETIF_RSP_ERROR);
505	else	505	else

drivers/nfc/st-nci/spi.c+1−0

@@ -278,6 +278,7 @@ static int st_nci_spi_remove(struct spi_device *dev) · 277 unmodified lines
278		278
279	static struct spi_device_id st_nci_spi_id_table[] = {	279	static struct spi_device_id st_nci_spi_id_table[] = {
280	{ST_NCI_SPI_DRIVER_NAME, 0},	280	{ST_NCI_SPI_DRIVER_NAME, 0},
		281	{"st21nfcb-spi", 0},
281	{}	282	{}
282	};	283	};
283	MODULE_DEVICE_TABLE(spi, st_nci_spi_id_table);	284	MODULE_DEVICE_TABLE(spi, st_nci_spi_id_table);

drivers/ptp/Kconfig+1−0

@@ -174,6 +174,7 @@ config PTP_1588_CLOCK_OCP · 173 unmodified lines
174	depends on I2C && MTD	174	depends on I2C && MTD
175	depends on SERIAL_8250	175	depends on SERIAL_8250
176	depends on !S390	176	depends on !S390
		177	depends on COMMON_CLK
177	select NET_DEVLINK	178	select NET_DEVLINK
178	help	179	help
179	This driver adds support for an OpenCompute time card.	180	This driver adds support for an OpenCompute time card.

drivers/s390/cio/ccwgroup.c+8−2

 /**
  * ccwgroup_set_offline() - disable a ccwgroup device
  * @gdev: target ccwgroup device
+ * @call_gdrv: Call the registered gdrv set_offline function
  *
  * This function attempts to put the ccwgroup device into the offline state.
  * Returns:
  *  %0 on success and a negative error value on failure.
  */
-int ccwgroup_set_offline(struct ccwgroup_device *gdev)
+int ccwgroup_set_offline(struct ccwgroup_device *gdev, bool call_gdrv)
 {
 	struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
 	int ret = -EINVAL;
 		return -EAGAIN;
 	if (gdev->state == CCWGROUP_OFFLINE)
 		goto out;
+	if (!call_gdrv) {
+		ret = 0;
+		goto offline;
+	}
 	if (gdrv->set_offline)
 		ret = gdrv->set_offline(gdev);
 	if (ret)
 		goto out;
+offline:
 	gdev->state = CCWGROUP_OFFLINE;
 out:
 	atomic_set(&gdev->onoff, 0);
 	if (value == 1)
 		ret = ccwgroup_set_online(gdev);
 	else if (value == 0)
-		ret = ccwgroup_set_offline(gdev);
+		ret = ccwgroup_set_offline(gdev, true);
 	else
 		ret = -EINVAL;
 out:

drivers/s390/net/qeth_core.h+0−1

@@ -858,7 +858,6 @@ struct qeth_card { · 857 unmodified lines
858	struct napi_struct napi;	858	struct napi_struct napi;
859	struct qeth_rx rx;	859	struct qeth_rx rx;
860	struct delayed_work buffer_reclaim_work;	860	struct delayed_work buffer_reclaim_work;
861	struct work_struct close_dev_work;
862	};	861	};
863		862
864	static inline bool qeth_card_hw_is_reachable(struct qeth_card *card)	863	static inline bool qeth_card_hw_is_reachable(struct qeth_card *card)

drivers/s390/net/qeth_core_main.c+9−13

 static int qeth_qdio_establish(struct qeth_card *);
 static void qeth_free_qdio_queues(struct qeth_card *card);
-static void qeth_close_dev_handler(struct work_struct *work)
-{
-	struct qeth_card *card;
-	card = container_of(work, struct qeth_card, close_dev_work);
-	QETH_CARD_TEXT(card, 2, "cldevhdl");
-	ccwgroup_set_offline(card->gdev);
-}
 static const char *qeth_get_cardname(struct qeth_card *card)
 {
 	if (IS_VM_NIC(card)) {
 				 &card->qdio.in_buf_pool.entry_list, list)
 		list_del(&pool_entry->list);
+	if (!queue)
+		return;
 	for (i = 0; i < ARRAY_SIZE(queue->bufs); i++)
 		queue->bufs[i].pool_entry = NULL;
 }
 	case IPA_CMD_STOPLAN:
 		if (cmd->hdr.return_code == IPA_RC_VEPA_TO_VEB_TRANSITION) {
 			dev_err(&card->gdev->dev,
-				"Interface %s is down because the adjacent port is no longer in reflective relay mode\n",
+				"Adjacent port of interface %s is no longer in reflective relay mode, trigger recovery\n",
 				netdev_name(card->dev));
-			schedule_work(&card->close_dev_work);
+			/* Set offline, then probably fail to set online: */
+			qeth_schedule_recovery(card);
 		} else {
+			/* stay online for subsequent STARTLAN */
 			dev_warn(&card->gdev->dev,
 				 "The link for interface %s on CHPID 0x%X failed\n",
 				 netdev_name(card->dev), card->info.chpid);
 	INIT_LIST_HEAD(&card->ipato.entries);
 	qeth_init_qdio_info(card);
 	INIT_DELAYED_WORK(&card->buffer_reclaim_work, qeth_buffer_reclaim_work);
-	INIT_WORK(&card->close_dev_work, qeth_close_dev_handler);
 	hash_init(card->rx_mode_addrs);
 	hash_init(card->local_addrs4);
 	hash_init(card->local_addrs6);
 		dev_info(&card->gdev->dev,
 			 "Device successfully recovered!\n");
 	} else {
-		ccwgroup_set_offline(card->gdev);
+		qeth_set_offline(card, disc, true);
+		ccwgroup_set_offline(card->gdev, false);
 		dev_warn(&card->gdev->dev,
 			 "The qeth device driver failed to recover an error on the device\n");
 	}

drivers/s390/net/qeth_l2_main.c+0−1

@@ -2307,7 +2307,6 @@ static void qeth_l2_remove_device(struct ccwgroup_device *gdev) · 2306 unmodified lines
2307	if (gdev->state == CCWGROUP_ONLINE)	2307	if (gdev->state == CCWGROUP_ONLINE)
2308	qeth_set_offline(card, card->discipline, false);	2308	qeth_set_offline(card, card->discipline, false);
2309		2309
2310	cancel_work_sync(&card->close_dev_work);
2311	if (card->dev->reg_state == NETREG_REGISTERED) {	2310	if (card->dev->reg_state == NETREG_REGISTERED) {
2312	priv = netdev_priv(card->dev);	2311	priv = netdev_priv(card->dev);
2313	if (priv->brport_features & BR_LEARNING_SYNC) {	2312	if (priv->brport_features & BR_LEARNING_SYNC) {

drivers/s390/net/qeth_l3_main.c+0−1

@@ -1969,7 +1969,6 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev) · 1968 unmodified lines
1969	if (cgdev->state == CCWGROUP_ONLINE)	1969	if (cgdev->state == CCWGROUP_ONLINE)
1970	qeth_set_offline(card, card->discipline, false);	1970	qeth_set_offline(card, card->discipline, false);
1971		1971
1972	cancel_work_sync(&card->close_dev_work);
1973	if (card->dev->reg_state == NETREG_REGISTERED)	1972	if (card->dev->reg_state == NETREG_REGISTERED)
1974	unregister_netdev(card->dev);	1973	unregister_netdev(card->dev);
1975		1974

include/linux/dsa/ocelot.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: GPL-2.0	1	/* SPDX-License-Identifier: GPL-2.0
2	* Copyright 2019-2021 NXP Semiconductors	2	* Copyright 2019-2021 NXP
3	*/	3	*/
4		4
5	#ifndef _NET_DSA_TAG_OCELOT_H	5	#ifndef _NET_DSA_TAG_OCELOT_H

include/linux/mdio.h+3−0

@@ -80,6 +80,9 @@ struct mdio_driver { · 79 unmodified lines
80		80
81	/* Clears up any memory if needed */	81	/* Clears up any memory if needed */
82	void (remove)(struct mdio_device mdiodev);	82	void (remove)(struct mdio_device mdiodev);
		83
		84	/* Quiesces the device on system shutdown, turns off interrupts etc */
		85	void (shutdown)(struct mdio_device mdiodev);
83	};	86	};
84		87
85	static inline struct mdio_driver *	88	static inline struct mdio_driver *

include/linux/packing.h+1−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: BSD-3-Clause	1	/* SPDX-License-Identifier: BSD-3-Clause
2	* Copyright (c) 2016-2018, NXP Semiconductors	2	* Copyright 2016-2018 NXP
3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
4	*/	4	*/
5	#ifndef _LINUX_PACKING_H	5	#ifndef _LINUX_PACKING_H

include/net/dsa.h+9−0

 	int	(*change_tag_protocol)(struct dsa_switch *ds, int port,
 				       enum dsa_tag_protocol proto);
+	/* Optional switch-wide initialization and destruction methods */
 	int	(*setup)(struct dsa_switch *ds);
 	void	(*teardown)(struct dsa_switch *ds);
+	/* Per-port initialization and destruction methods. Mandatory if the
+	 * driver registers devlink port regions, optional otherwise.
+	 */
+	int	(*port_setup)(struct dsa_switch *ds, int port);
+	void	(*port_teardown)(struct dsa_switch *ds, int port);
 	u32	(*get_phy_flags)(struct dsa_switch *ds, int port);
 	/*
 void dsa_unregister_switch(struct dsa_switch *ds);
 int dsa_register_switch(struct dsa_switch *ds);
+void dsa_switch_shutdown(struct dsa_switch *ds);
 struct dsa_switch *dsa_switch_find(int tree_index, int sw_index);
 #ifdef CONFIG_PM_SLEEP
 int dsa_switch_suspend(struct dsa_switch *ds);

include/net/sock.h+1−0

@@ -1640,6 +1640,7 @@ static inline void unlock_sock_fast(struct sock *sk, bool slow) · 1639 unmodified lines
1640	release_sock(sk);	1640	release_sock(sk);
1641	__release(&sk->sk_lock.slock);	1641	__release(&sk->sk_lock.slock);
1642	} else {	1642	} else {
		1643	mutex_release(&sk->sk_lock.dep_map, _RET_IP_);
1643	spin_unlock_bh(&sk->sk_lock.slock);	1644	spin_unlock_bh(&sk->sk_lock.slock);
1644	}	1645	}
1645	}	1646	}

lib/packing.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0	1	// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0
2	/* Copyright (c) 2016-2018, NXP Semiconductors	2	/* Copyright 2016-2018 NXP
3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>	3	* Copyright (c) 2018-2019, Vladimir Oltean <olteanv@gmail.com>
4	*/	4	*/
5	#include <linux/packing.h>	5	#include <linux/packing.h>

net/core/dev.c+10−6

@@ -6923,12 +6923,16 @@ EXPORT_SYMBOL(napi_disable); · 6922 unmodified lines
6923	*/	6923	*/
6924	void napi_enable(struct napi_struct *n)	6924	void napi_enable(struct napi_struct *n)
6925	{	6925	{
6926	BUG_ON(!test_bit(NAPI_STATE_SCHED, &n->state));	6926	unsigned long val, new;
6927	smp_mb__before_atomic();	6927
6928	clear_bit(NAPI_STATE_SCHED, &n->state);	6928	do {
6929	clear_bit(NAPI_STATE_NPSVC, &n->state);	6929	val = READ_ONCE(n->state);
6930	if (n->dev->threaded && n->thread)	6930	BUG_ON(!test_bit(NAPI_STATE_SCHED, &val));
6931	set_bit(NAPI_STATE_THREADED, &n->state);	6931
		6932	new = val & ~(NAPIF_STATE_SCHED \| NAPIF_STATE_NPSVC);
		6933	if (n->dev->threaded && n->thread)
		6934	new \|= NAPIF_STATE_THREADED;
		6935	} while (cmpxchg(&n->state, val, new) != val);
6932	}	6936	}
6933	EXPORT_SYMBOL(napi_enable);	6937	EXPORT_SYMBOL(napi_enable);
6934		6938

net/core/sock.c+23−14

 void lock_sock_nested(struct sock *sk, int subclass)
 {
+	/* The sk_lock has mutex_lock() semantics here. */
+	mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
 	might_sleep();
 	spin_lock_bh(&sk->sk_lock.slock);
 	if (sk->sk_lock.owned)
 		__lock_sock(sk);
 	sk->sk_lock.owned = 1;
-	spin_unlock(&sk->sk_lock.slock);
+	spin_unlock_bh(&sk->sk_lock.slock);
-	/*
-	 * The sk_lock has mutex_lock() semantics here:
-	 */
-	mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
-	local_bh_enable();
 }
 EXPORT_SYMBOL(lock_sock_nested);
  */
 bool lock_sock_fast(struct sock *sk) __acquires(&sk->sk_lock.slock)
 {
+	/* The sk_lock has mutex_lock() semantics here. */
+	mutex_acquire(&sk->sk_lock.dep_map, 0, 0, _RET_IP_);
 	might_sleep();
 	spin_lock_bh(&sk->sk_lock.slock);
-	if (!sk->sk_lock.owned)
+	if (!sk->sk_lock.owned) {
 		/*
-		 * Note : We must disable BH
+		 * Fast path return with bottom halves disabled and
+		 * sock::sk_lock.slock held.
+		 *
+		 * The 'mutex' is not contended and holding
+		 * sock::sk_lock.slock prevents all other lockers to
+		 * proceed so the corresponding unlock_sock_fast() can
+		 * avoid the slow path of release_sock() completely and
+		 * just release slock.
+		 *
+		 * From a semantical POV this is equivalent to 'acquiring'
+		 * the 'mutex', hence the corresponding lockdep
+		 * mutex_release() has to happen in the fast path of
+		 * unlock_sock_fast().
 		 */
 		return false;
+	}
 	__lock_sock(sk);
 	sk->sk_lock.owned = 1;
-	spin_unlock(&sk->sk_lock.slock);
-	/*
-	 * The sk_lock has mutex_lock() semantics here:
-	 */
-	mutex_acquire(&sk->sk_lock.dep_map, 0, 0, _RET_IP_);
 	__acquire(&sk->sk_lock.slock);
-	local_bh_enable();
+	spin_unlock_bh(&sk->sk_lock.slock);
 	return true;
 }
 EXPORT_SYMBOL(lock_sock_fast);

net/dsa/dsa2.c+106−8

@@ -429,6 +429,7 @@ static int dsa_port_setup(struct dsa_port *dp) · 428 unmodified lines
429	{	429	{
430	struct devlink_port *dlp = &dp->devlink_port;	430	struct devlink_port *dlp = &dp->devlink_port;
431	bool dsa_port_link_registered = false;	431	bool dsa_port_link_registered = false;
		432	struct dsa_switch *ds = dp->ds;
432	bool dsa_port_enabled = false;	433	bool dsa_port_enabled = false;
433	int err = 0;	434	int err = 0;
434		435
@@ -438,6 +439,12 @@ static int dsa_port_setup(struct dsa_port *dp) · 3 unmodified lines
438	INIT_LIST_HEAD(&dp->fdbs);	439	INIT_LIST_HEAD(&dp->fdbs);
439	INIT_LIST_HEAD(&dp->mdbs);	440	INIT_LIST_HEAD(&dp->mdbs);
440		441
		442	if (ds->ops->port_setup) {
		443	err = ds->ops->port_setup(ds, dp->index);
		444	if (err)
		445	return err;
		446	}
		447
441	switch (dp->type) {	448	switch (dp->type) {
442	case DSA_PORT_TYPE_UNUSED:	449	case DSA_PORT_TYPE_UNUSED:
443	dsa_port_disable(dp);	450	dsa_port_disable(dp);
@@ -480,8 +487,11 @@ static int dsa_port_setup(struct dsa_port *dp) · 36 unmodified lines
480	dsa_port_disable(dp);	487	dsa_port_disable(dp);
481	if (err && dsa_port_link_registered)	488	if (err && dsa_port_link_registered)
482	dsa_port_link_unregister_of(dp);	489	dsa_port_link_unregister_of(dp);
483	if (err)	490	if (err) {
		491	if (ds->ops->port_teardown)
		492	ds->ops->port_teardown(ds, dp->index);
484	return err;	493	return err;
		494	}
485		495
486	dp->setup = true;	496	dp->setup = true;
487		497
@@ -533,11 +543,15 @@ static int dsa_port_devlink_setup(struct dsa_port *dp) · 45 unmodified lines
533	static void dsa_port_teardown(struct dsa_port *dp)	543	static void dsa_port_teardown(struct dsa_port *dp)
534	{	544	{
535	struct devlink_port *dlp = &dp->devlink_port;	545	struct devlink_port *dlp = &dp->devlink_port;
		546	struct dsa_switch *ds = dp->ds;
536	struct dsa_mac_addr a, tmp;	547	struct dsa_mac_addr a, tmp;
537		548
538	if (!dp->setup)	549	if (!dp->setup)
539	return;	550	return;
540		551
		552	if (ds->ops->port_teardown)
		553	ds->ops->port_teardown(ds, dp->index);
		554
541	devlink_port_type_clear(dlp);	555	devlink_port_type_clear(dlp);
542		556
543	switch (dp->type) {	557	switch (dp->type) {
@@ -581,6 +595,36 @@ static void dsa_port_devlink_teardown(struct dsa_port *dp) · 37 unmodified lines
581	dp->devlink_port_setup = false;	595	dp->devlink_port_setup = false;
582	}	596	}
583		597
		598	/* Destroy the current devlink port, and create a new one which has the UNUSED
		599	* flavour. At this point, any call to ds->ops->port_setup has been already
		600	* balanced out by a call to ds->ops->port_teardown, so we know that any
		601	* devlink port regions the driver had are now unregistered. We then call its
		602	* ds->ops->port_setup again, in order for the driver to re-create them on the
		603	* new devlink port.
		604	*/
		605	static int dsa_port_reinit_as_unused(struct dsa_port *dp)
		606	{
		607	struct dsa_switch *ds = dp->ds;
		608	int err;
		609
		610	dsa_port_devlink_teardown(dp);
		611	dp->type = DSA_PORT_TYPE_UNUSED;
		612	err = dsa_port_devlink_setup(dp);
		613	if (err)
		614	return err;
		615
		616	if (ds->ops->port_setup) {
		617	/* On error, leave the devlink port registered,
		618	* dsa_switch_teardown will clean it up later.
		619	*/
		620	err = ds->ops->port_setup(ds, dp->index);
		621	if (err)
		622	return err;
		623	}
		624
		625	return 0;
		626	}
		627
584	static int dsa_devlink_info_get(struct devlink *dl,	628	static int dsa_devlink_info_get(struct devlink *dl,
585	struct devlink_info_req *req,	629	struct devlink_info_req *req,
586	struct netlink_ext_ack *extack)	630	struct netlink_ext_ack *extack)
@@ -836,7 +880,7 @@ static int dsa_switch_setup(struct dsa_switch *ds) · 249 unmodified lines
836	devlink_params_publish(ds->devlink);	880	devlink_params_publish(ds->devlink);
837		881
838	if (!ds->slave_mii_bus && ds->ops->phy_read) {	882	if (!ds->slave_mii_bus && ds->ops->phy_read) {
839	ds->slave_mii_bus = devm_mdiobus_alloc(ds->dev);	883	ds->slave_mii_bus = mdiobus_alloc();
840	if (!ds->slave_mii_bus) {	884	if (!ds->slave_mii_bus) {
841	err = -ENOMEM;	885	err = -ENOMEM;
842	goto teardown;	886	goto teardown;
@@ -846,13 +890,16 @@ static int dsa_switch_setup(struct dsa_switch *ds) · 3 unmodified lines
846		890
847	err = mdiobus_register(ds->slave_mii_bus);	891	err = mdiobus_register(ds->slave_mii_bus);
848	if (err < 0)	892	if (err < 0)
849	goto teardown;	893	goto free_slave_mii_bus;
850	}	894	}
851		895
852	ds->setup = true;	896	ds->setup = true;
853		897
854	return 0;	898	return 0;
855		899
		900	free_slave_mii_bus:
		901	if (ds->slave_mii_bus && ds->ops->phy_read)
		902	mdiobus_free(ds->slave_mii_bus);
856	teardown:	903	teardown:
857	if (ds->ops->teardown)	904	if (ds->ops->teardown)
858	ds->ops->teardown(ds);	905	ds->ops->teardown(ds);
@@ -877,8 +924,11 @@ static void dsa_switch_teardown(struct dsa_switch *ds) · 18 unmodified lines
877	if (!ds->setup)	924	if (!ds->setup)
878	return;	925	return;
879		926
880	if (ds->slave_mii_bus && ds->ops->phy_read)	927	if (ds->slave_mii_bus && ds->ops->phy_read) {
881	mdiobus_unregister(ds->slave_mii_bus);	928	mdiobus_unregister(ds->slave_mii_bus);
		929	mdiobus_free(ds->slave_mii_bus);
		930	ds->slave_mii_bus = NULL;
		931	}
882		932
883	dsa_switch_unregister_notifier(ds);	933	dsa_switch_unregister_notifier(ds);
884		934
@@ -938,12 +988,9 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst) · 53 unmodified lines
938	list_for_each_entry(dp, &dst->ports, list) {	988	list_for_each_entry(dp, &dst->ports, list) {
939	err = dsa_port_setup(dp);	989	err = dsa_port_setup(dp);
940	if (err) {	990	if (err) {
941	dsa_port_devlink_teardown(dp);	991	err = dsa_port_reinit_as_unused(dp);
942	dp->type = DSA_PORT_TYPE_UNUSED;
943	err = dsa_port_devlink_setup(dp);
944	if (err)	992	if (err)
945	goto teardown;	993	goto teardown;
946	continue;
947	}	994	}
948	}	995	}
949		996
@@ -1048,6 +1095,7 @@ static int dsa_tree_setup(struct dsa_switch_tree *dst) · 98 unmodified lines
1048	teardown_master:	1095	teardown_master:
1049	dsa_tree_teardown_master(dst);	1096	dsa_tree_teardown_master(dst);
1050	teardown_switches:	1097	teardown_switches:
		1098	dsa_tree_teardown_ports(dst);
1051	dsa_tree_teardown_switches(dst);	1099	dsa_tree_teardown_switches(dst);
1052	teardown_cpu_ports:	1100	teardown_cpu_ports:
1053	dsa_tree_teardown_cpu_ports(dst);	1101	dsa_tree_teardown_cpu_ports(dst);
@@ -1562,3 +1610,53 @@ void dsa_unregister_switch(struct dsa_switch *ds) · 508 unmodified lines
1562	mutex_unlock(&dsa2_mutex);	1610	mutex_unlock(&dsa2_mutex);
1563	}	1611	}
1564	EXPORT_SYMBOL_GPL(dsa_unregister_switch);	1612	EXPORT_SYMBOL_GPL(dsa_unregister_switch);
		1613
		1614	/* If the DSA master chooses to unregister its net_device on .shutdown, DSA is
		1615	* blocking that operation from completion, due to the dev_hold taken inside
		1616	* netdev_upper_dev_link. Unlink the DSA slave interfaces from being uppers of
		1617	* the DSA master, so that the system can reboot successfully.
		1618	*/
		1619	void dsa_switch_shutdown(struct dsa_switch *ds)
		1620	{
		1621	struct net_device master, slave_dev;
		1622	LIST_HEAD(unregister_list);
		1623	struct dsa_port *dp;
		1624
		1625	mutex_lock(&dsa2_mutex);
		1626	rtnl_lock();
		1627
		1628	list_for_each_entry(dp, &ds->dst->ports, list) {
		1629	if (dp->ds != ds)
		1630	continue;
		1631
		1632	if (!dsa_port_is_user(dp))
		1633	continue;
		1634
		1635	master = dp->cpu_dp->master;
		1636	slave_dev = dp->slave;
		1637
		1638	netdev_upper_dev_unlink(master, slave_dev);
		1639	/* Just unlinking ourselves as uppers of the master is not
		1640	* sufficient. When the master net device unregisters, that will
		1641	* also call dev_close, which we will catch as NETDEV_GOING_DOWN
		1642	* and trigger a dev_close on our own devices (dsa_slave_close).
		1643	* In turn, that will call dev_mc_unsync on the master's net
		1644	* device. If the master is also a DSA switch port, this will
		1645	* trigger dsa_slave_set_rx_mode which will call dev_mc_sync on
		1646	* its own master. Lockdep will complain about the fact that
		1647	* all cascaded masters have the same dsa_master_addr_list_lock_key,
		1648	* which it normally would not do if the cascaded masters would
		1649	* be in a proper upper/lower relationship, which we've just
		1650	* destroyed.
		1651	* To suppress the lockdep warnings, let's actually unregister
		1652	* the DSA slave interfaces too, to avoid the nonsensical
		1653	* multicast address list synchronization on shutdown.
		1654	*/
		1655	unregister_netdevice_queue(slave_dev, &unregister_list);
		1656	}
		1657	unregister_netdevice_many(&unregister_list);
		1658
		1659	rtnl_unlock();
		1660	mutex_unlock(&dsa2_mutex);
		1661	}
		1662	EXPORT_SYMBOL_GPL(dsa_switch_shutdown);

net/dsa/tag_ocelot.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2019 NXP Semiconductors	2	/* Copyright 2019 NXP
3	*/	3	*/
4	#include <linux/dsa/ocelot.h>	4	#include <linux/dsa/ocelot.h>
5	#include <soc/mscc/ocelot.h>	5	#include <soc/mscc/ocelot.h>

net/dsa/tag_ocelot_8021q.c+1−1

@@ -1,5 +1,5 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2	/* Copyright 2020-2021 NXP Semiconductors	2	/* Copyright 2020-2021 NXP
3	*	3	*
4	* An implementation of the software-defined tag_8021q.c tagger format, which	4	* An implementation of the software-defined tag_8021q.c tagger format, which
5	* also preserves full functionality under a vlan_filtering bridge. It does	5	* also preserves full functionality under a vlan_filtering bridge. It does

net/ipv4/nexthop.c+16−5

@@ -1982,6 +1982,8 @@ static int replace_nexthop_grp(struct net net, struct nexthop old, · 1981 unmodified lines
1982	rcu_assign_pointer(old->nh_grp, newg);	1982	rcu_assign_pointer(old->nh_grp, newg);
1983		1983
1984	if (newg->resilient) {	1984	if (newg->resilient) {
		1985	/* Make sure concurrent readers are not using 'oldg' anymore. */
		1986	synchronize_net();
1985	rcu_assign_pointer(oldg->res_table, tmp_table);	1987	rcu_assign_pointer(oldg->res_table, tmp_table);
1986	rcu_assign_pointer(oldg->spare->res_table, tmp_table);	1988	rcu_assign_pointer(oldg->spare->res_table, tmp_table);
1987	}	1989	}
@@ -3565,6 +3567,7 @@ static struct notifier_block nh_netdev_notifier = { · 1577 unmodified lines
3565	};	3567	};
3566		3568
3567	static int nexthops_dump(struct net net, struct notifier_block nb,	3569	static int nexthops_dump(struct net net, struct notifier_block nb,
		3570	enum nexthop_event_type event_type,
3568	struct netlink_ext_ack *extack)	3571	struct netlink_ext_ack *extack)
3569	{	3572	{
3570	struct rb_root *root = &net->nexthop.rb_root;	3573	struct rb_root *root = &net->nexthop.rb_root;
@@ -3575,8 +3578,7 @@ static int nexthops_dump(struct net net, struct notifier_block nb, · 4 unmodified lines
3575	struct nexthop *nh;	3578	struct nexthop *nh;
3576		3579
3577	nh = rb_entry(node, struct nexthop, rb_node);	3580	nh = rb_entry(node, struct nexthop, rb_node);
3578	err = call_nexthop_notifier(nb, net, NEXTHOP_EVENT_REPLACE, nh,	3581	err = call_nexthop_notifier(nb, net, event_type, nh, extack);
3579	extack);
3580	if (err)	3582	if (err)
3581	break;	3583	break;
3582	}	3584	}
@@ -3590,7 +3592,7 @@ int register_nexthop_notifier(struct net net, struct notifier_block nb, · 7 unmodified lines
3590	int err;	3592	int err;
3591		3593
3592	rtnl_lock();	3594	rtnl_lock();
3593	err = nexthops_dump(net, nb, extack);	3595	err = nexthops_dump(net, nb, NEXTHOP_EVENT_REPLACE, extack);
3594	if (err)	3596	if (err)
3595	goto unlock;	3597	goto unlock;
3596	err = blocking_notifier_chain_register(&net->nexthop.notifier_chain,	3598	err = blocking_notifier_chain_register(&net->nexthop.notifier_chain,
@@ -3603,8 +3605,17 @@ EXPORT_SYMBOL(register_nexthop_notifier); · 6 unmodified lines
3603		3605
3604	int unregister_nexthop_notifier(struct net net, struct notifier_block nb)	3606	int unregister_nexthop_notifier(struct net net, struct notifier_block nb)
3605	{	3607	{
3606	return blocking_notifier_chain_unregister(&net->nexthop.notifier_chain,	3608	int err;
3607	nb);	3609
		3610	rtnl_lock();
		3611	err = blocking_notifier_chain_unregister(&net->nexthop.notifier_chain,
		3612	nb);
		3613	if (err)
		3614	goto unlock;
		3615	nexthops_dump(net, nb, NEXTHOP_EVENT_DEL, NULL);
		3616	unlock:
		3617	rtnl_unlock();
		3618	return err;
3608	}	3619	}
3609	EXPORT_SYMBOL(unregister_nexthop_notifier);	3620	EXPORT_SYMBOL(unregister_nexthop_notifier);
3610		3621

net/mptcp/protocol.c+2−2

@@ -1316,7 +1316,7 @@ static int mptcp_sendmsg_frag(struct sock sk, struct sock ssk, · 1315 unmodified lines
1316	goto alloc_skb;	1316	goto alloc_skb;
1317	}	1317	}
1318		1318
1319	must_collapse = (info->size_goal - skb->len > 0) &&	1319	must_collapse = (info->size_goal > skb->len) &&
1320	(skb_shinfo(skb)->nr_frags < sysctl_max_skb_frags);	1320	(skb_shinfo(skb)->nr_frags < sysctl_max_skb_frags);
1321	if (must_collapse) {	1321	if (must_collapse) {
1322	size_bias = skb->len;	1322	size_bias = skb->len;
@@ -1325,7 +1325,7 @@ static int mptcp_sendmsg_frag(struct sock sk, struct sock ssk, · 2 unmodified lines
1325	}	1325	}
1326		1326
1327	alloc_skb:	1327	alloc_skb:
1328	if (!must_collapse && !ssk->sk_tx_skb_cache &&	1328	if (!must_collapse &&
1329	!mptcp_alloc_tx_skb(sk, ssk, info->data_lock_held))	1329	!mptcp_alloc_tx_skb(sk, ssk, info->data_lock_held))
1330	return 0;	1330	return 0;
1331		1331

net/smc/smc_clc.c+2−1

 		goto out_rel;
 	}
 	/* get address to which the internal TCP socket is bound */
-	kernel_getsockname(clcsock, (struct sockaddr *)&addrs);
+	if (kernel_getsockname(clcsock, (struct sockaddr *)&addrs) < 0)
+		goto out_rel;
 	/* analyze IP specific data of net_device belonging to TCP socket */
 	addr6 = (struct sockaddr_in6 *)&addrs;
 	rcu_read_lock();

net/smc/smc_core.c+2−0

@@ -1474,7 +1474,9 @@ static void smc_conn_abort_work(struct work_struct *work) · 1473 unmodified lines
1474	abort_work);	1474	abort_work);
1475	struct smc_sock *smc = container_of(conn, struct smc_sock, conn);	1475	struct smc_sock *smc = container_of(conn, struct smc_sock, conn);
1476		1476
		1477	lock_sock(&smc->sk);
1477	smc_conn_kill(conn, true);	1478	smc_conn_kill(conn, true);
		1479	release_sock(&smc->sk);
1478	sock_put(&smc->sk); /* sock_hold done by schedulers of abort_work */	1480	sock_put(&smc->sk); /* sock_hold done by schedulers of abort_work */
1479	}	1481	}
1480		1482

tools/testing/selftests/drivers/net/ocelot/tc_flower_chains.sh+1−1

@@ -1,6 +1,6 @@
1	#!/bin/bash	1	#!/bin/bash
2	# SPDX-License-Identifier: GPL-2.0	2	# SPDX-License-Identifier: GPL-2.0
3	# Copyright 2020 NXP Semiconductors	3	# Copyright 2020 NXP
4		4
5	WAIT_TIME=1	5	WAIT_TIME=1
6	NUM_NETIFS=4	6	NUM_NETIFS=4

tools/testing/selftests/net/af_unix/Makefile+1−4

@@ -1,5 +1,2 @@
1	##TEST_GEN_FILES := test_unix_oob	1	TEST_GEN_PROGS := test_unix_oob
2	TEST_PROGS := test_unix_oob
3	include ../../lib.mk	2	include ../../lib.mk
4
5	all: $(TEST_PROGS)

tools/testing/selftests/net/af_unix/test_unix_oob.c+3−2

@@ -271,8 +271,9 @@ main(int argc, char **argv) · 270 unmodified lines
271	read_oob(pfd, &oob);	271	read_oob(pfd, &oob);
272		272
273	if (!signal_recvd \|\| len != 127 \|\| oob != '%' \|\| atmark != 1) {	273	if (!signal_recvd \|\| len != 127 \|\| oob != '%' \|\| atmark != 1) {
274	fprintf(stderr, "Test 3 failed, sigurg %d len %d OOB %c ",	274	fprintf(stderr,
275	"atmark %d\n", signal_recvd, len, oob, atmark);	275	"Test 3 failed, sigurg %d len %d OOB %c atmark %d\n",
		276	signal_recvd, len, oob, atmark);
276	die(1);	277	die(1);
277	}	278	}
278		279