[PATCH] Allow selecting mv643xx_eth on Pegasos again

[PATCH] Allow selecting mv643xx_eth on Pegasos again

[Gabriel Paubert]

Since PPC_MUTIPLATFORM was removed, it was impossible to select the
driver for mv643xx_eth on the Pegasos. Fix by allowing to select
the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.

The patch also removes all references to MV64360 config option which 
no more exists.

Signed-off-by: Gabriel Paubert <paubert@iram.es> 

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a0d1146..1dfeb62 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -360,7 +360,7 @@ config PPCBUG_NVRAM
 
 config IRQ_ALL_CPUS
 	bool "Distribute interrupts on all CPUs by default"
-	depends on SMP && !MV64360
+	depends on SMP 
 	help
 	  This option gives the kernel permission to distribute IRQs across
 	  multiple CPUs.  Saying N here will route all IRQs to the first
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 214a92d..6fc0ff4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+	depends on MV64X60 || PPC_CHRP || PLAT_ORION
 	select INET_LRO
 	select PHYLIB
 	help

Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Benjamin Herrenschmidt]

On Fri, 2009-05-15 at 20:18 +0200, Gabriel Paubert wrote:
> Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
> will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.
> 
> The patch also removes all references to MV64360 config option which 
> no more exists.
> 
> Signed-off-by: Gabriel Paubert <paubert@iram.es> 

Please break that up into 2 different patches. The arch/powerpc one that
removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which
should be set to the netdev mailing list.

Thanks !

Cheers,
Ben.

> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index a0d1146..1dfeb62 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -360,7 +360,7 @@ config PPCBUG_NVRAM
>  
>  config IRQ_ALL_CPUS
>  	bool "Distribute interrupts on all CPUs by default"
> -	depends on SMP && !MV64360
> +	depends on SMP 
>  	help
>  	  This option gives the kernel permission to distribute IRQs across
>  	  multiple CPUs.  Saying N here will route all IRQs to the first
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 214a92d..6fc0ff4 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
>  
>  config MV643XX_ETH
>  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
> -	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
> +	depends on MV64X60 || PPC_CHRP || PLAT_ORION
>  	select INET_LRO
>  	select PHYLIB
>  	help

Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Gabriel Paubert]

On Mon, May 18, 2009 at 01:24:49PM +1000, Benjamin Herrenschmidt wrote:
> On Fri, 2009-05-15 at 20:18 +0200, Gabriel Paubert wrote:
> > Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> > driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> > the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
> > will not work wihtout arch/powerpc/platforms/chrp/pegasos_eth.
> > 
> > The patch also removes all references to MV64360 config option which 
> > no more exists.
> > 
> > Signed-off-by: Gabriel Paubert <paubert@iram.es> 
> 
> Please break that up into 2 different patches. The arch/powerpc one that
> removes the reference from IRQ_ALL_CPUs and the drivers/net/ one which
> should be set to the netdev mailing list.
> 

Ok, but I have a doubt about the PPC one, should MV64360 be removed or
changed to MV64X60?

In any case, I can't test it.

	Gabriel

[PATCH] Allow selecting mv643xx_eth on Pegasos again

[Gabriel Paubert]

Since PPC_MUTIPLATFORM was removed, it was impossible to select the
driver for mv643xx_eth on the Pegasos. Fix by allowing to select
the driver on CHRP platforms; Pegasos is a CHRP platform and the driver
will not work without arch/powerpc/platforms/chrp/pegasos_eth.

Signed-off-by: Gabriel Paubert <paubert@iram.es> 

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 214a92d..6fc0ff4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
 
 config MV643XX_ETH
 	tristate "Marvell Discovery (643XX) and Orion ethernet support"
-	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) || PLAT_ORION
+	depends on MV64X60 || PPC_CHRP || PLAT_ORION
 	select INET_LRO
 	select PHYLIB
 	help

RE: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Medve Emilian-EMMEDVE1]

> -----Original Message-----
> From: linuxppc-dev-bounces+emilian.medve=3Dfreescale.com@ozlabs.org
[mailto:linuxppc-dev-
> bounces+emilian.medve=3Dfreescale.com@ozlabs.org] On Behalf Of Gabriel
Paubert
> Sent: Monday, May 18, 2009 12:38 PM
> To: Lennert Buytenhek
> Cc: tbm@cyrius.com; LinuxPPC; pacman@kosh.dhis.org;
netdev@vger.kernel.org; David Miller
> Subject: [PATCH] Allow selecting mv643xx_eth on Pegasos again
>=20
> Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> the driver on CHRP platforms; Pegasos is a CHRP platform and the
driver
> will not work without arch/powerpc/platforms/chrp/pegasos_eth.
>=20
> Signed-off-by: Gabriel Paubert <paubert@iram.es>
>=20
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 214a92d..6fc0ff4 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
>=20
>  config MV643XX_ETH
>  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
> -	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) ||
PLAT_ORION
> +	depends on MV64X60 || PPC_CHRP || PLAT_ORION
>  	select INET_LRO
>  	select PHYLIB
>  	help

This got fixed here:
http://git.kernel.org/?p=3Dlinux/kernel/git/davem/net-next-2.6.git;a=3Dco=
mmi
tdiff;h=3D952ee9df26c487f2d73b2dced58ec904f19ea0f8


Cheers,
Emil.

Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Gabriel Paubert]

On Mon, May 18, 2009 at 10:48:58AM -0700, Medve Emilian-EMMEDVE1 wrote:
> > -----Original Message-----
> > From: linuxppc-dev-bounces+emilian.medve=freescale.com@ozlabs.org
> [mailto:linuxppc-dev-
> > bounces+emilian.medve=freescale.com@ozlabs.org] On Behalf Of Gabriel
> Paubert
> > Sent: Monday, May 18, 2009 12:38 PM
> > To: Lennert Buytenhek
> > Cc: tbm@cyrius.com; LinuxPPC; pacman@kosh.dhis.org;
> netdev@vger.kernel.org; David Miller
> > Subject: [PATCH] Allow selecting mv643xx_eth on Pegasos again
> > 
> > Since PPC_MUTIPLATFORM was removed, it was impossible to select the
> > driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> > the driver on CHRP platforms; Pegasos is a CHRP platform and the
> driver
> > will not work without arch/powerpc/platforms/chrp/pegasos_eth.
> > 
> > Signed-off-by: Gabriel Paubert <paubert@iram.es>
> > 
> > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> > index 214a92d..6fc0ff4 100644
> > --- a/drivers/net/Kconfig
> > +++ b/drivers/net/Kconfig
> > @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
> > 
> >  config MV643XX_ETH
> >  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
> > -	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) ||
> PLAT_ORION
> > +	depends on MV64X60 || PPC_CHRP || PLAT_ORION
> >  	select INET_LRO
> >  	select PHYLIB
> >  	help
> 
> This got fixed here:
> http://git.kernel.org/?p=linux/kernel/git/davem/net-next-2.6.git;a=commi
> tdiff;h=952ee9df26c487f2d73b2dced58ec904f19ea0f8

Ok, I was not aware of it, but the fact is that MV64360 no more exists
and the only non MV64X60 platform that may need it is the Pegasos (to my
knowledge) and it relies on some platform specific code enabled
by PPC_CHRP.

	Regards,
	Gabriel

RE: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Medve Emilian-EMMEDVE1]

Hello Gabriel,


> -----Original Message-----
> From: Gabriel Paubert [mailto:paubert@iram.es]
> Sent: Monday, May 18, 2009 1:48 PM
> To: Medve Emilian-EMMEDVE1
> Cc: Lennert Buytenhek; tbm@cyrius.com; LinuxPPC; pacman@kosh.dhis.org;
netdev@vger.kernel.org; David
> Miller
> Subject: Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again
>=20
> On Mon, May 18, 2009 at 10:48:58AM -0700, Medve Emilian-EMMEDVE1
wrote:
> > > -----Original Message-----
> > > From: =
linuxppc-dev-bounces+emilian.medve=3Dfreescale.com@ozlabs.org
> > [mailto:linuxppc-dev-
> > > bounces+emilian.medve=3Dfreescale.com@ozlabs.org] On Behalf Of
Gabriel
> > Paubert
> > > Sent: Monday, May 18, 2009 12:38 PM
> > > To: Lennert Buytenhek
> > > Cc: tbm@cyrius.com; LinuxPPC; pacman@kosh.dhis.org;
> > netdev@vger.kernel.org; David Miller
> > > Subject: [PATCH] Allow selecting mv643xx_eth on Pegasos again
> > >
> > > Since PPC_MUTIPLATFORM was removed, it was impossible to select
the
> > > driver for mv643xx_eth on the Pegasos. Fix by allowing to select
> > > the driver on CHRP platforms; Pegasos is a CHRP platform and the
> > driver
> > > will not work without arch/powerpc/platforms/chrp/pegasos_eth.
> > >
> > > Signed-off-by: Gabriel Paubert <paubert@iram.es>
> > >
> > > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> > > index 214a92d..6fc0ff4 100644
> > > --- a/drivers/net/Kconfig
> > > +++ b/drivers/net/Kconfig
> > > @@ -2351,7 +2351,7 @@ config UGETH_TX_ON_DEMAND
> > >
> > >  config MV643XX_ETH
> > >  	tristate "Marvell Discovery (643XX) and Orion ethernet support"
> > > -	depends on MV64360 || MV64X60 || (PPC_MULTIPLATFORM && PPC32) ||
> > PLAT_ORION
> > > +	depends on MV64X60 || PPC_CHRP || PLAT_ORION
> > >  	select INET_LRO
> > >  	select PHYLIB
> > >  	help
> >
> > This got fixed here:
> >
http://git.kernel.org/?p=3Dlinux/kernel/git/davem/net-next-2.6.git;a=3Dco=
mmi
> > tdiff;h=3D952ee9df26c487f2d73b2dced58ec904f19ea0f8
>=20
> Ok, I was not aware of it, but the fact is that MV64360 no more exists
> and the only non MV64X60 platform that may need it is the Pegasos (to
my
> knowledge) and it relies on some platform specific code enabled
> by PPC_CHRP.

You're correct. MV64360 seems to be stale. Do you want to re-spin your
patch to get rid of it?

(I wouldn't create a dependency between MV643XX_ETH and PPC_CHRP.)
=20

Cheers,
Emil.

Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Gabriel Paubert]

Hello Medve

On Mon, May 18, 2009 at 01:15:12PM -0700, Medve Emilian-EMMEDVE1 wrote:
> 
> You're correct. MV64360 seems to be stale. Do you want to re-spin your
> patch to get rid of it?


No problem, bu should I respin in from the current official git
or on top of yours?

> 
> (I wouldn't create a dependency between MV643XX_ETH and PPC_CHRP.)

Fine with me.

	Regards,
	Gabriel

RE: [PATCH] Allow selecting mv643xx_eth on Pegasos again

[Medve Emilian-EMMEDVE1]

Hello Gabriel,


> -----Original Message-----
> From: Gabriel Paubert [mailto:paubert@iram.es]
> Sent: Monday, May 18, 2009 5:19 PM
> To: Medve Emilian-EMMEDVE1
> Cc: Lennert Buytenhek; tbm@cyrius.com; LinuxPPC; pacman@kosh.dhis.org;
netdev@vger.kernel.org; David
> Miller
> Subject: Re: [PATCH] Allow selecting mv643xx_eth on Pegasos again
>=20
> Hello Medve
>=20
> On Mon, May 18, 2009 at 01:15:12PM -0700, Medve Emilian-EMMEDVE1
wrote:
> >
> > You're correct. MV64360 seems to be stale. Do you want to re-spin
your
> > patch to get rid of it?
>=20
>=20
> No problem, bu should I respin in from the current official git
> or on top of yours?

Top of the tree should be good.


Cheers,
Emil.


> > (I wouldn't create a dependency between MV643XX_ETH and PPC_CHRP.)
>=20
> Fine with me.
>=20
> 	Regards,
> 	Gabriel