Skip to contentSkip to conversation

smsc911x: add disable and re-enable Rx int to de-assert interrupt pin

PATCH In review Jason Wang 2 participants 3 messages Dec 23, 2010 – Dec 24, 2010

Subsystems (2)
lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH 1/1 smsc911x: add disable and re-enable Rx int to de-assert interrupt pin

When kernel enters irqhanlder, it will check the Rx interrupt status bit, if Rx status is set but can't call napi_schedule(), it will do nothing and directly return form irqhandler. This situation is prone to be produced when we repeatly call irqhandler through netpoll interface(i.e kgdboe connecting).

This is a potential risk for those level triggered platforms(i.e ti_omap3evm), because if we don't handle Rx int and just return from irqhandler, the irq pin will be keeping asserted, the level triggered platforms will have no chance to jump out from the Rx irq. The whole system will hung into the irq subsystem.

To solve it, we add a disable/re-enable Rx int operation for this situation, this operation can de-assert interrupt pin for this time and will leave the received data and status in the FIFO for later interrupts to handle.

---
 drivers/net/smsc911x.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
drivers/net/smsc911x.c +12 -6
index 64bfdae..dd6312f 100644
@@ -1492,14 +1492,20 @@ static irqreturn_t smsc911x_irqhandler(int irq, void *dev_id)
 	}
 
 	if (likely(intsts & inten & INT_STS_RSFL_)) {
-		if (likely(napi_schedule_prep(&pdata->napi))) {
-			/* Disable Rx interrupts */
-			temp = smsc911x_reg_read(pdata, INT_EN);
-			temp &= (~INT_EN_RSFL_EN_);
-			smsc911x_reg_write(pdata, INT_EN, temp);
+		/* Disable Rx interrupts first, if doesn't meet
+		 * napi_schedule_prep(), we will re-enable Rx interrupts. This
+		 * disable and re-enable pair operation can De-assert interrupt
+		 * line and is more safer to those level triggered platforms. */
+		temp = smsc911x_reg_read(pdata, INT_EN);
+		temp &= (~INT_EN_RSFL_EN_);
+		smsc911x_reg_write(pdata, INT_EN, temp);
+
+		if (likely(napi_schedule_prep(&pdata->napi)))
 			/* Schedule a NAPI poll */
 			__napi_schedule(&pdata->napi);
-		} else {
+		else {
+			temp |= INT_EN_RSFL_EN_;
+			smsc911x_reg_write(pdata, INT_EN, temp);
 			SMSC_WARNING(RX_ERR,
 				"napi_schedule_prep failed");
 		}
Signature · 1 line
1.5.6.5
maintainer
#1 lore raw

From: Jason Wang <[email protected]>
Date: Thu, 23 Dec 2010 18:43:13 +0800

Quoted 12 lines

When kernel enters irqhanlder, it will check the Rx interrupt status bit, if Rx status is set but can't call napi_schedule(), it will do nothing and directly return form irqhandler. This situation is prone to be produced when we repeatly call irqhandler through netpoll interface(i.e kgdboe connecting).

This is a potential risk for those level triggered platforms(i.e ti_omap3evm), because if we don't handle Rx int and just return from irqhandler, the irq pin will be keeping asserted, the level triggered platforms will have no chance to jump out from the Rx irq. The whole system will hung into the irq subsystem.

Quoted 6 lines

To solve it, we add a disable/re-enable Rx int operation for this situation, this operation can de-assert interrupt pin for this time and will leave the received data and status in the FIFO for later interrupts to handle.

You absolutely cannot do this.

You now can race with the NAPI completion code turning the RX interrupts back on, and you'll leave the chip with RX interrupts disabled.

You must solve your level triggered interrupt some other way, every NAPI based device must manage the interrupt disabling carefully and only when the napi POLL is successfully scheduled in order to avoid races.

And especially you must not make a crazy hack like this for obscure things like kgdboe.

author
#2 lore raw
Quoted 25 lines · David Miller

From: Jason Wang <[email protected]>
Date: Thu, 23 Dec 2010 18:43:13 +0800

Quoted 19 lines

When kernel enters irqhanlder, it will check the Rx interrupt status bit, if Rx status is set but can't call napi_schedule(), it will do nothing and directly return form irqhandler. This situation is prone to be produced when we repeatly call irqhandler through netpoll interface(i.e kgdboe connecting).

This is a potential risk for those level triggered platforms(i.e ti_omap3evm), because if we don't handle Rx int and just return from irqhandler, the irq pin will be keeping asserted, the level triggered platforms will have no chance to jump out from the Rx irq. The whole system will hung into the irq subsystem.

To solve it, we add a disable/re-enable Rx int operation for this situation, this operation can de-assert interrupt pin for this time and will leave the received data and status in the FIFO for later interrupts to handle.

Hi David,

Thanks for your comments.

Quoted 6 lines

You absolutely cannot do this.

You now can race with the NAPI completion code turning the RX interrupts back on, and you'll leave the chip with RX interrupts disabled.

I think my modification almost have the same execution path as the original design and don't produce the race condition with NAPI threads.

The original design is:
If (can call napi_schedule) {
disable rx int;
call napi_schedule()
} else {
keep rx int enabled;
return;
}

my modification is:
disable rx int;
if (can call napi_schedule) {
call napi_schedule();
} else {
re-enable rx int; // this will de-assert interrupt pin for this time return;
}

So my modification is: if we can call napi_schedule(), we will disable the rx int until the NAPI thread re-enable it. if we can't call napi_schedule(), the rx int will keep enabled. This logic is almost same as the original design. I can't figure out why original design is safe while my modification is risky.

Add more info:

the Freescale imx31pdk, imx51pdk and ti_omap3evm boards all use this driver, before apply this modification, their kgdboe connecting is not stable. After applied this patch, their nfs root is as good as before and their kgdboe connecting is stable.

Thanks,
Jason.

Quoted 9 lines

You must solve your level triggered interrupt some other way, every NAPI based device must manage the interrupt disabling carefully and only when the napi POLL is successfully scheduled in order to avoid races.

And especially you must not make a crazy hack like this for obscure things like kgdboe.