: mv643xx_eth_pcidev - implements hotplug for the marvell gige functionality by probing the northbridge pci id.

Add Marvell gigabit ethernet hotplug through the northbridge pci id support for the Pegasos machines.

Signed-off-by Nicolas DET <[email protected]>

Signed-off-by Sven Luther <[email protected]>

---
This patch is not optimal, as the proper way to handling this is to bring full hotplug support to the platform drivers, but this would be much more invasive and far reaching a project. This approach matches the marvell discovery northbridge pci id to load the driver for the builtin gigabit ethernet function, and is similar of what is done already using the discover module loading technique. With more and more distributions moving to using hotplug only to probe for modules to load, this patch becomes necessary.

Friendly,

Sven Luther

diff -Naur a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c

drivers/net/mv643xx_eth.c +7 -0

@@ -36,6 +36,10 @@
 #include <linux/udp.h>
 #include <linux/etherdevice.h>
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+#include <linux/pci.h>
+#endif
+
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>

@@ -1640,6 +1644,16 @@
 		" and Dale Farnsworth");
 MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+static struct pci_device_id pci_marvell_mv64360[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },

Quoted 37 lines · Sven Luther

Add Marvell gigabit ethernet hotplug through the northbridge pci id support for the Pegasos machines.

Signed-off-by Nicolas DET <[email protected]>

Signed-off-by Sven Luther <[email protected]>

---
This patch is not optimal, as the proper way to handling this is to bring full hotplug support to the platform drivers, but this would be much more invasive and far reaching a project. This approach matches the marvell discovery northbridge pci id to load the driver for the builtin gigabit ethernet function, and is similar of what is done already using the discover module loading technique. With more and more distributions moving to using hotplug only to probe for modules to load, this patch becomes necessary.

Friendly,

Sven Luther

diff -Naur a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c

drivers/net/mv643xx_eth.c +4 -0

@@ -36,6 +36,10 @@
 #include <linux/udp.h>
 #include <linux/etherdevice.h>
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+#include <linux/pci.h>
+#endif
+
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>

@@ -1640,6 +1644,16 @@
 		" and Dale Farnsworth");
 MODULE_DESCRIPTION("Ethernet driver for Marvell MV643XX");
 

drivers/net/mv643xx_eth.c MODULE_AUTHOR( "Rabeeh Khoury, Assaf Hof · line 1611

Quoted 13 lines

drivers/net/mv643xx_eth.c +10 -0

+#ifdef CONFIG_PPC_MULTIPLATFORM
+static struct pci_device_id pci_marvell_mv64360[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },
+	{ }
+};
+
+MODULE_DEVICE_TABLE(pci, pci_marvell_mv64360);
+#endif
+
+
 /*
  * The second part is the low level driver of the gigE ethernet ports.
  */

I don't think this is really dependent on PPC_MULTIPLATFORM, and the driver also supports 64460.

I don't think this is really dependent on PPC_MULTIPLATFORM, and the driver also supports 64460.

Quoted 2 lines

I don't think this is really dependent on PPC_MULTIPLATFORM, and the driver also supports 64460.

This is not a PCI driver so adding a device table is wrong.

Quoted 2 lines

I don't think this is really dependent on PPC_MULTIPLATFORM, and the driver also supports 64460.

This is not a PCI driver so adding a device table is wrong.

drivers/net/mv643xx_eth.c line 1649

Quoted 2 lines · Sven Luther

drivers/net/mv643xx_eth.c +2 -0

+static struct pci_device_id pci_marvell_mv64360[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },

Are there other devices in this northbridge whose drivers might also want to bind to this PCI id?

What other devices does this northbridge contain?

drivers/net/mv643xx_eth.c line 1649

Quoted 2 lines · Sven Luther

drivers/net/mv643xx_eth.c +2 -0

+static struct pci_device_id pci_marvell_mv64360[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },

Are there other devices in this northbridge whose drivers might also want to bind to this PCI id?

What other devices does this northbridge contain?

Quoted 8 lines · Paul Mackerras

drivers/net/mv643xx_eth.c line 1649

Quoted 2 lines · Sven Luther

drivers/net/mv643xx_eth.c +2 -0

+static struct pci_device_id pci_marvell_mv64360[] = {
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PCI_DEVICE_ID_MARVELL_MV64360) },

Are there other devices in this northbridge whose drivers might also want to bind to this PCI id?

Quoted 1 line

What other devices does this northbridge contain?

It does have a PIC, DMA engine, and SRAM that Sven mentioned but there are also a serial controller (MPSC), an i2c controller, and a watchdog timer. I would guess that the MPSC and i2c drivers, at least, should use MODULE_DEVICE_TABLE. If you agree, I'll add it to the list.

It does have a PIC, DMA engine, and SRAM that Sven mentioned but there are also a serial controller (MPSC), an i2c controller, and a watchdog timer. I would guess that the MPSC and i2c drivers, at least, should use MODULE_DEVICE_TABLE. If you agree, I'll add it to the list.

Quoted 4 lines · Mark A. Greer

It does have a PIC, DMA engine, and SRAM that Sven mentioned but there are also a serial controller (MPSC), an i2c controller, and a watchdog timer. I would guess that the MPSC and i2c drivers, at least, should use MODULE_DEVICE_TABLE. If you agree, I'll add it to the list.

But the point is that if one driver has claimed the device (because its ID is in its module device table), the other drivers won't be able to.

You need something like the macio driver that BenH did, which claims the macio device and creates a macio bus structure and allows individual macio device drivers to claim the pieces of it.