mirrors
/
anolis-cloud-kernel
mirror of https://gitee.com/anolis/cloud-kernel.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI / PPTT: Add a helper to fill a cpumask from a cache_id 

ANBZ: #1644

cherry-picked from https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git

MPAM identifies CPUs by the cache_id in the PPTT cache structure.

The driver needs to know which CPUs are associated with the cache,
the CPUs may not all be online, so cacheinfo does not have the
information.

Add a helper to pull this information out of the PPTT.

Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
Signed-off-by: Shawn Wang <shawnwang@linux.alibaba.com>
Reviewed-by: Xin Hao <xhao@linux.alibaba.com>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
This commit is contained in:
James Morse 2021-05-19 15:16:28 +01:00 committed by Xunlei Pang
parent 49e15ee7cb
commit 620ac938fc
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/acpi/pptt.c
View File

@ -1118,3 +1118,72 @@ int find_acpi_cache_level_from_id(u32 cache_id)
acpi_put_table(table);
return -ENOENT;
}
/**
* acpi_pptt_get_cpumask_from_cache_id() - Get the cpus associated with the
* specified cache
* @cache_id: The id field of the unified cache
* @cpus: Where to buidl the cpumask
*
* Determine which CPUs are below this cache in the PPTT. This allows the property
* to be found even if the CPUs are offline.
*
* The PPTT table must be rev 3 or later,
*
* Return: -ENOENT if the PPTT doesn't exist, or the cache cannot be found.
* Otherwise returns 0 and sets the cpus in the provided cpumask.
*/
int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id, cpumask_t *cpus)
{
u32 acpi_cpu_id;
acpi_status status;
int level, cpu, num_levels;
struct acpi_pptt_cache *cache;
struct acpi_table_header *table;
struct acpi_pptt_cache_v1* cache_v1;
struct acpi_pptt_processor *cpu_node;
cpumask_clear(cpus);
status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
if (ACPI_FAILURE(status)) {
acpi_pptt_warn_missing();
return -ENOENT;
}
if (table->revision < 3) {
acpi_put_table(table);
return -ENOENT;
}
/*
* If we found the cache first, we'd still need to walk from each cpu.
*/
for_each_possible_cpu(cpu) {
acpi_cpu_id = get_acpi_id_for_cpu(cpu);
cpu_node = acpi_find_processor_node(table, acpi_cpu_id);
if (!cpu_node)
break;
num_levels = acpi_count_levels(table, cpu_node);
for (level = 0; level <= num_levels; level++) {
cache = acpi_find_cache_node(table, acpi_cpu_id,
ACPI_PPTT_CACHE_TYPE_UNIFIED,
level, &cpu_node);
if (!cache)
continue;
cache_v1 = ACPI_ADD_PTR(struct acpi_pptt_cache_v1,
cache,
sizeof(struct acpi_pptt_cache));
if (cache->flags & ACPI_PPTT_CACHE_ID_VALID &&
cache_v1->cache_id == cache_id) {
cpumask_set_cpu(cpu, cpus);
}
}
}
acpi_put_table(table);
return 0;
}

6
include/linux/acpi.h
View File

@ -1367,6 +1367,7 @@ u32 acpi_pptt_count_containers(void);
int acpi_pptt_for_each_container(acpi_pptt_cpu_callback_t callback, void *arg);
void acpi_pptt_get_child_cpus(struct acpi_pptt_processor *parent_node, cpumask_t *cpus);
int acpi_pptt_get_cpus_from_container(u32 acpi_cpu_id, cpumask_t *cpus);
int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id, cpumask_t *cpus);
#else
static inline int acpi_pptt_cpu_is_thread(unsigned int cpu)
{
@ -1411,6 +1412,11 @@ static inline int acpi_pptt_get_cpus_from_container(u32 acpi_cpu_id,
{
return -EINVAL;
}
static inline int acpi_pptt_get_cpumask_from_cache_id(u32 cache_id,
cpumask_t *cpus)
{
return -EINVAL;
}
#endif
#ifdef CONFIG_ACPI