Skip to contentSkip to conversation

ARM: orion: Fix DSA platform device after mvmdio conversion

PATCH New Florian Fainelli 2 participants 5 messages Oct 3, 2015 – Oct 6, 2015

Subsystems (4)
Stable branch Arm (32-bit) Arm sub-architectures Arm/Marvell Dove/MV78xx0/Orion SoC support
lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

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

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")
CC stable at vger.kernel.org
Signed-off-by Florian Fainelli <[email protected]>

---
This patch should be queued for -stable kernels 3.18+, thanks!

 arch/arm/plat-orion/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-orion/common.c +1 -1
index 2235081a04ee..8861c367d061 100644
@@ -495,7 +495,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].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);
Signature · 1 line
2.1.0
author
#1 lore raw

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

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")
CC stable at vger.kernel.org
Signed-off-by Florian Fainelli <[email protected]>

---
This patch is for -stable kernels 3.10 to 3.17 (included)

 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
#2 lore raw

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

Hi Florian,

Quoted 11 lines · Florian Fainelli

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")
CC stable at vger.kernel.org
Signed-off-by Florian Fainelli <[email protected]>

---
This patch is for -stable kernels 3.10 to 3.17 (included)

is it something expected by the stable team?

I though that the normal flow was to send a fix, applying it on the current kernel and from this point the stable team try to apply it on all the relevant kernel. And only when the patch failed to apply you have to send them a port of the patch for the given version.

Here you anticipate it, I find it intersting, but I wonder if it fits in the stable team workflow.

Thanks,

Gregory

Quoted 20 lines
 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
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
author
#3 lore raw

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

Quoted 18 lines · Gregory CLEMENT

Hi Florian,

Quoted 11 lines · Florian Fainelli

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")
CC stable at vger.kernel.org
Signed-off-by Florian Fainelli <[email protected]>

---
This patch is for -stable kernels 3.10 to 3.17 (included)

is it something expected by the stable team?

Quoted 7 lines

I though that the normal flow was to send a fix, applying it on the current kernel and from this point the stable team try to apply it on all the relevant kernel. And only when the patch failed to apply you have to send them a port of the patch for the given version.

Here you anticipate it, I find it intersting, but I wonder if it fits in the stable team workflow.

Yes, I am not too sure about that, the commit message is wrong anyway, since it references the new, and not the old member name, maybe it is just best to wait for the fix to hit the mainline tree, and when this patch gets scheduled for -stable inclusion, I will re-submit a proper one that applies to 3.10 through 3.17?

The other intent of this "double" submission was for people like Frans who reported the issue on a specific kernel, to be able to get it in their inbox so can test that patch.

Signature · 1 line
Florian
#4 lore raw

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

In reply to Florian Fainelli

Hi Florian,

Quoted 9 lines · Florian Fainelli

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")
CC stable at vger.kernel.org
Signed-off-by Florian Fainelli <[email protected]>

Applied on mvebu/fixes

Thanks!

Gregory

Quoted 22 lines

---
This patch should be queued for -stable kernels 3.18+, thanks!

 arch/arm/plat-orion/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/plat-orion/common.c +1 -1
index 2235081a04ee..8861c367d061 100644
@@ -495,7 +495,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].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);
Signature · 1 line
2.1.0
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com