Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Hauke Mehrtens <hauke@hauke-m.de>,
        Woojung Huh <woojung.huh@microchip.com>,
        UNGLinuxDriver@microchip.com, Sean Wang <sean.wang@mediatek.com>,
        Landen Chao <Landen.Chao@mediatek.com>,
        DENG Qingfang <dqfext@gmail.com>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        George McCollister <george.mccollister@gmail.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Oleksij Rempel <linux@rempel-privat.de>,
        Michael Grzeschik <m.grzeschik@pengutronix.de>,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-mediatek@lists.infradead.org,
        Lino Sanfilippo <LinoSanfilippo@gmx.de>
Subject: [PATCH v2 net 4/5] net: dsa: microchip: ksz8863: be compatible with masters which unregister on shutdown
Date:   Fri, 17 Sep 2021 16:34:35 +0300
Message-Id: <20210917133436.553995-5-vladimir.oltean@nxp.com>
In-Reply-To: <20210917133436.553995-1-vladimir.oltean@nxp.com>
References: <20210917133436.553995-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (82.78.148.104) by AM0PR02CA0199.eurprd02.prod.outlook.com (2603:10a6:20b:28f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Fri, 17 Sep 2021 13:34:57 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 75f2b4ba-4282-4b46-affb-08d979dff1f7
X-MS-TrafficTypeDiagnostic: VE1PR04MB7341:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VE1PR04MB7341D2AE95B03DD502C029E7E0DD9@VE1PR04MB7341.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:3968;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 36ZryUgOY2Ckl5Zjx/CWeX3QnIi+k1cGJm9wsCLE9+wOJ6g/fyGd+F3Nt8dREzLWhpfWWKOTDHviGB06ZUpD1aYfPOMKYeIyAv0vxAH0v4NCMoO6/9urB8MNtkCpt+3wZrEuPuRbhZc1aDPdjDH/q6BtRJrjtHfjYih1awTRxN5UZ22XDj5icQlJTshBUPwLKws+V/5AorKOtUiqjEky+bjykECeh575F28keSk5Jh/18kxo8ypALcJuADHN7XRF2r7iHwDItgVr0bAdkmzOWvyr17OB/l1br7+5B+v1GIa9uqa9FlKe3c8wMetDiDtjpToytubfWrIPevrasdCEu8Go+yK4pj6psKfaoUFPbrXjLq2EGb63toNOZryA/GgBM71qP/eXCsnL4XzHbfFRpixR4/pmlzugd9n7eQL+pRTy9djefvIKtPFG3xPfrnEL7jjxQwC/Is8Kjo6m9mxt6w12Lma5cAB2yN5cpRlyvu1s01idU+Z3u+tfbJZVaAtDDaqjSpeGzqVYPLEHkGDUGn6k+iXJ077CJeYva/6Oxz/+479cJgWBspMDYc8M9R2j/HIwSJPH59iitFpNAgC9/DprYAFIeDiZATEcbptuvUSTosbrhauGZxXk/fDxCFvhCMfgmPx/RvkmYtbh7VGimAqqt09WcdIofYMfZGwkH8gR7c4cHksSfj5wGiZz0DfHykE+KmJaK7QeakTaddWZNR1u9SyCv2IZyoUNO8HdKeoWGq2Nw3Bdo4rFqGehhO8aMGbY3jin6Z8jOvE7wAE4Hdmjn2XZyPtvseMjzxPtcic=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5136.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(366004)(376002)(136003)(39860400002)(346002)(54906003)(316002)(38100700002)(38350700002)(36756003)(44832011)(2616005)(86362001)(6916009)(66556008)(478600001)(6512007)(6666004)(966005)(6486002)(8936002)(8676002)(26005)(1076003)(5660300002)(6506007)(52116002)(186003)(83380400001)(2906002)(4326008)(7416002)(66946007)(66476007)(956004);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?K365jBnbagEs1OMvINCJDFB1X5TLS3tLsG7Lmkr8hug97BDE4eN2ukWhxO59?=
 =?us-ascii?Q?u8pddxK0oeAZ9dcejP27xprJOf05QOkPZ4T5SmvYFYzBABHQ/xbayKC1kmrF?=
 =?us-ascii?Q?2k2Psem5l9FSlCqdDYRsydv2BnoSrRnV+dECdGRqyuloxjo8ZV5+V6M3+QxK?=
 =?us-ascii?Q?/NPM3IAbeHZvCwK3taxnZnoACzmzLKSZZ2i9kZBXoAoGDI9N8umOVxRD9dEv?=
 =?us-ascii?Q?WjIeFBkW1qfMu0Dykno1d3OpOMiBxpuAbjSnJ1yq9cTyezxZQxAOYxlZZVYA?=
 =?us-ascii?Q?yPBmYgeW7kNC3sHcLrksNk3RbaTlW3/Ev3B9K4ipsaSNjsK/AkHN18rnuunZ?=
 =?us-ascii?Q?WSnf+8RfyAm8x3pRnB4gAFQk7kA/9WWX1Ttm/KsCC+9dMl+Ug5yw8AB8XAUl?=
 =?us-ascii?Q?vx75akWWWZRS3gg+ZGXD2eu8g2DR8j+94R3i6hvKEQaM+4pbrndLaM9RqD67?=
 =?us-ascii?Q?uEgCMkjXPXFe1uQiA0gKHuuxKbQEVpRau959GW857kkzJA2rkk0gxwG7I+JI?=
 =?us-ascii?Q?9WrPJobRwO1qh888/FkucQ6wP6/TgIqy08wOXMFdonng/pC2kjEe+0STYdm0?=
 =?us-ascii?Q?WF+VVY74gGEEOdXEqzZzzE4boT3E+3OtUlLKup2rVp3hIKS9MbR9gqHGdR4V?=
 =?us-ascii?Q?u1UVIjTrPgnpZnSvEyrumJso60f6T1xA0AR+TwA8BnZjlnFL6RAl+ravmnNL?=
 =?us-ascii?Q?qydSdVJrjAyeOPAHaQyDX25iaYdVllzNVZWAFVdZg12ynZq67g0zfN7EPB+m?=
 =?us-ascii?Q?tKaaDHnOnjOQlcrezOqnBVafYYbQZU7SpQuctJUTYQf2oSYQAODSKOJpRMUm?=
 =?us-ascii?Q?p9buwAxEXzZCtZBqdfp5ubqB5KvSlyrq/AdKSrtc6JUdepFPsA9HhUeQFOek?=
 =?us-ascii?Q?dgjSPKJ5RbexkzUZSSI1J/Z+4i4FUZI/zcS1+aDiSOAx2Y13JXdUz2twiv8H?=
 =?us-ascii?Q?HQj72Y/IvnsWK1PVCi4ugk7EJySOcfJgPihW+9ToW/A3OfLLxES4nvvvMRC5?=
 =?us-ascii?Q?d/tOubXI336IrR9A1aSWKeZSVvR+UlnmvPBYoib5Rdk9eJ9sJvMlKXDhI+ax?=
 =?us-ascii?Q?QfQlBDkdJha4o7HWfA6pgFacEKwLS8dH70E3f60/m4i0IEA3m5zGRwG8hSaK?=
 =?us-ascii?Q?vW9kkbqxBAak66XZdNtqo8jRl8pnsyuP1f+oOWbOz66keFXIFhEa6NV7WTw1?=
 =?us-ascii?Q?wWk2HGfSsbRz/AkwEwik9eb6bSZDj3bTx9NM153ftny1PrX54MQmdqRmDDFt?=
 =?us-ascii?Q?Lkf+4h0ek+fu5t73ydUW1JW1lp5QSG2EpQ2H/lYOReGJMbqPthRRmwBvuTXU?=
 =?us-ascii?Q?IC6pQaKegiFut0E/9tQIFcpF?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 75f2b4ba-4282-4b46-affb-08d979dff1f7
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2021 13:34:59.5534
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: UFjbW5pHkuCy3JDUexrgGNAM+2MdpxAUHfctZfmWQn9O+pk4RLa913gny36ozu/rG9+GV0GPPylSM3GZcY1wnA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7341
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <LinoSanfilippo@gmx.de>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 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.25.1