Hi !
This patch allows Kconfig to build the MV643xx ethernet driver on
Pegasos (CONFIG_PPC_MULTIPLATFORM) and adds what I think is a missing
fix from Dale's batch, that is remove SA_INTERRUPT and add SA_SHIRQ in
there as the interrupt is shared if I understand things correctly.
Signed-off-by: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Fabio Massimo Di Nitto <[email protected]>
#! /bin/sh -e
. $(dirname $0)/DPATCH
@DPATCH@
diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig
--- linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig 2005-04-11 16:13:06.000000000 +0200
+++ /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig 2005-04-12 08:05:33.535955920 +0200
@@ -2044,7 +2044,7 @@
config MV643XX_ETH
tristate "MV-643XX Ethernet support"
- depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3
+ depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
help
This driver supports the gigabit Ethernet on the Marvell MV643XX
chipset which is used in the Momenco Ocelot C and Jaguar ATX and
diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c
--- linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c 2005-04-07 14:57:16.000000000 +0200
+++ /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c 2005-04-12 08:07:36.246301112 +0200
@@ -668,7 +668,7 @@
spin_lock_irq(&mp->lock);
err = request_irq(dev->irq, mv643xx_eth_int_handler,
- SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
+ SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
On Tue, Apr 12, 2005 at 07:13:04AM +0000, Benjamin Herrenschmidt wrote:
> This patch allows Kconfig to build the MV643xx ethernet driver on
> Pegasos (CONFIG_PPC_MULTIPLATFORM) and adds what I think is a missing
> fix from Dale's batch, that is remove SA_INTERRUPT and add SA_SHIRQ in
> there as the interrupt is shared if I understand things correctly.
>
> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
> Signed-off-by: Fabio Massimo Di Nitto <[email protected]>
This looks identical to the patch I posted to netdev two weeks ago
as the first of 20 patches for the MV643xx ethernet driver.
See <http://oss.sgi.com/archives/netdev/2005-03/msg01644.html> and
<http://oss.sgi.com/archives/netdev/2005-03/msg01642.html>.
Thanks,
-Dale
> #! /bin/sh -e
>
> . $(dirname $0)/DPATCH
>
> @DPATCH@
> diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig
> --- linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig 2005-04-11 16:13:06.000000000 +0200
> +++ /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig 2005-04-12 08:05:33.535955920 +0200
> @@ -2044,7 +2044,7 @@
>
> config MV643XX_ETH
> tristate "MV-643XX Ethernet support"
> - depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3
> + depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM
> help
> This driver supports the gigabit Ethernet on the Marvell MV643XX
> chipset which is used in the Momenco Ocelot C and Jaguar ATX and
> diff -urNad linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c
> --- linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c 2005-04-07 14:57:16.000000000 +0200
> +++ /usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c 2005-04-12 08:07:36.246301112 +0200
> @@ -668,7 +668,7 @@
> spin_lock_irq(&mp->lock);
>
> err = request_irq(dev->irq, mv643xx_eth_int_handler,
> - SA_INTERRUPT | SA_SAMPLE_RANDOM, dev->name, dev);
> + SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
>
> if (err) {
> printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dale Farnsworth wrote:
> On Tue, Apr 12, 2005 at 07:13:04AM +0000, Benjamin Herrenschmidt wrote:
>
>>This patch allows Kconfig to build the MV643xx ethernet driver on
>>Pegasos (CONFIG_PPC_MULTIPLATFORM) and adds what I think is a missing
>>fix from Dale's batch, that is remove SA_INTERRUPT and add SA_SHIRQ in
>>there as the interrupt is shared if I understand things correctly.
>>
>>Signed-off-by: Benjamin Herrenschmidt <[email protected]>
>>Signed-off-by: Fabio Massimo Di Nitto <[email protected]>
>
>
> This looks identical to the patch I posted to netdev two weeks ago
> as the first of 20 patches for the MV643xx ethernet driver.
>
> See <http://oss.sgi.com/archives/netdev/2005-03/msg01644.html> and
> <http://oss.sgi.com/archives/netdev/2005-03/msg01642.html>.
It is possible. I received an old patch from Sven Luther and bounced to
Benjamin rediffed against 2.6.12rc2, but the bits ended to be exactly
the same.
Fabio
PS feel free to claim credits on it. I don't want for sure take over
your work :)
- --
Self-Service law:
The last available dish of the food you have decided to eat, will be
inevitably taken from the person in front of you.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iQIVAwUBQlumhlA6oBJjVJ+OAQK/NQ/9FLAIyMR+8fnpOygf7PVFSC0bEMZ9GVuk
apCzX79QOjKAOOEaI/oSZEaH6K4/93lnUS1CjUiRYCv43mQ9RIw5cSs+if6TqSUF
UOzRiFIg269BTIvIJVklsGUN+lC0C3Z66VQzWYkS84UJ3gQoHs55IRhccWqVMO2p
L/VrcypZV5yD7OmqfsE7JJ4EYWtg/K3xigz+y7ZkyOfhuKWJdFbtRM+jjm67gMGq
J+IqXgLpN4dMp/C0woVjfE2/mebqiBN2ft6qPCYlgwXKXN7wPKcSodMpK6D64x6T
juvaSn6wgvQWmuRJh9bRBkHBM78eYiGFfBa4Mh8Il2aNrLmxjn8I52/wfq/wXd8j
4sDCnIC6YtNf5dbhK2jY6M9YCBs3SxzJu9O6yCjGGVfp0dpnPLFpbiZnWMAXQGz4
sVA7YCejkUJYMiJY9mlIh7960+V+g+PIBCk7myaOML24bsUp7AfAJtzdqQZqFSau
ZpD0e77prl16F4gOb+pMt+JGVeOWeZqVuhg8GlklFaAHGVBujE9Zb+uKh4ZTeag9
ksxWDZACe/kxNc9rFvBpabNLzK5oi4Tn4LWVRr105c6nLSXwladckUnT3MCSTwHU
yRD5YOerF0Rerh6OyWYw8FoG+vHSfIm6w87QxNSgQMjv6wOhZRVTyukF/A2V42tw
nq3U4qR66hM=
=uGjK
-----END PGP SIGNATURE-----
On Tue, Apr 12, 2005 at 05:13:04PM +1000, Benjamin Herrenschmidt wrote:
> Hi !
>
> This patch allows Kconfig to build the MV643xx ethernet driver on
> Pegasos (CONFIG_PPC_MULTIPLATFORM) and adds what I think is a missing
> fix from Dale's batch, that is remove SA_INTERRUPT and add SA_SHIRQ in
> there as the interrupt is shared if I understand things correctly.
>
> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
> Signed-off-by: Fabio Massimo Di Nitto <[email protected]>
Well, it originated by me/you/dale, but i think it is trivial stuff anyway.
Friendly,
Sven Luther
On Tue, Apr 12, 2005 at 10:44:24AM +0000, Fabio Massimo Di Nitto wrote:
> Dale Farnsworth wrote:
> > This looks identical to the patch I posted to netdev two weeks ago
> > as the first of 20 patches for the MV643xx ethernet driver.
> >
> > See <http://oss.sgi.com/archives/netdev/2005-03/msg01644.html> and
> > <http://oss.sgi.com/archives/netdev/2005-03/msg01642.html>.
>
> It is possible. I received an old patch from Sven Luther and bounced to
> Benjamin rediffed against 2.6.12rc2, but the bits ended to be exactly
> the same.
>
> PS feel free to claim credits on it. I don't want for sure take over
> your work :)
No problem. It was Nicolas' and Sven's patch and Like Sven said
this one is trivial. Mainly, I wanted to mention the other 19 patches
I've sent that I hope get accepted soon.
-Dale
> > It is possible. I received an old patch from Sven Luther and bounced to
> > Benjamin rediffed against 2.6.12rc2, but the bits ended to be exactly
> > the same.
> >
> > PS feel free to claim credits on it. I don't want for sure take over
> > your work :)
>
> No problem. It was Nicolas' and Sven's patch and Like Sven said
> this one is trivial. Mainly, I wanted to mention the other 19 patches
> I've sent that I hope get accepted soon.
We hope that too :)
Ben.