Page MenuHomeFreeBSD
Files F147655936

D23829.id.diff
No OneTemporary
Actions

D23829.id.diff
View Options

Index: head/sys/contrib/ncsw/inc/xx_ext.h
===================================================================
--- head/sys/contrib/ncsw/inc/xx_ext.h
+++ head/sys/contrib/ncsw/inc/xx_ext.h
@@ -794,5 +794,4 @@
void XX_PortalSetInfo(device_t dev);
-void XX_FmanFixIntr(int irq);
#endif /* __XX_EXT_H */
Index: head/sys/contrib/ncsw/user/env/xx.c
===================================================================
--- head/sys/contrib/ncsw/user/env/xx.c
+++ head/sys/contrib/ncsw/user/env/xx.c
@@ -95,7 +95,6 @@
/* Interrupt info */
#define XX_INTR_FLAG_PREALLOCATED (1 << 0)
-#define XX_INTR_FLAG_FMAN_FIX (1 << 1)
struct XX_IntrInfo {
driver_intr_t *handler;
@@ -295,23 +294,6 @@
return (0);
}
-void
-XX_FmanFixIntr(int irq)
-{
-
- XX_IntrInfo[irq].flags |= XX_INTR_FLAG_FMAN_FIX;
-}
-
-static bool
-XX_FmanNeedsIntrFix(int irq)
-{
-
- if (XX_IntrInfo[irq].flags & XX_INTR_FLAG_FMAN_FIX)
- return (1);
-
- return (0);
-}
-
static void
XX_Dispatch(void *arg)
{
@@ -398,21 +380,7 @@
err = bus_setup_intr(dev, r, flags, NULL, f_Isr, handle,
&XX_IntrInfo[irq].cookie);
- if (err)
- goto finish;
- /*
- * XXX: Bind FMan IRQ to CPU0. Current interrupt subsystem directs each
- * interrupt to all CPUs. Race between an interrupt assertion and
- * masking may occur and interrupt handler may be called multiple times
- * per one interrupt. FMan doesn't support such a situation. Workaround
- * is to bind FMan interrupt to one CPU0 only.
- */
-#ifdef SMP
- if (XX_FmanNeedsIntrFix(irq))
- err = powerpc_bind_intr(irq, 0);
-#endif
-finish:
return (err);
}
Index: head/sys/dev/dpaa/fman.c
===================================================================
--- head/sys/dev/dpaa/fman.c
+++ head/sys/dev/dpaa/fman.c
@@ -455,13 +455,6 @@
goto err;
}
- /*
- * XXX: Fix FMan interrupt. This is workaround for the issue with
- * interrupts directed to multiple CPUs by the interrupts subsystem.
- * Workaround is to bind the interrupt to only one CPU0.
- */
- XX_FmanFixIntr(rman_get_start(sc->irq_res));
-
sc->err_irq_rid = 1;
sc->err_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
&sc->err_irq_rid, RF_ACTIVE | RF_SHAREABLE);

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 13, 3:33 PM (4 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29599300
Default Alt Text
D23829.id.diff (2 KB)

Event Timeline