From owner-p4-projects@FreeBSD.ORG Mon Sep 29 19:21:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0FE816A4C0; Mon, 29 Sep 2003 19:21:41 -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 844DD16A4B3 for ; Mon, 29 Sep 2003 19:21:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD8CD43FE5 for ; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8U2LeXJ030620 for ; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8U2LeSb030617 for perforce@freebsd.org; Mon, 29 Sep 2003 19:21:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 29 Sep 2003 19:21:40 -0700 (PDT) Message-Id: <200309300221.h8U2LeSb030617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 38833 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: Tue, 30 Sep 2003 02:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=38833 Change 38833 by peter@peter_hammer on 2003/09/29 19:20:53 no, I won't go back to pretending the vector is part of the frame. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -421,13 +421,14 @@ } void -lapic_handle_intr(struct intrframe frame) +lapic_handle_intr(void *cookie, struct intrframe frame) { struct intsrc *isrc; + int vec = (uintptr_t)cookie; - if (frame.if_vec == -1) + if (vec == -1) panic("Couldn't get vector from ISR!"); - isrc = intr_lookup_source(frame.if_vec); + isrc = intr_lookup_source(vec); isrc->is_pic->pic_disable_source(isrc); lapic->eoi = 0; intr_execute_handlers(isrc, &frame); ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#4 (text+ko) ==== @@ -152,7 +152,7 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(struct intrframe frame); +void lapic_handle_intr(void *cookie, struct intrframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -342,17 +342,17 @@ SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) /* XXX */ -void atpic_sched_ithd(struct intrframe iframe); +void atpic_sched_ithd(void *cookie, struct intrframe iframe); void -atpic_sched_ithd(struct intrframe iframe) +atpic_sched_ithd(void *cookie, struct intrframe iframe) { struct atpic_intsrc *asrc; struct intsrc *isrc; + int vec = (uintptr_t)cookie; - KASSERT((uint)iframe.if_vec < ICU_LEN, - ("unknown int %d\n", iframe.if_vec)); - asrc = &atintrs[iframe.if_vec]; + KASSERT(vec < ICU_LEN, ("unknown int %d\n", vec)); + asrc = &atintrs[vec]; if (asrc->at_extsrc != NULL) isrc = asrc->at_extsrc; else