svn commit: r216923 - in stable/8/sys: amd64/amd64 i386/i386

[John Baldwin]

Author: jhb
Date: Mon Jan  3 17:57:44 2011
New Revision: 216923
URL: http://svn.freebsd.org/changeset/base/216923

Log:
  MFC 216679:
  Drop the icu_lock spinlock while pausing briefly after masking the
  interrupt in the I/O APIC before moving it to a different CPU.

Modified:
  stable/8/sys/amd64/amd64/io_apic.c
  stable/8/sys/i386/i386/io_apic.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/amd64/amd64/io_apic.c
==============================================================================
--- stable/8/sys/amd64/amd64/io_apic.c	Mon Jan  3 17:17:31 2011	(r216922)
+++ stable/8/sys/amd64/amd64/io_apic.c	Mon Jan  3 17:57:44 2011	(r216923)
@@ -359,7 +359,9 @@ ioapic_assign_cpu(struct intsrc *isrc, u
 	if (!intpin->io_masked && !intpin->io_edgetrigger) {
 		ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin),
 		    intpin->io_lowreg | IOART_INTMSET);
+		mtx_unlock_spin(&icu_lock);
 		DELAY(100);
+		mtx_lock_spin(&icu_lock);
 	}
 
 	intpin->io_cpu = apic_id;

Modified: stable/8/sys/i386/i386/io_apic.c
==============================================================================
--- stable/8/sys/i386/i386/io_apic.c	Mon Jan  3 17:17:31 2011	(r216922)
+++ stable/8/sys/i386/i386/io_apic.c	Mon Jan  3 17:57:44 2011	(r216923)
@@ -359,7 +359,9 @@ ioapic_assign_cpu(struct intsrc *isrc, u
 	if (!intpin->io_masked && !intpin->io_edgetrigger) {
 		ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin),
 		    intpin->io_lowreg | IOART_INTMSET);
+		mtx_unlock_spin(&icu_lock);
 		DELAY(100);
+		mtx_lock_spin(&icu_lock);
 	}
 
 	intpin->io_cpu = apic_id;