All of lore.kernel.org
 help / color / mirror / Atom feed
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, joe@perches.com, 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, 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 v18 02/11] arm64: Rename kexec elf_headers_mem to elf_load_addr
Date: Sat, 13 Feb 2021 08:10:40 -0800	[thread overview]
Message-ID: <20210213161049.6190-3-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210213161049.6190-1-nramas@linux.microsoft.com>

The architecture specific field, elf_headers_mem in struct kimage_arch,
that holds the address of the buffer in memory for ELF core header for
arm64 has a different name than the one used for powerpc.  This makes
it hard to have a common code for setting up the device tree for
kexec system call.

Rename elf_headers_mem to elf_load_addr to align with powerpc name so
common code can use it.

Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Suggested-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
---
 arch/arm64/include/asm/kexec.h         | 2 +-
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index d24b527e8c00..e6a99dfdffb8 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -98,7 +98,7 @@ struct kimage_arch {
 	unsigned long dtb_mem;
 	/* Core ELF header buffer */
 	void *elf_headers;
-	unsigned long elf_headers_mem;
+	unsigned long elf_load_addr;
 	unsigned long elf_headers_sz;
 };
 
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 03210f644790..d98bacec9426 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -73,7 +73,7 @@ static int setup_dtb(struct kimage *image,
 		/* add linux,elfcorehdr */
 		ret = fdt_appendprop_addrrange(dtb, 0, off,
 				FDT_PROP_KEXEC_ELFHDR,
-				image->arch.elf_headers_mem,
+				image->arch.elf_load_addr,
 				image->arch.elf_headers_sz);
 		if (ret)
 			return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
@@ -283,11 +283,11 @@ int load_other_segments(struct kimage *image,
 			goto out_err;
 		}
 		image->arch.elf_headers = headers;
-		image->arch.elf_headers_mem = kbuf.mem;
+		image->arch.elf_load_addr = kbuf.mem;
 		image->arch.elf_headers_sz = headers_sz;
 
 		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			 image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
+			 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load initrd */
-- 
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, joe@perches.com, catalin.marinas@arm.com,
	mpe@ellerman.id.au
Cc: mark.rutland@arm.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,
	allison@lohutok.net, serge@hallyn.com,
	devicetree@vger.kernel.org, pasha.tatashin@soleen.com,
	prsriva@linux.microsoft.com, hsinyi@chromium.org,
	linux-arm-kernel@lists.infradead.org, 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 v18 02/11] arm64: Rename kexec elf_headers_mem to elf_load_addr
Date: Sat, 13 Feb 2021 08:10:40 -0800	[thread overview]
Message-ID: <20210213161049.6190-3-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210213161049.6190-1-nramas@linux.microsoft.com>

The architecture specific field, elf_headers_mem in struct kimage_arch,
that holds the address of the buffer in memory for ELF core header for
arm64 has a different name than the one used for powerpc.  This makes
it hard to have a common code for setting up the device tree for
kexec system call.

Rename elf_headers_mem to elf_load_addr to align with powerpc name so
common code can use it.

Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Suggested-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
---
 arch/arm64/include/asm/kexec.h         | 2 +-
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index d24b527e8c00..e6a99dfdffb8 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -98,7 +98,7 @@ struct kimage_arch {
 	unsigned long dtb_mem;
 	/* Core ELF header buffer */
 	void *elf_headers;
-	unsigned long elf_headers_mem;
+	unsigned long elf_load_addr;
 	unsigned long elf_headers_sz;
 };
 
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 03210f644790..d98bacec9426 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -73,7 +73,7 @@ static int setup_dtb(struct kimage *image,
 		/* add linux,elfcorehdr */
 		ret = fdt_appendprop_addrrange(dtb, 0, off,
 				FDT_PROP_KEXEC_ELFHDR,
-				image->arch.elf_headers_mem,
+				image->arch.elf_load_addr,
 				image->arch.elf_headers_sz);
 		if (ret)
 			return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
@@ -283,11 +283,11 @@ int load_other_segments(struct kimage *image,
 			goto out_err;
 		}
 		image->arch.elf_headers = headers;
-		image->arch.elf_headers_mem = kbuf.mem;
+		image->arch.elf_load_addr = kbuf.mem;
 		image->arch.elf_headers_sz = headers_sz;
 
 		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			 image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
+			 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load initrd */
-- 
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, joe@perches.com, catalin.marinas@arm.com,
	mpe@ellerman.id.au
Cc: mark.rutland@arm.com, benh@kernel.crashing.org, tao.li@vivo.com,
	paulus@samba.org, vincenzo.frascino@arm.com,
	frowand.list@gmail.com, sashal@kernel.org, masahiroy@kernel.org,
	jmorris@namei.org, allison@lohutok.net, serge@hallyn.com,
	devicetree@vger.kernel.org, pasha.tatashin@soleen.com,
	prsriva@linux.microsoft.com, hsinyi@chromium.org,
	linux-arm-kernel@lists.infradead.org, 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 v18 02/11] arm64: Rename kexec elf_headers_mem to elf_load_addr
Date: Sat, 13 Feb 2021 08:10:40 -0800	[thread overview]
Message-ID: <20210213161049.6190-3-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20210213161049.6190-1-nramas@linux.microsoft.com>

The architecture specific field, elf_headers_mem in struct kimage_arch,
that holds the address of the buffer in memory for ELF core header for
arm64 has a different name than the one used for powerpc.  This makes
it hard to have a common code for setting up the device tree for
kexec system call.

Rename elf_headers_mem to elf_load_addr to align with powerpc name so
common code can use it.

Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
Suggested-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
---
 arch/arm64/include/asm/kexec.h         | 2 +-
 arch/arm64/kernel/machine_kexec_file.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index d24b527e8c00..e6a99dfdffb8 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -98,7 +98,7 @@ struct kimage_arch {
 	unsigned long dtb_mem;
 	/* Core ELF header buffer */
 	void *elf_headers;
-	unsigned long elf_headers_mem;
+	unsigned long elf_load_addr;
 	unsigned long elf_headers_sz;
 };
 
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 03210f644790..d98bacec9426 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -73,7 +73,7 @@ static int setup_dtb(struct kimage *image,
 		/* add linux,elfcorehdr */
 		ret = fdt_appendprop_addrrange(dtb, 0, off,
 				FDT_PROP_KEXEC_ELFHDR,
-				image->arch.elf_headers_mem,
+				image->arch.elf_load_addr,
 				image->arch.elf_headers_sz);
 		if (ret)
 			return (ret == -FDT_ERR_NOSPACE ? -ENOMEM : -EINVAL);
@@ -283,11 +283,11 @@ int load_other_segments(struct kimage *image,
 			goto out_err;
 		}
 		image->arch.elf_headers = headers;
-		image->arch.elf_headers_mem = kbuf.mem;
+		image->arch.elf_load_addr = kbuf.mem;
 		image->arch.elf_headers_sz = headers_sz;
 
 		pr_debug("Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\n",
-			 image->arch.elf_headers_mem, kbuf.bufsz, kbuf.memsz);
+			 image->arch.elf_load_addr, kbuf.bufsz, kbuf.memsz);
 	}
 
 	/* load initrd */
-- 
2.30.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-02-13 16:12 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-13 16:10 [PATCH v18 00/10] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2021-02-13 16:10 ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 01/11] powerpc: Rename kexec elfcorehdr_addr to elf_load_addr Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:31   ` Thiago Jung Bauermann
2021-02-15 21:31     ` Thiago Jung Bauermann
2021-02-15 21:31     ` Thiago Jung Bauermann
2021-02-13 16:10 ` Lakshmi Ramasubramanian [this message]
2021-02-13 16:10   ` [PATCH v18 02/11] arm64: Rename kexec elf_headers_mem " Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:34   ` Thiago Jung Bauermann
2021-02-15 21:34     ` Thiago Jung Bauermann
2021-02-15 21:34     ` Thiago Jung Bauermann
2021-02-13 16:10 ` [PATCH v18 03/11] of: Add a common kexec FDT setup function Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:41   ` Thiago Jung Bauermann
2021-02-15 21:41     ` Thiago Jung Bauermann
2021-02-15 21:41     ` Thiago Jung Bauermann
2021-02-22  1:32   ` Guenter Roeck
2021-02-22  1:32     ` Guenter Roeck
2021-02-22  1:32     ` Guenter Roeck
2021-02-22  1:35     ` Lakshmi Ramasubramanian
2021-02-22  1:35       ` Lakshmi Ramasubramanian
2021-02-22  1:35       ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 04/11] arm64: Use common of_kexec_alloc_and_setup_fdt() Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:46   ` Thiago Jung Bauermann
2021-02-15 21:46     ` Thiago Jung Bauermann
2021-02-15 21:46     ` Thiago Jung Bauermann
2021-02-13 16:10 ` [PATCH v18 05/11] powerpc: " Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:50   ` Thiago Jung Bauermann
2021-02-15 21:50     ` Thiago Jung Bauermann
2021-02-15 21:50     ` Thiago Jung Bauermann
2021-02-13 16:10 ` [PATCH v18 06/11] powerpc: Move ima buffer fields to struct kimage Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-15 21:58   ` Thiago Jung Bauermann
2021-02-15 21:58     ` Thiago Jung Bauermann
2021-02-15 21:58     ` Thiago Jung Bauermann
2021-02-13 16:10 ` [PATCH v18 07/11] powerpc: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 08/11] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 09/11] kexec: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 10/11] powerpc: Delete unused function delete_fdt_mem_rsv() Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10 ` [PATCH v18 11/11] arm64: Enable passing IMA log to next kernel on kexec Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-13 16:10   ` Lakshmi Ramasubramanian
2021-02-18  1:25 ` [PATCH v18 00/10] Carry forward IMA measurement log on kexec on ARM64 Rob Herring
2021-02-18  1:25   ` Rob Herring
2021-02-18  1:25   ` Rob Herring

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=20210213161049.6190-3-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=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=joe@perches.com \
    --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.