Skip to contentSkip to conversation

Patch "ARM: orion: Fix DSA platform device after mvmdio conversion" has been added to the 4.2-stable tree

PATCH In review [email protected] 2 participants 4 messages Nov 6, 2015

Subsystems (4)
Stable branch Arm (32-bit) Arm sub-architectures Arm/Marvell Dove/MV78xx0/Orion SoC support
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

ARM: orion: Fix DSA platform device after mvmdio conversion

to the 4.2-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:
arm-orion-fix-dsa-platform-device-after-mvmdio-conversion.patch
and it can be found in the queue-4.2 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 d836ace65ee98d7079bc3c5afdbcc0e27dca20a3 Mon Sep 17 00:00:00 2001

From: Florian Fainelli <[email protected]>
Date: Sat, 3 Oct 2015 13:03:47 -0700
Subject: ARM: orion: Fix DSA platform device after mvmdio conversion

From: Florian Fainelli <[email protected]>

commit d836ace65ee98d7079bc3c5afdbcc0e27dca20a3 upstream.

DSA expects the host_dev pointer to be the device structure associated with the MDIO bus controller driver. First commit breaking that was c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver"), and then, it got completely under the radar for a while.

Reported-by Frans van de Wiel <[email protected]>
Fixes c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
Signed-off-by Florian Fainelli <[email protected]>
Signed-off-by Gregory CLEMENT <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/arm/plat-orion/common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-orion/common.c +1 -1
@@ -495,7 +495,7 @@ void __init orion_ge00_switch_init(struc
 
 	d->netdev = &orion_ge00.dev;
 	for (i = 0; i < d->nr_chips; i++)
-		d->chip[i].host_dev = &orion_ge00_shared.dev;
+		d->chip[i].host_dev = &orion_ge_mvmdio.dev;
 	orion_switch_device.dev.platform_data = d;
 
 	platform_device_register(&orion_switch_device);

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

queue-4.2/arm-orion-fix-dsa-platform-device-after-mvmdio-conversion.patch

#1 lore raw

PATCH 1/1 ARM: orion: Fix DSA platform device after mvmdio conversion

DSA expects the mii_bus pointer to be the device structure associated with the MDIO bus controller driver. First commit breaking that was c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver"), and then, it got completely under the radar for a while.

Reported-by Frans van de Wiel <[email protected]>
Fixes c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
CC [email protected]
Signed-off-by Florian Fainelli <[email protected]>

---
Greg,

This is the patch for kernels 3.10 through 3.17, thanks!

 arch/arm/plat-orion/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-orion/common.c +1 -1
index 3ec6e8e8d368..3f02575e4cc8 100644
@@ -499,7 +499,7 @@ void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq)
 
 	d->netdev = &orion_ge00.dev;
 	for (i = 0; i < d->nr_chips; i++)
-		d->chip[i].mii_bus = &orion_ge00_shared.dev;
+		d->chip[i].mii_bus = &orion_ge_mvmdio.dev;
 	orion_switch_device.dev.platform_data = d;
 
 	platform_device_register(&orion_switch_device);
Signature · 1 line
2.1.0
author maintainer
#2 lore raw

Re: [PATCH] ARM: orion: Fix DSA platform device after mvmdio conversion

Quoted 5 lines · Florian Fainelli

DSA expects the mii_bus pointer to be the device structure associated with the MDIO bus controller driver. First commit breaking that was c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver"), and then, it got completely under the radar for a while.

Quoted 8 lines
Reported-by Frans van de Wiel <[email protected]>
Fixes c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
CC [email protected]
Signed-off-by Florian Fainelli <[email protected]>

---
Greg,

This is the patch for kernels 3.10 through 3.17, thanks!

What is the git commit id of this in Linus's tree?

#3 lore raw

Re: [PATCH] ARM: orion: Fix DSA platform device after mvmdio conversion

Quoted 13 lines · Greg KH
Quoted 12 lines · Florian Fainelli

DSA expects the mii_bus pointer to be the device structure associated with the MDIO bus controller driver. First commit breaking that was c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver"), and then, it got completely under the radar for a while.

Reported-by Frans van de Wiel <[email protected]>
Fixes c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
CC [email protected]
Signed-off-by Florian Fainelli <[email protected]>

---
Greg,

Quoted 4 lines
Quoted 1 line

This is the patch for kernels 3.10 through 3.17, thanks!

What is the git commit id of this in Linus's tree?

Upstream commit is d836ace65ee98d7079bc3c5afdbcc0e27dca20a3 ("ARM:
orion: Fix DSA platform device after mvmdio conversion").

Signature · 1 line
Florian