From patchwork Tue Feb 12 16:28:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 2129871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 16C06DF23E for ; Tue, 12 Feb 2013 16:37:03 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5IoT-0006BE-2K; Tue, 12 Feb 2013 16:34:33 +0000 Received: from mail.free-electrons.com ([94.23.35.102]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5Ijd-0002xn-DB for linux-arm-kernel@lists.infradead.org; Tue, 12 Feb 2013 16:29:42 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 4D53D863; Tue, 12 Feb 2013 17:29:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 7702A825; Tue, 12 Feb 2013 17:29:32 +0100 (CET) From: Thomas Petazzoni To: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 13/32] arm: mach-dove: use ORION_ADDR_MAP_NO_REMAP Date: Tue, 12 Feb 2013 17:28:47 +0100 Message-Id: <1360686546-24277-14-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1360686546-24277-1-git-send-email-thomas.petazzoni@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130212_112933_590664_B1417EF5 X-CRM114-Status: GOOD ( 14.04 ) X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lior Amsalem , Andrew Lunn , Russell King - ARM Linux , Jason Cooper , Arnd Bergmann , Stephen Warren , Thierry Reding , Eran Ben-Avi , Nadav Haklai , Maen Suleiman , Shadi Ammouri , Gregory Clement , Tawfik Bayouk , Jason Gunthorpe X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Currently, the addr_map_info structure uses an "int remap" to allow SoC-specific code to specify whether a given address decoding window should be remapped, and if so, the remapping address. To do so, it tests if the int is less than zero (no remap) or greater than zero. Unfortunately, this prevents any remapping address that is higher than 2 GB. In this commit, we convert mach-dove addr_map_info definition to use ORION_ADDR_MAP_NO_REMAP. Signed-off-by: Thomas Petazzoni --- arch/arm/mach-dove/addr-map.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-dove/addr-map.c b/arch/arm/mach-dove/addr-map.c index 2a06c01..febb4dc 100644 --- a/arch/arm/mach-dove/addr-map.c +++ b/arch/arm/mach-dove/addr-map.c @@ -61,28 +61,28 @@ static const struct __initdata orion_addr_map_info addr_map_info[] = { TARGET_PCIE1, ATTR_PCIE_IO, DOVE_PCIE1_IO_BUS_BASE }, { 2, DOVE_PCIE0_MEM_PHYS_BASE, DOVE_PCIE0_MEM_SIZE, - TARGET_PCIE0, ATTR_PCIE_MEM, -1 + TARGET_PCIE0, ATTR_PCIE_MEM, ORION_ADDR_MAP_NO_REMAP, }, { 3, DOVE_PCIE1_MEM_PHYS_BASE, DOVE_PCIE1_MEM_SIZE, - TARGET_PCIE1, ATTR_PCIE_MEM, -1 + TARGET_PCIE1, ATTR_PCIE_MEM, ORION_ADDR_MAP_NO_REMAP, }, /* * Window for CESA engine. */ { 4, DOVE_CESA_PHYS_BASE, DOVE_CESA_SIZE, - TARGET_CESA, ATTR_CESA, -1 + TARGET_CESA, ATTR_CESA, ORION_ADDR_MAP_NO_REMAP, }, /* * Window to the BootROM for Standby and Sleep Resume */ { 5, DOVE_BOOTROM_PHYS_BASE, DOVE_BOOTROM_SIZE, - TARGET_BOOTROM, ATTR_BOOTROM, -1 + TARGET_BOOTROM, ATTR_BOOTROM, ORION_ADDR_MAP_NO_REMAP, }, /* * Window to the PMU Scratch Pad space */ { 6, DOVE_SCRATCHPAD_PHYS_BASE, DOVE_SCRATCHPAD_SIZE, - TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, -1 + TARGET_SCRATCHPAD, ATTR_SCRATCHPAD, ORION_ADDR_MAP_NO_REMAP, }, /* End marker */ { -1, 0, 0, 0, 0, 0 }