From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> To: zohar@linux.ibm.com, bauerman@linux.ibm.com, robh@kernel.org, takahiro.akashi@linaro.org, gregkh@linuxfoundation.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au Cc: james.morse@arm.com, sashal@kernel.org, benh@kernel.crashing.org, paulus@samba.org, frowand.list@gmail.com, vincenzo.frascino@arm.com, mark.rutland@arm.com, dmitry.kasatkin@gmail.com, jmorris@namei.org, serge@hallyn.com, pasha.tatashin@soleen.com, allison@lohutok.net, masahiroy@kernel.org, bhsharma@redhat.com, mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com, christophe.leroy@c-s.fr, prsriva@linux.microsoft.com, balajib@linux.microsoft.com, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linuxppc-dev@vger.kernel.org Subject: [PATCH v14 4/6] powerpc: Delete unused functions Date: Mon, 4 Jan 2021 11:26:00 -0800 [thread overview] Message-ID: <20210104192602.10131-5-nramas@linux.microsoft.com> (raw) In-Reply-To: <20210104192602.10131-1-nramas@linux.microsoft.com> delete_fdt_mem_rsv() defined in "arch/powerpc/kexec/file_load.c" has been renamed to fdt_find_and_del_mem_rsv(), and moved to "drivers/of/kexec.c". Remove delete_fdt_mem_rsv() in "arch/powerpc/kexec/file_load.c". Call of_kexec_setup_new_fdt() from setup_new_fdt_ppc64() and remove setup_new_fdt() in "arch/powerpc/kexec/file_load.c". Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com> Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> --- arch/powerpc/include/asm/kexec.h | 4 --- arch/powerpc/kexec/file_load.c | 60 ------------------------------- arch/powerpc/kexec/file_load_64.c | 4 ++- 3 files changed, 3 insertions(+), 65 deletions(-) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index dbf09d2f36d0..b8c270e08481 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -123,10 +123,6 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline, int setup_purgatory(struct kimage *image, const void *slave_code, const void *fdt, unsigned long kernel_load_addr, unsigned long fdt_load_addr); -int setup_new_fdt(const struct kimage *image, void *fdt, - unsigned long initrd_load_addr, unsigned long initrd_len, - const char *cmdline); -int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size); #ifdef CONFIG_PPC64 struct kexec_buf; diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c index 9f3ec0b239ef..036c8fb48fc3 100644 --- a/arch/powerpc/kexec/file_load.c +++ b/arch/powerpc/kexec/file_load.c @@ -108,63 +108,3 @@ int setup_purgatory(struct kimage *image, const void *slave_code, return 0; } - -/** - * delete_fdt_mem_rsv - delete memory reservation with given address and size - * - * Return: 0 on success, or negative errno on error. - */ -int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size) -{ - int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); - - for (i = 0; i < num_rsvs; i++) { - uint64_t rsv_start, rsv_size; - - ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); - if (ret) { - pr_err("Malformed device tree.\n"); - return -EINVAL; - } - - if (rsv_start == start && rsv_size == size) { - ret = fdt_del_mem_rsv(fdt, i); - if (ret) { - pr_err("Error deleting device tree reservation.\n"); - return -EINVAL; - } - - return 0; - } - } - - return -ENOENT; -} - -/* - * setup_new_fdt - modify /chosen and memory reservation for the next kernel - * @image: kexec image being loaded. - * @fdt: Flattened device tree for the next kernel. - * @initrd_load_addr: Address where the next initrd will be loaded. - * @initrd_len: Size of the next initrd, or 0 if there will be none. - * @cmdline: Command line for the next kernel, or NULL if there will - * be none. - * - * Return: 0 on success, or negative errno on error. - */ -int setup_new_fdt(const struct kimage *image, void *fdt, - unsigned long initrd_load_addr, unsigned long initrd_len, - const char *cmdline) -{ - int ret; - - ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline); - if (ret) - goto err; - - return 0; - -err: - pr_err("Error setting up the new device tree.\n"); - return -EINVAL; -} diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index a05c19b3cc60..3cab318aa3b9 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -17,6 +17,7 @@ #include <linux/kexec.h> #include <linux/of_fdt.h> #include <linux/libfdt.h> +#include <linux/of.h> #include <linux/of_device.h> #include <linux/memblock.h> #include <linux/slab.h> @@ -944,7 +945,8 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt, struct crash_mem *umem = NULL, *rmem = NULL; int i, nr_ranges, ret; - ret = setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline); + ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, + cmdline); if (ret) goto out; -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> To: zohar@linux.ibm.com, bauerman@linux.ibm.com, robh@kernel.org, takahiro.akashi@linaro.org, gregkh@linuxfoundation.org, will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au Cc: mark.rutland@arm.com, benh@kernel.crashing.org, bhsharma@redhat.com, tao.li@vivo.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, linuxppc-dev@vger.kernel.org, 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 Subject: [PATCH v14 4/6] powerpc: Delete unused functions Date: Mon, 4 Jan 2021 11:26:00 -0800 [thread overview] Message-ID: <20210104192602.10131-5-nramas@linux.microsoft.com> (raw) In-Reply-To: <20210104192602.10131-1-nramas@linux.microsoft.com> delete_fdt_mem_rsv() defined in "arch/powerpc/kexec/file_load.c" has been renamed to fdt_find_and_del_mem_rsv(), and moved to "drivers/of/kexec.c". Remove delete_fdt_mem_rsv() in "arch/powerpc/kexec/file_load.c". Call of_kexec_setup_new_fdt() from setup_new_fdt_ppc64() and remove setup_new_fdt() in "arch/powerpc/kexec/file_load.c". Co-developed-by: Prakhar Srivastava <prsriva@linux.microsoft.com> Signed-off-by: Prakhar Srivastava <prsriva@linux.microsoft.com> Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com> --- arch/powerpc/include/asm/kexec.h | 4 --- arch/powerpc/kexec/file_load.c | 60 ------------------------------- arch/powerpc/kexec/file_load_64.c | 4 ++- 3 files changed, 3 insertions(+), 65 deletions(-) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index dbf09d2f36d0..b8c270e08481 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -123,10 +123,6 @@ char *setup_kdump_cmdline(struct kimage *image, char *cmdline, int setup_purgatory(struct kimage *image, const void *slave_code, const void *fdt, unsigned long kernel_load_addr, unsigned long fdt_load_addr); -int setup_new_fdt(const struct kimage *image, void *fdt, - unsigned long initrd_load_addr, unsigned long initrd_len, - const char *cmdline); -int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size); #ifdef CONFIG_PPC64 struct kexec_buf; diff --git a/arch/powerpc/kexec/file_load.c b/arch/powerpc/kexec/file_load.c index 9f3ec0b239ef..036c8fb48fc3 100644 --- a/arch/powerpc/kexec/file_load.c +++ b/arch/powerpc/kexec/file_load.c @@ -108,63 +108,3 @@ int setup_purgatory(struct kimage *image, const void *slave_code, return 0; } - -/** - * delete_fdt_mem_rsv - delete memory reservation with given address and size - * - * Return: 0 on success, or negative errno on error. - */ -int delete_fdt_mem_rsv(void *fdt, unsigned long start, unsigned long size) -{ - int i, ret, num_rsvs = fdt_num_mem_rsv(fdt); - - for (i = 0; i < num_rsvs; i++) { - uint64_t rsv_start, rsv_size; - - ret = fdt_get_mem_rsv(fdt, i, &rsv_start, &rsv_size); - if (ret) { - pr_err("Malformed device tree.\n"); - return -EINVAL; - } - - if (rsv_start == start && rsv_size == size) { - ret = fdt_del_mem_rsv(fdt, i); - if (ret) { - pr_err("Error deleting device tree reservation.\n"); - return -EINVAL; - } - - return 0; - } - } - - return -ENOENT; -} - -/* - * setup_new_fdt - modify /chosen and memory reservation for the next kernel - * @image: kexec image being loaded. - * @fdt: Flattened device tree for the next kernel. - * @initrd_load_addr: Address where the next initrd will be loaded. - * @initrd_len: Size of the next initrd, or 0 if there will be none. - * @cmdline: Command line for the next kernel, or NULL if there will - * be none. - * - * Return: 0 on success, or negative errno on error. - */ -int setup_new_fdt(const struct kimage *image, void *fdt, - unsigned long initrd_load_addr, unsigned long initrd_len, - const char *cmdline) -{ - int ret; - - ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline); - if (ret) - goto err; - - return 0; - -err: - pr_err("Error setting up the new device tree.\n"); - return -EINVAL; -} diff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c index a05c19b3cc60..3cab318aa3b9 100644 --- a/arch/powerpc/kexec/file_load_64.c +++ b/arch/powerpc/kexec/file_load_64.c @@ -17,6 +17,7 @@ #include <linux/kexec.h> #include <linux/of_fdt.h> #include <linux/libfdt.h> +#include <linux/of.h> #include <linux/of_device.h> #include <linux/memblock.h> #include <linux/slab.h> @@ -944,7 +945,8 @@ int setup_new_fdt_ppc64(const struct kimage *image, void *fdt, struct crash_mem *umem = NULL, *rmem = NULL; int i, nr_ranges, ret; - ret = setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, cmdline); + ret = of_kexec_setup_new_fdt(image, fdt, initrd_load_addr, initrd_len, + cmdline); if (ret) goto out; -- 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 19:27 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-04 19:25 [PATCH v14 0/6] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian 2021-01-04 19:25 ` Lakshmi Ramasubramanian 2021-01-04 19:25 ` [PATCH v14 1/6] ima: Move arch_ima_add_kexec_buffer() to ima Lakshmi Ramasubramanian 2021-01-04 19:25 ` Lakshmi Ramasubramanian 2021-01-04 19:25 ` [PATCH v14 2/6] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian 2021-01-04 19:25 ` Lakshmi Ramasubramanian 2021-01-13 2:14 ` Thiago Jung Bauermann 2021-01-13 2:14 ` Thiago Jung Bauermann 2021-01-04 19:25 ` [PATCH v14 3/6] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian 2021-01-04 19:25 ` Lakshmi Ramasubramanian 2021-01-04 19:26 ` Lakshmi Ramasubramanian [this message] 2021-01-04 19:26 ` [PATCH v14 4/6] powerpc: Delete unused functions Lakshmi Ramasubramanian 2021-01-12 23:30 ` Mimi Zohar 2021-01-12 23:30 ` Mimi Zohar 2021-01-12 23:57 ` Lakshmi Ramasubramanian 2021-01-12 23:57 ` Lakshmi Ramasubramanian 2021-01-13 2:15 ` Thiago Jung Bauermann 2021-01-13 2:15 ` Thiago Jung Bauermann 2021-01-04 19:26 ` [PATCH v14 5/6] arm64: Free DTB buffer if fdt_open_into() fails Lakshmi Ramasubramanian 2021-01-04 19:26 ` Lakshmi Ramasubramanian 2021-01-04 19:26 ` [PATCH v14 6/6] arm64: Add IMA log information in kimage used for kexec Lakshmi Ramasubramanian 2021-01-04 19:26 ` Lakshmi Ramasubramanian 2021-01-12 23:28 ` Mimi Zohar 2021-01-12 23:28 ` Mimi Zohar 2021-01-12 23:54 ` Lakshmi Ramasubramanian 2021-01-12 23:54 ` Lakshmi Ramasubramanian 2021-01-13 2:16 ` Thiago Jung Bauermann 2021-01-13 2:16 ` Thiago Jung Bauermann 2021-01-12 14:42 ` [PATCH v14 0/6] Carry forward IMA measurement log on kexec on ARM64 Rob Herring 2021-01-12 14:42 ` Rob Herring 2021-01-12 18:05 ` Mimi Zohar 2021-01-12 18:05 ` Mimi Zohar 2021-01-12 18:24 ` Lakshmi Ramasubramanian 2021-01-12 18:24 ` Lakshmi Ramasubramanian 2021-01-12 18:45 ` Thiago Jung Bauermann 2021-01-12 18:45 ` Thiago Jung Bauermann 2021-01-12 18:23 ` Lakshmi Ramasubramanian 2021-01-12 18:23 ` Lakshmi Ramasubramanian
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=20210104192602.10131-5-nramas@linux.microsoft.com \ --to=nramas@linux.microsoft.com \ --cc=allison@lohutok.net \ --cc=balajib@linux.microsoft.com \ --cc=bauerman@linux.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=bhsharma@redhat.com \ --cc=catalin.marinas@arm.com \ --cc=christophe.leroy@c-s.fr \ --cc=devicetree@vger.kernel.org \ --cc=dmitry.kasatkin@gmail.com \ --cc=frowand.list@gmail.com \ --cc=gregkh@linuxfoundation.org \ --cc=hsinyi@chromium.org \ --cc=james.morse@arm.com \ --cc=jmorris@namei.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=masahiroy@kernel.org \ --cc=mbrugger@suse.com \ --cc=mpe@ellerman.id.au \ --cc=pasha.tatashin@soleen.com \ --cc=paulus@samba.org \ --cc=prsriva@linux.microsoft.com \ --cc=robh@kernel.org \ --cc=sashal@kernel.org \ --cc=serge@hallyn.com \ --cc=takahiro.akashi@linaro.org \ --cc=tao.li@vivo.com \ --cc=vincenzo.frascino@arm.com \ --cc=will@kernel.org \ --cc=zohar@linux.ibm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.