From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: will.deacon@arm.com, catalin.marinas@arm.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, marc.zyngier@arm.com,
mark.rutland@arm.com, ard.biesheuvel@linaro.org,
Suzuki K Poulose <suzuki.poulose@arm.com>
Subject: [PATCH v2 2/9] arm64: Use consistent naming for errata handling
Date: Fri, 26 Aug 2016 10:23:11 +0100 [thread overview]
Message-ID: <1472203398-8751-3-git-send-email-suzuki.poulose@arm.com> (raw)
In-Reply-To: <1472203398-8751-1-git-send-email-suzuki.poulose@arm.com>
This is a cosmetic change to rename the functions dealing with
the errata work arounds to be more consistent with their naming.
1) check_local_cpu_errata() => update_cpu_errata_workarounds()
check_local_cpu_errata() actually updates the system's errata work
arounds. So rename it to reflect the same.
2) verify_local_cpu_errata() => verify_local_cpu_errata_workarounds()
Use errata_workarounds instead of _errata.
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
arch/arm64/include/asm/cpufeature.h | 4 ++--
arch/arm64/kernel/cpu_errata.c | 4 ++--
arch/arm64/kernel/cpufeature.c | 2 +-
arch/arm64/kernel/cpuinfo.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index f6f5e49..aadd946 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -193,10 +193,10 @@ void __init setup_cpu_features(void);
void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
const char *info);
void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps);
-void check_local_cpu_errata(void);
+void update_cpu_errata_workarounds(void);
void __init enable_errata_workarounds(void);
-void verify_local_cpu_errata(void);
+void verify_local_cpu_errata_workarounds(void);
void verify_local_cpu_capabilities(void);
u64 read_system_reg(u32 id);
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 82b0fc2..5836b3d 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -116,7 +116,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
* and the related information is freed soon after. If the new CPU requires
* an errata not detected at boot, fail this CPU.
*/
-void verify_local_cpu_errata(void)
+void verify_local_cpu_errata_workarounds(void)
{
const struct arm64_cpu_capabilities *caps = arm64_errata;
@@ -131,7 +131,7 @@ void verify_local_cpu_errata(void)
}
}
-void check_local_cpu_errata(void)
+void update_cpu_errata_workarounds(void)
{
update_cpu_capabilities(arm64_errata, "enabling workaround for");
}
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 43f73e0..a591c35 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1017,7 +1017,7 @@ void verify_local_cpu_capabilities(void)
if (!sys_caps_initialised)
return;
- verify_local_cpu_errata();
+ verify_local_cpu_errata_workarounds();
verify_local_cpu_features(arm64_features);
verify_local_elf_hwcaps(arm64_elf_hwcaps);
if (system_supports_32bit_el0())
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index ed1b84f..4fa7b73 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -364,7 +364,7 @@ static void __cpuinfo_store_cpu(struct cpuinfo_arm64 *info)
cpuinfo_detect_icache_policy(info);
- check_local_cpu_errata();
+ update_cpu_errata_workarounds();
}
void cpuinfo_store_cpu(void)
--
2.7.4
next prev parent reply other threads:[~2016-08-26 9:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-26 9:23 [PATCH v2 0/9] arm64: Work around for mismatched cache line size Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 1/9] arm64: Set the safe value for L1 icache policy Suzuki K Poulose
2016-08-26 9:23 ` Suzuki K Poulose [this message]
2016-08-26 9:23 ` [PATCH v2 3/9] arm64: Rearrange CPU errata workaround checks Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 4/9] arm64: alternative: Disallow patching instructions using literals Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 5/9] arm64: insn: Add helpers for adrp offsets Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 6/9] arm64: alternative: Add support for patching adrp instructions Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 7/9] arm64: Introduce raw_{d,i}cache_line_size Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 8/9] arm64: Refactor sysinstr exception handling Suzuki K Poulose
2016-08-26 9:23 ` [PATCH v2 9/9] arm64: Work around systems with mismatched cache line sizes Suzuki K Poulose
2016-08-26 11:03 ` Ard Biesheuvel
2016-08-26 13:04 ` Suzuki K Poulose
2016-08-26 13:08 ` Suzuki K Poulose
2016-08-26 16:16 ` Will Deacon
2016-08-26 16:58 ` Ard Biesheuvel
2016-08-26 17:00 ` Catalin Marinas
2016-09-02 10:03 ` Suzuki K Poulose
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472203398-8751-3-git-send-email-suzuki.poulose@arm.com \
--to=suzuki.poulose@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®