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@lists.ozlabs.org
Subject: [PATCH v15 08/10] powerpc: Delete unused function delete_fdt_mem_rsv()
Date: Fri, 15 Jan 2021 09:30:15 -0800 [thread overview]
Message-ID: <20210115173017.30617-9-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210115173017.30617-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".
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 | 1 -
arch/powerpc/kexec/file_load.c | 32 --------------------------------
2 files changed, 33 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 11679fc2cadc..b8c270e08481 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -123,7 +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 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 5dd3a9c45a2d..036c8fb48fc3 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -108,35 +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;
-}
--
2.30.0
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, 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, 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, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v15 08/10] powerpc: Delete unused function delete_fdt_mem_rsv()
Date: Fri, 15 Jan 2021 09:30:15 -0800 [thread overview]
Message-ID: <20210115173017.30617-9-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210115173017.30617-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".
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 | 1 -
arch/powerpc/kexec/file_load.c | 32 --------------------------------
2 files changed, 33 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 11679fc2cadc..b8c270e08481 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -123,7 +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 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 5dd3a9c45a2d..036c8fb48fc3 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -108,35 +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;
-}
--
2.30.0
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,
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, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v15 08/10] powerpc: Delete unused function delete_fdt_mem_rsv()
Date: Fri, 15 Jan 2021 09:30:15 -0800 [thread overview]
Message-ID: <20210115173017.30617-9-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210115173017.30617-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".
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 | 1 -
arch/powerpc/kexec/file_load.c | 32 --------------------------------
2 files changed, 33 deletions(-)
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index 11679fc2cadc..b8c270e08481 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -123,7 +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 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 5dd3a9c45a2d..036c8fb48fc3 100644
--- a/arch/powerpc/kexec/file_load.c
+++ b/arch/powerpc/kexec/file_load.c
@@ -108,35 +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;
-}
--
2.30.0
_______________________________________________
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-15 17:32 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 17:30 [PATCH v15 00/10] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 01/10] powerpc: Rename kexec elfcorehdr_addr to elf_headers_mem Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 02/10] of: Add a common kexec FDT setup function Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 03/10] arm64: Use common of_kexec_setup_new_fdt() Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 04/10] powerpc: " Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 05/10] ima: Move arch_ima_add_kexec_buffer() to ima Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 06/10] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 07/10] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian [this message]
2021-01-15 17:30 ` [PATCH v15 08/10] powerpc: Delete unused function delete_fdt_mem_rsv() Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` [PATCH v15 09/10] arm64: Call kmalloc() to allocate DTB buffer Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-17 13:23 ` Mimi Zohar
2021-01-17 13:23 ` Mimi Zohar
2021-01-17 13:23 ` Mimi Zohar
2021-01-27 16:52 ` Will Deacon
2021-01-27 16:52 ` Will Deacon
2021-01-27 16:52 ` Will Deacon
2021-01-27 17:59 ` Lakshmi Ramasubramanian
2021-01-27 17:59 ` Lakshmi Ramasubramanian
2021-01-27 17:59 ` Lakshmi Ramasubramanian
2021-01-27 18:43 ` Will Deacon
2021-01-27 18:43 ` Will Deacon
2021-01-27 18:43 ` Will Deacon
2021-01-28 3:52 ` Thiago Jung Bauermann
2021-01-28 3:52 ` Thiago Jung Bauermann
2021-01-28 3:52 ` Thiago Jung Bauermann
2021-01-28 4:00 ` Lakshmi Ramasubramanian
2021-01-28 4:00 ` Lakshmi Ramasubramanian
2021-01-28 4:00 ` Lakshmi Ramasubramanian
2021-01-28 4:14 ` Thiago Jung Bauermann
2021-01-28 4:14 ` Thiago Jung Bauermann
2021-01-28 4:14 ` Thiago Jung Bauermann
2021-01-28 4:33 ` Lakshmi Ramasubramanian
2021-01-28 4:33 ` Lakshmi Ramasubramanian
2021-01-28 4:33 ` Lakshmi Ramasubramanian
2021-01-28 4:57 ` Joe Perches
2021-01-28 4:57 ` Joe Perches
2021-01-28 4:57 ` Joe Perches
2021-02-01 18:58 ` Thiago Jung Bauermann
2021-02-01 18:58 ` Thiago Jung Bauermann
2021-02-01 18:58 ` Thiago Jung Bauermann
2021-01-15 17:30 ` [PATCH v15 10/10] arm64: Add IMA log information in kimage used for kexec Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-15 17:30 ` Lakshmi Ramasubramanian
2021-01-27 16:54 ` Will Deacon
2021-01-27 16:54 ` Will Deacon
2021-01-27 16:54 ` Will Deacon
2021-01-27 17:56 ` Lakshmi Ramasubramanian
2021-01-27 17:56 ` Lakshmi Ramasubramanian
2021-01-27 17:56 ` Lakshmi Ramasubramanian
2021-01-27 18:02 ` Will Deacon
2021-01-27 18:02 ` Will Deacon
2021-01-27 18:02 ` Will Deacon
2021-01-27 18:24 ` Lakshmi Ramasubramanian
2021-01-27 18:24 ` Lakshmi Ramasubramanian
2021-01-27 18:24 ` Lakshmi Ramasubramanian
2021-01-27 18:31 ` Mimi Zohar
2021-01-27 18:31 ` Mimi Zohar
2021-01-27 18:31 ` Mimi Zohar
2021-01-27 23:13 ` Will Deacon
2021-01-27 23:13 ` Will Deacon
2021-01-27 23:13 ` Will Deacon
2021-01-28 4:05 ` Lakshmi Ramasubramanian
2021-01-28 4:05 ` Lakshmi Ramasubramanian
2021-01-28 4:05 ` 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=20210115173017.30617-9-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@lists.ozlabs.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: link
Be 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.