NoaSoftware
/
TencentOS-kernel
forked from TencentOS/TencentOS-kernel
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #46 from Tencent/herberthbli 

acpi: disable AMD ghes timer
This commit is contained in:
herberthbli 2020-12-15 09:27:33 +08:00 committed by GitHub
parent b0ddb0c1b1 585426ae3f
commit fcc70b0ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/apei/hest.c
View File

@ -142,8 +142,10 @@ static int __init hest_parse_ghes_count(struct acpi_hest_header *hest_hdr, void
{
int *count = data;
if (hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR ||
hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR_V2)
if ((hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR ||
hest_hdr->type == ACPI_HEST_TYPE_GENERIC_ERROR_V2) &&
(boot_cpu_data.x86_vendor != X86_VENDOR_AMD ||
!(hest_hdr->source_id &0xF000)))
(*count)++;
return 0;
}
@ -154,8 +156,10 @@ static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
struct ghes_arr *ghes_arr = data;
int rc, i;
if (hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR &&
hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR_V2)
if ((hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR &&
hest_hdr->type != ACPI_HEST_TYPE_GENERIC_ERROR_V2) ||
((hest_hdr->source_id & 0xF000) &&
boot_cpu_data.x86_vendor == X86_VENDOR_AMD))
return 0;
if (!((struct acpi_hest_generic *)hest_hdr)->enabled)