Module Name: src
Committed By: cherry
Date: Mon Sep 10 02:49:23 UTC 2018
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c
Log Message:
In the NIOAPIC case, we do not need to support "legacy" irqs,
ie; We don't need to simultaneously pass back the irq in the
range 0 < irq < 16 (which are sometimes described as "legacy"
in src
This was non-obvious, until the semantics of "legacy" were
used in inconsistent ways in Xen (to also mean interrupts in
the 0 < irq < 256 range) which causes problems with attempting
to unify the sys/arch/x86/isa/isa_machdep.c:isa_intr_establish_xname()
function between XEN and !XEN
This commit should not affect current functionality on any
either native or Xen. It is needed for future code reorg, and
published now as a preview.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 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.43 src/sys/arch/x86/pci/pci_intr_machdep.c:1.44
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.43 Sun Jun 24 11:51:15 2018
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Mon Sep 10 02:49:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.43 2018/06/24 11:51:15 jdolecek Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.44 2018/09/10 02:49:23 cherry 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.43 2018/06/24 11:51:15 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_machdep.c,v 1.44 2018/09/10 02:49:23 cherry Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -294,9 +294,7 @@ pci_intr_find_intx_irq(pci_intr_handle_t
return ENOENT;
*pic = &ioapic->sc_pic;
*pin = APIC_IRQ_PIN(ih);
- *irq = APIC_IRQ_LEGACY_IRQ(ih);
- if (*irq < 0 || *irq >= NUM_LEGACY_IRQS)
- *irq = -1;
+ *irq = -1; /* PCI doesn't use legacy irq */
}
#endif
