From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179Ab1AXR5y (ORCPT ); Mon, 24 Jan 2011 12:57:54 -0500 Received: from service87.mimecast.com ([94.185.240.25]:51403 "HELO service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754045Ab1AXR4c (ORCPT ); Mon, 24 Jan 2011 12:56:32 -0500 From: Catalin Marinas To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Will Deacon Subject: [PATCH v4 18/19] ARM: LPAE: add support for ATAG_MEM64 Date: Mon, 24 Jan 2011 17:56:00 +0000 Message-Id: <1295891761-18366-19-git-send-email-catalin.marinas@arm.com> X-Mailer: git-send-email 1.7.3.2.164.g6f10c.dirty In-Reply-To: <1295891761-18366-1-git-send-email-catalin.marinas@arm.com> References: <1295891761-18366-1-git-send-email-catalin.marinas@arm.com> X-OriginalArrivalTime: 24 Jan 2011 17:56:15.0912 (UTC) FILETIME=[FEF33280:01CBBBEF] X-MC-Unique: 111012417563001501 Content-Type: text/plain; charset=WINDOWS-1252 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id p0OHw2DA031586 From: Will Deacon LPAE provides support for memory banks with physical addresses of up to 40 bits. This patch adds a new atag, ATAG_MEM64, so that the Kernel can be informed about memory that exists above the 4GB boundary. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas --- arch/arm/include/asm/setup.h | 10 +++++++++- arch/arm/kernel/compat.c | 4 ++-- arch/arm/kernel/setup.c | 12 +++++++++++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h index 5092118..fab849f 100644 --- a/arch/arm/include/asm/setup.h +++ b/arch/arm/include/asm/setup.h @@ -43,6 +43,13 @@ struct tag_mem32 { __u32 start; /* physical start address */ }; +#define ATAG_MEM64 0x54420002 + +struct tag_mem64 { + __u64 size; + __u64 start; /* physical start address */ +}; + /* VGA text type displays */ #define ATAG_VIDEOTEXT 0x54410003 @@ -147,7 +154,8 @@ struct tag { struct tag_header hdr; union { struct tag_core core; - struct tag_mem32 mem; + struct tag_mem32 mem32; + struct tag_mem64 mem64; struct tag_videotext videotext; struct tag_ramdisk ramdisk; struct tag_initrd initrd; diff --git a/arch/arm/kernel/compat.c b/arch/arm/kernel/compat.c index 9256523..f224d95 100644 --- a/arch/arm/kernel/compat.c +++ b/arch/arm/kernel/compat.c @@ -86,8 +86,8 @@ static struct tag * __init memtag(struct tag *tag, unsigned long start, unsigned tag = tag_next(tag); tag->hdr.tag = ATAG_MEM; tag->hdr.size = tag_size(tag_mem32); - tag->u.mem.size = size; - tag->u.mem.start = start; + tag->u.mem32.size = size; + tag->u.mem32.start = start; return tag; } diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index fe951e4..420a4e1 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -588,11 +588,21 @@ __tagtable(ATAG_CORE, parse_tag_core); static int __init parse_tag_mem32(const struct tag *tag) { - return arm_add_memory(tag->u.mem.start, tag->u.mem.size); + return arm_add_memory(tag->u.mem32.start, tag->u.mem32.size); } __tagtable(ATAG_MEM, parse_tag_mem32); +#ifdef CONFIG_PHYS_ADDR_T_64BIT +static int __init parse_tag_mem64(const struct tag *tag) +{ + /* We only use 32-bits for the size. */ + return arm_add_memory(tag->u.mem64.start, (unsigned long)tag->u.mem64.size); +} + +__tagtable(ATAG_MEM64, parse_tag_mem64); +#endif /* CONFIG_PHYS_ADDR_T_64BIT */ + #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) struct screen_info screen_info = { .orig_video_lines = 30,