Skip to content

Commit 01fee47

Browse files
committed
Merge branches 'acpi-apei', 'acpi-pad' and 'acpi-misc'
Merge ACPI APEI changes, an ACPI PAD driver update and an ACPI FFH handling cleanup related to ARM64 for 6.5-rc1: - Make ghes_get_devices() return NULL to indicate that there are no GHES devices so as to allow vendor-specific EDAC drivers to probe then (Li Yang). - Mark bert_disable() as __initdata and drop an unused function from the APEI GHES code (Miaohe Lin). - Make the ACPI PAD (Processor Aggregator Device) driver realize that Zhaoxin CPUs support nonstop TSC (Tony W Wang-oc). - Drop the certainly unnecessary and likely incorrect inclusion of linux/arm-smccc.h from acpi_ffh.c (Sudeep Holla). * acpi-apei: APEI: GHES: correctly return NULL for ghes_get_devices() ACPI: APEI: mark bert_disable as __initdata ACPI: APEI: GHES: Remove unused ghes_estatus_pool_size_request() * acpi-pad: ACPI: PAD: mark Zhaoxin CPUs NONSTOP TSC correctly * acpi-misc: ACPI: FFH: Drop the inclusion of linux/arm-smccc.h
4 parents 0586d26 + 9368aa1 + b72f301 + 097e727 commit 01fee47

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

drivers/acpi/acpi_ffh.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include <linux/idr.h>
1010
#include <linux/io.h>
1111

12-
#include <linux/arm-smccc.h>
13-
1412
static struct acpi_ffh_info ffh_ctx;
1513

1614
int __weak acpi_ffh_address_space_arch_setup(void *handler_ctxt,

drivers/acpi/acpi_pad.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static void power_saving_mwait_init(void)
6666
case X86_VENDOR_AMD:
6767
case X86_VENDOR_INTEL:
6868
case X86_VENDOR_ZHAOXIN:
69+
case X86_VENDOR_CENTAUR:
6970
/*
7071
* AMD Fam10h TSC will tick in all
7172
* C/P/S0/S1 states when this bit is set.

drivers/acpi/apei/bert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#define ACPI_BERT_PRINT_MAX_RECORDS 5
3535
#define ACPI_BERT_PRINT_MAX_LEN 1024
3636

37-
static int bert_disable;
37+
static int bert_disable __initdata;
3838

3939
/*
4040
* Print "all" the error records in the BERT table, but avoid huge spam to

drivers/acpi/apei/ghes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ struct ghes_vendor_record_entry {
152152
};
153153

154154
static struct gen_pool *ghes_estatus_pool;
155-
static unsigned long ghes_estatus_pool_size_request;
156155

157156
static struct ghes_estatus_cache __rcu *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE];
158157
static atomic_t ghes_estatus_cache_alloced;
@@ -191,7 +190,6 @@ int ghes_estatus_pool_init(unsigned int num_ghes)
191190
len = GHES_ESTATUS_CACHE_AVG_SIZE * GHES_ESTATUS_CACHE_ALLOCED_MAX;
192191
len += (num_ghes * GHES_ESOURCE_PREALLOC_MAX_SIZE);
193192

194-
ghes_estatus_pool_size_request = PAGE_ALIGN(len);
195193
addr = (unsigned long)vmalloc(PAGE_ALIGN(len));
196194
if (!addr)
197195
goto err_pool_alloc;
@@ -1544,6 +1542,8 @@ struct list_head *ghes_get_devices(void)
15441542

15451543
pr_warn_once("Force-loading ghes_edac on an unsupported platform. You're on your own!\n");
15461544
}
1545+
} else if (list_empty(&ghes_devs)) {
1546+
return NULL;
15471547
}
15481548

15491549
return &ghes_devs;

0 commit comments

Comments
 (0)