Skip to contentSkip to conversation

ppc32: MV643XX ethernet is an option for Pegasos

PATCH In review Benjamin Herrenschmidt 4 participants 6 messages Apr 12, 2005

Subsystems (3)
Networking Network drivers Kbuild
lore
Share & tools
lore

Benjamin Herrenschmidt

author
#0 lore raw

PATCH 1/1 ppc32: MV643XX ethernet is an option for Pegasos

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@

usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig renamed from drivers/net/Kconfig +1 -1
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
@@ -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
usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c renamed from drivers/net/mv643xx_eth.c +1 -1
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
@@ -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",
#1 lore raw
Quoted 7 lines · Benjamin Herrenschmidt

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

Quoted 30 lines

#! /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

usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/Kconfig renamed from drivers/net/Kconfig +1 -1
@@ -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

usr/src/dpatchtemp/dpep.nYRoKc/linux-source-2.6.12-2.6.11.90/drivers/net/mv643xx_eth.c renamed from drivers/net/mv643xx_eth.c +1 -1
@@ -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",
#2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 11 lines · Dale Farnsworth
Quoted 7 lines · Benjamin Herrenschmidt

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]>
Quoted 5 lines

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-----

#3 lore raw
Quoted 7 lines · Fabio Massimo Di Nitto
Quoted 5 lines · Dale Farnsworth

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

Quoted 6 lines

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

author
#4 lore raw
Quoted 11 lines
Quoted 7 lines

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.

#5 lore raw
In reply to Benjamin Herrenschmidt
Quoted 9 lines · Benjamin Herrenschmidt

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