From patchwork Wed Jun 19 16:30:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Dooks X-Patchwork-Id: 2750501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 912B59F8E1 for ; Wed, 19 Jun 2013 16:34:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6296B20298 for ; Wed, 19 Jun 2013 16:34:44 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05F5D20291 for ; Wed, 19 Jun 2013 16:34:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpLIz-00018W-OA; Wed, 19 Jun 2013 16:32:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpLII-0007f1-J8; Wed, 19 Jun 2013 16:31:38 +0000 Received: from ducie-dc1.codethink.co.uk ([37.128.190.40]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UpLHf-0007Zr-0D for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2013 16:31:01 +0000 Received: by ducie-dc1.codethink.co.uk (Postfix, from userid 1002) id 8947B46B945; Wed, 19 Jun 2013 17:30:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from rainbowdash.ducie.codethink.co.uk (rainbowdash.dyn.ducie.codethink.co.uk [192.168.24.134]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPS id 0B1B446B83E; Wed, 19 Jun 2013 17:30:16 +0100 (BST) Received: from ben by rainbowdash.ducie.codethink.co.uk with local (Exim 4.80) (envelope-from ) id 1UpLGv-0005GS-S7; Wed, 19 Jun 2013 17:30:13 +0100 From: Ben Dooks To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] ARM: update atag-to-fdt code to be endian agnostic Date: Wed, 19 Jun 2013 17:30:01 +0100 Message-Id: <1371659404-20167-5-git-send-email-ben.dooks@codethink.co.uk> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371659404-20167-1-git-send-email-ben.dooks@codethink.co.uk> References: <1371659404-20167-1-git-send-email-ben.dooks@codethink.co.uk> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130619_123059_214569_1CFD6FAB X-CRM114-Status: GOOD ( 15.43 ) X-Spam-Score: -3.2 (---) Cc: Ben Dooks X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The atag-to-fdt code can now use the conversion function we introduced previously to avoid it having to know about the endian-ness of the environment which booted the processor. Signed-off-by: Ben Dooks --- arch/arm/boot/compressed/atags_to_fdt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c index aabc02a..74e193e 100644 --- a/arch/arm/boot/compressed/atags_to_fdt.c +++ b/arch/arm/boot/compressed/atags_to_fdt.c @@ -108,9 +108,9 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) return 0; /* validate the ATAG */ - if (atag->hdr.tag != ATAG_CORE || - (atag->hdr.size != tag_size(tag_core) && - atag->hdr.size != 2)) + if (atag->hdr.tag != cpu_to_atag32(ATAG_CORE) || + (atag->hdr.size != cpu_to_atag32(tag_size(tag_core)) && + atag->hdr.size != cpu_to_atag32(2))) return 1; /* let's give it all the room it could need */ @@ -119,7 +119,7 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) return ret; for_each_tag(atag, atag_list) { - if (atag->hdr.tag == ATAG_CMDLINE) { + if (atag->hdr.tag == cpu_to_atag32(ATAG_CMDLINE)) { /* Append the ATAGS command line to the device tree * command line. * NB: This means that if the same parameter is set in @@ -132,17 +132,17 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) else setprop_string(fdt, "/chosen", "bootargs", atag->u.cmdline.cmdline); - } else if (atag->hdr.tag == ATAG_MEM) { + } else if (atag->hdr.tag == cpu_to_atag32(ATAG_MEM)) { if (memcount >= sizeof(mem_reg_property)/4) continue; - if (!atag->u.mem.size) + if (!atag32_to_cpu(atag->u.mem.size)) continue; - mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start); - mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size); - } else if (atag->hdr.tag == ATAG_INITRD2) { + mem_reg_property[memcount++] = cpu_to_fdt32(atag32_to_cpu(atag->u.mem.start)); + mem_reg_property[memcount++] = cpu_to_fdt32(atag32_to_cpu(atag->u.mem.size)); + } else if (atag->hdr.tag == cpu_to_atag32(ATAG_INITRD2)) { uint32_t initrd_start, initrd_size; - initrd_start = atag->u.initrd.start; - initrd_size = atag->u.initrd.size; + initrd_start = atag32_to_cpu(atag->u.initrd.start); + initrd_size = atag32_to_cpu(atag->u.initrd.size); setprop_cell(fdt, "/chosen", "linux,initrd-start", initrd_start); setprop_cell(fdt, "/chosen", "linux,initrd-end",