[PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"

[PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"

[Vladimir Oltean]

From: Vladimir Oltean <vladimir.oltean@nxp.com>

This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8.

The patch is not wrong, but the Fixes: tag is. It should have been:

	Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")

which means that it's fixing a commit which was introduced in:

git tag --contains 060ad66f97954
v5.5

which then means it should have not been backported to linux-5.4.y,
where things _were_ working and now they're not.

Reported-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
Changes in v1:
Adjusted the commit message from linux-4.19.y to linux-5.4.y

Changes in v2:
Fixed the sha1sum of the reverted commit.

 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index 6683409fbd4a..4b21ae27a9fd 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
 	}
 
 	/* Do this here, so we can be verbose early */
-	SET_NETDEV_DEV(net_dev, dev->parent);
+	SET_NETDEV_DEV(net_dev, dev);
 	dev_set_drvdata(dev, net_dev);
 
 	priv = netdev_priv(net_dev);
-- 
2.25.1

Re: [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"

[Greg KH]

On Wed, Jun 24, 2020 at 03:45:17PM +0300, Vladimir Oltean wrote:
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
> 
> This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8.
> 
> The patch is not wrong, but the Fixes: tag is. It should have been:
> 
> 	Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
> 
> which means that it's fixing a commit which was introduced in:
> 
> git tag --contains 060ad66f97954
> v5.5
> 
> which then means it should have not been backported to linux-5.4.y,
> where things _were_ working and now they're not.
> 
> Reported-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> ---
> Changes in v1:
> Adjusted the commit message from linux-4.19.y to linux-5.4.y
> 
> Changes in v2:
> Fixed the sha1sum of the reverted commit.
> 
>  drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> index 6683409fbd4a..4b21ae27a9fd 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
>  	}
>  
>  	/* Do this here, so we can be verbose early */
> -	SET_NETDEV_DEV(net_dev, dev->parent);
> +	SET_NETDEV_DEV(net_dev, dev);
>  	dev_set_drvdata(dev, net_dev);
>  
>  	priv = netdev_priv(net_dev);
> -- 
> 2.25.1
> 

Now queued up, thanks.

greg k-h

Re: [PATCH v2 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"

[Vladimir Oltean]

On Thu, Jul 30, 2020 at 09:30:13AM +0200, Greg KH wrote:
> 
> Now queued up, thanks.
> 
> greg k-h

Thanks Greg, I was wondering whether I should be reminding you or not.

-Vladimir