diff mbox

[v2,1/3] of/fdt: factor out assignment of initrd_start/initrd_end

Message ID 1455209282-9596-2-git-send-email-ard.biesheuvel@linaro.org
State Superseded
Headers show

Commit Message

Ard Biesheuvel Feb. 11, 2016, 4:48 p.m. UTC
Since architectures may not yet have their linear mapping up and running
when the initrd address is discovered from the DT, factor out the
assignment of initrd_start and initrd_end, so that an architecture can
override it and use the translation it needs.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 drivers/of/fdt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

-- 
2.5.0


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

Comments

Arnd Bergmann Feb. 11, 2016, 10:12 p.m. UTC | #1
On Thursday 11 February 2016 17:48:00 Ard Biesheuvel wrote:
> 

>  #ifdef CONFIG_BLK_DEV_INITRD

> +void __weak __early_init_dt_declare_initrd(unsigned long start,

> +                                          unsigned long end)

> +{

> +       initrd_start = (unsigned long)__va(start);

> +       initrd_end = (unsigned long)__va(end);

> +       initrd_below_start_ok = 1;

> +}

> +

> 


I find __weak functions particularly hard to follow, I think a Kconfig
symbols or a function you can override by defining a macro in asm/memory.h
would be nicer.

	Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Ard Biesheuvel Feb. 12, 2016, 8:08 a.m. UTC | #2
On 11 February 2016 at 23:12, Arnd Bergmann <arnd@arndb.de> wrote:
> On Thursday 11 February 2016 17:48:00 Ard Biesheuvel wrote:

>>

>>  #ifdef CONFIG_BLK_DEV_INITRD

>> +void __weak __early_init_dt_declare_initrd(unsigned long start,

>> +                                          unsigned long end)

>> +{

>> +       initrd_start = (unsigned long)__va(start);

>> +       initrd_end = (unsigned long)__va(end);

>> +       initrd_below_start_ok = 1;

>> +}

>> +

>>

>

> I find __weak functions particularly hard to follow, I think a Kconfig

> symbols or a function you can override by defining a macro in asm/memory.h

> would be nicer.

>


OK, that makes sense.

I will give Catalin a chance to comment before respinning, though.

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

Patch

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 1f98156f8996..d1dd23127085 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -760,6 +760,14 @@  const void * __init of_flat_dt_match_machine(const void *default_match,
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
+void __weak __early_init_dt_declare_initrd(unsigned long start,
+					   unsigned long end)
+{
+	initrd_start = (unsigned long)__va(start);
+	initrd_end = (unsigned long)__va(end);
+	initrd_below_start_ok = 1;
+}
+
 /**
  * early_init_dt_check_for_initrd - Decode initrd location from flat tree
  * @node: reference to node containing initrd location ('chosen')
@@ -782,9 +790,7 @@  static void __init early_init_dt_check_for_initrd(unsigned long node)
 		return;
 	end = of_read_number(prop, len/4);
 
-	initrd_start = (unsigned long)__va(start);
-	initrd_end = (unsigned long)__va(end);
-	initrd_below_start_ok = 1;
+	__early_init_dt_declare_initrd(start, end);
 
 	pr_debug("initrd_start=0x%llx  initrd_end=0x%llx\n",
 		 (unsigned long long)start, (unsigned long long)end);