Message ID | 20220621192034.3332546-11-sudeep.holla@arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arch_topology: Updates to add socket support and fix cluster ids | expand |
On Tue, Jun 21, 2022 at 08:20:24PM +0100, Sudeep Holla wrote: > Since the cacheinfo LLC information is used directly in arch_topology, > there is no need to parse and fetch the LLC ID information only for > ACPI systems. > > Just drop the redundant parsing and setting of llc_id in CPU topology > from ACPI PPTT. > > Cc: Will Deacon <will@kernel.org> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> > Hi Will/Catalin, > > This is part of a series updating topology to get both ACPI and DT view > aligned. I have not cc-ed you assuming you won't be interested. Let me > know if you are. The parts affecting arm64 is just this patch removing > some unnecessary ACPI code that is now moved to core arch_topology.c > > Please ack if you are happy with this and OK to take this as part of the > series. Yeah, that's fine, keep it with the rest of the series.
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 9ab78ad826e2..869ffc4d4484 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -89,8 +89,6 @@ int __init parse_acpi_topology(void) return 0; for_each_possible_cpu(cpu) { - int i, cache_id; - topology_id = find_acpi_cpu_topology(cpu, 0); if (topology_id < 0) return topology_id; @@ -107,18 +105,6 @@ int __init parse_acpi_topology(void) cpu_topology[cpu].cluster_id = topology_id; topology_id = find_acpi_cpu_topology_package(cpu); cpu_topology[cpu].package_id = topology_id; - - i = acpi_find_last_cache_level(cpu); - - if (i > 0) { - /* - * this is the only part of cpu_topology that has - * a direct relationship with the cache topology - */ - cache_id = find_acpi_cpu_cache_topology(cpu, i); - if (cache_id > 0) - cpu_topology[cpu].llc_id = cache_id; - } } return 0;