From ff25bce4ee279c51603a0a925136991bc6b4dc20 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 27 Sep 2021 01:00:49 -0400 Subject: [PATCH] Drop net-dsa-microchip-ksz8863-be-compatible-with-masters.patch Signed-off-by: Sasha Levin --- ...p-ksz8863-be-compatible-with-masters.patch | 72 ------------------- queue-5.14/series | 1 - 2 files changed, 73 deletions(-) delete mode 100644 queue-5.14/net-dsa-microchip-ksz8863-be-compatible-with-masters.patch diff --git a/queue-5.14/net-dsa-microchip-ksz8863-be-compatible-with-masters.patch b/queue-5.14/net-dsa-microchip-ksz8863-be-compatible-with-masters.patch deleted file mode 100644 index ad48b19bff1..00000000000 --- a/queue-5.14/net-dsa-microchip-ksz8863-be-compatible-with-masters.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0294db7d706b7950efb7b6c1cac14101d136710e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 17 Sep 2021 16:34:35 +0300 -Subject: net: dsa: microchip: ksz8863: be compatible with masters which - unregister on shutdown - -From: Vladimir Oltean - -[ Upstream commit fe4053078cd0f02a3fa140c43660f327702a9f10 ] - -Since commit 2f1e8ea726e9 ("net: dsa: link interfaces with the DSA -master to get rid of lockdep warnings"), DSA gained a requirement which -it did not fulfill, which is to unlink itself from the DSA master at -shutdown time. - -Since the Microchip sub-driver for KSZ8863 was introduced after the bad -commit, it has never worked with DSA masters which decide to unregister -their net_device on shutdown, effectively hanging the reboot process. -To fix that, we need to call dsa_switch_shutdown. - -Since this driver expects the MDIO bus to be backed by mdio_bitbang, I -don't think there is currently any MDIO bus driver which implements its -->shutdown by redirecting it to ->remove, but in any case, to be -compatible with that pattern, it is necessary to implement an "if this -then not that" scheme, to avoid ->remove and ->shutdown from being -called both for the same struct device. - -Fixes: 60a364760002 ("net: dsa: microchip: Add Microchip KSZ8863 SMI based driver support") -Link: https://lore.kernel.org/netdev/20210909095324.12978-1-LinoSanfilippo@gmx.de/ -Reported-by: Lino Sanfilippo -Signed-off-by: Vladimir Oltean -Reviewed-by: Florian Fainelli -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/dsa/microchip/ksz8863_smi.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/drivers/net/dsa/microchip/ksz8863_smi.c b/drivers/net/dsa/microchip/ksz8863_smi.c -index 11293485138c..5883fa7edda2 100644 ---- a/drivers/net/dsa/microchip/ksz8863_smi.c -+++ b/drivers/net/dsa/microchip/ksz8863_smi.c -@@ -191,6 +191,18 @@ static void ksz8863_smi_remove(struct mdio_device *mdiodev) - - if (dev) - ksz_switch_remove(dev); -+ -+ dev_set_drvdata(&mdiodev->dev, NULL); -+} -+ -+static void ksz8863_smi_shutdown(struct mdio_device *mdiodev) -+{ -+ struct ksz_device *dev = dev_get_drvdata(&mdiodev->dev); -+ -+ if (dev) -+ dsa_switch_shutdown(dev->ds); -+ -+ dev_set_drvdata(&mdiodev->dev, NULL); - } - - static const struct of_device_id ksz8863_dt_ids[] = { -@@ -203,6 +215,7 @@ MODULE_DEVICE_TABLE(of, ksz8863_dt_ids); - static struct mdio_driver ksz8863_driver = { - .probe = ksz8863_smi_probe, - .remove = ksz8863_smi_remove, -+ .shutdown = ksz8863_smi_shutdown, - .mdiodrv.driver = { - .name = "ksz8863-switch", - .of_match_table = ksz8863_dt_ids, --- -2.33.0 - diff --git a/queue-5.14/series b/queue-5.14/series index 105893ffe42..45bfa759fb7 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -52,7 +52,6 @@ afs-fix-updating-of-i_blocks-on-file-dir-extension.patch platform-x86-intel-punit_ipc-drop-wrong-use-of-acpi_.patch regulator-max14577-revert-regulator-max14577-add-pro.patch nlm-fix-svcxdr_encode_owner.patch -net-dsa-microchip-ksz8863-be-compatible-with-masters.patch net-dsa-xrs700x-be-compatible-with-masters-which-unr.patch virtio-net-fix-pages-leaking-when-building-skb-in-bi.patch enetc-fix-illegal-access-when-reading-affinity_hint.patch -- 2.47.3