Page MenuHomeFreeBSD
Files F147853184

D23826.diff
No OneTemporary
Actions

D23826.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
@@ -205,7 +205,7 @@
void XX_RestoreAllIntr(uint32_t flags);
-t_Error XX_PreallocAndBindIntr(uintptr_t irq, unsigned int cpu);
+t_Error XX_PreallocAndBindIntr(device_t dev, uintptr_t irq, unsigned int cpu);
t_Error XX_DeallocIntr(uintptr_t irq);
/**************************************************************************//**
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,8 +95,7 @@
/* Interrupt info */
#define XX_INTR_FLAG_PREALLOCATED (1 << 0)
-#define XX_INTR_FLAG_BOUND (1 << 1)
-#define XX_INTR_FLAG_FMAN_FIX (1 << 2)
+#define XX_INTR_FLAG_FMAN_FIX (1 << 1)
struct XX_IntrInfo {
driver_intr_t *handler;
@@ -320,16 +319,6 @@
info = arg;
- /* Bind this thread to proper CPU when SMP has been already started. */
- if ((info->flags & XX_INTR_FLAG_BOUND) == 0 && smp_started &&
- info->cpu >= 0) {
- thread_lock(curthread);
- sched_bind(curthread, info->cpu);
- thread_unlock(curthread);
-
- info->flags |= XX_INTR_FLAG_BOUND;
- }
-
if (info->handler == NULL) {
printf("%s(): IRQ handler is NULL!\n", __func__);
return;
@@ -339,7 +328,7 @@
}
t_Error
-XX_PreallocAndBindIntr(uintptr_t irq, unsigned int cpu)
+XX_PreallocAndBindIntr(device_t dev, uintptr_t irq, unsigned int cpu)
{
struct resource *r;
unsigned int inum;
@@ -349,6 +338,10 @@
inum = rman_get_start(r);
error = XX_SetIntr(irq, XX_Dispatch, &XX_IntrInfo[inum]);
+ if (error != 0)
+ return (error);
+
+ error = bus_bind_intr(dev, r, cpu);
if (error != 0)
return (error);
Index: head/sys/dev/dpaa/portals_common.c
===================================================================
--- head/sys/dev/dpaa/portals_common.c
+++ head/sys/dev/dpaa/portals_common.c
@@ -120,8 +120,7 @@
device_printf(dev, "Could not allocate irq.\n");
return (ENXIO);
}
-
- err = XX_PreallocAndBindIntr((uintptr_t)sc->sc_dp[cpu].dp_ires, cpu);
+ err = XX_PreallocAndBindIntr(dev, (uintptr_t)sc->sc_dp[cpu].dp_ires, cpu);
if (err != E_OK) {
device_printf(dev, "Could not prealloc and bind interrupt\n");

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 15, 4:46 AM (4 h, 26 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29702237
Default Alt Text
D23826.diff (2 KB)

Event Timeline