aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPierre Gondois <pierre.gondois@arm.com>2023-01-24 16:40:48 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-01-31 16:02:02 +0100
commit921e672dee91af86f8f9e44a067c735ebac0744b (patch)
tree8cf1c354da986528b123c02bcc718dae8ea8d895
parentcacheinfo: Make default acpi_get_cache_info() return an error (diff)
downloadwireguard-linux-921e672dee91af86f8f9e44a067c735ebac0744b.tar.xz
wireguard-linux-921e672dee91af86f8f9e44a067c735ebac0744b.zip
cacheinfo: Remove unused check in init_cache_level()
commit e75d18cecbb3 ("arm64: cacheinfo: Fix incorrect assignment of signed error value to unsigned fw_level") checks the fw_level value in init_cache_level() in case the value is negative. Remove this check as the error code is not returned through fw_level anymore, and reset fw_level if acpi_get_cache_info() failed. This allows to try fetching the cache information from clidr_el1. Signed-off-by: Pierre Gondois <pierre.gondois@arm.com> Link: https://lore.kernel.org/r/20230124154053.355376-4-pierre.gondois@arm.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm64/kernel/cacheinfo.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c
index 91677f4d3395..3ba70985e3a2 100644
--- a/arch/arm64/kernel/cacheinfo.c
+++ b/arch/arm64/kernel/cacheinfo.c
@@ -67,9 +67,6 @@ int init_cache_level(unsigned int cpu)
fw_level = 0;
}
- if (fw_level < 0)
- return fw_level;
-
if (level < fw_level) {
/*
* some external caches not specified in CLIDR_EL1