d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpica: Merge ACPICA 20221020

Browse Source
This commit is contained in:
Jung-uk Kim 2022-10-27 22:04:32 -04:00
parent 9a4bc5208f
commit 19ee8335c5
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/acpica/acpi_machdep.c
View File

@ -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);

4
sys/arm64/acpica/acpi_machdep.c
View File

@ -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);

1
sys/conf/files
View File

@ -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

4
sys/i386/acpica/acpi_machdep.c
View File

@ -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);

14
usr.sbin/acpi/acpidb/Makefile
View File

@ -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

12
usr.sbin/acpi/iasl/Makefile
View File

@ -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