From owner-p4-projects@FreeBSD.ORG Thu May 6 12:07:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A36F16A4D1; Thu, 6 May 2004 12:07:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5330416A4CE for ; Thu, 6 May 2004 12:07:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99D8443D48 for ; Thu, 6 May 2004 12:07:26 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i46J7QGe066122 for ; Thu, 6 May 2004 12:07:26 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i46J7QPD066119 for perforce@freebsd.org; Thu, 6 May 2004 12:07:26 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 6 May 2004 12:07:26 -0700 (PDT) Message-Id: <200405061907.i46J7QPD066119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 52365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2004 19:07:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=52365 Change 52365 by jhb@jhb_slimer on 2004/05/06 12:06:32 Various priority fixups. Affected files ... .. //depot/projects/smpng/sys/dev/sio/sio.c#42 edit .. //depot/projects/smpng/sys/kern/kern_idle.c#19 edit .. //depot/projects/smpng/sys/notes#14 edit .. //depot/projects/smpng/sys/pc98/pc98/sio.c#39 edit .. //depot/projects/smpng/sys/sys/interrupt.h#11 edit Differences ... ==== //depot/projects/smpng/sys/dev/sio/sio.c#42 (text+ko) ==== @@ -1122,9 +1122,9 @@ printf("\n"); if (sio_fast_ih == NULL) { - swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&tty_ithd, "sio", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&clk_ithd, "sio", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } minorbase = UNIT_TO_MINOR(unit); ==== //depot/projects/smpng/sys/kern/kern_idle.c#19 (text+ko) ==== @@ -60,6 +60,7 @@ td = FIRST_THREAD_IN_PROC(p); td->td_state = TDS_CAN_RUN; td->td_flags |= TDF_IDLETD; + td->td_priority = PRI_MAX_IDLE; mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); #ifdef SMP ==== //depot/projects/smpng/sys/notes#14 (text+ko) ==== @@ -1,6 +1,13 @@ This file serves as a sort of todo list for this branch as well as documenting what patches currently live in this branch. +- SWI Priorities + + SWI_CLOCK + + SWI_TQ* + + Fix tty hacks on clock to use SWI_CLOCK + + sio + - cy + - cx - Consolidate linux module version and dependencies into MI location. - Untested - Enable a pmap_emulate_reference check for Alpha under INVARIANTS instead ==== //depot/projects/smpng/sys/pc98/pc98/sio.c#39 (text+ko) ==== @@ -1797,7 +1797,7 @@ if (sio_fast_ih == NULL) { swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, &sio_fast_ih); - swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, + swi_add(&clk_ithd, "tty:sio", siopoll, NULL, SWI_CLOCK, 0, &sio_slow_ih); } minorbase = UNIT_TO_MINOR(unit); ==== //depot/projects/smpng/sys/sys/interrupt.h#11 (text+ko) ==== @@ -85,19 +85,18 @@ #define SWI_DELAY 0x2 /* - * Software interrupt bit numbers in priority order. The priority only - * determines which swi will be dispatched next; a higher priority swi - * may be dispatched when a nested h/w interrupt handler returns. + * Software interrupt numbers in priority order. The priority determines + * the priority of the corresponding interrupt thread. */ #define SWI_TTY 0 #define SWI_NET 1 #define SWI_CAMNET 2 #define SWI_CAMBIO 3 #define SWI_VM 4 -#define SWI_TQ_FAST 5 +#define SWI_CLOCK 5 +#define SWI_TQ_FAST 6 +#define SWI_TQ 6 #define SWI_TQ_GIANT 6 -#define SWI_TQ 7 -#define SWI_CLOCK 8 extern struct ithd *tty_ithd; extern struct ithd *clk_ithd;