From: "Russell King (Oracle)" <rmk+kernel@armlinux•org.uk>
To: Andrew Lunn <andrew@lunn•ch>, Heiner Kallweit <hkallweit1@gmail•com>
Cc: Jijie Shao <shaojijie@huawei•com>,
shaojijie@huawei•com, shenjian15@huawei•com,
liuyonglong@huawei•com, wangjie125@huawei•com,
chenhao418@huawei•com, lanhao@huawei•com,
wangpeiyang1@huawei•com, "David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
netdev@vger•kernel.org
Subject: [PATCH RFC net-next 4/7] net: phy: move phy_suspend() to end of phy_state_machine()
Date: Fri, 08 Sep 2023 12:21:00 +0100 [thread overview]
Message-ID: <E1qeZXo-007G4V-LF@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <ZPsDdqt1RrXB+aTO@shell.armlinux.org.uk>
Move the call to phy_suspend() to the end of phy_state_machine() after
we release the lock so that we can combine the locked areas.
phy_suspend() can not be called while holding phydev->lock as it has
caused deadlocks in the past.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux•org.uk>
---
drivers/net/phy/phy.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 5bb33af2a4cb..756326f38b14 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1494,15 +1494,11 @@ void phy_state_machine(struct work_struct *work)
func = &_phy_start_aneg;
}
- mutex_unlock(&phydev->lock);
-
- if (do_suspend)
- phy_suspend(phydev);
-
- if (err == -ENODEV)
+ if (err == -ENODEV) {
+ mutex_unlock(&phydev->lock);
return;
+ }
- mutex_lock(&phydev->lock);
if (err < 0)
phy_error_precise(phydev, func, err);
@@ -1519,6 +1515,9 @@ void phy_state_machine(struct work_struct *work)
if (phy_polling_mode(phydev) && phy_is_started(phydev))
phy_queue_state_machine(phydev, PHY_STATE_TIME);
mutex_unlock(&phydev->lock);
+
+ if (do_suspend)
+ phy_suspend(phydev);
}
/**
--
2.30.2
next prev parent reply other threads:[~2023-09-08 11:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 11:20 [PATCH RFC net-next 0/7] net: phy: avoid race when erroring stopping PHY Russell King (Oracle)
2023-09-08 11:20 ` [PATCH RFC net-next 1/7] net: phy: always call phy_process_state_change() under lock Russell King (Oracle)
2023-09-08 11:20 ` [PATCH RFC net-next 2/7] net: phy: call phy_error_precise() while holding the lock Russell King (Oracle)
2023-09-08 11:20 ` [PATCH RFC net-next 3/7] net: phy: move call to start aneg Russell King (Oracle)
2023-09-08 11:21 ` Russell King (Oracle) [this message]
2023-09-08 11:21 ` [PATCH RFC net-next 5/7] net: phy: move phy_state_machine() Russell King (Oracle)
2023-09-08 11:21 ` [PATCH RFC net-next 6/7] net: phy: split locked and unlocked section of phy_state_machine() Russell King (Oracle)
2023-09-08 11:21 ` [PATCH RFC net-next 7/7] net: phy: convert phy_stop() to use split state machine Russell King (Oracle)
2023-09-11 8:54 ` [PATCH RFC net-next 0/7] net: phy: avoid race when erroring stopping PHY Russell King (Oracle)
2023-09-12 6:35 ` Jijie Shao
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=E1qeZXo-007G4V-LF@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux$(echo .)org.uk \
--cc=andrew@lunn$(echo .)ch \
--cc=chenhao418@huawei$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=hkallweit1@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=lanhao@huawei$(echo .)com \
--cc=liuyonglong@huawei$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=shaojijie@huawei$(echo .)com \
--cc=shenjian15@huawei$(echo .)com \
--cc=wangjie125@huawei$(echo .)com \
--cc=wangpeiyang1@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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