git: 19ee8335c5c0 - main - acpica: Merge ACPICA 20221020
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Oct 2022 02:05:24 UTC
The branch main has been updated by jkim:
URL: https://cgit.FreeBSD.org/src/commit/?id=19ee8335c5c04c7e44cb11b320f716aa7a35f751
commit 19ee8335c5c04c7e44cb11b320f716aa7a35f751
Author: Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2022-10-28 02:04:32 +0000
Commit: Jung-uk Kim <jkim@FreeBSD.org>
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