From patchwork Tue Feb 12 16:28:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 219891 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 78F532C007C for ; Wed, 13 Feb 2013 03:29:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933367Ab3BLQ3g (ORCPT ); Tue, 12 Feb 2013 11:29:36 -0500 Received: from mail.free-electrons.com ([94.23.35.102]:45869 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933352Ab3BLQ3g (ORCPT ); Tue, 12 Feb 2013 11:29:36 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 6E6D4B94; Tue, 12 Feb 2013 17:29:35 +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 ED9BF825; Tue, 12 Feb 2013 17:29:34 +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 15/32] arm: mach-mvebu: use ORION_ADDR_MAP_NO_REMAP Date: Tue, 12 Feb 2013 17:28:49 +0100 Message-Id: <1360686546-24277-16-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-mvebu addr_map_info definition to use ORION_ADDR_MAP_NO_REMAP. Signed-off-by: Thomas Petazzoni --- arch/arm/mach-mvebu/addr-map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/addr-map.c b/arch/arm/mach-mvebu/addr-map.c index ab9b3bd..77c807b 100644 --- a/arch/arm/mach-mvebu/addr-map.c +++ b/arch/arm/mach-mvebu/addr-map.c @@ -42,7 +42,7 @@ armada_xp_addr_map_info[] = { * Window for the BootROM, needed for SMP on Armada XP */ { 0, 0xfff00000, SZ_1M, ARMADA_XP_TARGET_DEV_BUS, - ARMADA_XP_ATTR_DEV_BOOTROM, -1 }, + ARMADA_XP_ATTR_DEV_BOOTROM, ORION_ADDR_MAP_NO_REMAP }, /* End marker */ { -1, 0, 0, 0, 0, 0 }, };