Date: Wed, 2 Nov 2005 20:28:32 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 86245 for review Message-ID: <200511022028.jA2KSWHb006333@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=86245 Change 86245 by jhb@jhb_slimer on 2005/11/02 20:27:56 IFC @86243. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#73 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/io_apic.c#10 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#17 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#38 integrate .. //depot/projects/smpng/sys/amd64/include/apicvar.h#8 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#6 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#33 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#6 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#24 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#33 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#36 integrate .. //depot/projects/smpng/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/smpng/sys/conf/files#157 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnames.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acopcode.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aecommon.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/aeexec.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psloop.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsinfo.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcache.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmutex.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utstate.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#88 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#60 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#37 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#67 integrate .. //depot/projects/smpng/sys/i386/i386/io_apic.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#36 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#16 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/smpng/sys/kern/kern_mbuf.c#10 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#39 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#77 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#47 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#11 integrate .. //depot/projects/smpng/sys/net/if_gre.c#26 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#23 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#41 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#34 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#61 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#36 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#42 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#78 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#37 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#75 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#42 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#10 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#13 integrate .. //depot/projects/smpng/sys/netipx/spx_usrreq.c#23 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#54 integrate .. //depot/projects/smpng/sys/sys/param.h#89 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#47 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#55 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#73 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.181 2005/10/31 16:14:07 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.182 2005/11/02 08:23:28 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -323,6 +323,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); +static pv_entry_t pv_entry_reclaim(pmap_t locked_pmap); static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); @@ -1321,7 +1322,55 @@ return uma_zalloc(pvzone, M_NOWAIT); } +/* + * Reclaim a pv entry by removing a mapping to an inactive page. + */ +static pv_entry_t +pv_entry_reclaim(pmap_t locked_pmap) +{ + pmap_t pmap; + pt_entry_t *pte, tpte; + pv_entry_t pv; + vm_offset_t va; + vm_page_t m; + PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + TAILQ_FOREACH(m, &vm_page_queues[PQ_INACTIVE].pl, pageq) { + if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + continue; + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + va = pv->pv_va; + pmap = pv->pv_pmap; + if (pmap != locked_pmap && !PMAP_TRYLOCK(pmap)) + continue; + pmap->pm_stats.resident_count--; + pte = pmap_lev3pte(pmap, va); + tpte = *pte; + *pte = 0; + KASSERT((tpte & PG_W) == 0, + ("pv_entry_reclaim: wired pte %#lx", tpte)); + if ((tpte & PG_FOR) == 0) + vm_page_flag_set(m, PG_REFERENCED); + if ((tpte & PG_FOW) == 0) { + if (pmap_track_modified(va)) + vm_page_dirty(m); + } + pmap_invalidate_page(pmap, va); + TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist); + TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); + if (TAILQ_EMPTY(&m->md.pv_list)) + vm_page_flag_clear(m, PG_WRITEABLE); + m->md.pv_list_count--; + pmap_unuse_pt(pmap, va, pv->pv_ptem); + if (pmap != locked_pmap) + PMAP_UNLOCK(pmap); + return (pv); + } + } + panic("pv_entry_reclaim: increase vm.pmap.shpgperproc"); +} + static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { @@ -1368,7 +1417,7 @@ pv = get_pv_entry(); if (pv == NULL) - panic("no pv entries: increase vm.pmap.shpgperproc"); + pv = pv_entry_reclaim(pmap); pv->pv_va = va; pv->pv_pmap = pmap; pv->pv_ptem = mpte; ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.18 2005/10/31 15:41:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.19 2005/11/01 22:44:06 jkim Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -229,7 +229,7 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0) { + if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); ==== //depot/projects/smpng/sys/amd64/amd64/io_apic.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.17 2005/10/31 15:41:17 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.18 2005/11/02 20:11:46 jhb Exp $"); #include "opt_atpic.h" #include "opt_isa.h" @@ -56,10 +56,10 @@ #define IOAPIC_REDTBL_LO(i) (IOAPIC_REDTBL + (i) * 2) #define IOAPIC_REDTBL_HI(i) (IOAPIC_REDTBL_LO(i) + 1) -#define VECTOR_EXTINT 252 -#define VECTOR_NMI 253 -#define VECTOR_SMI 254 -#define VECTOR_DISABLED 255 +#define IRQ_EXTINT (NUM_IO_INTS + 1) +#define IRQ_NMI (NUM_IO_INTS + 2) +#define IRQ_SMI (NUM_IO_INTS + 3) +#define IRQ_DISABLED (NUM_IO_INTS + 4) #define DEST_NONE -1 @@ -68,22 +68,18 @@ static MALLOC_DEFINE(M_IOAPIC, "ioapic", "I/O APIC structures"); /* - * New interrupt support code.. - * - * XXX: we really should have the interrupt cookie passed up from new-bus - * just be a int pin, and not map 1:1 to interrupt vector number but should - * use INTR_TYPE_FOO to set priority bands for device classes and do all the - * magic remapping of intpin to vector in here. For now we just cheat as on - * ia64 and map intpin X to vector NRSVIDT + X. Note that we assume that the - * first IO APIC has ISA interrupts on pins 1-15. Not sure how you are - * really supposed to figure out which IO APIC in a system with multiple IO - * APIC's actually has the ISA interrupts routed to it. As far as interrupt - * pin numbers, we use the ACPI System Interrupt number model where each - * IO APIC has a contiguous chunk of the System Interrupt address space. + * I/O APIC interrupt source driver. Each pin is assigned an IRQ cookie + * as laid out in the ACPI System Interrupt number model where each I/O + * APIC has a contiguous chunk of the System Interrupt address space. + * We assume that IRQs 1 - 15 behave like ISA IRQs and that all other + * IRQs behave as PCI IRQs by default. We also assume that the pin for + * IRQ 0 is actually an ExtINT pin. The apic enumerators override the + * configuration of individual pins as indicated by their tables. */ struct ioapic_intsrc { struct intsrc io_intsrc; + u_int io_irq; u_int io_intpin:8; u_int io_vector:8; u_int io_activehi:1; @@ -107,7 +103,7 @@ static u_int ioapic_read(volatile ioapic_t *apic, int reg); static void ioapic_write(volatile ioapic_t *apic, int reg, u_int val); static const char *ioapic_bus_string(int bus_type); -static void ioapic_print_vector(struct ioapic_intsrc *intpin); +static void ioapic_print_irq(struct ioapic_intsrc *intpin); static void ioapic_enable_source(struct intsrc *isrc); static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); @@ -178,25 +174,25 @@ } static void -ioapic_print_vector(struct ioapic_intsrc *intpin) +ioapic_print_irq(struct ioapic_intsrc *intpin) { - switch (intpin->io_vector) { - case VECTOR_DISABLED: + switch (intpin->io_irq) { + case IRQ_DISABLED: printf("disabled"); break; - case VECTOR_EXTINT: + case IRQ_EXTINT: printf("ExtINT"); break; - case VECTOR_NMI: + case IRQ_NMI: printf("NMI"); break; - case VECTOR_SMI: + case IRQ_SMI: printf("SMI"); break; default: printf("%s IRQ %u", ioapic_bus_string(intpin->io_bus), - intpin->io_vector); + intpin->io_irq); } } @@ -259,14 +255,20 @@ struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic; uint32_t low, high, value; - /* For disabled pins, just ensure that they are masked. */ - if (intpin->io_vector == VECTOR_DISABLED) { + /* + * If a pin is completely invalid or if it is valid but hasn't + * been enabled yet, just ensure that the pin is masked. + */ + if (intpin->io_irq == IRQ_DISABLED || (intpin->io_irq < NUM_IO_INTS && + intpin->io_vector == 0)) { + mtx_lock_spin(&icu_lock); low = ioapic_read(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin)); if ((low & IOART_INTMASK) == IOART_INTMCLR) ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low | IOART_INTMSET); + mtx_unlock_spin(&icu_lock); return; } @@ -291,24 +293,26 @@ low |= IOART_INTALO; if (intpin->io_masked) low |= IOART_INTMSET; - switch (intpin->io_vector) { - case VECTOR_EXTINT: + switch (intpin->io_irq) { + case IRQ_EXTINT: KASSERT(intpin->io_edgetrigger, ("ExtINT not edge triggered")); low |= IOART_DELEXINT; break; - case VECTOR_NMI: + case IRQ_NMI: KASSERT(intpin->io_edgetrigger, ("NMI not edge triggered")); low |= IOART_DELNMI; break; - case VECTOR_SMI: + case IRQ_SMI: KASSERT(intpin->io_edgetrigger, ("SMI not edge triggered")); low |= IOART_DELSMI; break; default: - low |= IOART_DELLOPRI | apic_irq_to_idt(intpin->io_vector); + KASSERT(intpin->io_vector != 0, ("No vector for IRQ %u", + intpin->io_irq)); + low |= IOART_DELLOPRI | intpin->io_vector; } /* Write the values to the APIC. */ @@ -334,7 +338,7 @@ if (bootverbose) { printf("ioapic%u: routing intpin %u (", io->io_id, intpin->io_intpin); - ioapic_print_vector(intpin); + ioapic_print_irq(intpin); printf(") to cluster %u\n", intpin->io_dest); } ioapic_program_intpin(intpin); @@ -365,10 +369,27 @@ ioapic_enable_intr(struct intsrc *isrc) { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + struct ioapic *io = (struct ioapic *)isrc->is_pic; if (intpin->io_dest == DEST_NONE) { + /* + * Allocate an APIC vector for this interrupt pin. Once + * we have a vector we program the interrupt pin. Note + * that after we have booted ioapic_assign_cluster() + * will program the interrupt pin again, but it doesn't + * hurt to do that and trying to avoid that adds needless + * complication. + */ + intpin->io_vector = apic_alloc_vector(intpin->io_irq); + if (bootverbose) { + printf("ioapic%u: routing intpin %u (", io->io_id, + intpin->io_intpin); + ioapic_print_irq(intpin); + printf(") to vector %u\n", intpin->io_vector); + } + ioapic_program_intpin(intpin); ioapic_assign_cluster(intpin); - lapic_enable_intr(intpin->io_vector); + apic_enable_vector(intpin->io_vector); } } @@ -378,7 +399,7 @@ struct ioapic_intsrc *pin; pin = (struct ioapic_intsrc *)isrc; - return (pin->io_vector); + return (pin->io_irq); } static int @@ -386,6 +407,8 @@ { struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + if (intpin->io_vector == 0) + return 0; return (lapic_intr_pending(intpin->io_vector)); } @@ -523,16 +546,16 @@ for (i = 0, intpin = io->io_pins; i < numintr; i++, intpin++) { intpin->io_intsrc.is_pic = (struct pic *)io; intpin->io_intpin = i; - intpin->io_vector = intbase + i; + intpin->io_irq = intbase + i; /* * Assume that pin 0 on the first I/O APIC is an ExtINT pin. * Assume that pins 1-15 are ISA interrupts and that all * other pins are PCI interrupts. */ - if (intpin->io_vector == 0) + if (intpin->io_irq == 0) ioapic_set_extint(io, i); - else if (intpin->io_vector < IOAPIC_ISA_INTS) { + else if (intpin->io_irq < IOAPIC_ISA_INTS) { intpin->io_bus = APIC_BUS_ISA; intpin->io_activehi = 1; intpin->io_edgetrigger = 1; @@ -550,9 +573,9 @@ * logical IDs to CPU clusters when they are enabled. */ intpin->io_dest = DEST_NONE; - if (bootverbose && intpin->io_vector != VECTOR_DISABLED) { + if (bootverbose && intpin->io_irq != IRQ_DISABLED) { printf("ioapic%u: intpin %d -> ", io->io_id, i); - ioapic_print_vector(intpin); + ioapic_print_irq(intpin); printf(" (%s, %s)\n", intpin->io_edgetrigger ? "edge" : "level", intpin->io_activehi ? "high" : "low"); @@ -573,7 +596,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (-1); - return (io->io_pins[pin].io_vector); + return (io->io_pins[pin].io_irq); } int @@ -584,9 +607,9 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_DISABLED) + if (io->io_pins[pin].io_irq == IRQ_DISABLED) return (EINVAL); - io->io_pins[pin].io_vector = VECTOR_DISABLED; + io->io_pins[pin].io_irq = IRQ_DISABLED; if (bootverbose) printf("ioapic%u: intpin %d disabled\n", io->io_id, pin); return (0); @@ -600,9 +623,9 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || vector < 0) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); - io->io_pins[pin].io_vector = vector; + io->io_pins[pin].io_irq = vector; if (bootverbose) printf("ioapic%u: Routing IRQ %d -> intpin %d\n", io->io_id, vector, pin); @@ -619,7 +642,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = bus_type; if (bootverbose) @@ -636,12 +659,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_NMI) + if (io->io_pins[pin].io_irq == IRQ_NMI) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_NMI; + io->io_pins[pin].io_irq = IRQ_NMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; @@ -659,12 +682,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_SMI) + if (io->io_pins[pin].io_irq == IRQ_SMI) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_SMI; + io->io_pins[pin].io_irq = IRQ_SMI; io->io_pins[pin].io_masked = 0; io->io_pins[pin].io_edgetrigger = 1; io->io_pins[pin].io_activehi = 1; @@ -682,12 +705,12 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr) return (EINVAL); - if (io->io_pins[pin].io_vector == VECTOR_EXTINT) + if (io->io_pins[pin].io_irq == IRQ_EXTINT) return (0); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_bus = APIC_BUS_UNKNOWN; - io->io_pins[pin].io_vector = VECTOR_EXTINT; + io->io_pins[pin].io_irq = IRQ_EXTINT; if (enable_extint) io->io_pins[pin].io_masked = 0; else @@ -708,7 +731,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || pol == INTR_POLARITY_CONFORM) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_activehi = (pol == INTR_POLARITY_HIGH); if (bootverbose) @@ -725,7 +748,7 @@ io = (struct ioapic *)cookie; if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM) return (EINVAL); - if (io->io_pins[pin].io_vector >= NUM_IO_INTS) + if (io->io_pins[pin].io_irq >= NUM_IO_INTS) return (EINVAL); io->io_pins[pin].io_edgetrigger = (trigger == INTR_TRIGGER_EDGE); if (bootverbose) @@ -756,18 +779,11 @@ io->io_id, flags >> 4, flags & 0xf, io->io_intbase, io->io_intbase + io->io_numintr - 1); bsp_id = PCPU_GET(apic_id); - for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) { - /* - * Finish initializing the pins by programming the vectors - * and delivery mode. - */ - if (pin->io_vector == VECTOR_DISABLED) - continue; - ioapic_program_intpin(pin); - if (pin->io_vector >= NUM_IO_INTS) - continue; - intr_register_source(&pin->io_intsrc); - } + + /* Register valid pins as interrupt sources. */ + for (i = 0, pin = io->io_pins; i < io->io_numintr; i++, pin++) + if (pin->io_irq < NUM_IO_INTS) + intr_register_source(&pin->io_intsrc); } /* ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#17 (text+ko) ==== @@ -32,14 +32,18 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.18 2005/10/26 22:32:30 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.19 2005/11/02 20:11:46 jhb Exp $"); #include "opt_hwpmc_hooks.h" +#include "opt_ddb.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/pcpu.h> #include <sys/smp.h> #include <sys/proc.h> @@ -56,6 +60,11 @@ #include <machine/smp.h> #include <machine/specialreg.h> +#ifdef DDB +#include <sys/interrupt.h> +#include <ddb/ddb.h> +#endif + /* * We can handle up to 60 APICs via our logical cluster IDs, but currently * the physical IDs on Intel processors up to the Pentium 4 are limited to @@ -73,6 +82,10 @@ #define LAPIC_TIMER_STATHZ_DIVIDER 15 #define LAPIC_TIMER_PROFHZ_DIVIDER 3 +/* Magic IRQ values for the timer and syscalls. */ +#define IRQ_TIMER (NUM_IO_INTS + 1) +#define IRQ_SYSCALL (NUM_IO_INTS + 2) + /* * Support for local APICs. Local APICs manage interrupts on each * individual processor as opposed to I/O APICs which receive interrupts @@ -126,6 +139,9 @@ IDTVEC(apic_isr7), /* 224 - 255 */ }; +/* Include IDT_SYSCALL to make indexing easier. */ +static u_int ioint_irqs[APIC_NUM_IOINTS + 1]; + static u_int32_t lapic_timer_divisors[] = { APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16, APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 @@ -197,12 +213,14 @@ /* Perform basic initialization of the BSP's local APIC. */ lapic_enable(); + ioint_irqs[IDT_SYSCALL - APIC_IO_INTS] = IRQ_SYSCALL; /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); /* Local APIC timer interrupt. */ setidt(APIC_TIMER_INT, IDTVEC(timerint), SDT_SYSIGT, SEL_KPL, 0); + ioint_irqs[APIC_TIMER_INT - APIC_IO_INTS] = IRQ_TIMER; /* XXX: error/thermal interrupts */ } @@ -258,18 +276,6 @@ } void -lapic_enable_intr(u_int irq) -{ - u_int vector; - - vector = apic_irq_to_idt(irq); - KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); - KASSERT(ioint_handlers[vector / 32] != NULL, - ("No ISR handler for IRQ %u", irq)); - setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); -} - -void lapic_setup(void) { struct lapic *la; @@ -692,30 +698,102 @@ lapic->lvt_timer = value; } -/* Translate between IDT vectors and IRQ vectors. */ +/* Request a free IDT vector to be used by the specified IRQ. */ u_int -apic_irq_to_idt(u_int irq) +apic_alloc_vector(u_int irq) { u_int vector; KASSERT(irq < NUM_IO_INTS, ("Invalid IRQ %u", irq)); - vector = irq + APIC_IO_INTS; - if (vector >= IDT_SYSCALL) - vector++; - return (vector); + + /* + * Search for a free vector. Currently we just use a very simple + * algorithm to find the first free vector. + */ + mtx_lock_spin(&icu_lock); + for (vector = 0; vector < APIC_NUM_IOINTS; vector++) { + if (ioint_irqs[vector] != 0) + continue; + ioint_irqs[vector] = irq; + mtx_unlock_spin(&icu_lock); + return (vector + APIC_IO_INTS); + } + mtx_unlock_spin(&icu_lock); + panic("Couldn't find an APIC vector for IRQ %u", irq); +} + +void +apic_enable_vector(u_int vector) +{ + + KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); + KASSERT(ioint_handlers[vector / 32] != NULL, + ("No ISR handler for vector %u", vector)); + setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); +} + +/* Release an APIC vector when it's no longer in use. */ +void +apic_free_vector(u_int vector, u_int irq) +{ + KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && + vector <= APIC_IO_INTS + APIC_NUM_IOINTS, + ("Vector %u does not map to an IRQ line", vector)); + KASSERT(irq < NUM_IO_INTS, ("Invalid IRQ %u", irq)); + KASSERT(ioint_irqs[vector - APIC_IO_INTS] == irq, ("IRQ mismatch")); + mtx_lock_spin(&icu_lock); + ioint_irqs[vector - APIC_IO_INTS] = 0; + mtx_unlock_spin(&icu_lock); } +/* Map an IDT vector (APIC) to an IRQ (interrupt source). */ u_int apic_idt_to_irq(u_int vector) { KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL && - vector <= APIC_IO_INTS + NUM_IO_INTS, + vector <= APIC_IO_INTS + APIC_NUM_IOINTS, ("Vector %u does not map to an IRQ line", vector)); - if (vector > IDT_SYSCALL) - vector--; - return (vector - APIC_IO_INTS); + return (ioint_irqs[vector - APIC_IO_INTS]); +} + +#ifdef DDB +/* + * Dump data about APIC IDT vector mappings. + */ +DB_SHOW_COMMAND(apic, db_show_apic) +{ + struct intsrc *isrc; + int quit, i, verbose; + u_int irq; + + quit = 0; + if (strcmp(modif, "vv") == 0) + verbose = 2; + else if (strcmp(modif, "v") == 0) + verbose = 1; + else + verbose = 0; + db_setup_paging(db_simple_pager, &quit, db_lines_per_page); + for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + irq = ioint_irqs[i]; + if (irq != 0 && irq != IRQ_SYSCALL) { + db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); + if (irq == IRQ_TIMER) + db_printf("lapic timer\n"); + else if (irq < NUM_IO_INTS) { + isrc = intr_lookup_source(irq); + if (isrc == NULL || verbose == 0) + db_printf("IRQ %u\n", irq); + else + db_dump_intr_event(isrc->is_event, + verbose == 2); + } else + db_printf("IRQ %u ???\n", irq); + } + } } +#endif /* * APIC probing support code. This includes code to manage enumerators. ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#38 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.444 2005/10/27 18:54:43 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.445 2005/11/01 22:59:02 jhb Exp $ machine amd64 cpu HAMMER @@ -63,6 +63,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. options ADAPTIVE_GIANT # Giant mutex is adaptive. +options STOP_NMI # Stop CPUS using NMI instead of IPI # Debugging for use in -current options KDB # Enable kernel debugger support. ==== //depot/projects/smpng/sys/amd64/include/apicvar.h#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.13 2005/06/09 18:23:54 ups Exp $ + * $FreeBSD: src/sys/amd64/include/apicvar.h,v 1.14 2005/11/02 20:11:47 jhb Exp $ */ #ifndef _MACHINE_APICVAR_H_ @@ -173,7 +173,9 @@ IDTVEC(apic_isr4), IDTVEC(apic_isr5), IDTVEC(apic_isr6), IDTVEC(apic_isr7), IDTVEC(spuriousint), IDTVEC(timerint); -u_int apic_irq_to_idt(u_int irq); +u_int apic_alloc_vector(u_int irq); +void apic_enable_vector(u_int vector); +void apic_free_vector(u_int vector, u_int irq); u_int apic_idt_to_irq(u_int vector); void apic_register_enumerator(struct apic_enumerator *enumerator); void *ioapic_create(uintptr_t addr, int32_t id, int intbase); @@ -192,7 +194,6 @@ void lapic_create(u_int apic_id, int boot_cpu); void lapic_disable(void); void lapic_dump(const char *str); -void lapic_enable_intr(u_int vector); void lapic_eoi(void); int lapic_id(void); void lapic_init(uintptr_t addr); ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511022028.jA2KSWHb006333>