2013-05-29 13:10:23

by Vineet Gupta

[permalink] [raw]
Subject: Fwd: [PATCH 2/2] xtensa: Flat DeviceTree copy not future-safe

Hi Max,

This patch - acked by you then, got lost in the mist of time. Care to take it in
via xtensa tree for 3.11

Thx,
-Vineet


-------- Original Message --------
Subject: [PATCH 2/2] xtensa: Flat DeviceTree copy not future-safe
Date: Fri, 22 Feb 2013 00:09:22 +0530
From: Vineet Gupta <[email protected]>
To: Andrew Morton <[email protected]>, Chris Zankel <[email protected]>,
Max Filippov <[email protected]>, Marc Gauthier <[email protected]>
CC: Vineet Gupta <[email protected]>, <[email protected]>,
<[email protected]>
Newsgroups: gmane.linux.kernel
References: <[email protected]>

flat DT copy code calls bootmem allocator with @align = 0.
This is probably OK with legacy allocator which xtensa uses right now,
but this will panic right away with memblock allocator

Signed-off-by: Vineet Gupta <[email protected]>
Cc: Chris Zankel <[email protected]>
Cc: Max Filippov <[email protected]>
Cc: Marc Gauthier <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
arch/xtensa/kernel/setup.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 6dd25ec..c2a526e 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -256,7 +256,7 @@ void __init early_init_devtree(void *params)
static void __init copy_devtree(void)
{
void *alloc = early_init_dt_alloc_memory_arch(
- be32_to_cpu(initial_boot_params->totalsize), 0);
+ be32_to_cpu(initial_boot_params->totalsize), 8);
if (alloc) {
memcpy(alloc, initial_boot_params,
be32_to_cpu(initial_boot_params->totalsize));
--
1.7.4.1



2013-05-31 01:01:29

by Max Filippov

[permalink] [raw]
Subject: Re: [PATCH 2/2] xtensa: Flat DeviceTree copy not future-safe

Hi Vineet,

On Wed, May 29, 2013 at 5:10 PM, Vineet Gupta
<[email protected]> wrote:
> Hi Max,
>
> This patch - acked by you then, got lost in the mist of time. Care to take it in
> via xtensa tree for 3.11

Oops. Thanks for the reminder. Took it to the xtensa-fixes branch.

> -------- Original Message --------
> Subject: [PATCH 2/2] xtensa: Flat DeviceTree copy not future-safe
> Date: Fri, 22 Feb 2013 00:09:22 +0530
> From: Vineet Gupta <[email protected]>
> To: Andrew Morton <[email protected]>, Chris Zankel <[email protected]>,
> Max Filippov <[email protected]>, Marc Gauthier <[email protected]>
> CC: Vineet Gupta <[email protected]>, <[email protected]>,
> <[email protected]>
> Newsgroups: gmane.linux.kernel
> References: <[email protected]>

--
Thanks.
-- Max