diff options
author | tegge <tegge@FreeBSD.org> | 1998-04-01 21:07:37 +0000 |
---|---|---|
committer | tegge <tegge@FreeBSD.org> | 1998-04-01 21:07:37 +0000 |
commit | 028480bfb1299a0a34ad19f20e2cc3f24b402235 (patch) | |
tree | 77436497a16e77fa303820d1d60caeb109f2acad /sys/kern/subr_smp.c | |
parent | 574d6dcedfc1e96deb88ef6e7f5540eab053fe2d (diff) | |
download | FreeBSD-src-028480bfb1299a0a34ad19f20e2cc3f24b402235.zip FreeBSD-src-028480bfb1299a0a34ad19f20e2cc3f24b402235.tar.gz |
Add two workarounds for broken MP tables:
- Attempt to handle PCI devices where the interrupt is
an ISA/EISA interrupt according to the mp table.
- Attempt to handle multiple IO APIC pins connected to
the same PCI or ISA/EISA interrupt source. Print a
warning if this happens, since performance is suboptimal.
This workaround is only used for PCI devices.
With these two workarounds, the -SMP kernel is capable of running on
my Asus P/I-P65UP5 motherboard when version 1.4 of the MP table is disabled.
Diffstat (limited to 'sys/kern/subr_smp.c')
-rw-r--r-- | sys/kern/subr_smp.c | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index aa6adb9..6657ae48 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.69 1998/03/03 22:56:24 tegge Exp $ + * $Id: mp_machdep.c,v 1.70 1998/03/07 20:16:49 tegge Exp $ */ #include "opt_smp.h" @@ -1199,7 +1199,6 @@ isa_apic_pin(int isa_irq) } return -1; /* NOT found */ } -#undef SRCBUSIRQ /* @@ -1225,9 +1224,57 @@ pci_apic_pin(int pciBus, int pciDevice, int pciInt) return -1; /* NOT found */ } + +int +next_apic_pin(int pin) +{ + int intr, ointr; + int bus, bustype; + + bus = 0; + bustype = 0; + for (intr = 0; intr < nintrs; intr++) { + if (INTPIN(intr) != pin || INTTYPE(intr) != 0) + continue; + bus = SRCBUSID(intr); + bustype = apic_bus_type(bus); + if (bustype != ISA && + bustype != EISA && + bustype != PCI) + continue; + break; + } + if (intr >= nintrs) { + return -1; + } + for (ointr = intr + 1; ointr < nintrs; ointr++) { + if (INTTYPE(ointr) != 0) + continue; + if (bus != SRCBUSID(ointr)) + continue; + if (bustype == PCI) { + if (SRCBUSDEVICE(intr) != SRCBUSDEVICE(ointr)) + continue; + if (SRCBUSLINE(intr) != SRCBUSLINE(ointr)) + continue; + } + if (bustype == ISA || bustype == EISA) { + if (SRCBUSIRQ(intr) != SRCBUSIRQ(ointr)) + continue; + } + if (INTPIN(intr) == INTPIN(ointr)) + continue; + break; + } + if (ointr >= nintrs) { + return -1; + } + return INTPIN(ointr); +} #undef SRCBUSLINE #undef SRCBUSDEVICE #undef SRCBUSID +#undef SRCBUSIRQ #undef INTPIN #undef INTTYPE |