| Message ID | 20220629130644.1258904-1-sudeep.holla@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ACPI: Remove the unused find_acpi_cpu_cache_topology() | expand |
On Wed, Jun 29, 2022 at 3:07 PM Sudeep Holla <sudeep.holla@arm.com> wrote: > > The sole user of this find_acpi_cpu_cache_topology() was arm64 topology > which is now consolidated into the generic arch_topology without the need > of this function. > > Drop the unused function find_acpi_cpu_cache_topology(). > > Reported-by: Ionela Voinescu <ionela.voinescu@arm.com> > Cc: Rafael J. Wysocki <rafael@kernel.org> > Cc: linux-acpi@vger.kernel.org > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > drivers/acpi/pptt.c | 37 ------------------------------------- > include/linux/acpi.h | 5 ----- > 2 files changed, 42 deletions(-) > > Hi Rafael, > > This is another patch that I would like to be part of the series[1]. > Please ack the same if you are OK to route this via Greg. I am avoiding > to repost the whole series just for this one additional patch for now. Sure. Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > [1] https://lore.kernel.org/all/20220627165047.336669-1-sudeep.holla@arm.com/ > > diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c > index 763f021d45e6..dd3222a15c9c 100644 > --- a/drivers/acpi/pptt.c > +++ b/drivers/acpi/pptt.c > @@ -691,43 +691,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level) > return find_acpi_cpu_topology_tag(cpu, level, 0); > } > > -/** > - * find_acpi_cpu_cache_topology() - Determine a unique cache topology value > - * @cpu: Kernel logical CPU number > - * @level: The cache level for which we would like a unique ID > - * > - * Determine a unique ID for each unified cache in the system > - * > - * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found. > - * Otherwise returns a value which represents a unique topological feature. > - */ > -int find_acpi_cpu_cache_topology(unsigned int cpu, int level) > -{ > - struct acpi_table_header *table; > - struct acpi_pptt_cache *found_cache; > - acpi_status status; > - u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu); > - struct acpi_pptt_processor *cpu_node = NULL; > - int ret = -1; > - > - status = acpi_get_table(ACPI_SIG_PPTT, 0, &table); > - if (ACPI_FAILURE(status)) { > - acpi_pptt_warn_missing(); > - return -ENOENT; > - } > - > - found_cache = acpi_find_cache_node(table, acpi_cpu_id, > - CACHE_TYPE_UNIFIED, > - level, > - &cpu_node); > - if (found_cache) > - ret = ACPI_PTR_DIFF(cpu_node, table); > - > - acpi_put_table(table); > - > - return ret; > -} > - > /** > * find_acpi_cpu_topology_package() - Determine a unique CPU package value > * @cpu: Kernel logical CPU number > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 4f82a5bc6d98..7b96a8bff6d2 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1429,7 +1429,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level); > int find_acpi_cpu_topology_cluster(unsigned int cpu); > int find_acpi_cpu_topology_package(unsigned int cpu); > int find_acpi_cpu_topology_hetero_id(unsigned int cpu); > -int find_acpi_cpu_cache_topology(unsigned int cpu, int level); > #else > static inline int acpi_pptt_cpu_is_thread(unsigned int cpu) > { > @@ -1451,10 +1450,6 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu) > { > return -EINVAL; > } > -static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level) > -{ > - return -EINVAL; > -} > #endif > > #ifdef CONFIG_ACPI_PCC > -- > 2.37.0 >
diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index 763f021d45e6..dd3222a15c9c 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -691,43 +691,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level) return find_acpi_cpu_topology_tag(cpu, level, 0); } -/** - * find_acpi_cpu_cache_topology() - Determine a unique cache topology value - * @cpu: Kernel logical CPU number - * @level: The cache level for which we would like a unique ID - * - * Determine a unique ID for each unified cache in the system - * - * Return: -ENOENT if the PPTT doesn't exist, or the CPU cannot be found. - * Otherwise returns a value which represents a unique topological feature. - */ -int find_acpi_cpu_cache_topology(unsigned int cpu, int level) -{ - struct acpi_table_header *table; - struct acpi_pptt_cache *found_cache; - acpi_status status; - u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu); - struct acpi_pptt_processor *cpu_node = NULL; - int ret = -1; - - status = acpi_get_table(ACPI_SIG_PPTT, 0, &table); - if (ACPI_FAILURE(status)) { - acpi_pptt_warn_missing(); - return -ENOENT; - } - - found_cache = acpi_find_cache_node(table, acpi_cpu_id, - CACHE_TYPE_UNIFIED, - level, - &cpu_node); - if (found_cache) - ret = ACPI_PTR_DIFF(cpu_node, table); - - acpi_put_table(table); - - return ret; -} - /** * find_acpi_cpu_topology_package() - Determine a unique CPU package value * @cpu: Kernel logical CPU number diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4f82a5bc6d98..7b96a8bff6d2 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1429,7 +1429,6 @@ int find_acpi_cpu_topology(unsigned int cpu, int level); int find_acpi_cpu_topology_cluster(unsigned int cpu); int find_acpi_cpu_topology_package(unsigned int cpu); int find_acpi_cpu_topology_hetero_id(unsigned int cpu); -int find_acpi_cpu_cache_topology(unsigned int cpu, int level); #else static inline int acpi_pptt_cpu_is_thread(unsigned int cpu) { @@ -1451,10 +1450,6 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu) { return -EINVAL; } -static inline int find_acpi_cpu_cache_topology(unsigned int cpu, int level) -{ - return -EINVAL; -} #endif #ifdef CONFIG_ACPI_PCC
The sole user of this find_acpi_cpu_cache_topology() was arm64 topology which is now consolidated into the generic arch_topology without the need of this function. Drop the unused function find_acpi_cpu_cache_topology(). Reported-by: Ionela Voinescu <ionela.voinescu@arm.com> Cc: Rafael J. Wysocki <rafael@kernel.org> Cc: linux-acpi@vger.kernel.org Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/acpi/pptt.c | 37 ------------------------------------- include/linux/acpi.h | 5 ----- 2 files changed, 42 deletions(-) Hi Rafael, This is another patch that I would like to be part of the series[1]. Please ack the same if you are OK to route this via Greg. I am avoiding to repost the whole series just for this one additional patch for now. Regards, Sudeep [1] https://lore.kernel.org/all/20220627165047.336669-1-sudeep.holla@arm.com/