Date: Tue, 8 May 2007 21:29:14 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/amd64/amd64 intr_machdep.c io_apic.c local_apic.c msi.c nexus.c src/sys/amd64/include apicvar.h intr_machdep.h src/sys/amd64/isa atpic.c src/sys/i386/i386 intr_machdep.c io_apic.c local_apic.c msi.c nexus.c ... Message-ID: <200705082129.l48LTFZ5057886@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
jhb 2007-05-08 21:29:14 UTC
FreeBSD src repository
Modified files:
sys/amd64/amd64 intr_machdep.c io_apic.c local_apic.c
msi.c nexus.c
sys/amd64/include apicvar.h intr_machdep.h
sys/amd64/isa atpic.c
sys/i386/i386 intr_machdep.c io_apic.c local_apic.c
msi.c nexus.c
sys/i386/include apicvar.h intr_machdep.h
sys/i386/isa atpic.c
Log:
Minor fixes and tweaks to the x86 interrupt code:
- Split the intr_table_lock into an sx lock used for most things, and a
spin lock to protect intrcnt_index. Originally I had this as a spin lock
so interrupt code could use it to lookup sources. However, we don't
actually do that because it would add a lot of overhead to interrupts,
and if we ever do support removing interrupt sources, we can use other
means to safely do so w/o locking in the interrupt handling code.
- Replace is_enabled (boolean) with is_handlers (a count of handlers) to
determine if a source is enabled or not. This allows us to notice when
a source is no longer in use. When that happens, we now invoke a new
PIC method (pic_disable_intr()) to inform the PIC driver that the
source is no longer in use. The I/O APIC driver frees the APIC IDT
vector when this happens. The MSI driver no longer needs to have a
hack to clear is_enabled during msi_alloc() and msix_alloc() as a result
of this change as well.
- Add an apic_disable_vector() to reset an IDT vector back to Xrsvd to
complement apic_enable_vector() and use it in the I/O APIC and MSI code
when freeing an IDT vector.
- Add a new nexus hook: nexus_add_irq() to ask the nexus driver to add an
IRQ to its irq_rman. The MSI code uses this when it creates new
interrupt sources to let the nexus know about newly valid IRQs.
Previously the msi_alloc() and msix_alloc() passed some extra stuff
back to the nexus methods which then added the IRQs. This approach is
a bit cleaner.
- Change the MSI sx lock to a mutex. If we need to create new sources,
drop the lock, create the required number of sources, then get the lock
and try the allocation again.
Revision Changes Path
1.32 +38 -27 src/sys/amd64/amd64/intr_machdep.c
1.30 +20 -2 src/sys/amd64/amd64/io_apic.c
1.39 +12 -0 src/sys/amd64/amd64/local_apic.c
1.6 +71 -57 src/sys/amd64/amd64/msi.c
1.77 +11 -15 src/sys/amd64/amd64/nexus.c
1.24 +1 -0 src/sys/amd64/include/apicvar.h
1.18 +5 -4 src/sys/amd64/include/intr_machdep.h
1.22 +11 -3 src/sys/amd64/isa/atpic.c
1.27 +38 -27 src/sys/i386/i386/intr_machdep.c
1.34 +20 -2 src/sys/i386/i386/io_apic.c
1.41 +13 -0 src/sys/i386/i386/local_apic.c
1.6 +71 -57 src/sys/i386/i386/msi.c
1.73 +11 -15 src/sys/i386/i386/nexus.c
1.24 +1 -0 src/sys/i386/include/apicvar.h
1.20 +5 -4 src/sys/i386/include/intr_machdep.h
1.28 +11 -3 src/sys/i386/isa/atpic.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200705082129.l48LTFZ5057886>