From: Kevin Groeneveld <kgroeneveld@gmail.com>
To: Dejin Zheng <zhengdejin5@gmail.com>
Cc: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com,
linux@armlinux.org.uk, David Miller <davem@davemloft.net>,
corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org,
allison@lohutok.net, mchehab+samsung@kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next v7 09/10] net: phy: smsc: use phy_read_poll_timeout() to simplify the code
Date: Mon, 1 Jun 2020 15:05:27 -0400 [thread overview]
Message-ID: <CABF+-6UhnXVzJEnm-4K0hMd=Y53CDK=y2GfNuPVFzAN6w7HCYA@mail.gmail.com> (raw)
In-Reply-To: <20200323150600.21382-10-zhengdejin5@gmail.com>
Resent as plain text this time. Sorry to those that got this twice.
On Mon, Mar 23, 2020 at 11:10 AM Dejin Zheng <zhengdejin5@gmail.com> wrote:
>
> use phy_read_poll_timeout() to replace the poll codes for
> simplify lan87xx_read_status() function.
>
> Suggested-by: Andrew Lunn <andrew@lunn.ch>
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Dejin Zheng <zhengdejin5@gmail.com>
> ---
> v6 -> v7:
> - adapt to a newly added parameter sleep_before_read.
> v5 -> v6:
> - no changed.
> v4 -> v5:
> - add msleep before phy_read_poll_timeout() to keep the
> code more similar
> v3 -> v4:
> - add this patch by Andrew's suggestion. Thanks Andrew!
>
> drivers/net/phy/smsc.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
> index b73298250793..93da7d3d0954 100644
> --- a/drivers/net/phy/smsc.c
> +++ b/drivers/net/phy/smsc.c
> @@ -112,8 +112,6 @@ static int lan87xx_read_status(struct phy_device *phydev)
> int err = genphy_read_status(phydev);
>
> if (!phydev->link && priv->energy_enable) {
> - int i;
> -
> /* Disable EDPD to wake up PHY */
> int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
> if (rc < 0)
> @@ -125,15 +123,11 @@ static int lan87xx_read_status(struct phy_device *phydev)
> return rc;
>
> /* Wait max 640 ms to detect energy */
> - for (i = 0; i < 64; i++) {
> - /* Sleep to allow link test pulses to be sent */
> - msleep(10);
> - rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
> - if (rc < 0)
> - return rc;
> - if (rc & MII_LAN83C185_ENERGYON)
> - break;
> - }
> + phy_read_poll_timeout(phydev, MII_LAN83C185_CTRL_STATUS, rc,
> + rc & MII_LAN83C185_ENERGYON, 10000,
> + 640000, true);
> + if (rc < 0)
> + return rc;
>
> /* Re-enable EDPD */
> rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
> --
> 2.25.0
This patch causes the kernel log to be spammed with the following when
Ethernet cable is not connected:
SMSC LAN8710/LAN8720 2188000.ethernet-1:00: lan87xx_read_status failed: -110
It still seems to work but I think that is only a fluke.
The "if (rc < 0)" is not actually checking the return value of
phy_read_poll_timeout but is looking at the value of the register
read. I don't think rc will ever be negative in this case. If you
change the code to "rc = phy_read_poll_timeout(...)" so that it
actually checks the error then the function will behave differently
than before. The original code would only return an error if phy_read
returned an error. On a timeout it just continued. So the "if" could
be changed to "if (rc < 0 && rc != -ETIMEDOUT)". But you will still
get the extra messages in the log that were not there before.
Kevin
next prev parent reply other threads:[~2020-06-01 19:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 15:05 [PATCH net-next v7 00/10] introduce read_poll_timeout Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 01/10] iopoll: introduce read_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 02/10] iopoll: redefined readx_poll_timeout macro to simplify the code Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 03/10] net: phy: introduce phy_read_mmd_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 04/10] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 05/10] net: phy: aquantia: " Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 06/10] net: phy: marvell10g: " Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 07/10] net: phy: introduce phy_read_poll_timeout macro Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 08/10] net: phy: use phy_read_poll_timeout() to simplify the code Dejin Zheng
2020-03-23 15:05 ` [PATCH net-next v7 09/10] net: phy: smsc: " Dejin Zheng
2020-06-01 19:05 ` Kevin Groeneveld [this message]
[not found] ` <CABF+-6W-yo=CzaMaASdRGm5TS-JCnC5kGwPZHMce9OLPDCUw-g@mail.gmail.com>
2020-06-02 16:30 ` Dejin Zheng
2020-03-23 15:06 ` [PATCH net-next v7 10/10] net: phy: tja11xx: " Dejin Zheng
2020-03-24 5:00 ` [PATCH net-next v7 00/10] introduce read_poll_timeout David Miller
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='CABF+-6UhnXVzJEnm-4K0hMd=Y53CDK=y2GfNuPVFzAN6w7HCYA@mail.gmail.com' \
--to=kgroeneveld@gmail.com \
--cc=allison@lohutok.net \
--cc=andrew@lunn.ch \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mchehab+samsung@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=zhengdejin5@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).