diff mbox series

[RFC,3/4] arm64: Use common of_kexec_setup_new_fdt()

Message ID 20201211221006.1052453-4-robh@kernel.org (mailing list archive)
State New, archived
Headers show
Series Kexec FDT setup consolidation | expand

Commit Message

Rob Herring (Arm) Dec. 11, 2020, 10:10 p.m. UTC 
Signed-off-by: Rob Herring <robh@kernel.org>
---
 arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
 1 file changed, 3 insertions(+), 120 deletions(-)

Comments

Lakshmi Ramasubramanian Dec. 12, 2020, 3:20 p.m. UTC | #1 
On 12/11/20 2:10 PM, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>   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 <nramas@linux.microsoft.com>

  -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 <linux/kexec.h>
>   #include <linux/libfdt.h>
>   #include <linux/memblock.h>
> +#include <linux/of.h>
>   #include <linux/of_fdt.h>
> -#include <linux/random.h>
>   #include <linux/slab.h>
>   #include <linux/string.h>
>   #include <linux/types.h>
>   #include <linux/vmalloc.h>
> -#include <asm/byteorder.h>
> -
> -/* 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) {
>
Thiago Jung Bauermann Dec. 22, 2020, 9:49 p.m. UTC | #2 
Rob Herring <robh@kernel.org> writes:

> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
>  1 file changed, 3 insertions(+), 120 deletions(-)

Reviewed-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Will Deacon Jan. 12, 2021, 2:02 p.m. UTC | #3 
On Fri, Dec 11, 2020 at 04:10:05PM -0600, Rob Herring wrote:
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---

-ENOCOMMITMSG

>  arch/arm64/kernel/machine_kexec_file.c | 123 +------------------------
>  1 file changed, 3 insertions(+), 120 deletions(-)

But I can't argue with that diffstat, so:

Acked-by: Will Deacon <will@kernel.org>

Will
diff mbox series

Patch

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 <linux/kexec.h>
 #include <linux/libfdt.h>
 #include <linux/memblock.h>
+#include <linux/of.h>
 #include <linux/of_fdt.h>
-#include <linux/random.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/vmalloc.h>
-#include <asm/byteorder.h>
-
-/* 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) {