diff mbox

[3.10-3.17] ARM: orion: Fix DSA platform device after mvmdio conversion

Message ID 1443902628-7861-2-git-send-email-f.fainelli@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Florian Fainelli Oct. 3, 2015, 8:03 p.m. UTC
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" <fvdw@fvdw.eu>
Fixes: c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
CC: stable@vger.kernel.org
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
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(-)

Comments

Gregory CLEMENT Oct. 6, 2015, 2:31 p.m. UTC | #1
Hi Florian,
 
 On sam., oct. 03 2015, Florian Fainelli <f.fainelli@gmail.com> wrote:

> 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" <fvdw@fvdw.eu>
> Fixes: c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
> CC: stable@vger.kernel.org
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---
> 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

>
>  arch/arm/plat-orion/common.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
> index 3ec6e8e8d368..3f02575e4cc8 100644
> --- a/arch/arm/plat-orion/common.c
> +++ b/arch/arm/plat-orion/common.c
> @@ -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);
> -- 
> 2.1.0
>
Florian Fainelli Oct. 6, 2015, 6:42 p.m. UTC | #2
On 06/10/15 07:31, Gregory CLEMENT wrote:
> Hi Florian,
>  
>  On sam., oct. 03 2015, Florian Fainelli <f.fainelli@gmail.com> wrote:
> 
>> 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" <fvdw@fvdw.eu>
>> Fixes: c3a07134e6aa ("mv643xx_eth: convert to use the Marvell Orion MDIO driver")
>> CC: stable@vger.kernel.org
>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
>> ---
>> 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.

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.
diff mbox

Patch

diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 3ec6e8e8d368..3f02575e4cc8 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -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);