Module Name: src Committed By: yamt Date: Fri Jun 15 13:58:00 UTC 2012
Modified Files: src/sys/arch/x86/include: mpconfig.h src/sys/arch/x86/x86: intr.c Log Message: comments To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/include/mpconfig.h cvs rdiff -u -r1.73 -r1.74 src/sys/arch/x86/x86/intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x86/include/mpconfig.h diff -u src/sys/arch/x86/include/mpconfig.h:1.13 src/sys/arch/x86/include/mpconfig.h:1.14 --- src/sys/arch/x86/include/mpconfig.h:1.13 Fri Jul 1 18:22:39 2011 +++ src/sys/arch/x86/include/mpconfig.h Fri Jun 15 13:57:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mpconfig.h,v 1.13 2011/07/01 18:22:39 dyoung Exp $ */ +/* $NetBSD: mpconfig.h,v 1.14 2012/06/15 13:57:59 yamt Exp $ */ /* * Definitions originally from the mpbios code, but now used for ACPI @@ -16,7 +16,7 @@ #include <machine/pci_machdep.h> /* - * Interrupt typess + * Interrupt types */ #define MPS_INTTYPE_INT 0 #define MPS_INTTYPE_NMI 1 @@ -52,10 +52,15 @@ struct mp_intr_map { struct mp_intr_map *next; struct mp_bus *bus; + /* + * encoding of bus_pin is mp_bus dependant. + * for pci, bus_pin = (pci_device_number << 2) | pin + * where pin is 0=INTA ... 3=INTD. + */ int bus_pin; - struct pic *ioapic; + struct pic *ioapic; /* NULL for local apic */ int ioapic_pin; - int ioapic_ih; /* int handle, for apic_intr_est */ + int ioapic_ih; /* int handle, see i82093var.h for encoding */ int type; /* from mp spec intr record */ int flags; /* from mp spec intr record */ uint32_t redir; Index: src/sys/arch/x86/x86/intr.c diff -u src/sys/arch/x86/x86/intr.c:1.73 src/sys/arch/x86/x86/intr.c:1.74 --- src/sys/arch/x86/x86/intr.c:1.73 Tue Jun 12 17:26:29 2012 +++ src/sys/arch/x86/x86/intr.c Fri Jun 15 13:57:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.73 2012/06/12 17:26:29 yamt Exp $ */ +/* $NetBSD: intr.c,v 1.74 2012/06/15 13:57:59 yamt Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -133,7 +133,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.73 2012/06/12 17:26:29 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.74 2012/06/15 13:57:59 yamt Exp $"); #include "opt_intrdebug.h" #include "opt_multiprocessor.h" @@ -360,9 +360,7 @@ intr_find_pcibridge(int bus, pcitag_t *p #if NIOAPIC > 0 || NACPICA > 0 /* - * 'pin' argument is (dev << 2) | pin0 - * where dev is PCI device number (0-255) and - * pin0 is PCI interrupt pin number (0-3) + * 'pin' argument pci bus_pin encoding of a device/pin combination. */ int intr_find_mpmapping(int bus, int pin, int *handle)