From: Marc Zyngier <maz@kernel.org>
To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu
Cc: Mark Rutland <mark.rutland@arm.com>,
kernel-team@android.com,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
James Morse <james.morse@arm.com>,
David Brazdil <dbrazdil@google.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Subject: [PATCH v2 14/17] arm64: Add an aliasing facility for the idreg override
Date: Mon, 4 Jan 2021 13:50:08 +0000 [thread overview]
Message-ID: <20210104135011.2063104-15-maz@kernel.org> (raw)
In-Reply-To: <20210104135011.2063104-1-maz@kernel.org>
In order to map the override of idregs to options that a user
can easily understand, let's introduce yet another option
array, which maps an option to the corresponding idreg options.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/kernel/idreg-override.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index 75d9845f489b..16bc8b3b93ae 100644
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -37,6 +37,12 @@ static const struct reg_desc * const regs[] __initdata = {
&mmfr1,
};
+static const struct {
+ const char * const alias;
+ const char * const feature;
+} aliases[] __initdata = {
+};
+
static int __init find_field(const char *cmdline, const struct reg_desc *reg,
int f, u64 *v)
{
@@ -80,6 +86,18 @@ static void __init match_options(const char *cmdline)
}
}
+static __init void match_aliases(const char *cmdline)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(aliases); i++) {
+ char *str = strstr(cmdline, aliases[i].alias);
+
+ if ((str == cmdline || (str > cmdline && *(str - 1) == ' ')))
+ match_options(aliases[i].feature);
+ }
+}
+
static __init void parse_cmdline(void)
{
if (!IS_ENABLED(CONFIG_CMDLINE_FORCE)) {
@@ -100,6 +118,7 @@ static __init void parse_cmdline(void)
goto out;
match_options(prop);
+ match_aliases(prop);
if (!IS_ENABLED(CONFIG_CMDLINE_EXTEND))
return;
@@ -107,6 +126,7 @@ static __init void parse_cmdline(void)
out:
match_options(CONFIG_CMDLINE);
+ match_aliases(CONFIG_CMDLINE);
}
void __init init_shadow_regs(void)
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-04 14:21 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 13:49 [PATCH v2 00/17] arm64: Early CPU feature override, and an application to VHE Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 01/17] arm64: Fix labels in el2_setup macros Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 02/17] arm64: Fix outdated TCR setup comment Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 03/17] arm64: Turn the MMU-on sequence into a macro Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 04/17] arm64: Provide an 'upgrade to VHE' stub hypercall Marc Zyngier
2021-01-05 20:35 ` Jing Zhang
2021-01-05 21:03 ` Marc Zyngier
2021-01-04 13:49 ` [PATCH v2 05/17] arm64: Initialise as nVHE before switching to VHE Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 06/17] arm64: Move VHE-specific SPE setup to mutate_to_vhe() Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 07/17] arm64: Simplify init_el2_state to be non-VHE only Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 08/17] arm64: Move SCTLR_EL1 initialisation to EL-agnostic code Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 09/17] arm64: cpufeature: Add global feature override facility Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 10/17] arm64: Extract early FDT mapping from kaslr_early_init() Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 11/17] arm64: cpufeature: Add an early command-line cpufeature override facility Marc Zyngier
2021-01-06 2:16 ` Jing Zhang
2021-01-06 9:03 ` Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 12/17] arm64: Allow ID_AA64MMFR1_EL1.VH to be overridden from the command line Marc Zyngier
2021-01-05 22:42 ` Jing Zhang
2021-01-04 13:50 ` [PATCH v2 13/17] arm64: Honor VHE being disabled from the command-line Marc Zyngier
2021-01-04 13:50 ` Marc Zyngier [this message]
2021-01-04 13:50 ` [PATCH v2 15/17] arm64: Make kvm-arm.mode={nvhe, protected} an alias of id_aa64mmfr1.vh=0 Marc Zyngier
2021-01-04 13:50 ` [PATCH v2 16/17] KVM: arm64: Document HVC_VHE_RESTART stub hypercall Marc Zyngier
2021-01-05 22:58 ` Jing Zhang
2021-01-04 13:50 ` [PATCH v2 17/17] arm64: Move "nokaslr" over to the early cpufeature infrastructure Marc Zyngier
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=20210104135011.2063104-15-maz@kernel.org \
--to=maz@kernel.org \
--cc=alexandru.elisei@arm.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dbrazdil@google.com \
--cc=james.morse@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kernel-team@android.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).