svn commit: r359915 - in stable/12/sys: amd64/vmm/amd contrib/dev/acpica contrib/dev/acpica/common contrib/dev/acpica/compiler contrib/dev/acpica/components/debugger contrib/dev/acpica/components/d...

Tue Apr 14 08:34:42 UTC 2020

Author: jkim
Date: Tue Apr 14 08:34:34 2020
New Revision: 359915
URL: https://svnweb.freebsd.org/changeset/base/359915

Log:
  MFC:	r356618, r357959, r359346
  
  Merge ACPICA 20200326.

Modified:
  stable/12/sys/amd64/vmm/amd/amdvi_priv.h
  stable/12/sys/amd64/vmm/amd/ivrs_drv.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/dtcompilerparser.l
  stable/12/sys/contrib/dev/acpica/compiler/dtcompilerparser.y
  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
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/vmm/amd/amdvi_priv.h
==============================================================================

--- stable/12/sys/amd64/vmm/amd/amdvi_priv.h	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/amd64/vmm/amd/amdvi_priv.h	Tue Apr 14 08:34:34 2020	(r359915)
@@ -357,33 +357,15 @@ struct amdvi_domain {
 };
 
 /*
- * I/O Virtualization Hardware Definition Block (IVHD) type 0x10 (legacy)
- * uses ACPI_IVRS_HARDWARE define in contrib/dev/acpica/include/actbl2.h
- * New IVHD types 0x11 and 0x40 as defined in AMD IOMMU spec[48882] are missing in
- * ACPI code. These new types add extra field EFR(Extended Feature Register).
- * XXX : Use definition from ACPI when it is available.
- */
-typedef struct acpi_ivrs_hardware_efr_sup
-{
-	ACPI_IVRS_HEADER Header;
-	UINT16 CapabilityOffset;   /* Offset for IOMMU control fields */
-	UINT64 BaseAddress;        /* IOMMU control registers */
-	UINT16 PciSegmentGroup;
-	UINT16 Info;               /* MSI number and unit ID */
-	UINT32 Attr;               /* IOMMU Feature */
-	UINT64 ExtFR;              /* IOMMU Extended Feature */
-	UINT64 Reserved;           /* v1 feature or v2 attribute */
-} __attribute__ ((__packed__)) ACPI_IVRS_HARDWARE_EFRSUP;
-CTASSERT(sizeof(ACPI_IVRS_HARDWARE_EFRSUP) == 40);
-
-/*
  * Different type of IVHD.
  * XXX: Use AcpiIvrsType once new IVHD types are available.
 */
 enum IvrsType
 {
-	IVRS_TYPE_HARDWARE_LEGACY = 0x10, /* Legacy without EFRi support. */
-	IVRS_TYPE_HARDWARE_EFR 	  = 0x11, /* With EFR support. */
+	IVRS_TYPE_HARDWARE_LEGACY = ACPI_IVRS_TYPE_HARDWARE1,
+					/* Legacy without EFRi support. */
+	IVRS_TYPE_HARDWARE_EFR	  = ACPI_IVRS_TYPE_HARDWARE2,
+						/* With EFR support. */
 	IVRS_TYPE_HARDWARE_MIXED  = 0x40, /* Mixed with EFR support. */
 };
 

Modified: stable/12/sys/amd64/vmm/amd/ivrs_drv.c
==============================================================================
--- stable/12/sys/amd64/vmm/amd/ivrs_drv.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/amd64/vmm/amd/ivrs_drv.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -54,7 +54,7 @@ int	ivhd_count;			/* Number of IVHD header. */
  * Cached IVHD header list.
  * Single entry for each IVHD, filtered the legacy one.
  */
-ACPI_IVRS_HARDWARE *ivhd_hdrs[10];	
+ACPI_IVRS_HARDWARE1 *ivhd_hdrs[10];	
 
 extern int amdvi_ptp_level;		/* Page table levels. */
 
@@ -161,7 +161,7 @@ ivrs_hdr_find_iter(ACPI_IVRS_HEADER * ivrs_hdr, void *
 	return (1);
 }
 
-static ACPI_IVRS_HARDWARE *
+static ACPI_IVRS_HARDWARE1 *
 ivhd_find_by_index(int idx)
 {
 	struct find_ivrs_hdr_args fi;
@@ -171,7 +171,7 @@ ivhd_find_by_index(int idx)
 
 	ivrs_hdr_iterate_tbl(ivrs_hdr_find_iter, &fi);
 
-	return ((ACPI_IVRS_HARDWARE *)fi.ptr);
+	return ((ACPI_IVRS_HARDWARE1 *)fi.ptr);
 }
 
 static void
@@ -195,7 +195,7 @@ ivhd_dev_add_entry(struct amdvi_softc *softc, uint32_t
  * Record device attributes as suggested by BIOS.
  */
 static int
-ivhd_dev_parse(ACPI_IVRS_HARDWARE* ivhd, struct amdvi_softc *softc)
+ivhd_dev_parse(ACPI_IVRS_HARDWARE1 *ivhd, struct amdvi_softc *softc)
 {
 	ACPI_IVRS_DE_HEADER *de;
 	uint8_t *p, *end;
@@ -209,12 +209,12 @@ ivhd_dev_parse(ACPI_IVRS_HARDWARE* ivhd, struct amdvi_
 
 	switch (ivhd->Header.Type) {
 		case IVRS_TYPE_HARDWARE_LEGACY:
-			p = (uint8_t *)ivhd + sizeof(ACPI_IVRS_HARDWARE);
+			p = (uint8_t *)ivhd + sizeof(ACPI_IVRS_HARDWARE1);
 			break;
 
 		case IVRS_TYPE_HARDWARE_EFR:
 		case IVRS_TYPE_HARDWARE_MIXED:
-			p = (uint8_t *)ivhd + sizeof(ACPI_IVRS_HARDWARE_EFRSUP);
+			p = (uint8_t *)ivhd + sizeof(ACPI_IVRS_HARDWARE2);
 			break;
 
 		default:
@@ -327,7 +327,7 @@ static void
 ivhd_identify(driver_t *driver, device_t parent)
 {
 	ACPI_TABLE_IVRS *ivrs;
-	ACPI_IVRS_HARDWARE *ivhd;
+	ACPI_IVRS_HARDWARE1 *ivhd;
 	ACPI_STATUS status;
 	int i, count = 0;
 	uint32_t ivrs_ivinfo;
@@ -408,7 +408,7 @@ ivhd_identify(driver_t *driver, device_t parent)
 static int
 ivhd_probe(device_t dev)
 {
-	ACPI_IVRS_HARDWARE *ivhd;
+	ACPI_IVRS_HARDWARE1 *ivhd;
 	int unit;
 
 	if (acpi_get_handle(dev) != NULL)
@@ -582,7 +582,7 @@ ivhd_print_ext_feature(device_t dev, uint64_t ext_feat
 }
 
 static int
-ivhd_print_cap(struct amdvi_softc *softc, ACPI_IVRS_HARDWARE * ivhd)
+ivhd_print_cap(struct amdvi_softc *softc, ACPI_IVRS_HARDWARE1 * ivhd)
 {
 	device_t dev;
 	int max_ptp_level;
@@ -612,8 +612,8 @@ ivhd_print_cap(struct amdvi_softc *softc, ACPI_IVRS_HA
 static int
 ivhd_attach(device_t dev)
 {
-	ACPI_IVRS_HARDWARE *ivhd;
-	ACPI_IVRS_HARDWARE_EFRSUP *ivhd_efr;
+	ACPI_IVRS_HARDWARE1 *ivhd;
+	ACPI_IVRS_HARDWARE2 *ivhd_efr;
 	struct amdvi_softc *softc;
 	int status, unit;
 
@@ -637,7 +637,7 @@ ivhd_attach(device_t dev)
 	 * On lgeacy IVHD type(0x10), it is documented as feature
 	 * but in newer type it is attribute.
 	 */
-	softc->ivhd_feature = ivhd->Reserved;
+	softc->ivhd_feature = ivhd->FeatureReporting;
 	/* 
 	 * PCI capability has more capabilities that are not part of IVRS.
 	 */
@@ -648,12 +648,11 @@ ivhd_attach(device_t dev)
 	softc->event_msix = ivhd->Info & 0x1F;
 #endif
 	switch (ivhd->Header.Type) {
-		case IVRS_TYPE_HARDWARE_EFR:
-		case IVRS_TYPE_HARDWARE_MIXED:
-			ivhd_efr = (ACPI_IVRS_HARDWARE_EFRSUP *)ivhd;
-			softc->ext_feature = ivhd_efr->ExtFR;
-			break;
-
+	case IVRS_TYPE_HARDWARE_EFR:
+	case IVRS_TYPE_HARDWARE_MIXED:
+		ivhd_efr = (ACPI_IVRS_HARDWARE2 *)ivhd;
+		softc->ext_feature = ivhd_efr->EfrRegisterImage;
+		break;
 	}
 
 	softc->ctrl = (struct amdvi_ctrl *) PHYS_TO_DMAP(ivhd->BaseAddress);

Modified: stable/12/sys/contrib/dev/acpica/changes.txt
==============================================================================
--- stable/12/sys/contrib/dev/acpica/changes.txt	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/changes.txt	Tue Apr 14 08:34:34 2020	(r359915)
@@ -1,22 +1,254 @@
 ----------------------------------------
+26 March 2020. Summary of changes for version 20200326:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Performed a code clean-up to prevent build errors on early versions of 
+GCC-10.
+
+Added the NHLT table signature. iASL data table compiler/disassembler 
+support for this table is coming soon.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools: 
+
+AcpiExec: Fixed several problems with the namespace initialization file 
+(-fi<filename> option). Includes fixes to prevent AE_ALREADY_EXISTS 
+errors, several seg faults, and enhancements to line parsing within the 
+init file. In addition, each object found in the init file and it's new 
+value is displayed, as well as any such entries that do not have a 
+corresponding name in the namespace. For reference, the syntax for the 
+various supported data types are presented below:
+	PCHG 0x777788889999BBBB	// Integer
+	\DEV1.STR1 "XYZ"			// String
+	BUF1 (88 99 AA)			// Buffer
+	PKG1 [0x1111 0x2222]		// Package
+	\BF1 0x7980				// BufferField
+	RCRV 0x0123456789ABCDEF	// Field Unit
+
+iASL: Added a custom iASL macro __EXPECT__(iASL-Error-Code). This macro 
+can be used anywhere in a given ASL file to configure iASL to expect an 
+iASL compiler error code on the line where this macro was placed. If the 
+error code does not exist, an error is generated. This is intended to be 
+used for ACPICA's ASL test suite, but can be used by ASL developers as 
+well.
+
+iASL: table compiler: Implemented IVRS IVHD type 11h parsing. The AMD 
+IVRS table parsing supported only IVHD type 10h structures. Parsing an 
+IVHD type 11h caused the iasl to report unknown subtable type. Add 
+necessary structure definition for IVHD type 11h and apply correct 
+parsing method based on subtable type. Micha? ?ygowski.
+
+iASL: table compiler: Fixed IVRS table IVHD type 10h reserved field name 
+According to AMD IOMMU Specification Revision 3.05 the reserved field 
+should be IOMMU Feature Reporting. Change the name of the field to the 
+correct one. Micha? ?ygowski.
+
+acpiexec: removed redeclaration of AcpiGbl_DbOpt_NoRegionSupport. Patch 
+based on suggestions by David Seifert and Benjamin Berg.
+
+iASL: table compiler: removed an unused variable (DtCompilerParserResult) 
+causing linking errors. Patch based on suggestions by David Seifert and 
+Benjamin Berg.
+
+iASL: table compiler: make LexBuffer static to avoid linking errors in 
+newer compilers. Patch based on suggestions by David Seifert and Benjamin 
+Berg.
+
+iASL: fixed type matching between External and Named objects. External 
+object types can only be expressed with ACPI object type values that are 
+defined in the ACPI spec. However, iASL uses ACPI object type values that 
+are local to ACPICA in addition to the values defined in the ACPI spec. 
+This change implements type matching to map some object type values 
+specific to ACPICA to ones that are defined in the ACPI spec.
+
+iASL: Dropped the type mismatch compiler error that can arise from 
+External declarations to a warning. This warning can occur when there is 
+a type difference between the external declaration and the actual object 
+declaration (when compiling multiple files/modules simultaneously).
+
+iASL: removed an incorrect error message regarding externals. This change 
+removes an incorrect error that is emitted when a duplicate external 
+declaration does not contain a type that opens a scope. This is incorrect 
+because the duplicate external with conflicting types are already caught 
+by iASL and it doesn't make any sense to enforce what this conflicting 
+type should be.
+
+AcpiXtract: fix AX_IS_TABLE_BLOCK_HEADER macro. This macro needs to be 
+surrounded by parens. Otherwise, a logical statement that applies a 
+logical not operator to this macro could result in a computation that 
+applies the operator to the left side of the logical and but not the 
+right. Reported-by: John Levon <john.levon at joyent.com>
+
+Fixed a problem with the local version of sprint(): On 32-bit, the 
+provided sprintf() is non-functional: with a size of ACPI_UINT32_MAX, 
+String + Size will wrap, meaning End < Start, and 
+AcpiUtBoundStringOutput() will never output anything as a result. The 
+symptom seen of this was acpixtract failing to output anything -- with a 
+custom build that included utprint.c. Signed-off-by: John Levon 
+<john.levon at joyent.com>
+
+iASL: Changed the "PlatformCommChannel" ASL keyword to "PCC", as per the 
+ACPI specification.
+
+
+----------------------------------------
+14 February 2020. Summary of changes for version 20200214:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Enable sleep button on ACPI legacy wake:  Hibernation (S4) is triggered 
+in a guest when it receives a sleep trigger from the hypervisor. When the 
+guest resumes from this power state, it does not see the SleepEnabled 
+bit. In other words, the sleepHibernation (S4) is triggered in a guest 
+when it receives a sleep trigger from the hypervisor. When the guest 
+resumes from this power state, it does not see the SleepEnabled bit. In 
+other words, the sleep button is not enabled on waking from an S4 state. 
+This causes subsequent invocation of sleep state to fail since the 
+guest.button is not enabled on waking from an S4 state. This causes 
+subsequent invocation of sleep state to fail in the guest. Fix this 
+problem by enabling the sleep button in ACPI legacy wake. From Anchal 
+Agarwal <anchalag at amazon.com>.
+
+Implemented a new external interface, AcpiAnyGpeStatusSet (). To be used 
+for checking the status bits of all enabled GPEs in one go. It is needed 
+to distinguish spurious SCIs from genuine ones when deciding whether or 
+not to wake up the system from suspend-to-idle.
+
+Generic Makefiles: replace HOST name with ACPI_HOST: Some machines may be 
+using HOST in their environment to represent the host name for their 
+machines. Avoid this problem by renaming this variable from HOST to 
+ACPI_HOST.
+
+MSVC 2017 project files: Enable multiprocessor generation to improve 
+build performance.
+
+Added a macro to get the byte width of a Generic Address structure. New 
+ACPI_ACCESS_BYTE_WIDTH is in addition to the existing 
+ACPI_ACCESS_BIT_WIDTH. From Mika Westerberg.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools: 
+
+iASL: Implemented full support for the (optional, rarely used) ReturnType 
+and ParameterTypesList for the Method, Function, and External operators. 
+For Method declarations, the number of individual ParameterTypes must 
+match the declaration of the number of arguments (NumArgs). This also 
+Fixes a problem with the External operator where extra/extraneous bytes 
+were emitted in the AML code if the optional ReturnType/ParameterTypes 
+were specified for a MethodObj declaration.
+New error message:
+1) Method NumArgs count does not match length of ParameterTypes list
+
+iASL: Implemented detection of type mismatches between External 
+declarations and named object declarations. Also, detect type mismatches 
+between multiple External declarations of the same Name.
+New error messages:
+1) Type mismatch between external declaration and actual object 
+declaration detected
+2) Type mismatch between multiple external declarations detected
+
+iASL: Implemented new error messages for External operators that specify 
+a ReturnType and/or ParameterTypesList for any object type other than 
+control methods (MethodObj).
+New error messages:
+1) Return type is only allowed for Externals declared as MethodObj
+2) Parameter type is only allowed for Externals declared as MethodObj
+
+iASL: Implemented two new remark/warning messages for ASL code that 
+creates named objects from within a control method. This is very 
+inefficient since the named object must be created and deleted each time 
+the method is executed.
+New messages:
+1) Creation of named objects within a method is highly inefficient, use 
+globals or method local variables instead (remark)
+2) Static OperationRegion should be declared outside control method 
+(warning)
+
+iASL: Improved illegal forward reference detection by adding support to 
+detect forward-reference method invocations.
+
+iASL: Detect and issue an error message for NameStrings that contain too 
+many individual NameSegs (>255). This is an AML limitation that is 
+defined in the ACPI specification.
+New message:
+1) NameString contains too many NameSegs (>255)
+
+acpidump: windows: use GetSystemFirmwareTable API for all tables except 
+SSDT. By using this API, acpidump is able to get all tables in the XSDT
+
+iASL: Removed unused parser file and updated msvc2017 project files. 
+Removed the obsolete AslCompiler.y from the repository.
+
+iASL: msvc2017: Fixed macros in the file dependency list to prevent 
+unnecessary rebuilds. Replace %(Directory) with %(RelativeDir).
+
+Disassembler: Prevent spilling error messages to the output file. All 
+errors are directed to the console instead. These error messages 
+prevented re-compilation of the resulting disassembled ASL output file 
+(.DSL).
+
+
+----------------------------------------
+10 January 2020. Summary of changes for version 20200110:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Updated all copyrights to 2020. This affects all ACPICA source code 
+modules.
+
+
+2) iASL Compiler/Disassembler and ACPICA tools:
+
+ASL test suite (ASLTS): Updated all copyrights to 2020.
+
+Tools and utilities: Updated all signon copyrights to 2020.
+
+iASL: fix forward reference analysis for field declarations. Fixes 
+forward reference analysis for field declarations by searching the 
+parent scope for the named object when the object is not present in 
+the current scope.
+
+iASL: Improved the error output for ALREADY_EXISTS errors. Now, the 
+full pathname of the name that already exists is printed.
+
+iASL: Enhance duplicate Case() detection for buffers. Add check for 
+buffers with no initializer list (these buffers will be filled with 
+zeros at runtime.)
+
+
+----------------------------------------
 13 December 2019. Summary of changes for version 20191213:
 
 
 1) ACPICA kernel-resident subsystem:
 
-Return a Buffer object for all fields created via the CreateField operator. Previously, an Integer would be returned if the size of the field was less than or equal to the current size of an Integer. Although this goes against the ACPI specification, it provides compatibility with other ACPI implementations. Also updated the ASLTS test suite to reflect this new behavior.
+Return a Buffer object for all fields created via the CreateField
+operator. Previously, an Integer would be returned if the size of
+the field was less than or equal to the current size of an Integer.
+Although this goes against the ACPI specification, it provides
+compatibility with other ACPI implementations. Also updated the
+ASLTS test suite to reflect this new behavior.
 
 2) iASL Compiler/Disassembler and ACPICA tools:
 
-iASL: Implemented detection of (and throw an error for) duplicate values for Case statements within a single Switch statement. Duplicate Integers, Strings, and Buffers are supported.
+iASL: Implemented detection of (and throw an error for) duplicate
+values for Case statements within a single Switch statement. Duplicate
+Integers, Strings, and Buffers are supported.
 
-iASL: Fix error logging issue during multiple file compilation -- Switch to the correct input file during error node creation.
+iASL: Fix error logging issue during multiple file compilation --
+Switch to the correct input file during error node creation.
 
-iASL: For duplicate named object creation, now emit an error instead of a warning - since this will cause a runtime error.
+iASL: For duplicate named object creation, now emit an error instead
+of a warning - since this will cause a runtime error.
 
 AcpiSrc: Add unix line-ending support for non-Windows builds.
 
-iASL: Add an error condition for an attempt to create a NameString with > 255 NameSegs (the max allowable via the AML definition).
+iASL: Add an error condition for an attempt to create a NameString
+with > 255 NameSegs (the max allowable via the AML definition).
 
 
 ----------------------------------------
@@ -8806,8 +9038,8 @@ much larger code and data size.
 
 Fix build error under Bison-2.4.
 
-Dissasembler: Enhanced FADT support. Added decoding of the Boot 
-Architecture 
+Disassembler: Enhanced FADT support. Added decoding of the Boot
+Architecture
 flags. Now decode all flags, regardless of the FADT version. Flag output 
 includes the FADT version which first defined each flag.
 

Modified: stable/12/sys/contrib/dev/acpica/common/acfileio.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/acfileio.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/acfileio.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/acgetline.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/acgetline.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/acgetline.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/adfile.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/adisasm.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -156,6 +156,7 @@
 #include <contrib/dev/acpica/include/acnamesp.h>
 #include <contrib/dev/acpica/include/acparser.h>
 #include <contrib/dev/acpica/include/acapps.h>
+#include <contrib/dev/acpica/include/acconvert.h>
 
 
 #define _COMPONENT          ACPI_TOOLS
@@ -379,8 +380,6 @@ AdAmlDisassemble (
             Status = AE_ERROR;
             goto Cleanup;
         }
-
-        AcpiOsRedirectOutput (File);
     }
 
     *OutFilename = DisasmFilename;
@@ -467,6 +466,11 @@ AdDisassembleOneTable (
 
     if (!AcpiGbl_ForceAmlDisassembly && !AcpiUtIsAmlTable (Table))
     {
+        if (File)
+        {
+            AcpiOsRedirectOutput (File);
+        }
+
         AdDisassemblerHeader (Filename, ACPI_IS_DATA_TABLE);
 
         /* This is a "Data Table" (non-AML table) */
@@ -489,6 +493,10 @@ AdDisassembleOneTable (
         return (AE_OK);
     }
 
+    /* Initialize the converter output file */
+
+    ASL_CV_INIT_FILETREE(Table, File);
+
     /*
      * This is an AML table (DSDT or SSDT).
      * Always parse the tables, only option is what to display
@@ -499,6 +507,13 @@ AdDisassembleOneTable (
         AcpiOsPrintf ("Could not parse ACPI tables, %s\n",
             AcpiFormatException (Status));
         return (Status);
+    }
+
+    /* Redirect output for code generation and debugging output */
+
+    if (File)
+    {
+        AcpiOsRedirectOutput (File);
     }
 
     /* Debug output, namespace and parse tree */

Modified: stable/12/sys/contrib/dev/acpica/common/adwalk.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/adwalk.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/adwalk.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/ahids.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahids.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/ahids.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/ahpredef.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/ahtable.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahtable.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/ahtable.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -258,7 +258,7 @@ const AH_TABLE      AcpiGbl_SupportedTables[] =
     {ACPI_SIG_WDDT, "Watchdog Description Table"},
     {ACPI_SIG_WDRT, "Watchdog Resource Table"},
     {ACPI_SIG_WPBT, "Windows Platform Binary Table"},
-    {ACPI_SIG_WSMT, "Windows SMM Security Migrations Table"},
+    {ACPI_SIG_WSMT, "Windows SMM Security Mitigations Table"},
     {ACPI_SIG_XENV, "Xen Environment table"},
     {ACPI_SIG_XSDT, "Extended System Description Table"},
     {NULL,          NULL}

Modified: stable/12/sys/contrib/dev/acpica/common/ahuuids.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/ahuuids.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/ahuuids.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/cmfsize.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/cmfsize.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/cmfsize.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmextern.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmrestag.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmrestag.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmrestag.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmswitch.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmswitch.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmswitch.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtable.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -1676,7 +1676,8 @@ AcpiDmDumpTable (
             Temp8 = *Target;
             switch (Temp8)
             {
-            case ACPI_IVRS_TYPE_HARDWARE:
+            case ACPI_IVRS_TYPE_HARDWARE1:
+            case ACPI_IVRS_TYPE_HARDWARE2:
 
                 Name = AcpiDmIvrsSubnames[0];
                 break;

Modified: stable/12/sys/contrib/dev/acpica/common/dmtables.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtables.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtables.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -506,7 +506,6 @@ AdParseTable (
 
     AmlLength = Table->Length - sizeof (ACPI_TABLE_HEADER);
     AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
-    ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
 
     AcpiUtSetIntegerWidth (Table->Revision);
 

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump1.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump2.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -475,11 +475,16 @@ AcpiDmDumpIvrs (
 
         switch (Subtable->Type)
         {
-        case ACPI_IVRS_TYPE_HARDWARE:
+        case ACPI_IVRS_TYPE_HARDWARE1:
 
             InfoTable = AcpiDmTableInfoIvrs0;
             break;
 
+        case ACPI_IVRS_TYPE_HARDWARE2:
+
+            InfoTable = AcpiDmTableInfoIvrs01;
+            break;
+
         case ACPI_IVRS_TYPE_MEMORY1:
         case ACPI_IVRS_TYPE_MEMORY2:
         case ACPI_IVRS_TYPE_MEMORY3:
@@ -514,11 +519,21 @@ AcpiDmDumpIvrs (
 
         /* The hardware subtable can contain multiple device entries */
 
-        if (Subtable->Type == ACPI_IVRS_TYPE_HARDWARE)
+        if (Subtable->Type == ACPI_IVRS_TYPE_HARDWARE1 ||
+            Subtable->Type == ACPI_IVRS_TYPE_HARDWARE2)
         {
-            EntryOffset = Offset + sizeof (ACPI_IVRS_HARDWARE);
-            DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
-                sizeof (ACPI_IVRS_HARDWARE));
+            if (Subtable->Type == ACPI_IVRS_TYPE_HARDWARE1)
+            {
+                EntryOffset = Offset + sizeof (ACPI_IVRS_HARDWARE1);
+                DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
+                    sizeof (ACPI_IVRS_HARDWARE1));
+            }
+            else if (Subtable->Type == ACPI_IVRS_TYPE_HARDWARE2)
+            {
+                EntryOffset = Offset + sizeof (ACPI_IVRS_HARDWARE2);
+                DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, Subtable,
+                    sizeof (ACPI_IVRS_HARDWARE2));
+            }
 
             while (EntryOffset < (Offset + Subtable->Length))
             {

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbdump3.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, 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	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo1.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbinfo2.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbinfo2.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo2.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -403,7 +403,21 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoIvrs0[] =
     {ACPI_DMT_UINT64,   ACPI_IVRS0_OFFSET (BaseAddress),            "Base Address", 0},
     {ACPI_DMT_UINT16,   ACPI_IVRS0_OFFSET (PciSegmentGroup),        "PCI Segment Group", 0},
     {ACPI_DMT_UINT16,   ACPI_IVRS0_OFFSET (Info),                   "Virtualization Info", 0},
-    {ACPI_DMT_UINT32,   ACPI_IVRS0_OFFSET (Reserved),               "Reserved", 0},
+    {ACPI_DMT_UINT32,   ACPI_IVRS0_OFFSET (FeatureReporting),       "Feature Reporting", 0},
+    ACPI_DMT_TERMINATOR
+};
+
+/* 0x10: I/O Virtualization Hardware Definition (IVHD) Block */
+
+ACPI_DMTABLE_INFO           AcpiDmTableInfoIvrs01[] =
+{
+    {ACPI_DMT_UINT16,   ACPI_IVRS01_OFFSET (CapabilityOffset),       "Capability Offset", 0},
+    {ACPI_DMT_UINT64,   ACPI_IVRS01_OFFSET (BaseAddress),            "Base Address", 0},
+    {ACPI_DMT_UINT16,   ACPI_IVRS01_OFFSET (PciSegmentGroup),        "PCI Segment Group", 0},
+    {ACPI_DMT_UINT16,   ACPI_IVRS01_OFFSET (Info),                   "Virtualization Info", 0},
+    {ACPI_DMT_UINT32,   ACPI_IVRS01_OFFSET (Attributes),             "Attributes", 0},
+    {ACPI_DMT_UINT64,   ACPI_IVRS01_OFFSET (EfrRegisterImage),       "EFR Image", 0},
+    {ACPI_DMT_UINT64,   ACPI_IVRS01_OFFSET (Reserved),               "Reserved", 0},
     ACPI_DMT_TERMINATOR
 };
 

Modified: stable/12/sys/contrib/dev/acpica/common/dmtbinfo3.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/dmtbinfo3.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/dmtbinfo3.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -691,7 +691,7 @@ ACPI_DMTABLE_INFO           AcpiDmTableInfoWpbt0[] =
 
 /*******************************************************************************
  *
- * WSMT - Windows SMM Security Migrations Table
+ * WSMT - Windows SMM Security Mitigations Table
  *
  ******************************************************************************/
 

Modified: stable/12/sys/contrib/dev/acpica/common/getopt.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/common/getopt.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/common/getopt.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslallocate.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslallocate.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslallocate.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslanalyze.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslanalyze.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslanalyze.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -151,6 +151,7 @@
 
 #include <contrib/dev/acpica/compiler/aslcompiler.h>
 #include "aslcompiler.y.h"
+#include <contrib/dev/acpica/include/acnamesp.h>
 #include <string.h>
 
 
@@ -421,6 +422,7 @@ AnCheckMethodReturnValue (
 {
     ACPI_PARSE_OBJECT       *OwningOp;
     ACPI_NAMESPACE_NODE     *Node;
+    char                    *ExternalPath;
 
 
     Node = ArgOp->Asl.Node;
@@ -435,18 +437,19 @@ AnCheckMethodReturnValue (
     /* Examine the parent op of this method */
 
     OwningOp = Node->Op;
+    ExternalPath = AcpiNsGetNormalizedPathname (Node, TRUE);
+
     if (OwningOp->Asl.CompileFlags & OP_METHOD_NO_RETVAL)
     {
         /* Method NEVER returns a value */
 
-        AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, Op->Asl.ExternalName);
+        AslError (ASL_ERROR, ASL_MSG_NO_RETVAL, Op, ExternalPath);
     }
     else if (OwningOp->Asl.CompileFlags & OP_METHOD_SOME_NO_RETVAL)
     {
         /* Method SOMETIMES returns a value, SOMETIMES not */
 
-        AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL,
-            Op, Op->Asl.ExternalName);
+        AslError (ASL_WARNING, ASL_MSG_SOME_NO_RETVAL, Op, ExternalPath);
     }
     else if (!(ThisNodeBtype & RequiredBtypes))
     {
@@ -469,6 +472,11 @@ AnCheckMethodReturnValue (
 
             AslError (ASL_ERROR, ASL_MSG_INVALID_TYPE, ArgOp, AslGbl_MsgBuffer);
         }
+    }
+
+    if (ExternalPath)
+    {
+        ACPI_FREE (ExternalPath);
     }
 }
 

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslascii.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslascii.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslascii.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslbtypes.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslbtypes.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslbtypes.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslcache.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslcache.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslcache.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslcodegen.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslcodegen.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslcodegen.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License

Modified: stable/12/sys/contrib/dev/acpica/compiler/aslcompile.c
==============================================================================
--- stable/12/sys/contrib/dev/acpica/compiler/aslcompile.c	Tue Apr 14 07:38:34 2020	(r359914)
+++ stable/12/sys/contrib/dev/acpica/compiler/aslcompile.c	Tue Apr 14 08:34:34 2020	(r359915)
@@ -8,7 +8,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2019, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999 - 2020, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -283,6 +283,7 @@ CmDoCompile (
 
     LsDumpParseTree ();
 
+    UtEndEvent (Event);
     UtEndEvent (FullCompile);
     return (AE_OK);
 
@@ -647,7 +648,7 @@ void
 AslCompilerFileHeader (
     UINT32                  FileId)
 {
-    struct tm               *NewTime;
+    char                    *NewTime;
     time_t                  Aclock;
     char                    *Prefix = "";
 
@@ -691,13 +692,17 @@ AslCompilerFileHeader (
 
     /* Compilation header with timestamp */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
