From owner-p4-projects@FreeBSD.ORG Mon Nov 5 18:55:53 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80E216A468; Mon, 5 Nov 2007 18:55:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8A1716A419 for ; Mon, 5 Nov 2007 18:55:52 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90E8313C4B5 for ; Mon, 5 Nov 2007 18:55:52 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA5ItqSZ014885 for ; Mon, 5 Nov 2007 18:55:52 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA5ItqXE014882 for perforce@freebsd.org; Mon, 5 Nov 2007 18:55:52 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 5 Nov 2007 18:55:52 GMT Message-Id: <200711051855.lA5ItqXE014882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 128689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2007 18:55:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=128689 Change 128689 by gonzo@gonzo_jeeves on 2007/11/05 18:55:07 o Add IRQ dispatching routine. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/idt/idtreg.h#5 edit .. //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/idt/idtreg.h#5 (text+ko) ==== @@ -134,10 +134,15 @@ #define ICU_IP_BIT(irq) (1 << ICU_IP(irq)) #define ICU_GROUP(irq) (((irq) - IRQ_BASE) >> 5) -#define ICU_GROUP_MASK_REG(irq) \ - (ICU_IMASK2 + ((((irq) - IRQ_BASE) >> 5) * ICU_GROUP_REG_OFFSET)) -#define ICU_GROUP_PEND_REG(irq) \ - (ICU_IPEND2 + ((((irq) - IRQ_BASE) >> 5) * ICU_GROUP_REG_OFFSET)) +#define ICU_GROUP_MASK_REG(group) \ + (ICU_IMASK2 + ((((group) - 2) * ICU_GROUP_REG_OFFSET))) +#define ICU_GROUP_IPEND_REG(group) \ + (ICU_IPEND2 + ((((group) - 2) * ICU_GROUP_REG_OFFSET))) + +#define ICU_IRQ_MASK_REG(irq) \ + (ICU_IMASK2 + ((ICU_GROUP(irq) * ICU_GROUP_REG_OFFSET))) +#define ICU_IRQ_IPEND_REG(irq) \ + (ICU_IPEND2 + ((ICU_GROUP(irq) * ICU_GROUP_REG_OFFSET))) #define PCI_IRQ_BASE IP_IRQ(6, 4) #define PCI_IRQ_END IP_IRQ(6, 7) ==== //depot/projects/mips2/src/sys/mips/mips32/idt/obio.c#4 (text+ko) ==== @@ -270,7 +270,7 @@ handler, arg, intr_priority(flags), flags, cookiep); /* unmask IRQ */ - mask_register = ICU_GROUP_MASK_REG(irq); + mask_register = ICU_IRQ_MASK_REG(irq); ip_bit = ICU_IP_BIT(irq); mask = ICU_REG_READ(mask_register); @@ -295,7 +295,7 @@ panic("Trying to teardown unoccupied IRQ"); /* mask IRQ */ - mask_register = ICU_GROUP_MASK_REG(irq); + mask_register = ICU_IRQ_MASK_REG(irq); ip_bit = ICU_IP_BIT(irq); mask = ICU_REG_READ(mask_register); @@ -315,14 +315,43 @@ struct obio_softc *sc = arg; struct intr_event *event; struct intr_handler *ih; - uint32_t irqstat, ipend; - int irq, thread = 0; + uint32_t irqstat, ipend, imask, xpend; + int irq, thread = 0, group, i; /* TODO: handle all IRQs */ irqstat = 0; + irq = 0; + for (group = 2; group <= 6; group++) { + ipend = ICU_REG_READ(ICU_GROUP_IPEND_REG(group)); + imask = ICU_REG_READ(ICU_GROUP_MASK_REG(group)); + xpend = ipend; + ipend &= ~imask; + while ((i = fls(xpend)) != 0) { + xpend &= ~(1 << (i - 1)); + irq = IP_IRQ(group, i - 1); + } + + while ((i = fls(ipend)) != 0) { + ipend &= ~(1 << (i - 1)); + irq = IP_IRQ(group, i - 1); + event = sc->sc_eventstab[irq]; + if (event && !TAILQ_EMPTY(&event->ie_handlers)) { + /* Execute fast handlers. */ + TAILQ_FOREACH(ih, &event->ie_handlers, + ih_next) { + if (ih->ih_filter == NULL) + thread = 1; + else + ih->ih_filter(ih->ih_argument); + } + } - irq = 0; + /* Schedule thread if needed. */ + if (thread) + intr_event_schedule_thread(event); + } + } #if 0 ipend = ICU_REG_READ(ICU_IPEND2); printf("ipend2 = %08x!\n", ipend); @@ -340,21 +369,6 @@ #endif while (irqstat != 0) { if ((irqstat & 1) == 1) { - event = sc->sc_eventstab[irq]; - if (event && !TAILQ_EMPTY(&event->ie_handlers)) { - /* Execute fast handlers. */ - TAILQ_FOREACH(ih, &event->ie_handlers, - ih_next) { - if (ih->ih_filter == NULL) - thread = 1; - else - ih->ih_filter(ih->ih_argument); - } - } - - /* Schedule thread if needed. */ - if (thread) - intr_event_schedule_thread(event); } irq++;