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=-7.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT 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 BBF30C3A5A1 for ; Mon, 26 Aug 2019 03:16:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 913812168B for ; Mon, 26 Aug 2019 03:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566789385; bh=D2J2yFbNfuX9EmYpsOlxL/yhHWHvzg/hw54VGoYgnN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=t32rPFN1wSUsPegvBBL0lgJj3/VPKxqAsXQ8Zo812Ja74DeM//Dz2PR37edBcc5KS VAS2ceuCg9C8wsIU8eavbTdv3H9+Muohez2zC/bA9B+j21+iq32T1k/OXAPWe2MCM6 SfKf3MNV8vTf0CT2+gy3H/hRK5p+HR/a6YHWxg+s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729465AbfHZDQV (ORCPT ); Sun, 25 Aug 2019 23:16:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:35576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726434AbfHZDQV (ORCPT ); Sun, 25 Aug 2019 23:16:21 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C73AF217F4; Mon, 26 Aug 2019 03:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566789380; bh=D2J2yFbNfuX9EmYpsOlxL/yhHWHvzg/hw54VGoYgnN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pl6imcvKxaV3bep6DFK/+9RlMhgAZn6LLoDPEBksO06VfD6S8PaeLdwFkGJzLPob/ KdcZS1riYtxTSx3BR4doPcddoz2Aw5kKTwG9AvseKeJ6wAJwZTNtW10XAxVmrftRAr KWPGkaLR1QL2zgW8MkUeonANezK7Swu703yRVv6g= From: Masami Hiramatsu To: Steven Rostedt , Frank Rowand Cc: Ingo Molnar , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH v3 03/19] skc: Add a boot setup routine from cmdline Date: Mon, 26 Aug 2019 12:16:13 +0900 Message-Id: <156678937345.21459.4178076251522180375.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <156678933823.21459.4100380582025186209.stgit@devnote2> References: <156678933823.21459.4100380582025186209.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Add a boot setup routine from cmdline option "skc=ADDR,SIZE". Bootloader has to setup this cmdline option when it loads the skc file on memory. The ADDR must be a physical address. Signed-off-by: Masami Hiramatsu --- Documentation/admin-guide/kernel-parameters.txt | 5 ++ init/main.c | 54 +++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 47d981a86e2f..9a955b1bd1bf 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4273,6 +4273,11 @@ simeth= [IA-64] simscsi= + skc=paddr,size [SKC] + Pass the physical memory address and size of loaded + supplemental kernel cmdline (SKC) text. This will + be treated by bootloader which loads the SKC file. + slram= [HW,MTD] slab_nomerge [MM] diff --git a/init/main.c b/init/main.c index 96f8d5af52d6..d06eb3d63b77 100644 --- a/init/main.c +++ b/init/main.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -245,6 +246,58 @@ static int __init loglevel(char *str) early_param("loglevel", loglevel); +#ifdef CONFIG_SKC +__initdata unsigned long initial_skc; +__initdata unsigned long initial_skc_len; + +static int __init save_skc_address(char *str) +{ + char *p; + + p = strchr(str, ','); + if (!p) + return -EINVAL; + *p++ = '\0'; + /* First options should be physical address - int is not enough */ + if (kstrtoul(str, 0, &initial_skc) < 0) + return -EINVAL; + if (kstrtoul(p, 0, &initial_skc_len) < 0) + return -EINVAL; + if (initial_skc_len > SKC_DATA_MAX) + return -E2BIG; + /* Reserve it for protection */ + memblock_reserve(initial_skc, initial_skc_len); + + return 0; +} +early_param("skc", save_skc_address); + +static void __init setup_skc(void) +{ + u32 size; + char *data, *copy; + + if (!initial_skc) + return; + + data = early_memremap(initial_skc, initial_skc_len); + size = initial_skc_len + 1; + + copy = memblock_alloc(size, SMP_CACHE_BYTES); + if (!copy) { + pr_err("Failed to allocate memory for structured kernel cmdline\n"); + goto end; + } + memcpy(copy, data, initial_skc_len); + copy[size - 1] = '\0'; + + skc_init(copy); +end: + early_memunmap(data, initial_skc_len); +} +#else +#define setup_skc() do { } while (0) +#endif /* Change NUL term back to "=", to make "param" the whole string. */ static int __init repair_env_string(char *param, char *val, const char *unused, void *arg) @@ -596,6 +649,7 @@ asmlinkage __visible void __init start_kernel(void) setup_arch(&command_line); mm_init_cpumask(&init_mm); setup_command_line(command_line); + setup_skc(); setup_nr_cpu_ids(); setup_per_cpu_areas(); smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */