From:   Meng Li <Meng.Li@windriver.com>
To:     stable@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
        mcoquelin.stm32@gmail.com, linux@armlinux.org.uk, andrew@lunn.ch,
        qiangqing.zhang@nxp.com
Cc:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        meng.li@windriver.com
Subject: [PATCH 4/6] net: stmmac: fix system hang if change mac address after interface ifdown
Date:   Fri, 19 Nov 2021 10:53:57 +0800
Message-Id: <20211119025359.30815-5-Meng.Li@windriver.com>
In-Reply-To: <20211119025359.30815-1-Meng.Li@windriver.com>
References: <20211119025359.30815-1-Meng.Li@windriver.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lGEfT4+AHl9awIZh2oi5Ql09lY/8Qg4kRPuzMmdXvX3WTSWglQFtK8uSrZ+u?=
 =?us-ascii?Q?nlMdICqiaTeriEJtReN7gqSG3NHvBC33zvoh5WRBhnSY8N0tqSiJLHAb6QoL?=
 =?us-ascii?Q?Nz+k/RfOGLJAanYVcuPkjBWySYt42Hxvqt/Tbt70lpLFjuw3QznbJBuK8C+y?=
 =?us-ascii?Q?aNKjr+c++QeAXrSAsv3AnOT9pxaDE/C1Qi6rn6SE/anNSYe0tr6DtQ8HYYle?=
 =?us-ascii?Q?4OW+kJZB9ZnbUGpc2cJ2g+fFeyqpKlEWa+e+MXJTTSliue8NjRImwf/yOMcO?=
 =?us-ascii?Q?YGhAG2QsI3Sb1HX83OEiiDlVH1LwNUm15oQxA4dTaA9fvLewtDAdi86rRnSZ?=
 =?us-ascii?Q?4mhKnMAEliumPi+bvgcKp2pZ/MIXsdpjKADKN2jGYq6335TUUnpjit0iZHZM?=
 =?us-ascii?Q?A69wocwzp/qjAuqYXpFG9x/xzv1qQa0lf5cijZZpdV70P6Xtw+WgX8NhCdNX?=
 =?us-ascii?Q?xlXQB4Iqcdwg5eHhDQhoGn4sja7z2Pco8x0epo3LJziDd5I3KRKWHZgGgXBM?=
 =?us-ascii?Q?aUTtCx7NjwxeCHc26u8yV1PbqPt6LZhCSL+7lDX/VTBKrtd7L4wfjuk0ysk/?=
 =?us-ascii?Q?4eQMjO9BBFkirnznMfuNYj3blmG6pmyLXawQmbsQ2uBTEnV38bE64iu6ELQ/?=
 =?us-ascii?Q?lT26RNI4VSgqCZIAx81dm5JmeXP7nLeTCxA7wlluOkC/DpH91xjNpZ/WBIJa?=
 =?us-ascii?Q?kco4iO6eCUHwRPCAMmrVg9bhgT8nGS7ZIjNbujXwInWo0ZFDlowb51B7nLOi?=
 =?us-ascii?Q?Jxdb+4/Te297CFRho68Omrmn+NwFZwlBKOvkIB/O6r+pdIo/pPffFiDyqZT4?=
 =?us-ascii?Q?9wNNUvsn1FNk568NdHP3kDLHx8E8WED4OYpeoGb0lRJ5att0O8GS1uSY+Ba1?=
 =?us-ascii?Q?GmYQqb03mffvlrfT+S+ZmDSv9xldZB2wJM6wKd2vzlVgWEIRj9QqGpJe+Iiz?=
 =?us-ascii?Q?ecgNJnSS90GBl7Mw0ucOxMWe53Ok0HbEiuTKJLdetKDKS3gzWSsYlJo20XiE?=
 =?us-ascii?Q?Gdymqxy0r42RPanC9b7f7IU6mrPxDPNZT/sGpB/EsvevkLkktIsEdQn7J+tP?=
 =?us-ascii?Q?I8VQy0O8T4LxRaI/JGbevTKAWZF7Oq875V0W+TBJgBDHNuL14g6m0gsSjtm+?=
 =?us-ascii?Q?NYxV3zdiYXEN3/wOtmx4RB58CUro8nUZIHQFjgNWWIwi9JHFwD6j7IcVpN/V?=
 =?us-ascii?Q?EgMgcVqTeC6Lytv9waK9WYNgpPXKCJ6qiNysx6BnhXY/WDqlybbXXxBA6fSa?=
 =?us-ascii?Q?X29ALUn1O4q/Bh5pQdbyczlMPh3hZRdGj7pnA4t6aH9gjrrLbxsavxmMf+Cm?=
 =?us-ascii?Q?TPP+9wdRR2P+4bnmMVbv7bR0BV5/5Yy7V0z6Ji5we4ovIVvwIXgTC5I3tmVn?=
 =?us-ascii?Q?u3AduyZ5KqZMI2VTjR4BBd+HOzJfW1T35dJFZf+yQSMYZwk9wwBIhpW7KCL6?=
 =?us-ascii?Q?hrubEqJivjH8bAxC1XeEw9sGPaYXzb/1tRVCf4RHbgp7dalAMFTXUND1Reeg?=
 =?us-ascii?Q?hFKjc7f3lxfN/eA0DHNqCVGnBqgrMwFtKCiXOcjVstXr9q+5tX04ec8Oevbx?=
 =?us-ascii?Q?I6cmXJZ/LWMIVqQu9XmFwz+/d4KO5BXM0saw3izN5haOuItBaCz4XJ2dTtBj?=
 =?us-ascii?Q?QYPusOGMVEvxtX/iLOExOms=3D?=
X-OriginatorOrg: windriver.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cccf9d27-450b-4862-7ecb-08d9ab07e9e2
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5191.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Nov 2021 02:54:32.8085
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qG139Tp22FZu4cfCXDmKxdhawdRjFq+7BqXZAE6PP4vQaHSP3DOwVqjk0kxRpxmilJsHE+H0MVMMpqXQfvSRfg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4951
X-Proofpoint-GUID: A5ohj3qpsnnwWgpyYC-mt3LYXTejlJi7
X-Proofpoint-ORIG-GUID: A5ohj3qpsnnwWgpyYC-mt3LYXTejlJi7
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475
 definitions=2021-11-19_02,2021-11-17_01,2020-04-07_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 spamscore=0
 impostorscore=0 lowpriorityscore=0 suspectscore=0 bulkscore=0
 malwarescore=0 mlxscore=0 phishscore=0 priorityscore=1501 clxscore=1015
 mlxlogscore=832 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2110150000 definitions=main-2111190012
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Joakim Zhang <qiangqing.zhang@nxp.com>

commit 4691ffb18ac908609aab07d13af7995b6b89d33c upstream.

Fix system hang with below sequences:
~# ifconfig ethx down
~# ifconfig ethx hw ether xx:xx:xx:xx:xx:xx

After ethx down, stmmac all clocks gated off and then register access causes
system hang.

Fixes: 5ec55823438e ("net: stmmac: add clocks management for gmac driver")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Meng Li <Meng.Li@windriver.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 51626edc6a4c..cccf98f66ff4 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4324,12 +4324,21 @@ static int stmmac_set_mac_address(struct net_device *ndev, void *addr)
 	struct stmmac_priv *priv = netdev_priv(ndev);
 	int ret = 0;
 
+	ret = pm_runtime_get_sync(priv->device);
+	if (ret < 0) {
+		pm_runtime_put_noidle(priv->device);
+		return ret;
+	}
+
 	ret = eth_mac_addr(ndev, addr);
 	if (ret)
-		return ret;
+		goto set_mac_error;
 
 	stmmac_set_umac_addr(priv, priv->hw, ndev->dev_addr, 0);
 
+set_mac_error:
+	pm_runtime_put(priv->device);
+
 	return ret;
 }
 
-- 
2.17.1