From: Florian Fainelli <florian.fainelli@broadcom.com>
To: netdev@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com,
Florian Fainelli <florian.fainelli@broadcom.com>,
Doug Berger <opendmb@gmail.com>,
Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
Stanislav Fomichev <sdf@fomichev.me>,
Antoine Tenart <atenart@kernel.org>,
Kuniyuki Iwashima <kuniyu@google.com>,
Yajun Deng <yajun.deng@linux.dev>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net-next 2/2] net: bcmgenet: Support calling set_pauseparam from panic context
Date: Mon, 3 Nov 2025 11:46:31 -0800 [thread overview]
Message-ID: <20251103194631.3393020-3-florian.fainelli@broadcom.com> (raw)
In-Reply-To: <20251103194631.3393020-1-florian.fainelli@broadcom.com>
Avoid making sleeping calls that would not be able to complete the MMIO
writes ignoring pause frame reception and generation at the Ethernet MAC
controller level.
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/net/ethernet/broadcom/genet/bcmmii.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
index 38f854b94a79..de7156b5ecf7 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
@@ -75,7 +75,8 @@ static void bcmgenet_mac_config(struct net_device *dev)
reg |= RGMII_LINK;
bcmgenet_ext_writel(priv, reg, EXT_RGMII_OOB_CTRL);
- spin_lock_bh(&priv->reg_lock);
+ if (!panic_in_progress())
+ spin_lock_bh(&priv->reg_lock);
reg = bcmgenet_umac_readl(priv, UMAC_CMD);
reg &= ~((CMD_SPEED_MASK << CMD_SPEED_SHIFT) |
CMD_HD_EN |
@@ -88,7 +89,8 @@ static void bcmgenet_mac_config(struct net_device *dev)
reg |= CMD_TX_EN | CMD_RX_EN;
}
bcmgenet_umac_writel(priv, reg, UMAC_CMD);
- spin_unlock_bh(&priv->reg_lock);
+ if (!panic_in_progress())
+ spin_unlock_bh(&priv->reg_lock);
active = phy_init_eee(phydev, 0) >= 0;
bcmgenet_eee_enable_set(dev,
@@ -139,7 +141,8 @@ void bcmgenet_phy_pause_set(struct net_device *dev, bool rx, bool tx)
linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->advertising, rx);
linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->advertising,
rx | tx);
- phy_start_aneg(phydev);
+ if (!panic_in_progress())
+ phy_start_aneg(phydev);
mutex_lock(&phydev->lock);
if (phydev->link)
--
2.34.1
next prev parent reply other threads:[~2025-11-03 19:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 19:46 [PATCH net-next 0/2] Allow disabling pause frames on panic Florian Fainelli
2025-11-03 19:46 ` [PATCH net-next 1/2] net: ethernet: Allow disabling pause " Florian Fainelli
2025-11-03 22:08 ` Andrew Lunn
2025-11-03 19:46 ` Florian Fainelli [this message]
2025-11-03 22:19 ` [PATCH net-next 2/2] net: bcmgenet: Support calling set_pauseparam from panic context Andrew Lunn
2025-11-03 23:00 ` Florian Fainelli
2025-11-04 4:14 ` Andrew Lunn
2025-11-03 23:22 ` [PATCH net-next 0/2] Allow disabling pause frames on panic Jakub Kicinski
2025-11-03 23:34 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251103194631.3393020-3-florian.fainelli@broadcom.com \
--to=florian.fainelli@broadcom.com \
--cc=andrew+netdev@lunn.ch \
--cc=atenart@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=kuniyu@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=opendmb@gmail.com \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=yajun.deng@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®