From: Johan Hovold <johan@kernel.org>
To: Niklas Cassel <niklas.cassel@axis.com>
Cc: f.fainelli@gmail.com, festevam@gmail.com, davem@davemloft.net,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
johan@kernel.org, Niklas Cassel <niklass@axis.com>,
stable <stable@vger.kernel.org>
Subject: Re: [PATCH v3] net: phy: micrel: Fix regression in kszphy_probe
Date: Mon, 11 May 2015 15:50:40 +0200 [thread overview]
Message-ID: <20150511135040.GD24504@localhost> (raw)
In-Reply-To: <1431351015-21956-1-git-send-email-niklass@axis.com>
On Mon, May 11, 2015 at 03:30:15PM +0200, Niklas Cassel wrote:
> Don't do clock-mode-select if clk == NULL,
> since when building without CONFIG_HAVE_CLK,
> clk_get returns NULL and clk_get_rate returns 0.
>
> Doing clock-mode-select in this cause causes kszphy_probe to
> return -EINVAL and thus prevents the device from being probed.
>
> The original code (before regression) would return 0
> when building without CONFIG_HAVE_CLK.
>
> Cc: stable <stable@vger.kernel.org> # 3.19+
> Fixes: 63f44b2bfccd ("net: phy: micrel: add generic clock-mode-select
> support")
You're blaming the wrong commit here -- the regression was introduced by
1fadee0c3645 ("net/phy: micrel: Add clock support for KSZ8021/KSZ8031")
and then the commit you mention made even more devices fail without
CONFIG_HAVE_CLK.
Thought I mentioned this commit explicitly in my last mail but see now
that I only wrote that the offending commit went into 3.18 (i.e. not
3.19).
> Signed-off-by: Niklas Cassel <niklass@axis.com>
> ---
> drivers/net/phy/micrel.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 1190fd8..f6a34e3 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -548,7 +548,11 @@ static int kszphy_probe(struct phy_device *phydev)
> }
>
> clk = devm_clk_get(&phydev->dev, "rmii-ref");
> - if (!IS_ERR(clk)) {
> + /* Don't check rate if clk == NULL, since when CONFIG_HAVE_CLK is not
> + * set, clk_get returns NULL and clk_get_rate returns 0. Doing so
> + * would return -EINVAL and prevent the device from being probed.
> + */
Why not simply
/* NOTE: clk may be NULL if building without CONFIG_HAVE_CLK */
> + if (!IS_ERR_OR_NULL(clk)) {
> unsigned long rate = clk_get_rate(clk);
> bool rmii_ref_clk_sel_25_mhz;
Johan
prev parent reply other threads:[~2015-05-11 13:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 13:30 [PATCH v3] net: phy: micrel: Fix regression in kszphy_probe Niklas Cassel
2015-05-11 13:50 ` Johan Hovold [this message]
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=20150511135040.GD24504@localhost \
--to=johan@kernel.org \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=festevam@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=niklas.cassel@axis.com \
--cc=niklass@axis.com \
--cc=stable@vger.kernel.org \
/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).