Author: jkim
Date: Fri Sep 20 22:07:59 2019
New Revision: 352566
URL: https://svnweb.freebsd.org/changeset/base/352566

Log:
  MFC:  r342869, r344398, r344446, r344448, r345713, r345980, r347415,
        r349863, r350510, r351095
  
  Merge ACPICA up to 20190703.

Modified:
  stable/12/sys/amd64/acpica/acpi_machdep.c
  stable/12/sys/arm64/acpica/acpi_machdep.c
  stable/12/sys/contrib/dev/acpica/changes.txt
  stable/12/sys/contrib/dev/acpica/common/acfileio.c
  stable/12/sys/contrib/dev/acpica/common/acgetline.c
  stable/12/sys/contrib/dev/acpica/common/adfile.c
  stable/12/sys/contrib/dev/acpica/common/adisasm.c
  stable/12/sys/contrib/dev/acpica/common/adwalk.c
  stable/12/sys/contrib/dev/acpica/common/ahids.c
  stable/12/sys/contrib/dev/acpica/common/ahpredef.c
  stable/12/sys/contrib/dev/acpica/common/ahtable.c
  stable/12/sys/contrib/dev/acpica/common/ahuuids.c
  stable/12/sys/contrib/dev/acpica/common/cmfsize.c
  stable/12/sys/contrib/dev/acpica/common/dmextern.c
  stable/12/sys/contrib/dev/acpica/common/dmrestag.c
  stable/12/sys/contrib/dev/acpica/common/dmswitch.c
  stable/12/sys/contrib/dev/acpica/common/dmtable.c
  stable/12/sys/contrib/dev/acpica/common/dmtables.c
  stable/12/sys/contrib/dev/acpica/common/dmtbdump.c
  stable/12/sys/contrib/dev/acpica/common/dmtbdump1.c
  stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c
  stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c
  stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c
  stable/12/sys/contrib/dev/acpica/common/dmtbinfo1.c
  stable/12/sys/contrib/dev/acpica/common/dmtbinfo2.c
  stable/12/sys/contrib/dev/acpica/common/dmtbinfo3.c
  stable/12/sys/contrib/dev/acpica/common/getopt.c
  stable/12/sys/contrib/dev/acpica/compiler/aslallocate.c
  stable/12/sys/contrib/dev/acpica/compiler/aslanalyze.c
  stable/12/sys/contrib/dev/acpica/compiler/aslascii.c
  stable/12/sys/contrib/dev/acpica/compiler/aslbtypes.c
  stable/12/sys/contrib/dev/acpica/compiler/aslcache.c
  stable/12/sys/contrib/dev/acpica/compiler/aslcodegen.c
  stable/12/sys/contrib/dev/acpica/compiler/aslcompile.c
  stable/12/sys/contrib/dev/acpica/compiler/aslcompiler.h
  stable/12/sys/contrib/dev/acpica/compiler/aslcompiler.l
  stable/12/sys/contrib/dev/acpica/compiler/aslcstyle.y
  stable/12/sys/contrib/dev/acpica/compiler/asldebug.c
  stable/12/sys/contrib/dev/acpica/compiler/asldefine.h
  stable/12/sys/contrib/dev/acpica/compiler/aslerror.c
  stable/12/sys/contrib/dev/acpica/compiler/aslexternal.c
  stable/12/sys/contrib/dev/acpica/compiler/aslfileio.c
  stable/12/sys/contrib/dev/acpica/compiler/aslfiles.c
  stable/12/sys/contrib/dev/acpica/compiler/aslfold.c
  stable/12/sys/contrib/dev/acpica/compiler/aslglobal.h
  stable/12/sys/contrib/dev/acpica/compiler/aslhelp.c
  stable/12/sys/contrib/dev/acpica/compiler/aslhelpers.y
  stable/12/sys/contrib/dev/acpica/compiler/aslhex.c
  stable/12/sys/contrib/dev/acpica/compiler/aslkeywords.y
  stable/12/sys/contrib/dev/acpica/compiler/asllength.c
  stable/12/sys/contrib/dev/acpica/compiler/asllisting.c
  stable/12/sys/contrib/dev/acpica/compiler/asllistsup.c
  stable/12/sys/contrib/dev/acpica/compiler/aslload.c
  stable/12/sys/contrib/dev/acpica/compiler/asllookup.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmain.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmap.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmapenter.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmaputils.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmessages.c
  stable/12/sys/contrib/dev/acpica/compiler/aslmessages.h
  stable/12/sys/contrib/dev/acpica/compiler/aslmethod.c
  stable/12/sys/contrib/dev/acpica/compiler/aslnamesp.c
  stable/12/sys/contrib/dev/acpica/compiler/asloffset.c
  stable/12/sys/contrib/dev/acpica/compiler/aslopcodes.c
  stable/12/sys/contrib/dev/acpica/compiler/asloperands.c
  stable/12/sys/contrib/dev/acpica/compiler/aslopt.c
  stable/12/sys/contrib/dev/acpica/compiler/asloptions.c
  stable/12/sys/contrib/dev/acpica/compiler/aslparseop.c
  stable/12/sys/contrib/dev/acpica/compiler/aslparser.y
  stable/12/sys/contrib/dev/acpica/compiler/aslpld.c
  stable/12/sys/contrib/dev/acpica/compiler/aslpredef.c
  stable/12/sys/contrib/dev/acpica/compiler/aslprepkg.c
  stable/12/sys/contrib/dev/acpica/compiler/aslprimaries.y
  stable/12/sys/contrib/dev/acpica/compiler/aslprintf.c
  stable/12/sys/contrib/dev/acpica/compiler/aslprune.c
  stable/12/sys/contrib/dev/acpica/compiler/aslresource.c
  stable/12/sys/contrib/dev/acpica/compiler/aslresources.y
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype1.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  stable/12/sys/contrib/dev/acpica/compiler/aslrules.y
  stable/12/sys/contrib/dev/acpica/compiler/aslstartup.c
  stable/12/sys/contrib/dev/acpica/compiler/aslstubs.c
  stable/12/sys/contrib/dev/acpica/compiler/aslsupport.l
  stable/12/sys/contrib/dev/acpica/compiler/aslsupport.y
  stable/12/sys/contrib/dev/acpica/compiler/asltokens.y
  stable/12/sys/contrib/dev/acpica/compiler/asltransform.c
  stable/12/sys/contrib/dev/acpica/compiler/asltree.c
  stable/12/sys/contrib/dev/acpica/compiler/asltypes.h
  stable/12/sys/contrib/dev/acpica/compiler/asltypes.y
  stable/12/sys/contrib/dev/acpica/compiler/aslutils.c
  stable/12/sys/contrib/dev/acpica/compiler/asluuid.c
  stable/12/sys/contrib/dev/acpica/compiler/aslwalks.c
  stable/12/sys/contrib/dev/acpica/compiler/aslxref.c
  stable/12/sys/contrib/dev/acpica/compiler/aslxrefout.c
  stable/12/sys/contrib/dev/acpica/compiler/cvcompiler.c
  stable/12/sys/contrib/dev/acpica/compiler/cvdisasm.c
  stable/12/sys/contrib/dev/acpica/compiler/cvparser.c
  stable/12/sys/contrib/dev/acpica/compiler/dtcompile.c
  stable/12/sys/contrib/dev/acpica/compiler/dtcompiler.h
  stable/12/sys/contrib/dev/acpica/compiler/dtexpress.c
  stable/12/sys/contrib/dev/acpica/compiler/dtfield.c
  stable/12/sys/contrib/dev/acpica/compiler/dtio.c
  stable/12/sys/contrib/dev/acpica/compiler/dtparser.l
  stable/12/sys/contrib/dev/acpica/compiler/dtparser.y
  stable/12/sys/contrib/dev/acpica/compiler/dtsubtable.c
  stable/12/sys/contrib/dev/acpica/compiler/dttable.c
  stable/12/sys/contrib/dev/acpica/compiler/dttable1.c
  stable/12/sys/contrib/dev/acpica/compiler/dttable2.c
  stable/12/sys/contrib/dev/acpica/compiler/dttemplate.c
  stable/12/sys/contrib/dev/acpica/compiler/dttemplate.h
  stable/12/sys/contrib/dev/acpica/compiler/dtutils.c
  stable/12/sys/contrib/dev/acpica/compiler/preprocess.h
  stable/12/sys/contrib/dev/acpica/compiler/prexpress.c
  stable/12/sys/contrib/dev/acpica/compiler/prmacros.c
  stable/12/sys/contrib/dev/acpica/compiler/prparser.l
  stable/12/sys/contrib/dev/acpica/compiler/prparser.y
  stable/12/sys/contrib/dev/acpica/compiler/prscan.c
  stable/12/sys/contrib/dev/acpica/compiler/prutils.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbexec.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbinput.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbnames.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbobject.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbstats.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbtest.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbutils.c
  stable/12/sys/contrib/dev/acpica/components/debugger/dbxface.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  stable/12/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  stable/12/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  stable/12/sys/contrib/dev/acpica/components/events/evevent.c
  stable/12/sys/contrib/dev/acpica/components/events/evglock.c
  stable/12/sys/contrib/dev/acpica/components/events/evgpe.c
  stable/12/sys/contrib/dev/acpica/components/events/evgpeblk.c
  stable/12/sys/contrib/dev/acpica/components/events/evgpeinit.c
  stable/12/sys/contrib/dev/acpica/components/events/evgpeutil.c
  stable/12/sys/contrib/dev/acpica/components/events/evhandler.c
  stable/12/sys/contrib/dev/acpica/components/events/evmisc.c
  stable/12/sys/contrib/dev/acpica/components/events/evregion.c
  stable/12/sys/contrib/dev/acpica/components/events/evrgnini.c
  stable/12/sys/contrib/dev/acpica/components/events/evsci.c
  stable/12/sys/contrib/dev/acpica/components/events/evxface.c
  stable/12/sys/contrib/dev/acpica/components/events/evxfevnt.c
  stable/12/sys/contrib/dev/acpica/components/events/evxfgpe.c
  stable/12/sys/contrib/dev/acpica/components/events/evxfregn.c
  stable/12/sys/contrib/dev/acpica/components/executer/exconcat.c
  stable/12/sys/contrib/dev/acpica/components/executer/exconfig.c
  stable/12/sys/contrib/dev/acpica/components/executer/exconvrt.c
  stable/12/sys/contrib/dev/acpica/components/executer/excreate.c
  stable/12/sys/contrib/dev/acpica/components/executer/exdebug.c
  stable/12/sys/contrib/dev/acpica/components/executer/exdump.c
  stable/12/sys/contrib/dev/acpica/components/executer/exfield.c
  stable/12/sys/contrib/dev/acpica/components/executer/exfldio.c
  stable/12/sys/contrib/dev/acpica/components/executer/exmisc.c
  stable/12/sys/contrib/dev/acpica/components/executer/exmutex.c
  stable/12/sys/contrib/dev/acpica/components/executer/exnames.c
  stable/12/sys/contrib/dev/acpica/components/executer/exoparg1.c
  stable/12/sys/contrib/dev/acpica/components/executer/exoparg2.c
  stable/12/sys/contrib/dev/acpica/components/executer/exoparg3.c
  stable/12/sys/contrib/dev/acpica/components/executer/exoparg6.c
  stable/12/sys/contrib/dev/acpica/components/executer/exprep.c
  stable/12/sys/contrib/dev/acpica/components/executer/exregion.c
  stable/12/sys/contrib/dev/acpica/components/executer/exresnte.c
  stable/12/sys/contrib/dev/acpica/components/executer/exresolv.c
  stable/12/sys/contrib/dev/acpica/components/executer/exresop.c
  stable/12/sys/contrib/dev/acpica/components/executer/exserial.c
  stable/12/sys/contrib/dev/acpica/components/executer/exstore.c
  stable/12/sys/contrib/dev/acpica/components/executer/exstoren.c
  stable/12/sys/contrib/dev/acpica/components/executer/exstorob.c
  stable/12/sys/contrib/dev/acpica/components/executer/exsystem.c
  stable/12/sys/contrib/dev/acpica/components/executer/extrace.c
  stable/12/sys/contrib/dev/acpica/components/executer/exutils.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwpci.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwregs.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwxface.c
  stable/12/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsdump.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nseval.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsinit.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsload.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsnames.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsobject.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsparse.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nspredef.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nssearch.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsutils.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nswalk.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  stable/12/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  stable/12/sys/contrib/dev/acpica/components/parser/psargs.c
  stable/12/sys/contrib/dev/acpica/components/parser/psloop.c
  stable/12/sys/contrib/dev/acpica/components/parser/psobject.c
  stable/12/sys/contrib/dev/acpica/components/parser/psopcode.c
  stable/12/sys/contrib/dev/acpica/components/parser/psopinfo.c
  stable/12/sys/contrib/dev/acpica/components/parser/psparse.c
  stable/12/sys/contrib/dev/acpica/components/parser/psscope.c
  stable/12/sys/contrib/dev/acpica/components/parser/pstree.c
  stable/12/sys/contrib/dev/acpica/components/parser/psutils.c
  stable/12/sys/contrib/dev/acpica/components/parser/pswalk.c
  stable/12/sys/contrib/dev/acpica/components/parser/psxface.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsaddr.c
  stable/12/sys/contrib/dev/acpica/components/resources/rscalc.c
  stable/12/sys/contrib/dev/acpica/components/resources/rscreate.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsdump.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsinfo.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsio.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsirq.c
  stable/12/sys/contrib/dev/acpica/components/resources/rslist.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsmemory.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsmisc.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsserial.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsutils.c
  stable/12/sys/contrib/dev/acpica/components/resources/rsxface.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbdata.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbfadt.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbfind.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbinstal.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbprint.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbutils.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbxface.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbxfload.c
  stable/12/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utaddress.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utalloc.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utascii.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utcache.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utcopy.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utdebug.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utdecode.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utdelete.c
  stable/12/sys/contrib/dev/acpica/components/utilities/uterror.c
  stable/12/sys/contrib/dev/acpica/components/utilities/uteval.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utexcep.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utglobal.c
  stable/12/sys/contrib/dev/acpica/components/utilities/uthex.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utids.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utinit.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utlock.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utmath.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utmisc.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utmutex.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utnonansi.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utobject.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utosi.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utownerid.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utpredef.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utresdecode.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utresrc.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utstate.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utstring.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  stable/12/sys/contrib/dev/acpica/components/utilities/uttrack.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utuuid.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utxface.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utxferror.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  stable/12/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  stable/12/sys/contrib/dev/acpica/include/acapps.h
  stable/12/sys/contrib/dev/acpica/include/acbuffer.h
  stable/12/sys/contrib/dev/acpica/include/acclib.h
  stable/12/sys/contrib/dev/acpica/include/accommon.h
  stable/12/sys/contrib/dev/acpica/include/acconfig.h
  stable/12/sys/contrib/dev/acpica/include/acconvert.h
  stable/12/sys/contrib/dev/acpica/include/acdebug.h
  stable/12/sys/contrib/dev/acpica/include/acdisasm.h
  stable/12/sys/contrib/dev/acpica/include/acdispat.h
  stable/12/sys/contrib/dev/acpica/include/acevents.h
  stable/12/sys/contrib/dev/acpica/include/acexcep.h
  stable/12/sys/contrib/dev/acpica/include/acglobal.h
  stable/12/sys/contrib/dev/acpica/include/achware.h
  stable/12/sys/contrib/dev/acpica/include/acinterp.h
  stable/12/sys/contrib/dev/acpica/include/aclocal.h
  stable/12/sys/contrib/dev/acpica/include/acmacros.h
  stable/12/sys/contrib/dev/acpica/include/acnames.h
  stable/12/sys/contrib/dev/acpica/include/acnamesp.h
  stable/12/sys/contrib/dev/acpica/include/acobject.h
  stable/12/sys/contrib/dev/acpica/include/acopcode.h
  stable/12/sys/contrib/dev/acpica/include/acoutput.h
  stable/12/sys/contrib/dev/acpica/include/acparser.h
  stable/12/sys/contrib/dev/acpica/include/acpi.h
  stable/12/sys/contrib/dev/acpica/include/acpiosxf.h
  stable/12/sys/contrib/dev/acpica/include/acpixf.h
  stable/12/sys/contrib/dev/acpica/include/acpredef.h
  stable/12/sys/contrib/dev/acpica/include/acresrc.h
  stable/12/sys/contrib/dev/acpica/include/acrestyp.h
  stable/12/sys/contrib/dev/acpica/include/acstruct.h
  stable/12/sys/contrib/dev/acpica/include/actables.h
  stable/12/sys/contrib/dev/acpica/include/actbinfo.h
  stable/12/sys/contrib/dev/acpica/include/actbl.h
  stable/12/sys/contrib/dev/acpica/include/actbl1.h
  stable/12/sys/contrib/dev/acpica/include/actbl2.h
  stable/12/sys/contrib/dev/acpica/include/actbl3.h
  stable/12/sys/contrib/dev/acpica/include/actypes.h
  stable/12/sys/contrib/dev/acpica/include/acutils.h
  stable/12/sys/contrib/dev/acpica/include/acuuid.h
  stable/12/sys/contrib/dev/acpica/include/amlcode.h
  stable/12/sys/contrib/dev/acpica/include/amlresrc.h
  stable/12/sys/contrib/dev/acpica/include/platform/acenv.h
  stable/12/sys/contrib/dev/acpica/include/platform/acenvex.h
  stable/12/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  stable/12/sys/contrib/dev/acpica/include/platform/acgcc.h
  stable/12/sys/contrib/dev/acpica/include/platform/acgccex.h
  stable/12/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  stable/12/sys/dev/acpica/Osd/OsdTable.c
  stable/12/sys/dev/acpica/acpi_quirk.c
  stable/12/sys/i386/acpica/acpi_machdep.c
  stable/12/usr.sbin/acpi/acpidump/acpi.c
  stable/12/usr.sbin/bhyve/acpi.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- stable/12/sys/amd64/acpica/acpi_machdep.c   Fri Sep 20 21:27:41 2019        
(r352565)
+++ stable/12/sys/amd64/acpica/acpi_machdep.c   Fri Sep 20 22:07:59 2019        
(r352566)
@@ -164,7 +164,7 @@ map_table(vm_paddr_t pa, int offset, const char *sig)
        void *table;
 
        header = table_map(pa, offset, sizeof(ACPI_TABLE_HEADER));
-       if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) {
+       if (strncmp(header->Signature, sig, ACPI_NAMESEG_SIZE) != 0) {
                table_unmap(header, sizeof(ACPI_TABLE_HEADER));
                return (NULL);
        }
@@ -202,7 +202,7 @@ probe_table(vm_paddr_t address, const char *sig)
                printf("Table '%.4s' at 0x%jx\n", table->Signature,
                    (uintmax_t)address);
 
-       if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0) {
+       if (strncmp(table->Signature, sig, ACPI_NAMESEG_SIZE) != 0) {
                table_unmap(table, sizeof(ACPI_TABLE_HEADER));
                return (0);
        }

Modified: stable/12/sys/arm64/acpica/acpi_machdep.c
==============================================================================
--- stable/12/sys/arm64/acpica/acpi_machdep.c   Fri Sep 20 21:27:41 2019        
(r352565)
+++ stable/12/sys/arm64/acpica/acpi_machdep.c   Fri Sep 20 22:07:59 2019        
(r352566)
@@ -68,7 +68,7 @@ map_table(vm_paddr_t pa, int offset, const char *sig)
        void *table;
 
        header = pmap_mapbios(pa, sizeof(ACPI_TABLE_HEADER));
-       if (strncmp(header->Signature, sig, ACPI_NAME_SIZE) != 0) {
+       if (strncmp(header->Signature, sig, ACPI_NAMESEG_SIZE) != 0) {
                pmap_unmapbios((vm_offset_t)header, sizeof(ACPI_TABLE_HEADER));
                return (NULL);
        }
@@ -107,7 +107,7 @@ probe_table(vm_paddr_t address, const char *sig)
                printf("Table '%.4s' at 0x%jx\n", table->Signature,
                    (uintmax_t)address);
 
-       if (strncmp(table->Signature, sig, ACPI_NAME_SIZE) != 0) {
+       if (strncmp(table->Signature, sig, ACPI_NAMESEG_SIZE) != 0) {
                pmap_unmapbios((vm_offset_t)table, sizeof(ACPI_TABLE_HEADER));
                return (0);
        }

Modified: stable/12/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- stable/12/sys/contrib/dev/acpica/changes.txt        Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/changes.txt        Fri Sep 20 22:07:59 
2019        (r352566)
@@ -1,4 +1,356 @@
 ----------------------------------------
+03 July 2019. Summary of changes for version 20190703:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Remove legacy module-level support code. There were still some remnants 
+of the legacy module-level code executions. Since we no longer support 
+this option, this is essentially dead code and has been removed from the 
+ACPICA source.
+
+iASL: ensure that _WAK, _PTS, _TTS, and _Sx are declared only at the root 
+scope. If these named objects are declared outside the root scope, they 
+will not be invoked by any host Operating System.
+
+Clear status of GPEs on first direct enable. ACPI GPEs (other than the EC 
+one) can be enabled in two situations. First, the GPEs with existing _Lxx 
+and _Exx methods are enabled implicitly by ACPICA during system 
+initialization.  Second, the GPEs without these methods (like GPEs listed 
+by _PRW objects for wakeup devices) need to be enabled directly by the 
+code that is going to use them (e.g. ACPI power management or device 
+drivers).
+
+In the former case, if the status of a given GPE is set to start with, 
+its handler method (either _Lxx or _Exx) needs to be invoked to take care 
+of the events (possibly) signaled before the GPE was enabled. In the 
+latter case, however, the first caller of AcpiEnableGpe() for a given GPE 
+should not be expected to care about any events that might be signaled 
+through it earlier.  In that case, it is better to clear the status of 
+the GPE before enabling it, to prevent stale events from triggering 
+unwanted actions (like spurious system resume, for example).
+
+For this reason, modify AcpiEvAddGpeReference() to take an additional 
+boolean argument indicating whether or not the GPE status needs to be 
+cleared when its reference counter changes from zero to one and make 
+AcpiEnableGpe() pass TRUE to it through that new argument.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools:
+
+The tool generation process has been migrated to MSVC 2017, and all 
+project files have been upgraded. The new project files appear in the 
+directory \acpica\generate\msvc2017. This change effectively deprecates 
+the older project files in \acpica\generate\msvc9.
+
+iASL: ensure that _WAK, _PTS, _TTS, and _Sx are declared only at the root 
+scope. If these named objects are declared outside the root scope, they 
+will not be invoked by any host Operating System
+
+----------------------------------------
+09 May 2019. Summary of changes for version 20190509:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Revert commit  6c43e1a ("ACPICA: Clear status of GPEs before enabling 
+them") that causes problems with Thunderbolt controllers to occur if a 
+dock device is connected at init time (the xhci_hcd and thunderbolt 
+modules crash which prevents peripherals connected through them from 
+working). Commit 6c43e1a effectively causes commit ecc1165b8b74 ("ACPICA: 
+Dispatch active GPEs at init time") to get undone, so the problem 
+addressed by commit ecc1165b8b74 appears again as a result of it.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools:
+
+Reverted iASL: Additional forward reference detection. This change 
+reverts forward reference detection for field declarations. The feature 
+unintentionally emitted AML bytecode with incorrect package lengths for 
+some ASL code related to Fields and OperationRegions. This malformed AML 
+can cause systems to crash
+during boot. The malformed AML bytecode is emitted in iASL version 
+20190329 and 20190405.
+
+iASL: improve forward reference detection. This change improves forward 
+reference detection for named objects inside of scopes. If a parse object 
+has the OP_NOT_FOUND_DURING_LOAD set, it means that Op is a reference to 
+a named object that is declared later in the AML bytecode. This is 
+allowed if the reference is inside of a method and the declaration is 
+outside of a method like so:
+
+DefinitionBlock(...)
+{
+    Method (TEST)
+    {
+        Return (NUM0)
+    }
+    Name (NUM0,0)
+}
+
+However, if the declaration and reference are both in the same method or 
+outside any methods, this is a forward reference and should be marked as 
+an error because it would result in runtime errors.
+
+DefinitionBlock(...)
+{
+    Name (BUFF, Buffer (NUM0) {}) // Forward reference
+    Name (NUM0, 0x0)
+
+    Method (TEST)
+    {
+        Local0 = NUM1
+        Name (NUM1, 0x1) // Forward reference
+        return (Local0)
+    }
+}
+
+iASL: Implemented additional buffer overflow analysis for BufferField 
+declarations. Check if a buffer index argument to a create buffer field 
+operation is beyond the end of the target buffer.
+
+This affects these AML operators:
+ 
+   AML_CREATE_FIELD_OP
+   AML_CREATE_BIT_FIELD_OP
+   AML_CREATE_BYTE_FIELD_OP
+   AML_CREATE_WORD_FIELD_OP
+   AML_CREATE_DWORD_FIELD_OP
+   AML_CREATE_QWORD_FIELD_OP
+
+ There are three conditions that must be satisfied in order to allow this 
+validation at compile time:
+ 
+   1) The length of the target buffer must be an integer constant
+   2) The index specified in the create* must be an integer constant
+   3) For CreateField, the bit length argument must be non-zero.
+
+Example:
+    Name (BUF1, Buffer() {1,2})
+    CreateField (BUF1, 7, 9, CF03)  // 3: ERR
+
+dsdt.asl     14:     CreateField (BUF1, 7, 9, CF03)  // 3: ERR
+Error    6165 -                           ^ Buffer index beyond end of 
+target buffer
+
+
+----------------------------------------
+05 April 2019. Summary of changes for version 20190405:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Event Manager: History: Commit 18996f2db918 ("ACPICA: Events: Stop 
+unconditionally clearing ACPI IRQs during suspend/resume") was added 
+earlier to stop clearing of event status bits unconditionally on suspend 
+and resume paths. Though this change fixed an issue on suspend path, it 
+introduced regressions on several resume paths. In the case of S0ix, 
+events are enabled as part of device suspend path. If status bits for the 
+events are set when they are enabled, it could result in premature wake 
+from S0ix. If status is cleared for any event that is being enabled so 
+that any stale events are cleared out. In case of S0ix, events are 
+enabled as part of device suspend path. If status bits for the events are 
+set when they are enabled, it could result in premature wake from S0ix.
+
+This change ensures that status is cleared for any event that is being 
+enabled so that any stale events are cleared out.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools:
+
+iASL: Implemented an enhanced multiple file compilation that combines 
+named objects from all input files to a single namespace. With this 
+feature, any unresolved external declarations as well as duplicate named 
+object declarations can be detected during compilation rather than 
+generating errors much later at runtime. The following commands are 
+examples that utilize this feature:
+    iasl dsdt.asl ssdt.asl
+    iasl dsdt.asl ssdt1.asl ssdt2.asl
+    iasl dsdt.asl ssdt*.asl
+
+----------------------------------------
+29 March 2019. Summary of changes for version 20190329:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Namespace support: Remove the address nodes from global list after method 
+termination. The global address list contains pointers to namespace nodes 
+that represent Operation Regions. This change properly removes Operation 
+Region namespace nodes that are declared dynamically during method 
+execution.
+
+Linux: Use a different debug default than ACPICA. There was a divergence 
+between Linux and the ACPICA codebases. In order to resolve this 
+divergence, Linux now declares its own debug default in aclinux.h
+
+Renamed some internal macros to improve code understanding and 
+maintenance. The macros below all operate on single 4-character ACPI 
+NameSegs, not generic strings (old -> new):
+    ACPI_NAME_SIZE    -> ACPI_NAMESEG_SIZE
+    ACPI_COMPARE_NAME -> ACPI_COMPARE_NAMESEG
+    ACPI_MOVE_NAME    -> ACPI_COPY_NAMESEG
+
+Fix for missing comma in array declaration for the AcpiGbl_GenericNotify 
+table.
+
+Test suite: Update makefiles, add PCC operation region support
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Implemented additional illegal forward reference detection. Now 
+detect and emit an error upon detection of a forward reference from a 
+Field to an Operation Region. This will fail at runtime if allowed to 
+pass the compiler.
+
+AcpiExec: Add an address list check for dynamic Operation Regions. This 
+feature performs a sanity test for each node the global address list. 
+This is done in order to ensure that all dynamic operation regions are 
+properly removed from the global address list and no dangling pointers 
+are left behind.
+
+Disassembler: Improved generation of resource pathnames. This change 
+improves the code that generates resource descriptor and resource tag 
+pathnames. The original code used a bunch of str* C library functions 
+that caused warnings on some compilers.
+
+iASL: Removed some uses of strncpy and replaced with memmove. The strncpy 
+function can overwrite buffers if the calling code is not very careful. 
+In the case of generating a module/table header, use of memmove is a 
+better implementation.
+
+
+3) Status of new features that have not been completed at this time:
+
+iASL: Implementing an enhanced multiple file compilation into a single 
+namespace feature (Status): This feature will be released soon, and 
+allows multiple ASL files to be compiled into the same single namespace. 
+By doing so, any unresolved external declarations as well as duplicate 
+named object declarations can be detected during compilation (rather than 
+later during runtime). The following commands are examples that utilize 
+this feature:
+    iasl dsdt.asl ssdt.asl
+    iasl dsdt.asl ssdt1.asl ssdt2.asl
+    iasl dsdt.asl ssdt*.asl
+
+ASL tutorial status: Feedback is being gathered internally and the 
+current plan is to publish this tutorial on the ACPICA website after a 
+final review by a tech writer.
+
+----------------------------------------
+15 February 2019. Summary of changes for version 20190215:
+
+
+0) Support for ACPI specification version 6.3:
+
+Add PCC operation region support for the AML interpreter. This adds PCC 
+operation region support in the AML interpreter and a default handler for 
+acpiexec. The change also renames the PCC region address space keyword to 
+PlatformCommChannel.
+
+Support for new predefined methods _NBS, _NCH, _NIC, _NIH, and _NIG. 
+These methods provide OSPM with health information and device boot 
+status.
+
+PDTT: Add TriggerOrder to the PCC Identifier structure. The field value 
+defines if the trigger needs to be invoked by OSPM before or at the end 
+of kernel crash dump processing/handling operation.
+
+SRAT: Add Generic Affinity Structure subtable. This subtable in the SRAT 
+is used for describing devices such as heterogeneous processors, 
+accelerators, GPUs, and IO devices with integrated compute or DMA 
+engines.
+
+MADT: Add support for statistical profiling in GICC. Statistical 
+profiling extension (SPE) is an architecture-specific feature for ARM.
+
+MADT: Add online capable flag. If this bit is set, system hardware 
+supports enabling this processor during OS runtime.
+
+New Error Disconnect Recover Notification value. There are a number of 
+scenarios where system Firmware in collaboration with hardware may 
+disconnect one or more devices from the rest of the system for purposes 
+of error containment. Firmware can use this new notification value to 
+alert OSPM of such a removal.
+
+PPTT: New additional fields in Processor Structure Flags. These flags 
+provide more information about processor topology.
+
+NFIT/Disassembler: Change a field name from "Address Range" to "Region 
+Type".
+
+HMAT updates: make several existing fields to be reserved as well as 
+rename subtable 0 to "memory proximity domain attributes".
+
+GTDT: Add support for new GTDT Revision 3. This revision adds information 
+for the EL2 timer.
+
+iASL: Update the HMAT example template for new fields.
+
+iASL: Add support for the new revision of the GTDT (Rev 3).
+
+
+1) ACPICA kernel-resident subsystem:
+
+AML Parser: fix the main AML parse loop to correctly skip erroneous 
+extended opcodes. AML opcodes come in two lengths: 1-byte opcodes and 2-
+byte extended opcodes. If an error occurs during an AML table load, the 
+AML parser will continue loading the table by skipping the offending 
+opcode. This implements a "load table at any cost" philosophy.
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+iASL: Add checks for illegal object references, such as a reference 
+outside of method to an object within a method. Such an object is only 
+temporary.
+
+iASL: Emit error for creation of a zero-length operation region. Such a 
+region is rather pointless. If encountered, a runtime error is also 
+implemented in the interpeter.
+
+Debugger: Fix a possible fault with the "test objects" command.
+
+iASL: Makefile: support parent directory filenames containing embedded 
+spaces.
+
+iASL: Update the TPM2 template to revision 4.
+
+iASL: Add the ability to report specific warnings or remarks as errors.
+
+Disassembler: Disassemble OEMx tables as actual AML byte code. 
+Previously, these tables were treated as "unknown table".
+
+iASL: Add definition and disassembly for TPM2 revision 3.
+
+iASL: Add support for TPM2 rev 3 compilation.
+
+
+----------------------------------------
+08 January 2019. Summary of changes for version 20190108:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Updated all copyrights to 2019. This affects all source code modules.
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+ASL test suite (ASLTS): Updated all copyrights to 2019.
+
+Tools: Updated all signon copyrights to 2019.
+
+AcpiExec: Added a new option to dump extra information concerning any 
+memory leaks detected by the internal object/cache tracking mechanism. -
+va
+
+iASL: Updated the table template for the TPM2 table to the newest version 
+of the table (Revision 4)
+
+
+----------------------------------------
 13 December 2018. Summary of changes for version 20181213:
 
 
@@ -1193,7 +1545,7 @@ internal cache) is detected and ignored via object poi
 
 Debugger: Fixed an AML interpreter mutex issue during the single stepping 
 of control methods. If certain debugger commands are executed during 
-stepping, a mutex aquire/release error could occur. Lv Zheng.
+stepping, a mutex acquire/release error could occur. Lv Zheng.
 
 Fixed some issues generating ACPICA with the Intel C compiler by 
 restoring the original behavior and compiler-specific include file in 
@@ -6735,7 +7087,7 @@ keyword is not standard across compilers, and this typ
 be 
 configured on a per-compiler basis. Lin Ming.
 
-Made the system global AcpiGbl_SystemAwakeAndRunning publically 
+Made the system global AcpiGbl_SystemAwakeAndRunning publicly
 available. 
 Added an extern for this boolean in acpixf.h. Some hosts utilize this 
 value 
@@ -11402,9 +11754,9 @@ Helgaas.
 Removed the length limit (200) on string objects as per the upcoming ACPI 
 3.0A specification. This affects the following areas of the interpreter: 
 1) 
-any implicit conversion of a Buffer to a String, 2) a String object 
+any implicit conversion of a Buffer to a String, 2) a String object
 result 
-of the ASL Concatentate operator, 3) the String object result of the ASL 
+of the ASL Concatenate operator, 3) the String object result of the ASL
 ToString operator.
 
 Fixed a problem in the Windows OS interface layer (OSL) where a 
@@ -13560,7 +13912,7 @@ next access width boundary (a common coding error.)
 Renamed OSD_HANDLER to ACPI_OSD_HANDLER, and OSD_EXECUTION_CALLBACK to 
 ACPI_OSD_EXEC_CALLBACK for consistency with other ACPI symbols.  Also, 
 these 
-symbols are lowercased by the latest version of the AcpiSrc tool.
+symbols are lowercase by the latest version of the AcpiSrc tool.
 
 The prototypes for the PCI interfaces in acpiosxf.h have been updated to 
 rename "Register" to simply "Reg" to prevent certain compilers from 
@@ -14932,8 +15284,8 @@ with the Linux coding style.
 Removed the non-Linux SourceSafe module revision number from each
 module header.
 
-Completed major overhaul of symbols to be lowercased for linux.
-Doubled the number of symbols that are lowercased.
+Completed major overhaul of symbols to be lowercase for linux.
+Doubled the number of symbols that are lowercase.
 
 Fixed a problem where identifiers within procedure headers and
 within quotes were not fully lower cased (they were left with a
@@ -16429,7 +16781,7 @@ Summary of changes for this label: 02_14_02
 Implemented support in AcpiLoadTable to allow loading of FACS and
 FADT tables.
 
-Suport for the now-obsolete interim 0.71 64-bit ACPI tables has
+Support for the now-obsolete interim 0.71 64-bit ACPI tables has
 been removed.  All 64-bit platforms should be migrated to the ACPI
 2.0 tables.  The actbl71.h header has been removed from the source
 tree.
@@ -16779,7 +17131,7 @@ Updated all files to apply cleanly against 2.4.16.
 
 Added basic PCI Interrupt Routing Table (PRT) support for IA32
 (acpi_pci.c), and unified the PRT code for IA32 and IA64.  This
-version supports both static and dyanmic PRT entries, but dynamic
+version supports both static and dynamic PRT entries, but dynamic
 entries are treated as if they were static (not yet
 reconfigurable).  Architecture- specific code to use this data is
 absent on IA32 but should be available shortly.
@@ -16868,7 +17220,7 @@ power-down, and thermal passive cooling issues (coming
 
 Added additional typechecking for Fields within restricted access
 Operation Regions.  All fields within EC and CMOS regions must be
-declared with ByteAcc. All fields withing SMBus regions must be
+declared with ByteAcc. All fields within SMBus regions must be
 declared with the BufferAcc access type.
 
 Fixed a problem where the listing file output of control methods
@@ -17041,7 +17393,7 @@ objects to not be deleted during subsystem termination
 
 Fixed a problem with the external AcpiEvaluateObject interface
 where the subsystem would fault if the named object to be
-evaluated refered to a constant such as Zero, Ones, etc.
+evaluated referred to a constant such as Zero, Ones, etc.
 
 Fixed a problem with IndexFields and BankFields where the
 subsystem would fault if the index, data, or bank registers were
@@ -17108,7 +17460,7 @@ sleeps.)
 The AcpiEnterSleepState and AcpiLeaveSleepState interfaces now
 support wake-enabled GPEs.  This means that upon entering the
 sleep state, all GPEs that are not wake-enabled are disabled.
-When leaving the sleep state, these GPEs are reenabled.
+When leaving the sleep state, these GPEs are re-enabled.
 
 A local double-precision divide/modulo module has been added to
 enhance portability to OS kernels where a 64-bit math library is

Modified: stable/12/sys/contrib/dev/acpica/common/acfileio.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/acfileio.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/acfileio.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -585,7 +585,7 @@ AcValidateTableHeader (
      * These fields must be ASCII: OemId, OemTableId, AslCompilerId.
      * We allow a NULL terminator in OemId and OemTableId.
      */
-    for (i = 0; i < ACPI_NAME_SIZE; i++)
+    for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
     {
         if (!ACPI_IS_ASCII ((UINT8) TableHeader.AslCompilerId[i]))
         {

Modified: stable/12/sys/contrib/dev/acpica/common/acgetline.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/acgetline.c Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/acgetline.c Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/adfile.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/adfile.c    Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/adfile.c    Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/adisasm.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/adisasm.c   Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/adisasm.c   Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -459,7 +459,7 @@ AdDisassembleOneTable (
      */
     if (AcpiGbl_CaptureComments)
     {
-        strncpy (Table->Signature, AcpiGbl_TableSig, ACPI_NAME_SIZE);
+        strncpy (Table->Signature, AcpiGbl_TableSig, ACPI_NAMESEG_SIZE);
     }
 #endif
 
@@ -579,7 +579,7 @@ AdDisassembleOneTable (
         if (AslGbl_MapfileFlag)
         {
             fprintf (stderr, "%14s %s - %u bytes\n",
-                AslGbl_Files[ASL_FILE_MAP_OUTPUT].ShortDescription,
+                AslGbl_FileDescs[ASL_FILE_MAP_OUTPUT].ShortDescription,
                 AslGbl_Files[ASL_FILE_MAP_OUTPUT].Filename,
                 FlGetFileSize (ASL_FILE_MAP_OUTPUT));
         }

Modified: stable/12/sys/contrib/dev/acpica/common/adwalk.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/adwalk.c    Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/adwalk.c    Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -814,7 +814,7 @@ AcpiDmLoadDescendingOp (
 
         while (AcpiGbl_PreDefinedNames[PreDefineIndex].Name)
         {
-            if (ACPI_COMPARE_NAME (Node->Name.Ascii,
+            if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii,
                 AcpiGbl_PreDefinedNames[PreDefineIndex].Name))
             {
                 PreDefined = TRUE;

Modified: stable/12/sys/contrib/dev/acpica/common/ahids.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahids.c     Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/ahids.c     Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/ahpredef.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahpredef.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/ahpredef.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -305,6 +305,11 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_MSM",    "Memory Set Monitoring", "Sets bandwidth monitoring 
parameters for a memory device"),
     AH_PREDEF ("_MTL",    "Minimum Throttle Limit", "Returns the minimum 
throttle limit for a thermal zone"),
     AH_PREDEF ("_MTP",    "Memory Type", "Resource Descriptor field"),
+    AH_PREDEF ("_NBS",    "NVDIMM Boot Status", "Returns information about 
NVDIMM device’s status at boot time"),
+    AH_PREDEF ("_NCH",    "NVDIMM Current Health Information", "Returns 
current health information of the NVDIMM device"),
+    AH_PREDEF ("_NIC",    "NVDIMM Health Error Injection Capabilities", 
"Returns health error injection capabilities that are supported by the 
platform"),
+    AH_PREDEF ("_NIG",    "NVDIMM Inject Health Error Status","Returns 
currently active health errors and their error attributes that are injected by 
_NIH"),
+    AH_PREDEF ("_NIH",    "NVDIMM Inject/Clear Health Errors", "Returns the 
status of injecting or clearing Health Errors"),
     AH_PREDEF ("_NTT",    "Notification Temperature Threshold", "Returns a 
threshold for device temperature change that requires platform notification"),
     AH_PREDEF ("_OFF",    "Power Off", "Sets a power resource to the off 
state"),
     AH_PREDEF ("_ON_",    "Power On", "Sets a power resource to the on state"),
@@ -393,7 +398,7 @@ const AH_PREDEFINED_NAME    AslPredefinedInfo[] =
     AH_PREDEF ("_SDD",    "Set Device Data", "Sets data for a SATA device"),
     AH_PREDEF ("_SEG",    "PCI Segment", "Returns a device's PCI Segment Group 
number"),
     AH_PREDEF ("_SHL",    "Set Hardware Limit", "Sets the hardware limit 
enforced by the Power Meter"),
-    AH_PREDEF ("_SHR",    "Sharable", "Interrupt share status, Resource 
Descriptor field"),
+    AH_PREDEF ("_SHR",    "Shareable", "Interrupt share status, Resource 
Descriptor field"),
     AH_PREDEF ("_SI_",    "System Indicators", "Predefined scope"),
     AH_PREDEF ("_SIZ",    "Size", "DMA transfer size, Resource Descriptor 
field"),
     AH_PREDEF ("_SLI",    "System Locality Information", "Returns a list of 
NUMA system localities"),
@@ -485,7 +490,7 @@ AcpiAhMatchPredefinedName (
 
     for (Info = AslPredefinedInfo; Info->Name; Info++)
     {
-        if (ACPI_COMPARE_NAME (Nameseg, Info->Name))
+        if (ACPI_COMPARE_NAMESEG (Nameseg, Info->Name))
         {
             return (Info);
         }

Modified: stable/12/sys/contrib/dev/acpica/common/ahtable.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahtable.c   Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/ahtable.c   Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -183,7 +183,7 @@ AcpiAhGetTableInfo (
 
     for (Info = AcpiGbl_SupportedTables; Info->Signature; Info++)
     {
-        if (ACPI_COMPARE_NAME (Signature, Info->Signature))
+        if (ACPI_COMPARE_NAMESEG (Signature, Info->Signature))
         {
             return (Info);
         }

Modified: stable/12/sys/contrib/dev/acpica/common/ahuuids.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahuuids.c   Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/ahuuids.c   Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -226,7 +226,7 @@ AcpiAhMatchUuid (
 
     for (Info = Gbl_AcpiUuids; Info->Description; Info++)
     {
-        /* Null string means desciption is a UUID class */
+        /* Null string means description is a UUID class */
 
         if (!Info->String)
         {

Modified: stable/12/sys/contrib/dev/acpica/common/cmfsize.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/cmfsize.c   Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/cmfsize.c   Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmextern.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmextern.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmextern.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -1216,7 +1216,7 @@ AcpiDmCreateSubobjectForExternal (
  *
  * DESCRIPTION: Add one external to the namespace by resolvign the external
  *              (by performing a namespace lookup) and annotating the resulting
- *              namespace node with the approperiate information if the type
+ *              namespace node with the appropriate information if the type
  *              is ACPI_TYPE_REGION or ACPI_TYPE_METHOD.
  *
  
******************************************************************************/

Modified: stable/12/sys/contrib/dev/acpica/common/dmrestag.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmrestag.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmrestag.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -747,6 +747,7 @@ AcpiGetTagPathname (
     UINT8                   ResourceTableIndex;
     ACPI_SIZE               RequiredSize;
     char                    *Pathname;
+    char                    *PathnameEnd;
     AML_RESOURCE            *Aml;
     ACPI_PARSE_OBJECT       *Op;
     char                    *InternalPath;
@@ -809,20 +810,27 @@ AcpiGetTagPathname (
         RequiredSize, FALSE);
 
     /*
-     * Create the full path to the resource and tag by: remove the buffer name,
-     * append the resource descriptor name, append a dot, append the tag name.
+     * Create the full path to the resource and tag by:
+     *  1) Remove the buffer nameseg from the end of the pathname
+     *  2) Append the resource descriptor nameseg
+     *  3) Append a dot
+     *  4) Append the field tag nameseg
      *
-     * TBD: Always using the full path is a bit brute force, the path can be
+     * Always using the full path is a bit brute force, the path can be
      * often be optimized with carats (if the original buffer namepath is a
      * single nameseg). This doesn't really matter, because these paths do not
      * end up in the final compiled AML, it's just an appearance issue for the
      * disassembled code.
      */
-    Pathname[strlen (Pathname) - ACPI_NAME_SIZE] = 0;
-    strncat (Pathname, ResourceNode->Name.Ascii, ACPI_NAME_SIZE);
-    strcat (Pathname, ".");
-    strncat (Pathname, Tag, ACPI_NAME_SIZE);
+    PathnameEnd = Pathname + (RequiredSize - ACPI_NAMESEG_SIZE - 1);
+    ACPI_COPY_NAMESEG (PathnameEnd, ResourceNode->Name.Ascii);
 
+    PathnameEnd += ACPI_NAMESEG_SIZE;
+    *PathnameEnd = '.';
+
+    PathnameEnd++;
+    ACPI_COPY_NAMESEG (PathnameEnd, Tag);
+
     /* Internalize the namepath to AML format */
 
     AcpiNsInternalizeName (Pathname, &InternalPath);
@@ -863,7 +871,7 @@ static void
 AcpiDmUpdateResourceName (
     ACPI_NAMESPACE_NODE     *ResourceNode)
 {
-    char                    Name[ACPI_NAME_SIZE];
+    char                    Name[ACPI_NAMESEG_SIZE];
 
 
     /* Ignore if a unique name has already been assigned */
@@ -906,7 +914,7 @@ AcpiDmUpdateResourceName (
  *
  * PARAMETERS:  BitIndex            - Index into the resource descriptor
  *              Resource            - Pointer to the raw resource data
- *              ResourceIndex       - Index correspoinding to the resource type
+ *              ResourceIndex       - Index corresponding to the resource type
  *
  * RETURN:      Pointer to the resource tag (ACPI_NAME). NULL if no match.
  *

Modified: stable/12/sys/contrib/dev/acpica/common/dmswitch.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmswitch.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmswitch.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtable.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtable.c   Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtable.c   Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -320,7 +320,7 @@ static const char           *AcpiDmHestNotifySubnames[
 
 static const char           *AcpiDmHmatSubnames[] =
 {
-    "Memory Subystem Address Range",
+    "Memory Proximity Domain Attributes",
     "System Locality Latency and Bandwidth Information",
     "Memory Side Cache Information",
     "Unknown Structure Type"         /* Reserved */
@@ -400,6 +400,7 @@ static const char           *AcpiDmSratSubnames[] =
     "Processor Local x2APIC Affinity",
     "GICC Affinity",
     "GIC ITS Affinity",             /* Acpi 6.2 */
+    "Generic Initiator Affinity",   /* Acpi 6.3 */
     "Unknown Subtable Type"         /* Reserved */
 };
 
@@ -601,7 +602,7 @@ AcpiDmGetTableData (
 
     for (Info = AcpiDmTableData; Info->Signature; Info++)
     {
-        if (ACPI_COMPARE_NAME (Signature, Info->Signature))
+        if (ACPI_COMPARE_NAMESEG (Signature, Info->Signature))
         {
             return (Info);
         }
@@ -656,7 +657,7 @@ AcpiDmDumpDataTable (
      * Handle tables that don't use the common ACPI table header structure.
      * Currently, these are the FACS, RSDP, and S3PT.
      */
-    if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
+    if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
     {
         Length = Table->Length;
         Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs);
@@ -669,7 +670,7 @@ AcpiDmDumpDataTable (
     {
         Length = AcpiDmDumpRsdp (Table);
     }
-    else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT))
+    else if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT))
     {
         Length = AcpiDmDumpS3pt (Table);
     }

Modified: stable/12/sys/contrib/dev/acpica/common/dmtables.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtables.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtables.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -281,7 +281,7 @@ AdCreateTableHeader (
 
         /* Revision of DSDT controls the ACPI integer width */
 
-        if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT))
+        if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT))
         {
             AcpiOsPrintf (" **** 32-bit table (V1), no 64-bit math support");
         }

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump1.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump1.c Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump1.c Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -1106,9 +1106,26 @@ AcpiDmDumpGtdt (
         return;
     }
 
-    /* Subtables */
+    /* Rev 3 fields */
 
     Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
+
+    if (Table->Revision > 2)
+    {
+        SubtableLength = sizeof (ACPI_GTDT_EL2);
+        Status = AcpiDmDumpTable (Length, Offset, Subtable,
+            SubtableLength, AcpiDmTableInfoGtdtEl2);
+        if (ACPI_FAILURE (Status))
+        {
+            return;
+        }
+        Offset += SubtableLength;
+    }
+
+    Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset);
+
+    /* Subtables */
+
     while (Offset < Table->Length)
     {
         /* Common subtable header */
@@ -1406,7 +1423,7 @@ AcpiDmDumpHmat (
         case ACPI_HMAT_TYPE_ADDRESS_RANGE:
 
             InfoTable = AcpiDmTableInfoHmat0;
-            Length = sizeof (ACPI_HMAT_ADDRESS_RANGE);
+            Length = sizeof (ACPI_HMAT_PROXIMITY_DOMAIN);
             break;
 
         case ACPI_HMAT_TYPE_LOCALITY:

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -331,6 +331,11 @@ AcpiDmDumpSrat (
         case ACPI_SRAT_TYPE_GIC_ITS_AFFINITY:
 
             InfoTable = AcpiDmTableInfoSrat4;
+            break;
+
+        case ACPI_SRAT_TYPE_GENERIC_AFFINITY:
+
+            InfoTable = AcpiDmTableInfoSrat5;
             break;
 
         default:

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c  Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c  Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbinfo1.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbinfo1.c Fri Sep 20 21:27:41 
2019        (r352565)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo1.c Fri Sep 20 22:07:59 
2019        (r352566)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2018, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -814,6 +814,15 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdt[] =
     ACPI_DMT_TERMINATOR
 };
 
+/* GDTD EL2 timer info. This table is appended to AcpiDmTableInfoGtdt for rev 
3 and later */
+
+ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtEl2[] =
+{
+    {ACPI_DMT_UINT32,   ACPI_GTDT_EL2_OFFSET (VirtualEL2TimerGsiv),  "Virtual 
EL2 Timer GSIV", 0},
+    {ACPI_DMT_UINT32,   ACPI_GTDT_EL2_OFFSET (VirtualEL2TimerFlags), "Virtual 
EL2 Timer Flags", 0},
+    ACPI_DMT_TERMINATOR
+};
+
 /* GTDT Subtable header (one per Subtable) */
 
 ACPI_DMTABLE_INFO           AcpiDmTableInfoGtdtHdr[] =
@@ -1105,20 +1114,18 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoHmatHdr[] =
 
 /* HMAT subtables */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to