[3.19.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue

[3.19.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    stmmac: fix check for phydev being open

to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue

This patch is scheduled to be released in version 3.19.8-ckt8.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From ba01d7935fb4710b33ccc217b8e9a9cce88e1d75 Mon Sep 17 00:00:00 2001
From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Date: Wed, 9 Sep 2015 18:01:08 +0300
Subject: stmmac: fix check for phydev being open

commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream.

Current check of phydev with IS_ERR(phydev) may make not much sense
because of_phy_connect() returns NULL on failure instead of error value.

Still for checking result of phy_connect() IS_ERR() makes perfect sense.

So let's use combined check IS_ERR_OR_NULL() that covers both cases.

Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: linux-kernel@vger.kernel.org
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8834b82..5b9d3f7 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -829,8 +829,11 @@ static int stmmac_init_phy(struct net_device *dev)

 	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);

-	if (IS_ERR(phydev)) {
+	if (IS_ERR_OR_NULL(phydev)) {
 		pr_err("%s: Could not attach to PHY\n", dev->name);
+		if (!phydev)
+			return -ENODEV;
+
 		return PTR_ERR(phydev);
 	}

--
1.9.1

Re: [3.19.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue

[Sergei Shtylyov]

Hello.

On 10/20/2015 01:40 AM, Kamal Mostafa wrote:

> This is a note to let you know that I have just added a patch titled
>
>      stmmac: fix check for phydev being open
>
> to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree
> which can be found at:
>
>      http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
>
> This patch is scheduled to be released in version 3.19.8-ckt8.
>
> If you, or anyone else, feels it should not be added to this tree, please
> reply to this email.
>
> For more information about the 3.19.y-ckt tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

    Uh oh, it happened again... :-(
    NAK.

> Thanks.
> -Kamal
>
> ------
>
>  From ba01d7935fb4710b33ccc217b8e9a9cce88e1d75 Mon Sep 17 00:00:00 2001
> From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Date: Wed, 9 Sep 2015 18:01:08 +0300
> Subject: stmmac: fix check for phydev being open
>
> commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream.
>
> Current check of phydev with IS_ERR(phydev) may make not much sense
> because of_phy_connect() returns NULL on failure instead of error value.

    of_phy_connect() insn't called yet in 3.19 as should be obvious from the 
patch context.

> Still for checking result of phy_connect() IS_ERR() makes perfect sense.
>
> So let's use combined check IS_ERR_OR_NULL() that covers both cases.
>
> Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: David Miller <davem@davemloft.net>
> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> ---
>   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8834b82..5b9d3f7 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -829,8 +829,11 @@ static int stmmac_init_phy(struct net_device *dev)
>
>   	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);
>
> -	if (IS_ERR(phydev)) {
> +	if (IS_ERR_OR_NULL(phydev)) {
>   		pr_err("%s: Could not attach to PHY\n", dev->name);
> +		if (!phydev)
> +			return -ENODEV;
> +
>   		return PTR_ERR(phydev);
>   	}
>
> --
> 1.9.1

MBR, Sergei

Re: [3.19.y-ckt stable] Patch "stmmac: fix check for phydev being open" has been added to staging queue

[Kamal Mostafa]

On Tue, 2015-10-20 at 01:57 +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 10/20/2015 01:40 AM, Kamal Mostafa wrote:
> 
> > This is a note to let you know that I have just added a patch titled
> >
> >      stmmac: fix check for phydev being open
> >
> > to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree
> > which can be found at:
> >
> >      http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
> >
> > This patch is scheduled to be released in version 3.19.8-ckt8.
> >
> > If you, or anyone else, feels it should not be added to this tree, please
> > reply to this email.
> >
> > For more information about the 3.19.y-ckt tree, see
> > https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
> 
>     Uh oh, it happened again... :-(
>     NAK.


Thanks Sergei.  Dropped this patch from 3.19-stable.

 -Kamal


> > Thanks.
> > -Kamal
> >
> > ------
> >
> >  From ba01d7935fb4710b33ccc217b8e9a9cce88e1d75 Mon Sep 17 00:00:00 2001
> > From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> > Date: Wed, 9 Sep 2015 18:01:08 +0300
> > Subject: stmmac: fix check for phydev being open
> >
> > commit dfc50fcaad574e5c8c85cbc83eca1426b2413fa4 upstream.
> >
> > Current check of phydev with IS_ERR(phydev) may make not much sense
> > because of_phy_connect() returns NULL on failure instead of error value.
> 
>     of_phy_connect() insn't called yet in 3.19 as should be obvious from the 
> patch context.
> 
> > Still for checking result of phy_connect() IS_ERR() makes perfect sense.
> >
> > So let's use combined check IS_ERR_OR_NULL() that covers both cases.
> >
> > Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> > Cc: linux-kernel@vger.kernel.org
> > Cc: David Miller <davem@davemloft.net>
> > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> > Signed-off-by: Kamal Mostafa <kamal@canonical.com>
> > ---
> >   drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 ++++-
> >   1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > index 8834b82..5b9d3f7 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> > @@ -829,8 +829,11 @@ static int stmmac_init_phy(struct net_device *dev)
> >
> >   	phydev = phy_connect(dev, phy_id_fmt, &stmmac_adjust_link, interface);
> >
> > -	if (IS_ERR(phydev)) {
> > +	if (IS_ERR_OR_NULL(phydev)) {
> >   		pr_err("%s: Could not attach to PHY\n", dev->name);
> > +		if (!phydev)
> > +			return -ENODEV;
> > +
> >   		return PTR_ERR(phydev);
> >   	}
> >
> > --
> > 1.9.1
> 
> MBR, Sergei
>