From patchwork Thu Jul 10 07:26:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 33396 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EAB9E203C0 for ; Thu, 10 Jul 2014 07:29:25 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf57570771pab.1 for ; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:in-reply-to:references:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=ekmWWDBp53GyehtcPYSOZcdrpmZ9kyn8R6d89znVoZ4=; b=Ao+xq2oOEOSYWGKHityYQ1EH9X5+y7V7/zyU67kpTCCESpelC0x6gsRsqwIs+ky5Cx e6Sb8eIGC/v0e9kaYOkS4HbZgqv+1RqJNCD48cdxnyjTKuRf5+U/1/2RpUt25iaMF4Ow c0TT6M+1E4phxh/hFHQxfWDkapPQJ41gyPyqPK7q3YIf5MLnaPqLLUGl60G7mEv24aPM P7H5MPbLXF7DT1yAJaEaKQJjbZDQe/Kw43AEbNNB8SUg5EcKksSl3t/+noE6pUm0roTS OjHx9SV+RPUzyZiKY62iBkNnTZonizEY21qjTPVWCqpAhoYgybRF2Q4N7co9tAxaHPyK 870g== X-Gm-Message-State: ALoCoQlHq1TU8ePAmB0Sb9H/y8OrMX86qa2oTQWtSgGGKisxKUOMXiI+YvWDSI+oHnLp26sTeq40 X-Received: by 10.68.242.74 with SMTP id wo10mr22459034pbc.0.1404977365283; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.38.51 with SMTP id s48ls305458qgs.64.gmail; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) X-Received: by 10.52.241.76 with SMTP id wg12mr36764814vdc.5.1404977365143; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id cx1si13052396vec.38.2014.07.10.00.29.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 00:29:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ij19so9602276vcb.36 for ; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) X-Received: by 10.58.228.74 with SMTP id sg10mr42895191vec.6.1404977365058; Thu, 10 Jul 2014 00:29:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp111315vcb; Thu, 10 Jul 2014 00:29:24 -0700 (PDT) X-Received: by 10.68.102.34 with SMTP id fl2mr9561041pbb.2.1404977364299; Thu, 10 Jul 2014 00:29:24 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qu8si47926918pbb.27.2014.07.10.00.29.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 00:29:24 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X58ls-0007xV-O2; Thu, 10 Jul 2014 07:28:00 +0000 Received: from mail-pa0-f50.google.com ([209.85.220.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X58lp-0007pw-M8 for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2014 07:27:58 +0000 Received: by mail-pa0-f50.google.com with SMTP id bj1so10648055pad.37 for ; Thu, 10 Jul 2014 00:27:36 -0700 (PDT) X-Received: by 10.68.253.73 with SMTP id zy9mr20338229pbc.114.1404977256881; Thu, 10 Jul 2014 00:27:36 -0700 (PDT) Received: from localhost ([122.167.123.210]) by mx.google.com with ESMTPSA id kk1sm48557023pbd.61.2014.07.10.00.27.32 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 10 Jul 2014 00:27:36 -0700 (PDT) From: Viresh Kumar To: arnd@linaro.org, olof@lixom.net Subject: [PATCH V9 4/7] ARM: SPEAr13xx: Fix static mapping table Date: Thu, 10 Jul 2014 12:56:35 +0530 Message-Id: <5a6d915a382c34940865b9ac8835c5af78723cc4.1404976058.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140710_002757_742732_831F716F X-CRM114-Status: UNSURE ( 9.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.50 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Pratyush Anand , b.zolnierkie@samsung.com, linux-pci@vger.kernel.org, spear-devel@list.st.com, mark@nicholnet.com, Viresh Kumar , Mohit Kumar , bhelgaas@google.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Pratyush Anand SPEAr13xx was using virtual address space 0xFE000000 to map physical address space 0xB3000000. But pci_remap_io uses 0xFEE00000 as virtual address and so replace 0xFE000000 with 0xF9000000. Acked-by: Viresh Kumar Acked-by: Arnd Bergmann Signed-off-by: Pratyush Anand Signed-off-by: Mohit Kumar [viresh: fixed logs/cclist] Signed-off-by: Viresh Kumar --- arch/arm/mach-spear/include/mach/spear.h | 4 ++-- arch/arm/mach-spear/spear13xx.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h index 5cdc53d..f2d6a01 100644 --- a/arch/arm/mach-spear/include/mach/spear.h +++ b/arch/arm/mach-spear/include/mach/spear.h @@ -52,10 +52,10 @@ #ifdef CONFIG_ARCH_SPEAR13XX #define PERIP_GRP2_BASE UL(0xB3000000) -#define VA_PERIP_GRP2_BASE IOMEM(0xFE000000) +#define VA_PERIP_GRP2_BASE IOMEM(0xF9000000) #define MCIF_SDHCI_BASE UL(0xB3000000) #define SYSRAM0_BASE UL(0xB3800000) -#define VA_SYSRAM0_BASE IOMEM(0xFE800000) +#define VA_SYSRAM0_BASE IOMEM(0xF9800000) #define SYS_LOCATION (VA_SYSRAM0_BASE + 0x600) #define PERIP_GRP1_BASE UL(0xE0000000) diff --git a/arch/arm/mach-spear/spear13xx.c b/arch/arm/mach-spear/spear13xx.c index c9897ea..53a7614 100644 --- a/arch/arm/mach-spear/spear13xx.c +++ b/arch/arm/mach-spear/spear13xx.c @@ -52,7 +52,7 @@ void __init spear13xx_l2x0_init(void) /* * Following will create 16MB static virtual/physical mappings * PHYSICAL VIRTUAL - * 0xB3000000 0xFE000000 + * 0xB3000000 0xF9000000 * 0xE0000000 0xFD000000 * 0xEC000000 0xFC000000 * 0xED000000 0xFB000000