Date: Fri, 30 Mar 2007 00:40:41 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 116895 for review Message-ID: <200703300040.l2U0ef4L080986@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=116895 Change 116895 by jhb@jhb_mutex on 2007/03/30 00:40:24 IFC @116893. Affected files ... .. //depot/projects/smpng/sys/Makefile#16 integrate .. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#7 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#19 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#65 integrate .. //depot/projects/smpng/sys/amd64/amd64/prof_machdep.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#59 integrate .. //depot/projects/smpng/sys/amd64/amd64/tsc.c#6 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#37 integrate .. //depot/projects/smpng/sys/amd64/include/acpica_machdep.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#11 integrate .. //depot/projects/smpng/sys/amd64/include/segments.h#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#12 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#8 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_locore.s#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#21 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#23 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#25 integrate .. //depot/projects/smpng/sys/arm/at91/at91_st.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#9 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/smpng/sys/arm/at91/kb920x_machdep.c#14 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#6 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_wdog.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#5 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#7 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/getc.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/memcmp.c#3 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/spi_flash.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/strlen.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/ficl.h#4 integrate .. //depot/projects/smpng/sys/boot/ficl/float.c#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/fileaccess.fr#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/oo.fr#3 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/prefix.fr#3 integrate .. //depot/projects/smpng/sys/boot/ficl/softwords/softcore.awk#3 integrate .. //depot/projects/smpng/sys/boot/ficl/tools.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/smpng/sys/boot/ficl/vm.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/words.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.S#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#11 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/acpi_stub.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#35 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#17 integrate .. //depot/projects/smpng/sys/conf/NOTES#139 integrate .. //depot/projects/smpng/sys/conf/files#202 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#59 integrate .. //depot/projects/smpng/sys/conf/options#138 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/altq_subr.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#25 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnames.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acopcode.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aecommon.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aeexec.c#2 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adfile.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adwalk.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmrestag.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtable.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbdump.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmtbinfo.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/common/getopt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.l#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslerror.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllength.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllisting.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslload.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmap.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopcodes.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asloperands.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslresource.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype1.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslrestype2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstubs.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltransform.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#24 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#25 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#22 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psloop.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#21 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsinfo.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#18 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbfadt.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbfind.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#20 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcache.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#23 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#19 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmutex.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utresrc.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utstate.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uttrack.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#17 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#20 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#12 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#99 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#26 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#19 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#39 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_dock.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#43 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#37 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_perf.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_quirk.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_throttle.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#23 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#65 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#23 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#81 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/smpng/sys/dev/iicbus/icee.c#1 branch .. //depot/projects/smpng/sys/dev/iicbus/iic.c#14 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbb.c#8 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.c#10 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus.h#4 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.c#6 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#8 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#56 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/smpng/sys/dev/isp/isp_library.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#53 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#24 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#37 integrate .. //depot/projects/smpng/sys/dev/mk48txx/mk48txx.c#8 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#88 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#26 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#54 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#3 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_macio.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe_sbus.c#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_core.c#4 integrate .. //depot/projects/smpng/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#26 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#15 integrate .. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#44 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#102 integrate .. //depot/projects/smpng/sys/dev/watchdog/watchdog.c#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#62 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#38 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#44 integrate .. //depot/projects/smpng/sys/geom/journal/g_journal.c#4 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#10 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#25 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#19 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#126 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/geode.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#52 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#28 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#116 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#106 integrate .. //depot/projects/smpng/sys/i386/i386/tsc.c#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#32 integrate .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#8 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#9 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#19 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#41 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#39 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#40 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#46 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#10 integrate .. //depot/projects/smpng/sys/ia64/acpica/madt.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#5 integrate .. //depot/projects/smpng/sys/kern/init_main.c#67 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#103 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#145 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#89 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#100 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#46 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#103 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#58 delete .. //depot/projects/smpng/sys/kern/vfs_bio.c#102 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#138 integrate .. //depot/projects/smpng/sys/modules/Makefile#137 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#32 integrate .. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/if_edsc/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#92 integrate .. //depot/projects/smpng/sys/net/if_disc.c#24 integrate .. //depot/projects/smpng/sys/net/if_edsc.c#1 branch .. //depot/projects/smpng/sys/net/if_ethersubr.c#81 integrate .. //depot/projects/smpng/sys/net/rtsock.c#57 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#19 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.c#10 integrate .. //depot/projects/smpng/sys/netgraph/netflow/ng_netflow.h#7 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#54 integrate .. //depot/projects/smpng/sys/netinet/in.c#37 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#44 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#83 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#91 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#101 integrate .. //depot/projects/smpng/sys/netinet/tcp_sack.c#20 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#59 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#52 integrate .. //depot/projects/smpng/sys/rpc/rpcclnt.c#13 integrate .. //depot/projects/smpng/sys/sys/cpu.h#3 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#24 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#69 integrate .. //depot/projects/smpng/sys/sys/mount.h#58 integrate .. //depot/projects/smpng/sys/sys/param.h#114 integrate .. //depot/projects/smpng/sys/sys/rwlock.h#9 integrate .. //depot/projects/smpng/sys/tools/acpi_quirks2h.awk#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#65 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#84 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#93 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.40 2006/11/26 18:27:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.41 2007/03/24 22:21:01 maxim Exp $ .include <bsd.own.mk> @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= cam coda compat conf contrib crypto ddb dev fs geom gnu i4b \ - isa isofs kern libkern modules net net80211 netatalk netatm \ + isa kern libkern modules net net80211 netatalk netatm \ netgraph netinet netinet6 netipx netkey netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci sys \ ufs vm ${ARCHDIR} ==== //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#7 (text+ko) ==== @@ -26,16 +26,18 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.13 2005/09/11 18:39:00 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); /* * 6.1 : Environmental support */ #include <sys/types.h> +#include <sys/bus.h> #include <sys/linker_set.h> #include <sys/sysctl.h> #include <contrib/dev/acpica/acpi.h> +#include <contrib/dev/acpica/actables.h> static u_long amd64_acpi_root; @@ -54,25 +56,16 @@ return(0); } -ACPI_STATUS -AcpiOsGetRootPointer(UINT32 Flags, ACPI_POINTER *RsdpPhysicalAddress) +ACPI_PHYSICAL_ADDRESS +AcpiOsGetRootPointer(void) { - ACPI_POINTER ptr; - ACPI_STATUS status; + u_long ptr; - if (amd64_acpi_root == 0) { - /* - * The loader passes the physical address at which it found the - * RSDP in a hint. We could recover this rather than searching - * manually here. - */ - status = AcpiFindRootPointer(Flags, &ptr); - if (status == AE_OK) - amd64_acpi_root = ptr.Pointer.Physical; - } else - status = AE_OK; + if (amd64_acpi_root == 0 && + (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || + AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + ptr != 0) + amd64_acpi_root = ptr; - RsdpPhysicalAddress->PointerType = ACPI_PHYSICAL_POINTER; - RsdpPhysicalAddress->Pointer.Physical = amd64_acpi_root; - return (status); + return (amd64_acpi_root); } ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#13 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.22 2007/03/05 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,7 +56,7 @@ #define NIOAPICS 32 /* Max number of I/O APICs */ #define NLAPICS 32 /* Max number of local APICs */ -typedef void madt_entry_handler(APIC_HEADER *entry, void *arg); +typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { @@ -70,26 +70,29 @@ } lapics[NLAPICS]; static int madt_found_sci_override; -static MULTIPLE_APIC_TABLE *madt; +static ACPI_TABLE_MADT *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; MALLOC_DEFINE(M_MADT, "madt_table", "ACPI MADT Table Items"); -static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); -static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); +static enum intr_polarity interrupt_polarity(UINT16 IntiFlags, UINT8 Source); +static enum intr_trigger interrupt_trigger(UINT16 IntiFlags, UINT8 Source); static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); -static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); -static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); -static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); +static void madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg); +static void madt_parse_interrupt_override( + ACPI_MADT_INTERRUPT_OVERRIDE *intr); +static void madt_parse_ints(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); +static void madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); -static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); +static void madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, + void *arg __unused); static int madt_probe_table(vm_paddr_t address); static void madt_register(void *dummy); static int madt_setup_local(void); @@ -161,14 +164,14 @@ void *table; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); - if (strncmp(header->Signature, sig, 4) != 0) { + if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) { madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); return (NULL); } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); table = madt_map(pa, offset, length); - if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) { + if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { if (bootverbose) printf("MADT: Failed checksum for table %s\n", sig); madt_unmap(table, length); @@ -192,10 +195,10 @@ static int madt_probe(void) { - ACPI_POINTER rsdp_ptr; - RSDP_DESCRIPTOR *rsdp; - RSDT_DESCRIPTOR *rsdt; - XSDT_DESCRIPTOR *xsdt; + ACPI_PHYSICAL_ADDRESS rsdp_ptr; + ACPI_TABLE_RSDP *rsdp; + ACPI_TABLE_RSDT *rsdt; + ACPI_TABLE_XSDT *xsdt; int i, count; if (resource_disabled("acpi", 0)) @@ -206,12 +209,9 @@ * calls pmap_mapbios() to find the RSDP, we assume that we can use * pmap_mapbios() to map the RSDP. */ - if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) + if ((rsdp_ptr = AcpiOsGetRootPointer()) == 0) return (ENXIO); -#ifdef __i386__ - KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); -#endif - rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr, sizeof(ACPI_TABLE_RSDP)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -230,38 +230,40 @@ * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbGenerateChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("MADT: RSDP failed extended checksum\n"); return (ENXIO); } - xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); + xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, + ACPI_SIG_XSDT); if (xsdt == NULL) { if (bootverbose) printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) break; madt_unmap_table(xsdt); } else { - rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, RSDT_SIG); + rsdt = madt_map_table(rsdp->RsdtPhysicalAddress, 1, + ACPI_SIG_RSDT); if (rsdt == NULL) { if (bootverbose) printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) break; madt_unmap_table(rsdt); } - pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(ACPI_TABLE_RSDP)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -275,7 +277,7 @@ * Verify that we can map the full table and that its checksum is * correct, etc. */ - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); if (madt == NULL) return (ENXIO); madt_unmap_table(madt); @@ -303,7 +305,7 @@ printf("Table '%.4s' at 0x%jx\n", table->Signature, (uintmax_t)address); - if (strncmp(table->Signature, APIC_SIG, 4) != 0) { + if (strncmp(table->Signature, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0) { madt_unmap(table, sizeof(ACPI_TABLE_HEADER)); return (0); } @@ -320,7 +322,7 @@ madt_probe_cpus(void) { - madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + madt = madt_map_table(madt_physaddr, 0, ACPI_SIG_MADT); KASSERT(madt != NULL, ("Unable to re-map MADT")); madt_walk_table(madt_probe_cpus_handler, NULL); madt_unmap_table(madt); @@ -336,10 +338,10 @@ { madt = pmap_mapbios(madt_physaddr, madt_length); - lapic_init(madt->LocalApicAddress); + lapic_init(madt->Address); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->OemId), madt->OemId, - (int)sizeof(madt->OemTableId), madt->OemTableId); + (int)sizeof(madt->Header.OemId), madt->Header.OemId, + (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -378,10 +380,10 @@ * force it to use level trigger and active-low polarity. */ if (!madt_found_sci_override) { - if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin) - != 0) - printf("MADT: Could not find APIC for SCI IRQ %d\n", - AcpiGbl_FADT->SciInt); + if (madt_find_interrupt(AcpiGbl_FADT.SciInterrupt, &ioapic, + &pin) != 0) + printf("MADT: Could not find APIC for SCI IRQ %u\n", + AcpiGbl_FADT.SciInterrupt); else { printf( "MADT: Forcing active-low polarity and level trigger for SCI\n"); @@ -416,46 +418,46 @@ static void madt_walk_table(madt_entry_handler *handler, void *arg) { - APIC_HEADER *entry; + ACPI_SUBTABLE_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Length; + end = (u_char *)(madt) + madt->Header.Length; for (p = (u_char *)(madt + 1); p < end; ) { - entry = (APIC_HEADER *)p; + entry = (ACPI_SUBTABLE_HEADER *)p; handler(entry, arg); p += entry->Length; } } static void -madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) +madt_probe_cpus_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) { - MADT_PROCESSOR_APIC *proc; + ACPI_MADT_LOCAL_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROCESSOR: + case ACPI_MADT_TYPE_LOCAL_APIC: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (MADT_PROCESSOR_APIC *)entry; + proc = (ACPI_MADT_LOCAL_APIC *)entry; if (bootverbose) - printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorId, - proc->ProcessorEnabled ? "enabled" : "disabled"); - if (!proc->ProcessorEnabled) + printf("MADT: Found CPU APIC ID %u ACPI ID %u: %s\n", + proc->Id, proc->ProcessorId, + (proc->LapicFlags & ACPI_MADT_ENABLED) ? + "enabled" : "disabled"); + if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->LocalApicId >= NLAPICS) - panic("%s: CPU ID %d too high", __func__, - proc->LocalApicId); - la = &lapics[proc->LocalApicId]; + if (proc->Id >= NLAPICS) + panic("%s: CPU ID %u too high", __func__, proc->Id); + la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, - ("Duplicate local APIC ID %d", proc->LocalApicId)); + ("Duplicate local APIC ID %u", proc->Id)); la->la_enabled = 1; la->la_acpi_id = proc->ProcessorId; - lapic_create(proc->LocalApicId, 0); + lapic_create(proc->Id, 0); break; } } @@ -465,26 +467,26 @@ * Add an I/O APIC from an entry in the table. */ static void -madt_parse_apics(APIC_HEADER *entry, void *arg __unused) +madt_parse_apics(ACPI_SUBTABLE_HEADER *entry, void *arg __unused) { - MADT_IO_APIC *apic; + ACPI_MADT_IO_APIC *apic; switch (entry->Type) { - case APIC_IO: - apic = (MADT_IO_APIC *)entry; + case ACPI_MADT_TYPE_IO_APIC: + apic = (ACPI_MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", - apic->IoApicId, apic->Interrupt, + printf( + "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", + apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->IoApicId >= NIOAPICS) - panic("%s: I/O APIC ID %d too high", __func__, - apic->IoApicId); - if (ioapics[apic->IoApicId].io_apic != NULL) - panic("%s: Double APIC ID %d", __func__, - apic->IoApicId); - ioapics[apic->IoApicId].io_apic = ioapic_create(apic->Address, - apic->IoApicId, apic->Interrupt); - ioapics[apic->IoApicId].io_vector = apic->Interrupt; + if (apic->Id >= NIOAPICS) + panic("%s: I/O APIC ID %u too high", __func__, + apic->Id); + if (ioapics[apic->Id].io_apic != NULL) + panic("%s: Double APIC ID %u", __func__, apic->Id); + ioapics[apic->Id].io_apic = ioapic_create(apic->Address, + apic->Id, apic->GlobalIrqBase); + ioapics[apic->Id].io_vector = apic->GlobalIrqBase; break; default: break; @@ -498,18 +500,18 @@ * SCI for which we use Active Lo, Level Triggered. */ static enum intr_polarity -interrupt_polarity(UINT16 Polarity, UINT8 Source) +interrupt_polarity(UINT16 IntiFlags, UINT8 Source) { - switch (Polarity) { - case POLARITY_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_POLARITY_MASK) { + case ACPI_MADT_POLARITY_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_POLARITY_LOW); else return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_HIGH: + case ACPI_MADT_POLARITY_ACTIVE_HIGH: return (INTR_POLARITY_HIGH); - case POLARITY_ACTIVE_LOW: + case ACPI_MADT_POLARITY_ACTIVE_LOW: return (INTR_POLARITY_LOW); default: panic("Bogus Interrupt Polarity"); @@ -517,18 +519,18 @@ } static enum intr_trigger -interrupt_trigger(UINT16 TriggerMode, UINT8 Source) +interrupt_trigger(UINT16 IntiFlags, UINT8 Source) { - switch (TriggerMode) { - case TRIGGER_CONFORMS: - if (Source == AcpiGbl_FADT->SciInt) + switch (IntiFlags & ACPI_MADT_TRIGGER_MASK) { + case ACPI_MADT_TRIGGER_CONFORMS: + if (Source == AcpiGbl_FADT.SciInterrupt) return (INTR_TRIGGER_LEVEL); else return (INTR_TRIGGER_EDGE); - case TRIGGER_EDGE: + case ACPI_MADT_TRIGGER_EDGE: return (INTR_TRIGGER_EDGE); - case TRIGGER_LEVEL: + case ACPI_MADT_TRIGGER_LEVEL: return (INTR_TRIGGER_LEVEL); default: panic("Bogus Interrupt Trigger Mode"); @@ -586,7 +588,7 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) +madt_parse_interrupt_override(ACPI_MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; @@ -594,20 +596,19 @@ enum intr_polarity pol; char buf[64]; - if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->Source == 0 && - intr->Interrupt == 2) { + if (acpi_quirks & ACPI_Q_MADT_IRQ0 && intr->SourceIrq == 0 && + intr->GlobalIrq == 2) { if (bootverbose) printf("MADT: Skipping timer override\n"); return; } if (bootverbose) printf("MADT: Interrupt override: source %u, irq %u\n", - intr->Source, intr->Interrupt); + intr->SourceIrq, intr->GlobalIrq); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->Interrupt, &new_ioapic, - &new_pin) != 0) { - printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->Interrupt, intr->Source); + if (madt_find_interrupt(intr->GlobalIrq, &new_ioapic, &new_pin) != 0) { + printf("MADT: Could not find APIC for vector %u (IRQ %u)\n", + intr->GlobalIrq, intr->SourceIrq); return; } @@ -615,15 +616,15 @@ * Lookup the appropriate trigger and polarity modes for this * entry. */ - trig = interrupt_trigger(intr->TriggerMode, intr->Source); - pol = interrupt_polarity(intr->Polarity, intr->Source); + trig = interrupt_trigger(intr->IntiFlags, intr->SourceIrq); + pol = interrupt_polarity(intr->IntiFlags, intr->SourceIrq); /* * If the SCI is identity mapped but has edge trigger and * active-hi polarity or the force_sci_lo tunable is set, * force it to use level/lo. */ - if (intr->Source == AcpiGbl_FADT->SciInt) { + if (intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) { madt_found_sci_override = 1; if (getenv_string("hw.acpi.sci.trigger", buf, sizeof(buf))) { if (tolower(buf[0]) == 'e') @@ -652,23 +653,24 @@ } /* Remap the IRQ if it is mapped to a different interrupt vector. */ - if (intr->Source != intr->Interrupt) { + if (intr->SourceIrq != intr->GlobalIrq) { /* * If the SCI is remapped to a non-ISA global interrupt, * then override the vector we use to setup and allocate * the interrupt. */ - if (intr->Interrupt > 15 && - intr->Source == AcpiGbl_FADT->SciInt) - acpi_OverrideInterruptLevel(intr->Interrupt); + if (intr->GlobalIrq > 15 && + intr->SourceIrq == AcpiGbl_FADT.SciInterrupt) + acpi_OverrideInterruptLevel(intr->GlobalIrq); else - ioapic_remap_vector(new_ioapic, new_pin, intr->Source); - if (madt_find_interrupt(intr->Source, &old_ioapic, + ioapic_remap_vector(new_ioapic, new_pin, + intr->SourceIrq); + if (madt_find_interrupt(intr->SourceIrq, &old_ioapic, &old_pin) != 0) - printf("MADT: Could not find APIC for source IRQ %d\n", - intr->Source); + printf("MADT: Could not find APIC for source IRQ %u\n", + intr->SourceIrq); else if (ioapic_get_vector(old_ioapic, old_pin) == - intr->Source) + intr->SourceIrq) ioapic_disable_pin(old_ioapic, old_pin); } @@ -681,31 +683,31 @@ * Parse an entry for an NMI routed to an IO APIC. */ static void -madt_parse_nmi(MADT_NMI_SOURCE *nmi) +madt_parse_nmi(ACPI_MADT_NMI_SOURCE *nmi) { void *ioapic; u_int pin; - if (madt_find_interrupt(nmi->Interrupt, &ioapic, &pin) != 0) { - printf("MADT: Could not find APIC for vector %d\n", - nmi->Interrupt); + if (madt_find_interrupt(nmi->GlobalIrq, &ioapic, &pin) != 0) { + printf("MADT: Could not find APIC for vector %u\n", + nmi->GlobalIrq); return; } ioapic_set_nmi(ioapic, pin); - if (nmi->TriggerMode != TRIGGER_CONFORMS) + if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS)) ioapic_set_triggermode(ioapic, pin, - interrupt_trigger(nmi->TriggerMode, 0)); - if (nmi->Polarity != TRIGGER_CONFORMS) + interrupt_trigger(nmi->IntiFlags, 0)); + if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS)) ioapic_set_polarity(ioapic, pin, - interrupt_polarity(nmi->Polarity, 0)); + interrupt_polarity(nmi->IntiFlags, 0)); } /* * Parse an entry for an NMI routed to a local APIC LVT pin. */ static void -madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi) +madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi) { u_int apic_id, pin; @@ -713,8 +715,8 @@ apic_id = APIC_ID_ALL; else if (madt_find_cpu(nmi->ProcessorId, &apic_id) != 0) { if (bootverbose) - printf("MADT: Ignoring local NMI routed to ACPI CPU %u\n", - nmi->ProcessorId); + printf("MADT: Ignoring local NMI routed to " + "ACPI CPU %u\n", nmi->ProcessorId); return; } if (nmi->Lint == 0) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703300040.l2U0ef4L080986>