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: 219893 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ADED82C007C for ; Wed, 13 Feb 2013 03:29:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933295Ab3BLQ3i (ORCPT ); Tue, 12 Feb 2013 11:29:38 -0500 Received: from mail.free-electrons.com ([94.23.35.102]:45849 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933365Ab3BLQ3d (ORCPT ); Tue, 12 Feb 2013 11:29:33 -0500 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 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 , Jason Gunthorpe , Tawfik Bayouk 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> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.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 }