From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F9A2C433DB for ; Mon, 18 Jan 2021 13:20:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F80E206F9 for ; Mon, 18 Jan 2021 13:20:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F80E206F9 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UZW4ftbDGkBWpjfHNBxWxeq2uQpeNxY9FeobzztWChk=; b=XJIMnHAeQcKRswL+twzrK8Til 7VtHDdM1Jvf7PRnkjGdjNxdmI3j/CoAFq8nSMzeYQCg1QQUmb2EL+CkEoA65jRO0iBWzZD5+EExgM zJvxm450WS73Zig0QcTqXfiV70zg8ZPI8GVOyo3uYgrczY70agKXtPoGz+0uPqZnv+UvZt087r5AR GfWEw28aLkptG4MyZS6MGlc6q3nHVUCPrtHMt1a0b2l+yskKu71ri9kjOFbAjGWYtyIRjLov0l/lz 82r69hcCMf8Q6XHDXoVLVRf7W2Jur2Ey/ee60WwUSO5kzspwFMgDwoVCDW4kqvhIYob0H6ovQ82vo cxyrjTQEw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1UQg-0007ae-J3; Mon, 18 Jan 2021 13:18:46 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1UQc-0007ZS-EM for linux-arm-kernel@lists.infradead.org; Mon, 18 Jan 2021 13:18:44 +0000 Received: by mail-wr1-x431.google.com with SMTP id q18so16459637wrn.1 for ; Mon, 18 Jan 2021 05:18:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dT8H6DDOS90XqFHWCI7TqFyOQmYmAu8E1f2CVSOpl/o=; b=EgspKE8oFCLCiFmdwKtBz2VjUuROfWzgFVAWJT2v2444A0T/mq8eQwih4wjcbDddGB kXj2hnBpS3W4vDilb//9GY6jrkUfIj44PxVpxH9MYX5ds+1WnMVw4MzIhG9J0reDPisi scE5mTvdAw5Hlnnn4IAsMJw8kncej6tCC3sqbl6YcHhuoYyKStMyGTHZ33dug43+iaLi /vLjOyriHbV/JZgpR6REiio1aSN9n5pXnhww3etjfo01vaa34iINw6EeAMAFbx+NYhgA rmoDjcd5wEqNg07GM1PnTNgJTYdRNnZMMnL9gFv1EMrC7g5IwYhcj+CIV849advE4KO/ cG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dT8H6DDOS90XqFHWCI7TqFyOQmYmAu8E1f2CVSOpl/o=; b=lnqOZiF4MjWIemTobAN0Y2ESRwrhZvmfHf6TUmGTKf904v/RjyVgWGPJccq2Mg3Vno EKE3iox03bM6X1Uaf8K0X5tZg5j8+lKkmdrXHA7Yq/OxBoDMRmwIDYCg0+MQi7b4jh/0 AfdKBQj8KC2yRf1aaq6+EcK4+SOCjlltPBEmRjG374evZ3VICHInsu5uE7kldFqxjS49 b+ltQhqNkzQAhJe5IOBPlgUI+CMwMEIZB3s5ufJ3eqk2JlcfHCSLyBKGxF0M9+NYoC64 wOVxhUKbAIAL9OY55LwVGP4nSr2MELG++gEj6BfF8QuaRY8mkQ4ksfxS47q1BzPWvw2X pXXg== X-Gm-Message-State: AOAM530SNW4RSNsAcMynkKYM6dctVa1UCNgOxatG19pcrPsOSG0NRwCk X2HxFc3QwNLzXD9EdjaL/6as5zA3S/Z2XA== X-Google-Smtp-Source: ABdhPJwWobt6pVg/42LLNxfilYuO6c87nDIqhPBmiOFom1mvCywbxa/XGq5HBvenNWiYZUprwDAUKA== X-Received: by 2002:adf:e883:: with SMTP id d3mr25756288wrm.139.1610975921450; Mon, 18 Jan 2021 05:18:41 -0800 (PST) Received: from google.com ([2a01:4b00:8523:2d03:3d4d:985d:87b7:4d55]) by smtp.gmail.com with ESMTPSA id y14sm25110466wru.96.2021.01.18.05.18.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 05:18:40 -0800 (PST) Date: Mon, 18 Jan 2021 13:18:39 +0000 From: David Brazdil To: Marc Zyngier Subject: Re: [PATCH v4 15/21] arm64: Add an aliasing facility for the idreg override Message-ID: <20210118131839.7ao33jeufq3dfnb4@google.com> References: <20210118094533.2874082-1-maz@kernel.org> <20210118094533.2874082-16-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210118094533.2874082-16-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210118_081842_523655_F97832A9 X-CRM114-Status: GOOD ( 22.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Jing Zhang , kernel-team@android.com, Srinivas Ramana , Suzuki K Poulose , Catalin Marinas , Alexandru Elisei , linux-kernel@vger.kernel.org, Ard Biesheuvel , James Morse , Julien Thierry , Ajay Patil , Prasad Sodagudi , Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jan 18, 2021 at 09:45:27AM +0000, Marc Zyngier wrote: > 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 Acked-by: David Brazdil > --- > 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) == ' '))) nit: Extract to a 'cmdline_contains' helper? Took me a good few seconds to parse this in the previous patch. Giving it a name would help, and now it's also shared. > + 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