Module Name: src
Committed By: yamt
Date: Fri Jun 15 14:07:44 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c
Log Message:
comment
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/pci/pci_intr_machdep.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/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.24 src/sys/arch/x86/pci/pci_intr_machdep.c:1.25
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.24 Fri Jun 15 14:02:41 2012
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Fri Jun 15 14:07:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.24 2012/06/15 14:02:41 yamt Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.25 2012/06/15 14:07:44 yamt Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.24 2012/06/15 14:02:41 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.25 2012/06/15 14:07:44 yamt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -144,6 +144,10 @@ pci_intr_map(const struct pci_attach_arg
KASSERT(rawpin <= PCI_INTERRUPT_PIN_D);
pci_decompose_tag(pc, pa->pa_tag, &bus, &dev, &func);
if (mp_busses != NULL) {
+ /*
+ * Note: PCI_INTERRUPT_PIN_A == 1 where intr_find_mpmapping
+ * wants pci bus_pin encoding which uses INT_A == 0.
+ */
if (intr_find_mpmapping(bus,
(dev << 2) | (rawpin - PCI_INTERRUPT_PIN_A), ihp) == 0) {
if (APIC_IRQ_LEGACY_IRQ(*ihp) == 0)
