Skip to contentSkip to conversation

Patch "fsl/man: Inherit parent device and of_node" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Sep 15, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

fsl/man: Inherit parent device and of_node

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
fsl-man-inherit-parent-device-and-of_node.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Sep 14 23:20:08 PDT 2017

From: Florian Fainelli <[email protected]>
Date: Tue, 22 Aug 2017 15:24:47 -0700
Subject: fsl/man: Inherit parent device and of_node

From: Florian Fainelli <[email protected]>

[ Upstream commit a1a50c8e4c241a505b7270e1a3c6e50d94e794b1 ]

Junote Cai reported that he was not able to get a DSA setup involving the Freescale DPAA/FMAN driver to work and narrowed it down to of_find_net_device_by_node(). This function requires the network device's device reference to be correctly set which is the case here, though we have lost any device_node association there.

The problem is that dpaa_eth_add_device() allocates a "dpaa-ethernet" platform device, and later on dpaa_eth_probe() is called but SET_NETDEV_DEV() won't be propagating &pdev->dev.of_node properly. Fix this by inherenting both the parent device and the of_node when dpaa_eth_add_device() creates the platform device.

Fixes 3933961682a3 ("fsl/fman: Add FMan MAC driver")
---
 drivers/net/ethernet/freescale/fman/mac.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/net/ethernet/freescale/fman/mac.c +3 -0
@@ -622,6 +622,9 @@ static struct platform_device *dpaa_eth_
 		goto no_mem;
 	}
 
+	pdev->dev.of_node = node;
+	pdev->dev.parent = priv->dev;
+
 	ret = platform_device_add_data(pdev, &data, sizeof(data));
 	if (ret)
 		goto err;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/fsl-man-inherit-parent-device-and-of_node.patch queue-4.9/revert-net-phy-correctly-process-phy_halted-in-phy_stop_machine.patch