From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84BD2C433FE for ; Sun, 24 Oct 2021 17:50:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6350060F57 for ; Sun, 24 Oct 2021 17:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231700AbhJXRwd (ORCPT ); Sun, 24 Oct 2021 13:52:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229886AbhJXRwc (ORCPT ); Sun, 24 Oct 2021 13:52:32 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73A14C061745; Sun, 24 Oct 2021 10:50:11 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id c28so8290736qtv.11; Sun, 24 Oct 2021 10:50:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jl13HdyL7EYvNKB/qp3Rbfr+ATdErdZL265BgLiXYwE=; b=Ip5yqZJ4Y24kUoTO74/nN6kuoFiidtJzEfjORZYPxZ40jxmUd7wzQNY81JeJdwUbxD tH+4pX73zKP9H9ft/dc/rstETsHkzaA56pKvqQBNrgfY8u2Xcv8FAnoIiEl6jokoAh6v H7x9wqDNYPe2Ofd+pTzvGeKNgbTFa0/YPppni+AaLZ0NVoa3opBzIlNgduKEvWUTPQIj DJeil5TfisJ/YjWohROiQYdowTOdyWWBdaYXjQoq/N/FEuln7jbkHADYtiUIHgi3r8Ob Yq0DKJIw4l5gqF8JjI3BIKXmlwwARO6fCmFOPoJWIQa+nGuGqOTwUvoDREqgF6jw11C6 b5yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jl13HdyL7EYvNKB/qp3Rbfr+ATdErdZL265BgLiXYwE=; b=mhKa/Y/NLDvBeDI4AEx3xhxEHEEFtCR1AiZxXBYpc0vC1eFFUdYwC4XJntblBk3XiE cPG0sdJtz0eZxX2O44XY/gTeBQ/KQGx8pdGOAumzUa28YJuIrG1pXeo5XRA4jShuvfe3 4v9MPi7t/DR0r+uBxwoAT3h2sTzNJRUhM3qMV65wMuEKYuuwDhMjm77yV3igRnJf95md aoTvmCzxWxAsJT0gZiDh2BS6op90Ku4CmX3ua/dXSC6Mpkf3OUdkhqBDgSZRsro/C59T j9P6VHtxXBhgJFZ95ZGWWWpunour8c/8G0Qi1mh31/2Kt38//KwSkmGtUpkqoysukSUm 0Shw== X-Gm-Message-State: AOAM530FAkW/9cL6xkXiLkbnSpYk1++aNV606d/DchhjcxnVKNHWaEqr BLWyMECHgpAyKKP55CBDvTiij4xHgQI= X-Google-Smtp-Source: ABdhPJyTHlgcHa+z6WWlTNRFVRHcREu5A8m9m6+OJFNVkh0Hwqduk/5TXL4uIeUIeQnXek/ymbzZmQ== X-Received: by 2002:ac8:58cf:: with SMTP id u15mr13034190qta.334.1635097809891; Sun, 24 Oct 2021 10:50:09 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id e13sm7327335qka.117.2021.10.24.10.50.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 10:50:08 -0700 (PDT) From: Trevor Woerner To: linux-kernel@vger.kernel.org Cc: Vladimir Zapolskiy , "David S. Miller" , Jakub Kicinski , linux-arm-kernel@lists.infradead.org (moderated list:ARM/LPC32XX SOC SUPPORT), netdev@vger.kernel.org (open list:NETWORKING DRIVERS) Subject: [PATCH] net: nxp: lpc_eth.c: avoid hang when bringing interface down Date: Sun, 24 Oct 2021 13:50:02 -0400 Message-Id: <20211024175003.7879-1-twoerner@gmail.com> X-Mailer: git-send-email 2.30.0.rc0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A hard hang is observed whenever the ethernet interface is brought down. If the PHY is stopped before the LPC core block is reset, the SoC will hang. Comparing lpc_eth_close() and lpc_eth_open() I re-arranged the ordering of the functions calls in lpc_eth_close() to reset the hardware before stopping the PHY. Signed-off-by: Trevor Woerner --- drivers/net/ethernet/nxp/lpc_eth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index d29fe562b3de..c910fa2f40a4 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c @@ -1015,9 +1015,6 @@ static int lpc_eth_close(struct net_device *ndev) napi_disable(&pldat->napi); netif_stop_queue(ndev); - if (ndev->phydev) - phy_stop(ndev->phydev); - spin_lock_irqsave(&pldat->lock, flags); __lpc_eth_reset(pldat); netif_carrier_off(ndev); @@ -1025,6 +1022,8 @@ static int lpc_eth_close(struct net_device *ndev) writel(0, LPC_ENET_MAC2(pldat->net_base)); spin_unlock_irqrestore(&pldat->lock, flags); + if (ndev->phydev) + phy_stop(ndev->phydev); clk_disable_unprepare(pldat->clk); return 0; -- 2.30.0.rc0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A597C433EF for ; Sun, 24 Oct 2021 17:51:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 541E260FE7 for ; Sun, 24 Oct 2021 17:51:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 541E260FE7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=gG1CzUekXwjmlEWEAsF5UoYYnkhbjqSD27SkhdGCT5M=; b=NLqddyftRxBCUd IEBmpUNG4xMHmvq/Q3nC9GEPFs63qqaewSk5TYHra4XK+3jDha0P5GsIBYZ10fLtNhE5uuM15kcpL 60P5fSGrqsseX2L3DsjRkWHnonEwablLAvUXfmoxdJOKXzU84X8PtWjMSohDnqVWBnGxxXgooeCDo n/ZVwRDSnb5DPnFiKLKC4ucJtJnbSxJj+AEZAlpnflTOKO8wj//cSjMTn778IsKPFmiH8cnz6+H34 RmC+vyThe4JkiF8Lzaia8UVOVXHEtw+Z1SjM8jOL5XXJGf41PBs90cd0jCrGrogPSFSJNKbpvDBXd UqUODqudjVyJnmpK4u+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mehdQ-00EQ74-HY; Sun, 24 Oct 2021 17:50:16 +0000 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mehdM-00EQ66-ON for linux-arm-kernel@lists.infradead.org; Sun, 24 Oct 2021 17:50:14 +0000 Received: by mail-qt1-x82a.google.com with SMTP id z24so8315255qtv.9 for ; Sun, 24 Oct 2021 10:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jl13HdyL7EYvNKB/qp3Rbfr+ATdErdZL265BgLiXYwE=; b=Ip5yqZJ4Y24kUoTO74/nN6kuoFiidtJzEfjORZYPxZ40jxmUd7wzQNY81JeJdwUbxD tH+4pX73zKP9H9ft/dc/rstETsHkzaA56pKvqQBNrgfY8u2Xcv8FAnoIiEl6jokoAh6v H7x9wqDNYPe2Ofd+pTzvGeKNgbTFa0/YPppni+AaLZ0NVoa3opBzIlNgduKEvWUTPQIj DJeil5TfisJ/YjWohROiQYdowTOdyWWBdaYXjQoq/N/FEuln7jbkHADYtiUIHgi3r8Ob Yq0DKJIw4l5gqF8JjI3BIKXmlwwARO6fCmFOPoJWIQa+nGuGqOTwUvoDREqgF6jw11C6 b5yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jl13HdyL7EYvNKB/qp3Rbfr+ATdErdZL265BgLiXYwE=; b=u8sIVxQFxwVYAlzJFV7c5EepnQB5DtkLuXNBCoZBbQ3Y6prj3jGy0sDlSG3yH/wph6 wvaChYYbTpz+ehm+IJuZukCbuOeKhc/M5DcWnFgBhNvZPnosy5LXlty79/TtmV+KwJvj aQZSA1O9AryxsI2MhawaFC9fbusUaMks7GoiqvoeoyqoiT02LAp/nilQOsAfWbdXbrQD x07f7g9IuRhDHU9zUbTYhdffUCHOkHw1ZF5NVSjGOJjHDHhTyeIkuR+v211/ElHjpncd TDcfdgBfI7xkIMCWj+ynKdYxhl6bTSkdgCSdeYR5lId2Gj6YOOIZvYksdiQQjlpB0cNO aVew== X-Gm-Message-State: AOAM531tGKut4xTBcAjQwO9Pjh+PRBH1gy28NYUAvKfOaUIq3FFiKSKJ Y30gsw6Bm1SFlQScKvhi1gw= X-Google-Smtp-Source: ABdhPJyTHlgcHa+z6WWlTNRFVRHcREu5A8m9m6+OJFNVkh0Hwqduk/5TXL4uIeUIeQnXek/ymbzZmQ== X-Received: by 2002:ac8:58cf:: with SMTP id u15mr13034190qta.334.1635097809891; Sun, 24 Oct 2021 10:50:09 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id e13sm7327335qka.117.2021.10.24.10.50.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 10:50:08 -0700 (PDT) From: Trevor Woerner To: linux-kernel@vger.kernel.org Cc: Vladimir Zapolskiy , "David S. Miller" , Jakub Kicinski , linux-arm-kernel@lists.infradead.org (moderated list:ARM/LPC32XX SOC SUPPORT), netdev@vger.kernel.org (open list:NETWORKING DRIVERS) Subject: [PATCH] net: nxp: lpc_eth.c: avoid hang when bringing interface down Date: Sun, 24 Oct 2021 13:50:02 -0400 Message-Id: <20211024175003.7879-1-twoerner@gmail.com> X-Mailer: git-send-email 2.30.0.rc0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211024_105012_835078_B78C9BE3 X-CRM114-Status: GOOD ( 11.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A hard hang is observed whenever the ethernet interface is brought down. If the PHY is stopped before the LPC core block is reset, the SoC will hang. Comparing lpc_eth_close() and lpc_eth_open() I re-arranged the ordering of the functions calls in lpc_eth_close() to reset the hardware before stopping the PHY. Signed-off-by: Trevor Woerner --- drivers/net/ethernet/nxp/lpc_eth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index d29fe562b3de..c910fa2f40a4 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c @@ -1015,9 +1015,6 @@ static int lpc_eth_close(struct net_device *ndev) napi_disable(&pldat->napi); netif_stop_queue(ndev); - if (ndev->phydev) - phy_stop(ndev->phydev); - spin_lock_irqsave(&pldat->lock, flags); __lpc_eth_reset(pldat); netif_carrier_off(ndev); @@ -1025,6 +1022,8 @@ static int lpc_eth_close(struct net_device *ndev) writel(0, LPC_ENET_MAC2(pldat->net_base)); spin_unlock_irqrestore(&pldat->lock, flags); + if (ndev->phydev) + phy_stop(ndev->phydev); clk_disable_unprepare(pldat->clk); return 0; -- 2.30.0.rc0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel