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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 EBF65C433FE for ; Sat, 12 Dec 2020 15:22:11 +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 9F9B322240 for ; Sat, 12 Dec 2020 15:22:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F9B322240 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.microsoft.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-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=S7oncClH3fgfRlvrn/MHkgwadTfTLlaMtyOmTMrcjWc=; b=QEevjLDqB4O/S35dHDtRIFsZt fIEQXIW41uaMR5g1m6BWN2JNMMya3RztB0XzbX38OtLQ9/CT+MgvCaQ8UW65j45WIfUVd2Oy9ezn+ 6XIp3v32sJxW3zWnY4UrUuIkFN1dNKbPFs4oiQJczfPg/ri/VI2HMacyftiNnwrVT21PCA/xj2KEe T4Rw1+MGLCC5MbOLHFFxpA+RpyUJj3zpSpfE7fGPVZ0rq1JjVqZ2De4SpJ1k+bVPZ/t+jFfrPU2j6 XETzUFRdTTGMPvitxDp2umgMQRkc9TufEzMVQKDlq4hZRvfBPBjfQbwXfGBfYYgUsUr5MDrac4qko qeafJTAUQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ko6hf-0007fk-GU; Sat, 12 Dec 2020 15:20:59 +0000 Received: from linux.microsoft.com ([13.77.154.182]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ko6hc-0007fC-BE for linux-arm-kernel@lists.infradead.org; Sat, 12 Dec 2020 15:20:57 +0000 Received: from [192.168.0.104] (c-73-42-176-67.hsd1.wa.comcast.net [73.42.176.67]) by linux.microsoft.com (Postfix) with ESMTPSA id 8676C20B717A; Sat, 12 Dec 2020 07:20:54 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8676C20B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1607786455; bh=De4rpOU7R3cbE0tgBHmdBeaCpxGO9h+TqzXJ25bLXU0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=Qp6NDi1/+kT4y61jN2rVY9no55vb/n4icGCopAQWuS6saUQ43bWnFH9QWLVOGwTQX yNtVAwGFsctW/yo0jBcsc8P4ToeUWNdQQfbLnpCmFVpwVNU5/Ao0VFuJU3aLbRxgvA /Bpm/oxpAuzEjQivPFlywVC3nsIs6eTDEpl01hvI= Subject: Re: [RFC PATCH 3/4] arm64: Use common of_kexec_setup_new_fdt() To: Rob Herring , takahiro.akashi@linaro.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au References: <20201211221006.1052453-1-robh@kernel.org> <20201211221006.1052453-4-robh@kernel.org> From: Lakshmi Ramasubramanian Message-ID: Date: Sat, 12 Dec 2020 07:20:53 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201211221006.1052453-4-robh@kernel.org> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201212_102056_573265_2C35D3F4 X-CRM114-Status: GOOD ( 20.89 ) 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@arm.com, benh@kernel.crashing.org, bhsharma@redhat.com, tao.li@vivo.com, zohar@linux.ibm.com, paulus@samba.org, vincenzo.frascino@arm.com, frowand.list@gmail.com, sashal@kernel.org, masahiroy@kernel.org, jmorris@namei.org, linux-arm-kernel@lists.infradead.org, serge@hallyn.com, devicetree@vger.kernel.org, pasha.tatashin@soleen.com, prsriva@linux.microsoft.com, hsinyi@chromium.org, allison@lohutok.net, christophe.leroy@c-s.fr, mbrugger@suse.com, balajib@linux.microsoft.com, dmitry.kasatkin@gmail.com, linux-kernel@vger.kernel.org, james.morse@arm.com, linux-integrity@vger.kernel.org, Thiago Jung Bauermann Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 12/11/20 2:10 PM, Rob Herring wrote: > Signed-off-by: Rob Herring > --- > arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------ > 1 file changed, 3 insertions(+), 120 deletions(-) > This change looks good to me. Reviewed-by: Lakshmi Ramasubramanian -lakshmi > diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c > index 5b0e67b93cdc..7de9c47dee7c 100644 > --- a/arch/arm64/kernel/machine_kexec_file.c > +++ b/arch/arm64/kernel/machine_kexec_file.c > @@ -15,23 +15,12 @@ > #include > #include > #include > +#include > #include > -#include > #include > #include > #include > #include > -#include > - > -/* relevant device tree properties */ > -#define FDT_PROP_KEXEC_ELFHDR "linux,elfcorehdr" > -#define FDT_PROP_MEM_RANGE "linux,usable-memory-range" > -#define FDT_PROP_INITRD_START "linux,initrd-start" > -#define FDT_PROP_INITRD_END "linux,initrd-end" > -#define FDT_PROP_BOOTARGS "bootargs" > -#define FDT_PROP_KASLR_SEED "kaslr-seed" > -#define FDT_PROP_RNG_SEED "rng-seed" > -#define RNG_SEED_SIZE 128 > > const struct kexec_file_ops * const kexec_file_loaders[] = { > &kexec_image_ops, > @@ -50,112 +39,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) > return kexec_image_post_load_cleanup_default(image); > } > > -static int setup_dtb(struct kimage *image, > - unsigned long initrd_load_addr, unsigned long initrd_len, > - char *cmdline, void *dtb) > -{ > - int off, ret; > - > - ret = fdt_path_offset(dtb, "/chosen"); > - if (ret < 0) > - goto out; > - > - off = ret; > - > - ret = fdt_delprop(dtb, off, FDT_PROP_KEXEC_ELFHDR); > - if (ret && ret != -FDT_ERR_NOTFOUND) > - goto out; > - ret = fdt_delprop(dtb, off, FDT_PROP_MEM_RANGE); > - if (ret && ret != -FDT_ERR_NOTFOUND) > - goto out; > - > - if (image->type == KEXEC_TYPE_CRASH) { > - /* add linux,elfcorehdr */ > - ret = fdt_appendprop_addrrange(dtb, 0, off, > - FDT_PROP_KEXEC_ELFHDR, > - image->arch.elf_headers_mem, > - image->arch.elf_headers_sz); > - if (ret) > - return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); > - > - /* add linux,usable-memory-range */ > - ret = fdt_appendprop_addrrange(dtb, 0, off, > - FDT_PROP_MEM_RANGE, > - crashk_res.start, > - crashk_res.end - crashk_res.start + 1); > - if (ret) > - return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL); > - } > - > - /* add bootargs */ > - if (cmdline) { > - ret = fdt_setprop_string(dtb, off, FDT_PROP_BOOTARGS, cmdline); > - if (ret) > - goto out; > - } else { > - ret = fdt_delprop(dtb, off, FDT_PROP_BOOTARGS); > - if (ret && (ret != -FDT_ERR_NOTFOUND)) > - goto out; > - } > - > - /* add initrd-* */ > - if (initrd_load_addr) { > - ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_START, > - initrd_load_addr); > - if (ret) > - goto out; > - > - ret = fdt_setprop_u64(dtb, off, FDT_PROP_INITRD_END, > - initrd_load_addr + initrd_len); > - if (ret) > - goto out; > - } else { > - ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_START); > - if (ret && (ret != -FDT_ERR_NOTFOUND)) > - goto out; > - > - ret = fdt_delprop(dtb, off, FDT_PROP_INITRD_END); > - if (ret && (ret != -FDT_ERR_NOTFOUND)) > - goto out; > - } > - > - /* add kaslr-seed */ > - ret = fdt_delprop(dtb, off, FDT_PROP_KASLR_SEED); > - if (ret == -FDT_ERR_NOTFOUND) > - ret = 0; > - else if (ret) > - goto out; > - > - if (rng_is_initialized()) { > - u64 seed = get_random_u64(); > - ret = fdt_setprop_u64(dtb, off, FDT_PROP_KASLR_SEED, seed); > - if (ret) > - goto out; > - } else { > - pr_notice("RNG is not initialised: omitting \"%s\" property\n", > - FDT_PROP_KASLR_SEED); > - } > - > - /* add rng-seed */ > - if (rng_is_initialized()) { > - void *rng_seed; > - ret = fdt_setprop_placeholder(dtb, off, FDT_PROP_RNG_SEED, > - RNG_SEED_SIZE, &rng_seed); > - if (ret) > - goto out; > - get_random_bytes(rng_seed, RNG_SEED_SIZE); > - } else { > - pr_notice("RNG is not initialised: omitting \"%s\" property\n", > - FDT_PROP_RNG_SEED); > - } > - > -out: > - if (ret) > - return (ret == -FDT_ERR_NOSPACE) ? -ENOMEM : -EINVAL; > - > - return 0; > -} > - > /* > * More space needed so that we can add initrd, bootargs, kaslr-seed, > * rng-seed, userable-memory-range and elfcorehdr. > @@ -185,8 +68,8 @@ static int create_dtb(struct kimage *image, > if (ret) > return -EINVAL; > > - ret = setup_dtb(image, initrd_load_addr, initrd_len, > - cmdline, buf); > + ret = of_kexec_setup_new_fdt(image, buf, initrd_load_addr, > + initrd_len, cmdline); > if (ret) { > vfree(buf); > if (ret == -ENOMEM) { > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel