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

[PATCH 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 b145710b69388aa4034d32b4a937f18f66b5538e.

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>
---
 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 stable-5.4.y] Revert "dpaa_eth: fix usage as DSA master, try 3"

[Vladimir Oltean]

On Wed, 24 Jun 2020 at 15:40, Vladimir Oltean <olteanv@gmail.com> wrote:
>
> From: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> This reverts commit b145710b69388aa4034d32b4a937f18f66b5538e.

Sorry, this sha1sum is wrong, I forgot to update it from 4.19. I'll send a v2.

>
> 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>
> ---
>  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
>