Received: by 10.180.88.195 with SMTP id bi3mr24474wib.3.1344648637917;
        Fri, 10 Aug 2012 18:30:37 -0700 (PDT)
Path: n2ni68554249win.0!nntp.google.com!goblin3!goblin1!goblin.stu.neva.ru!uio.no!nntp.uio.no!.POSTED!not-for-mail
From: Cyril Chemparathy <cy...@ti.com>
Newsgroups: fa.linux.kernel
Subject: [PATCH v2 09/22] ARM: LPAE: use phys_addr_t for initrd location and size
Date: Sat, 11 Aug 2012 01:30:37 UTC
Organization: Internet mailing list
Lines: 59
Sender: linux-kernel-ow...@vger.kernel.org
Message-ID: <fa.dgw7H8ZOSCZ1I/cQ0m6ZOvDP9f0@ifi.uio.no>
References: <fa.ojkY1lHnQwZC5SfVQ8MJKsfoboo@ifi.uio.no>
NNTP-Posting-Host: mail-jess.uio.no
Mime-Version: 1.0
X-Trace: readme.uio.no 1344648637 1889 129.240.7.9 (11 Aug 2012 01:30:37 GMT)
X-Complaints-To: abuse@uio.no
NNTP-Posting-Date: Sat, 11 Aug 2012 01:30:37 +0000 (UTC)
Cc: <a...@arndb.de>, <catalin.mari...@arm.com>,
	<grant.lik...@secretlab.ca>, <n...@linaro.org>,
	<li...@arm.linux.org.uk>, <will.dea...@arm.com>,
	Vitaly Andrianov <vita...@ti.com>,
	Cyril Chemparathy <cy...@ti.com>
To: <linux-ker...@vger.kernel.org>,
	<linux-arm-ker...@lists.infradead.org>
X-Mailer: git-send-email 1.7.9.5
In-Reply-To: <1344648306-15619-1-git-send-email-cyril@ti.com>
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Original-Date: Fri, 10 Aug 2012 21:24:52 -0400
Original-Message-Id: <1344648306-15619-10-git-send-email-cyril@ti.com>
Original-References: <1344648306-15619-1-git-send-email-cy...@ti.com>
Content-Type: text/plain

From: Vitaly Andrianov <vita...@ti.com>

This patch fixes the initrd setup code to use phys_addr_t instead of assuming
32-bit addressing.  Without this we cannot boot on systems where initrd is
located above the 4G physical address limit.

Signed-off-by: Vitaly Andrianov <vita...@ti.com>
Signed-off-by: Cyril Chemparathy <cy...@ti.com>
---
 arch/arm/mm/init.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 19ba70b..bae9d05 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -36,12 +36,13 @@
 
 #include "mm.h"
 
-static unsigned long phys_initrd_start __initdata = 0;
+static phys_addr_t phys_initrd_start __initdata = 0;
 static unsigned long phys_initrd_size __initdata = 0;
 
 static int __init early_initrd(char *p)
 {
-	unsigned long start, size;
+	phys_addr_t start;
+	unsigned long size;
 	char *endp;
 
 	start = memparse(p, &endp);
@@ -347,14 +348,14 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
 #ifdef CONFIG_BLK_DEV_INITRD
 	if (phys_initrd_size &&
 	    !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) {
-		pr_err("INITRD: 0x%08lx+0x%08lx is not a memory region - disabling initrd\n",
-		       phys_initrd_start, phys_initrd_size);
+		pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling initrd\n",
+		       (u64)phys_initrd_start, phys_initrd_size);
 		phys_initrd_start = phys_initrd_size = 0;
 	}
 	if (phys_initrd_size &&
 	    memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) {
-		pr_err("INITRD: 0x%08lx+0x%08lx overlaps in-use memory region - disabling initrd\n",
-		       phys_initrd_start, phys_initrd_size);
+		pr_err("INITRD: 0x%08llx+0x%08lx overlaps in-use memory region - disabling initrd\n",
+		       (u64)phys_initrd_start, phys_initrd_size);
 		phys_initrd_start = phys_initrd_size = 0;
 	}
 	if (phys_initrd_size) {
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/