From patchwork Wed Aug 13 08:13:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Young X-Patchwork-Id: 4716941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CB49AC0338 for ; Wed, 13 Aug 2014 08:15:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D9CBD201B4 for ; Wed, 13 Aug 2014 08:15:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B69BC20176 for ; Wed, 13 Aug 2014 08:15:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XHTgY-0004K8-O7; Wed, 13 Aug 2014 08:13:30 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XHTgW-00046Y-Lb for linux-arm-kernel@lists.infradead.org; Wed, 13 Aug 2014 08:13:29 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7D8CMme026236 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Aug 2014 04:12:23 -0400 Received: from darkstar.nay.redhat.com (dhcp-16-138.nay.redhat.com [10.66.16.138]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7D8C9ni018456 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Wed, 13 Aug 2014 04:12:13 -0400 Date: Wed, 13 Aug 2014 16:13:47 +0800 From: Dave Young To: Matt Fleming Subject: Re: [PATCH 2/5] efi: add kernel param efi=noruntime Message-ID: <20140813081347.GA3977@darkstar.nay.redhat.com> References: <1407823822-23829-1-git-send-email-dyoung@redhat.com> <1407823822-23829-2-git-send-email-dyoung@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1407823822-23829-2-git-send-email-dyoung@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140813_011328_763793_C4340FBD X-CRM114-Status: GOOD ( 29.00 ) X-Spam-Score: -5.7 (-----) Cc: Alessandro Zummo , Randy Dunlap , rtc-linux@googlegroups.com, Ard Biesheuvel , linux-efi@vger.kernel.org, Catalin Marinas , Mark Salter , Will Deacon , linux-kernel@vger.kernel.org, Leif Lindholm , Ingo Molnar , hpa@zytor.com, Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 08/12/14 at 02:10pm, Dave Young wrote: > noefi kernel param means actually disabling efi runtime, Per suggestion from > Leif Lindholm efi=noruntime should be better. But since noefi is already used > in X86 thus just adding another param efi=noruntime for same purpose. > > Signed-off-by: Dave Young > --- > Documentation/kernel-parameters.txt | 4 +++- > arch/x86/platform/efi/efi.c | 12 ------------ > drivers/firmware/efi/efi.c | 22 ++++++++++++++++++++++ > 3 files changed, 25 insertions(+), 13 deletions(-) > > diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt > index a8eb6af..09d8c54 100644 > --- a/Documentation/kernel-parameters.txt > +++ b/Documentation/kernel-parameters.txt > @@ -992,11 +992,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. > Format: {"off" | "on" | "skip[mbr]"} > > efi= [EFI] > - Format: { "old_map" } > + Format: { "old_map" | "noruntime" } > old_map [X86-64]: switch to the old ioremap-based EFI > runtime services mapping. 32-bit still uses this one by > default. > > + noruntime : disable EFI runtime services support > + > efi_no_storage_paranoia [EFI; X86] > Using this parameter you can use more than 50% of > your efi variable storage. Use this parameter only if > diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c > index dd7aaa1..eae91be 100644 > --- a/arch/x86/platform/efi/efi.c > +++ b/arch/x86/platform/efi/efi.c > @@ -929,15 +929,3 @@ u64 efi_mem_attributes(unsigned long phys_addr) > } > return 0; > } > - > -static int __init parse_efi_cmdline(char *str) > -{ > - if (*str == '=') > - str++; > - > - if (!strncmp(str, "old_map", 7)) > - set_bit(EFI_OLD_MEMMAP, &efi.flags); > - > - return 0; > -} > -early_param("efi", parse_efi_cmdline); > diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c > index c8f01a7..f3ec3f2 100644 > --- a/drivers/firmware/efi/efi.c > +++ b/drivers/firmware/efi/efi.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > > struct efi __read_mostly efi = { > .mps = EFI_INVALID_TABLE_ADDR, > @@ -54,6 +55,27 @@ bool efi_runtime_disabled(void) > return disable_runtime; > } > > +static int __init parse_efi_cmdline(char *str) > +{ > + if (*str == '=') > + str++; > + > +#ifdef CONFIG_X86 > + if (!strncmp(str, "old_map", 7)) { > + set_bit(EFI_OLD_MEMMAP, &efi.flags); > + goto out; > + } > +#endif > + if (!strncmp(str, "noruntime", 9)) { > + disable_runtime = true; > + goto out; > + } > + For sharing functions I moved old_map here, but rethinking about it maybe it's better to keep it in arch code. Matt, I see you have some code for libstub option parsing, I will rebase on your efi/next and I'm thinking to add a generic function for parsing params like below (for old_map, but libstub can not use it): diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index c90d3cd..c73a7df5 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -932,26 +932,8 @@ u64 efi_mem_attributes(unsigned long phys_addr) static int __init parse_efi_cmdline(char *str) { - if (*str == '=') - str++; - - while (*str) { - if (!strncmp(str, "old_map", 7)) { - set_bit(EFI_OLD_MEMMAP, &efi.flags); - str += strlen("old_map"); - } - - /* - * Skip any options we don't understand. Presumably - * they apply to the EFI boot stub. - */ - while (*str && *str != ',') - str++; - - /* If we hit a delimiter, skip it */ - if (*str == ',') - str++; - } + if (parse_option_str(str, "old_map")) + set_bit(EFI_OLD_MEMMAP, &efi.flags); return 0; } diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 4c52907..d612718 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -407,6 +407,7 @@ int vsscanf(const char *, const char *, va_list); extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(const char *ptr, char **retptr); +extern bool parse_option_str(const char *str, const char *option); extern int core_kernel_text(unsigned long addr); extern int core_kernel_data(unsigned long addr); diff --git a/lib/cmdline.c b/lib/cmdline.c index d4932f7..f384125 100644 --- a/lib/cmdline.c +++ b/lib/cmdline.c @@ -155,3 +155,32 @@ unsigned long long memparse(const char *ptr, char **retptr) return ret; } EXPORT_SYMBOL(memparse); + +/** + * parse_option_str - Parse a string and check an option is set or not + * @str: String to be parsed + * @option: the option name + * + * This function parses a string containing a comma-separated + * list of strings like a=b,c. + * + * Return true if there's such option in the string, or return false. + */ ++bool parse_option_str(const char *str, const char *option) +{ + while (*str) { + if (!strncmp(str, option, strlen(option))) { + str += strlen(option); + if (!*str || *str == ',') + return true; + } + + while (*str && *str != ',') + str++; + + if (*str == ',') + str++; + } + + return false; +}