netdev - Re: [PATCH] net: macb: fix phy interrupt parsing

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <c133034e-c696-f3a3-fd02-1dbf2a9552b5@microchip.com>
Date:   Thu, 27 Apr 2017 11:36:44 +0200
From:   Nicolas Ferre <nicolas.ferre@...rochip.com>
To:     Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
        "David S . Miller" <davem@...emloft.net>
CC:     Bartosz Folta <bfolta@...ence.com>, <netdev@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] net: macb: fix phy interrupt parsing

Le 26/04/2017 à 12:06, Alexandre Belloni a écrit :
> Since 83a77e9ec415, the phydev irq is explicitly set to PHY_POLL when
> there is no pdata. It doesn't work on DT enabled platforms because the
> phydev irq is already set by libphy before.
> 
> Fixes: 83a77e9ec415 ("net: macb: Added PCI wrapper for Platform Driver.")

Means 4.10+

> Signed-off-by: Alexandre Belloni <alexandre.belloni@...e-electrons.com>

Acked-by: Nicolas Ferre <nicolas.ferre@...rochip.com>

Seems a good candidate for net stable.

Bye,

> ---
>  drivers/net/ethernet/cadence/macb.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index e131ecd17ab9..004223a866fe 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -432,15 +432,17 @@ static int macb_mii_probe(struct net_device *dev)
>  	}
>  
>  	pdata = dev_get_platdata(&bp->pdev->dev);
> -	if (pdata && gpio_is_valid(pdata->phy_irq_pin)) {
> -		ret = devm_gpio_request(&bp->pdev->dev, pdata->phy_irq_pin,
> -					"phy int");
> -		if (!ret) {
> -			phy_irq = gpio_to_irq(pdata->phy_irq_pin);
> -			phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
> +	if (pdata) {
> +		if (gpio_is_valid(pdata->phy_irq_pin)) {
> +			ret = devm_gpio_request(&bp->pdev->dev,
> +						pdata->phy_irq_pin, "phy int");
> +			if (!ret) {
> +				phy_irq = gpio_to_irq(pdata->phy_irq_pin);
> +				phydev->irq = (phy_irq < 0) ? PHY_POLL : phy_irq;
> +			}
> +		} else {
> +			phydev->irq = PHY_POLL;
>  		}
> -	} else {
> -		phydev->irq = PHY_POLL;
>  	}
>  
>  	/* attach the mac to the phy */
> 


-- 
Nicolas Ferre