From nobody Fri Oct 28 02:05:24 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mz5VF045qz4gn1M; Fri, 28 Oct 2022 02:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mz5VD2tyFz3mdD; Fri, 28 Oct 2022 02:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666922724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/QbQKqIEoAR+s1HcO8e6Axi7qaMUw4mOWxlSxeCOLo=; b=DPNCpA0oZ3b3NIEi4+1UFFeAkauVaqUtrXimQmDM/ScloEyyUzGbLIs5azOAUvJ9ptNiSI 0LvoDDAeAYWM/gxF/zA2pFvsbUlHfuRhxLHucKBaiAgbMsZG+U5KM6Qbod07PdHDG1hFxA k9URvip1nzJLsLD1DjaXwzPgpfGD7USBcEys1XFcCIhlMEotZpLKkfkhgN+H8BYA9dn5r/ GdOLtKouxNCS8w4jVFifcgTOoyRfXxdP07IQ5XW6SC9jxvAxvoWvl+8seOgGn7r3MP4f+1 ftuoLpHjhHRRT4juH/M3nJzA2zkaEEGzWXFAAzHx8uBlKbzPad1Y+lZ4g9kyKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mz5VD1nQJzL8c; Fri, 28 Oct 2022 02:05:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29S25ODv011083; Fri, 28 Oct 2022 02:05:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29S25OFc011082; Fri, 28 Oct 2022 02:05:24 GMT (envelope-from git) Date: Fri, 28 Oct 2022 02:05:24 GMT Message-Id: <202210280205.29S25OFc011082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 19ee8335c5c0 - main - acpica: Merge ACPICA 20221020 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19ee8335c5c04c7e44cb11b320f716aa7a35f751 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666922724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/QbQKqIEoAR+s1HcO8e6Axi7qaMUw4mOWxlSxeCOLo=; b=Roa7/mr1hlBJpWKHCefQzCz1Y2sZwY/ft0g/eE8vP/W2T/tLhpUnFHq44JqwV70EzswECg b5RqxvkdbcUKKmniTLrPFN23SwAH1dkUV9jmugYtlJHYb4LunrLAQ7DfsTo6c8rcdi/lij N9gR83vDCr+DIumNrLLUhaZ8/utI/WLxTRBBQAUeymSBoRK0bCO4Awt9V3GQrqaFCSB3KQ FeWs9zuGxuKcMFyNZ4j+xThOqVfd0ZPLYwuqLsWU2FDVYtXgoiiOpXfCS01qV0Sk/kHcFL QbPd4IF2SZJwTYuvz5gYyD9EOFBzv5qQE2hr9ru+6x6OWnAcCtECCj+38zBWHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666922724; a=rsa-sha256; cv=none; b=hoX3euaTO/Wr1H91fKev7M4ZE5X6YgAAJo9+jAfLUWby8GrYFqeTq0lenq5Ztatj0kDod4 cIYSCbCSGyMc4KC146eWE8RkhBDkESxSFgqHB19dxnh5pujxXqIKU8fT/OaWcSysT1u4vO QcledAfWZALPV1CYi/ti9vdtLRuvXJ30vOOTGwDT84DYR9bjBb/FWeHaozC64SvwXPMn8Z dY0ITA0qQV6CQ06vHL408TO3l2GulLsl4PtRpNtlhJrSWGYhlc+HazPu0tn3HOszn9VKzl EQPgDsMfv1YWuHcDk4hj3hRbLMLE77wUz5ehYMoRJbKpV1B4Xc74FSN0ZO/Ihw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=19ee8335c5c04c7e44cb11b320f716aa7a35f751 commit 19ee8335c5c04c7e44cb11b320f716aa7a35f751 Author: Jung-uk Kim AuthorDate: 2022-10-28 02:04:32 +0000 Commit: Jung-uk Kim CommitDate: 2022-10-28 02:04:32 +0000 acpica: Merge ACPICA 20221020 --- sys/amd64/acpica/acpi_machdep.c | 4 ++-- sys/arm64/acpica/acpi_machdep.c | 4 ++-- sys/conf/files | 1 + sys/i386/acpica/acpi_machdep.c | 4 ++-- usr.sbin/acpi/acpidb/Makefile | 14 +++++++------- usr.sbin/acpi/iasl/Makefile | 12 ++++++------ 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index 41d70a1c9751..e11f3c22ce20 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -109,7 +109,7 @@ map_table(vm_paddr_t pa, const char *sig) length = header->Length; pmap_unmapbios(header, sizeof(ACPI_TABLE_HEADER)); table = pmap_mapbios(pa, length); - if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { + if (ACPI_FAILURE(AcpiUtChecksum(table, length))) { if (bootverbose) printf("ACPI: Failed checksum for table %s\n", sig); #if (ACPI_CHECKSUM_ABORT) @@ -199,7 +199,7 @@ acpi_find_table(const char *sig) * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiUtChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { printf("ACPI: RSDP failed extended checksum\n"); pmap_unmapbios(rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c index 1b89b8ff04e2..199f5713f36f 100644 --- a/sys/arm64/acpica/acpi_machdep.c +++ b/sys/arm64/acpica/acpi_machdep.c @@ -78,7 +78,7 @@ map_table(vm_paddr_t pa, const char *sig) pmap_unmapbios(header, sizeof(ACPI_TABLE_HEADER)); table = pmap_mapbios(pa, length); - if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { + if (ACPI_FAILURE(AcpiUtChecksum(table, length))) { if (bootverbose) printf("ACPI: Failed checksum for table %s\n", sig); #if (ACPI_CHECKSUM_ABORT) @@ -172,7 +172,7 @@ acpi_find_table(const char *sig) * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiUtChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { printf("ACPI: RSDP failed extended checksum\n"); pmap_unmapbios(rsdp, sizeof(ACPI_TABLE_RSDP)); return (0); diff --git a/sys/conf/files b/sys/conf/files index b77fd3139544..3123f75d6b8a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -555,6 +555,7 @@ contrib/dev/acpica/components/utilities/utalloc.c optional acpi contrib/dev/acpica/components/utilities/utascii.c optional acpi contrib/dev/acpica/components/utilities/utbuffer.c optional acpi contrib/dev/acpica/components/utilities/utcache.c optional acpi +contrib/dev/acpica/components/utilities/utcksum.c optional acpi contrib/dev/acpica/components/utilities/utcopy.c optional acpi contrib/dev/acpica/components/utilities/utdebug.c optional acpi contrib/dev/acpica/components/utilities/utdecode.c optional acpi diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 9df23565de4a..83d8d1a7f40c 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -127,7 +127,7 @@ map_table(vm_paddr_t pa, const char *sig) length = header->Length; pmap_unmapbios(header, sizeof(ACPI_TABLE_HEADER)); table = pmap_mapbios(pa, length); - if (ACPI_FAILURE(AcpiTbChecksum(table, length))) { + if (ACPI_FAILURE(AcpiUtChecksum(table, length))) { if (bootverbose) printf("ACPI: Failed checksum for table %s\n", sig); #if (ACPI_CHECKSUM_ABORT) @@ -218,7 +218,7 @@ acpi_find_table(const char *sig) * the version 1.0 portion of the RSDP. Version 2.0 has * an additional checksum that we verify first. */ - if (AcpiTbChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { + if (AcpiUtChecksum((UINT8 *)rsdp, ACPI_RSDP_XCHECKSUM_LENGTH)) { if (bootverbose) printf("ACPI: RSDP failed extended checksum\n"); return (0); diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 5a6fceb2a4cb..892f1e8c0cdb 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -62,13 +62,13 @@ SRCS+= tbdata.c tbfadt.c tbfind.c tbinstal.c tbprint.c \ # components/utilities SRCS+= utaddress.c utalloc.c utascii.c utbuffer.c utcache.c \ - utcopy.c utdebug.c utdecode.c utdelete.c uterror.c \ - uteval.c utexcep.c utglobal.c uthex.c utids.c utinit.c \ - utlock.c utmath.c utmisc.c utmutex.c utnonansi.c \ - utobject.c utosi.c utownerid.c utpredef.c utresdecode.c \ - utresrc.c utstate.c utstring.c utstrsuppt.c \ - utstrtoul64.c uttrack.c utuuid.c utxface.c utxferror.c \ - utxfinit.c + utcksum.c utcopy.c utdebug.c utdecode.c utdelete.c \ + uterror.c uteval.c utexcep.c utglobal.c uthex.c utids.c \ + utinit.c utlock.c utmath.c utmisc.c utmutex.c \ + utnonansi.c utobject.c utosi.c utownerid.c utpredef.c \ + utresdecode.c utresrc.c utstate.c utstring.c \ + utstrsuppt.c utstrtoul64.c uttrack.c utuuid.c utxface.c \ + utxferror.c utxfinit.c # os_specific/service_layers SRCS+= osgendbg.c osunixxf.c diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index 1807156475b1..15b6d7a03c3d 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -66,12 +66,12 @@ SRCS+= tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c \ # components/utilities SRCS+= utaddress.c utalloc.c utascii.c utbuffer.c utcache.c \ - utcopy.c utdebug.c utdecode.c utdelete.c uterror.c \ - utexcep.c utglobal.c uthex.c utinit.c utlock.c utmath.c \ - utmisc.c utmutex.c utnonansi.c utobject.c utownerid.c \ - utpredef.c utresdecode.c utresrc.c utstate.c utstring.c \ - utstrsuppt.c utstrtoul64.c utuuid.c utxface.c \ - utxferror.c + utcksum.c utcopy.c utdebug.c utdecode.c utdelete.c \ + uterror.c utexcep.c utglobal.c uthex.c utinit.c \ + utlock.c utmath.c utmisc.c utmutex.c utnonansi.c \ + utobject.c utownerid.c utpredef.c utresdecode.c \ + utresrc.c utstate.c utstring.c utstrsuppt.c \ + utstrtoul64.c utuuid.c utxface.c utxferror.c # os_specific/service_layers SRCS+= osunixxf.c