* [PATCH] staging: octeon: Call SET_NETDEV_DEV()
@ 2016-12-15 1:13 Florian Fainelli
2016-12-21 1:02 ` Florian Fainelli
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2016-12-15 1:13 UTC (permalink / raw)
To: netdev
Cc: davem, Florian Fainelli, Greg Kroah-Hartman, Aaro Koskinen,
Laura Garcia Liebana, Philippe Reynes, Asbjoern Sloth Toennesen,
Jarod Wilson, Bhaktipriya Shridhar, open list:STAGING SUBSYSTEM,
open list
The Octeon driver calls into PHYLIB which now checks for
net_device->dev.parent, so make sure we do set it before calling into
any MDIO/PHYLIB related function.
Fixes: ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/staging/octeon/ethernet.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 8130dfe89745..4971aa54756a 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
/* Initialize the device private structure. */
struct octeon_ethernet *priv = netdev_priv(dev);
+ SET_NETDEV_DEV(dev, &pdev->dev);
dev->netdev_ops = &cvm_oct_pow_netdev_ops;
priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
priv->port = CVMX_PIP_NUM_INPUT_PORTS;
@@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
}
/* Initialize the device private structure. */
+ SET_NETDEV_DEV(dev, &pdev->dev);
priv = netdev_priv(dev);
priv->netdev = dev;
priv->of_node = cvm_oct_node_for_port(pip, interface,
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: octeon: Call SET_NETDEV_DEV()
2016-12-15 1:13 [PATCH] staging: octeon: Call SET_NETDEV_DEV() Florian Fainelli
@ 2016-12-21 1:02 ` Florian Fainelli
2016-12-21 3:20 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2016-12-21 1:02 UTC (permalink / raw)
To: netdev
Cc: davem, Greg Kroah-Hartman, Aaro Koskinen, Laura Garcia Liebana,
Philippe Reynes, Asbjoern Sloth Toennesen, Jarod Wilson,
Bhaktipriya Shridhar, open list:STAGING SUBSYSTEM, open list
On 12/14/2016 05:13 PM, Florian Fainelli wrote:
> The Octeon driver calls into PHYLIB which now checks for
> net_device->dev.parent, so make sure we do set it before calling into
> any MDIO/PHYLIB related function.
>
> Fixes: ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
> Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Greg, David, since this is a fix for a regression introduced in the net
tree, it may make sense that David take it via his tree.
Thanks
> ---
> drivers/staging/octeon/ethernet.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
> index 8130dfe89745..4971aa54756a 100644
> --- a/drivers/staging/octeon/ethernet.c
> +++ b/drivers/staging/octeon/ethernet.c
> @@ -770,6 +770,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
> /* Initialize the device private structure. */
> struct octeon_ethernet *priv = netdev_priv(dev);
>
> + SET_NETDEV_DEV(dev, &pdev->dev);
> dev->netdev_ops = &cvm_oct_pow_netdev_ops;
> priv->imode = CVMX_HELPER_INTERFACE_MODE_DISABLED;
> priv->port = CVMX_PIP_NUM_INPUT_PORTS;
> @@ -816,6 +817,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
> }
>
> /* Initialize the device private structure. */
> + SET_NETDEV_DEV(dev, &pdev->dev);
> priv = netdev_priv(dev);
> priv->netdev = dev;
> priv->of_node = cvm_oct_node_for_port(pip, interface,
>
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: octeon: Call SET_NETDEV_DEV()
2016-12-21 1:02 ` Florian Fainelli
@ 2016-12-21 3:20 ` David Miller
2016-12-27 22:15 ` Florian Fainelli
0 siblings, 1 reply; 5+ messages in thread
From: David Miller @ 2016-12-21 3:20 UTC (permalink / raw)
To: f.fainelli
Cc: netdev, gregkh, aaro.koskinen, nevola, tremyfr, asbjorn, jarod,
bhaktipriya96, devel, linux-kernel
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 20 Dec 2016 17:02:37 -0800
> On 12/14/2016 05:13 PM, Florian Fainelli wrote:
>> The Octeon driver calls into PHYLIB which now checks for
>> net_device->dev.parent, so make sure we do set it before calling into
>> any MDIO/PHYLIB related function.
>>
>> Fixes: ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
>> Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>
> Greg, David, since this is a fix for a regression introduced in the net
> tree, it may make sense that David take it via his tree.
Since the change in question is in Linus's tree, it's equally valid
for Greg to take it as well.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: octeon: Call SET_NETDEV_DEV()
2016-12-21 3:20 ` David Miller
@ 2016-12-27 22:15 ` Florian Fainelli
2017-01-03 16:11 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2016-12-27 22:15 UTC (permalink / raw)
To: gregkh
Cc: David Miller, netdev, aaro.koskinen, nevola, tremyfr, asbjorn,
jarod, bhaktipriya96, devel, linux-kernel
On 12/20/2016 07:20 PM, David Miller wrote:
> From: Florian Fainelli <f.fainelli@gmail.com>
> Date: Tue, 20 Dec 2016 17:02:37 -0800
>
>> On 12/14/2016 05:13 PM, Florian Fainelli wrote:
>>> The Octeon driver calls into PHYLIB which now checks for
>>> net_device->dev.parent, so make sure we do set it before calling into
>>> any MDIO/PHYLIB related function.
>>>
>>> Fixes: ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
>>> Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
>>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>>
>> Greg, David, since this is a fix for a regression introduced in the net
>> tree, it may make sense that David take it via his tree.
>
> Since the change in question is in Linus's tree, it's equally valid
> for Greg to take it as well.
Sure, Greg, can you take this change? Thank you!
--
Florian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: octeon: Call SET_NETDEV_DEV()
2016-12-27 22:15 ` Florian Fainelli
@ 2017-01-03 16:11 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-01-03 16:11 UTC (permalink / raw)
To: Florian Fainelli
Cc: devel, asbjorn, aaro.koskinen, netdev, nevola, linux-kernel,
jarod, bhaktipriya96, David Miller, tremyfr
On Tue, Dec 27, 2016 at 02:15:57PM -0800, Florian Fainelli wrote:
> On 12/20/2016 07:20 PM, David Miller wrote:
> > From: Florian Fainelli <f.fainelli@gmail.com>
> > Date: Tue, 20 Dec 2016 17:02:37 -0800
> >
> >> On 12/14/2016 05:13 PM, Florian Fainelli wrote:
> >>> The Octeon driver calls into PHYLIB which now checks for
> >>> net_device->dev.parent, so make sure we do set it before calling into
> >>> any MDIO/PHYLIB related function.
> >>>
> >>> Fixes: ec988ad78ed6 ("phy: Don't increment MDIO bus refcount unless it's a different owner")
> >>> Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
> >>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> >>
> >> Greg, David, since this is a fix for a regression introduced in the net
> >> tree, it may make sense that David take it via his tree.
> >
> > Since the change in question is in Linus's tree, it's equally valid
> > for Greg to take it as well.
>
> Sure, Greg, can you take this change? Thank you!
Will do so now, thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-03 16:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-15 1:13 [PATCH] staging: octeon: Call SET_NETDEV_DEV() Florian Fainelli
2016-12-21 1:02 ` Florian Fainelli
2016-12-21 3:20 ` David Miller
2016-12-27 22:15 ` Florian Fainelli
2017-01-03 16:11 ` Greg KH
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).