Skip to contentSkip to conversation

mv643xx fixes - Disable interrupts on all ports during initialization

PATCH In review Brent Cook 4 participants 5 messages Jun 27, 2006 – Jul 3, 2006

Subsystems (2)
lore
Share & tools
lore

Brent Cook

author
#0 lore raw

PATCH 1/3 mv643xx fixes - Disable interrupts on all ports during initialization

This patch disable interrupts on all ports during initialization. The current assumes that the firmware has already disabled all interrupts on all ports. We have encountered some boards that do not always disable interrupts (XES XPedite 6200 for instance) on a soft reset. This patch prevents a kernel panic if a packet is received before the DMA ring buffers are setup for a port on which interrupts are left enabled by the firmware.

drivers/net/mv643xx_eth.c +6 -0
Index: linux-2.6-bps/drivers/net/mv643xx_eth.c
===================================================================
@@ -777,6 +777,13 @@
 	unsigned int size;
 	int err;
 
+	/* Mask all interrupts on ethernet port */
+	mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+		 ETH_INT_MASK_ALL);
+	/* wait for previous write to complete */
+	mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
+
 	err = request_irq(dev->irq, mv643xx_eth_int_handler,
 			SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 	if (err) {
#1 lore raw
Quoted 1 line · Brent Cook

This patch disable interrupts on all ports during initialization. The current assumes that the firmware has already disabled all interrupts on all ports. We have encountered some boards that do not always disable interrupts (XES XPedite 6200 for instance) on a soft reset. This patch prevents a kernel panic if a packet is received before the DMA ring buffers are setup for a port on which interrupts are left enabled by the firmware.

You probably have bigger problems than the interrupt being left enabled. If the interrupt is left enabled, the DMA engine is probably left enabled, and if a packet happens
to come in before the driver can properly configure them, some random part of memory will get overwritten.
The firmware needs to disable this device before transferring control to the kernel, both the interrupts and the DMA, there is no way to fix this in the kernel.

#2 lore raw
Quoted 7 lines · John Haller
Quoted 6 lines · Brent Cook

This patch disable interrupts on all ports during initialization. The current assumes that the firmware has already disabled all interrupts on all ports. We have encountered some boards that do not always disable interrupts (XES XPedite 6200 for instance) on a soft reset. This patch prevents a kernel panic if a packet is received before the DMA ring buffers are setup for a port on which interrupts are left enabled by the firmware.

Quoted 8 lines

You probably have bigger problems than the interrupt being left enabled. If the interrupt is left enabled, the DMA engine is probably left enabled, and if a packet happens
to come in before the driver can properly configure them, some random part of memory will get overwritten.
The firmware needs to disable this device before transferring control to the kernel, both the interrupts and the DMA, there is no way to fix this in the kernel.

I agree that the patch isn't the best fix for this problem.

Brent, for this particular case, I believe there's chip errata for the Discovery bridge preventing it from resetting itself when the board resets itself in non-monarch mode. That's why interrupts are left enabled. This issue should never crop up if the board is monarch on the PCI bus.

So the proper workaround would be for our firmware to account for this case and disable interrupts, ethernet, etc. on a soft non-monarch reset. We could also do this in the boot wrapper code as a safety measure.

Also, note that the firmware _will_ already explicitly disable ethernet before transferring control over to the OS _if_ you're booting over ethernet instead of flash.

- Nate Case <[email protected]>

#3 lore raw
In reply to Brent Cook
Quoted 3 lines · Brent Cook

This patch disable interrupts on all ports during initialization. The current assumes that the firmware has already disabled all interrupts on all ports. We have encountered some boards that do not always disable interrupts (XES XPedite 6200 for instance) on a soft reset. This patch prevents a kernel panic if a packet is received before the DMA ring buffers are setup for a port on which interrupts are left enabled by the firmware.

ACK patches 1-3, but:

[jgarzik@pretzel netdev-2.6]$ git-applymbox /g/tmp/mbox ~/info/signoff.txt 3 patch(es) to process.

Applying 'mv643xx fixes - Disable interrupts on all ports during initialization'
fatal: corrupt patch at line 19

author
#4 lore raw

PATCH 1/3 mv643xx fixes - Disable interrupts on all ports during initialization

That's the last time I hand-edit a patch - this is really more of a workaround since I've learned that the interrupts should have been disabled by the firmware anyway. But, it doesn't hurt. Updated description

This patch disable interrupts on all ports during initialization. The current driver assumes that the firmware has already disabled all interrupts on all ports. We have encountered some boards that do not always disable interrupts (XES XPedite 6200 for instance) on a soft reset on all ethernet ports. This patch prevents a kernel panic if a packet is received before the DMA ring buffers are setup for a port on which interrupts are left enabled by the firmware.

drivers/net/mv643xx_eth.c +6 -0
Index: current/drivers/net/mv643xx_eth.c
===================================================================
@@ -777,6 +777,12 @@
 	unsigned int size;
 	int err;
 
+	/* Mask all interrupts on ethernet port */
+	mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num),
+		ETH_INT_MASK_ALL);
+	/* wait for previous write to complete */
+	mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num));
+
 	err = request_irq(dev->irq, mv643xx_eth_int_handler,
 			SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
 	if (err) {