From patchwork Mon Feb 15 16:05:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 8316421 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 977799F399 for ; Mon, 15 Feb 2016 16:15:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BAED202A1 for ; Mon, 15 Feb 2016 16:15:41 +0000 (UTC) Received: from bombadil.infradead.org (unknown [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF97920398 for ; Mon, 15 Feb 2016 16:15:40 +0000 (UTC) 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 1aVLeo-0005bb-OT; Mon, 15 Feb 2016 16:05:50 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVLek-0005Jb-QM for linux-arm-kernel@lists.infradead.org; Mon, 15 Feb 2016 16:05:47 +0000 Received: by mail-wm0-x244.google.com with SMTP id c200so16415283wme.0 for ; Mon, 15 Feb 2016 08:05:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id; bh=NVfi5yCU5GaipFi8EsjmBmcBkzXv2yoAZG2XZP0dBzw=; b=gOiqSextnWGff6RgVpa7/ggeC7q+VQT+Fhq6mCkLUACxha/oRttGDcNwaS1m0DU8ct nNAOllr3wY/8fjp/DyNjlHtaot5d6Xj4ffmEfvXhqc3iL7HYTsdSOM84lchoDVGA62ZK ZHcCzbBTzg3UxBLup8ME/Pg/TY7rNvHKKeLTmBMOEE/mri0TKQBrvN4eFiAy15S/CHHj P1uxITg1+tPl5Ix/T548Zo84PDXpEBB3DBp7kGliaHE1Ur/H9yBOCP3C+lbnxq8ngVlB FVF7sHjaN1osGuv6slKfGr+W/i0waBOBgO08qIUf9YG90snJwidrCYUX7l7ideBPArnm /Vrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=NVfi5yCU5GaipFi8EsjmBmcBkzXv2yoAZG2XZP0dBzw=; b=iIGw/VRqjY66OXo7kIbTNY7RSOLKy/8XV7unATn9+5cHgMV8Ats+QLbVxKp3PyHJLn +Z7RiYfKdqMMv4XQBronTvol8ngmGggfyKIzz5il2EBrSOBkbJIUEtVcheJtzZ8fx7Zk TnPx8B0bgvOmT2m4rT1a8pUQeBT53Fa0y1+OYk0kAX1BFU16y7pjD13duhIga3bHlg0Z Y+udDioTaKTCaUVEbNlHDYMppfDaOgGfiX0LP8op64pekFUBbViuofJSQ7TGrAipllqE w7FQV/hG0HsBsEb1ERbxZCkkyRwUqOWE0fqS4VklKZMdbyeLUOLz4kM61t5V17m08Ve2 lVhA== X-Gm-Message-State: AG10YOSFzZY7vKfgE+r0VjsBS1E4JVMioqhew03V0ZB7EmOCqUpfK35GBm88o2bROtlAMw== X-Received: by 10.194.57.48 with SMTP id f16mr15984502wjq.99.1455552324929; Mon, 15 Feb 2016 08:05:24 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by smtp.gmail.com with ESMTPSA id lm5sm25842495wjc.12.2016.02.15.08.05.24 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 15 Feb 2016 08:05:24 -0800 (PST) From: Michal Simek To: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Nicolas Pitre Subject: [PATCH 1/3] ARM: zynq: Move early printk virtual address to vmalloc area Date: Mon, 15 Feb 2016 17:05:17 +0100 Message-Id: <67c9013fc61f53515934b54847a05df8b8e1504a.1455552315.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160215_080547_081926_21E9E9A6 X-CRM114-Status: GOOD ( 10.97 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Josh Cartwright , Peter Crosthwaite , Arun Chandran , Russell King , monstr@monstr.eu, linux-kernel@vger.kernel.org, Rob Herring , Steffen Trumtrar , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, RDNS_NONE, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch "ARM: 8432/1: move VMALLOC_END from 0xff000000 to 0xff800000" (sha1: 6ff0966052c46efb53980b8a1add2e7b49c9f560) has moved also start of VMALLOC area because size didn't change. That's why origin location of vmalloc was vmalloc : 0xf0000000 - 0xff000000 ( 240 MB) and now is vmalloc : 0xf0800000 - 0xff800000 ( 240 MB) That's why uart virtual addresses need to be changed to reflect this new memory setup. Starting address should be vmalloc start address. Signed-off-by: Michal Simek Acked-by: Arnd Bergmann --- arch/arm/include/debug/zynq.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/debug/zynq.S b/arch/arm/include/debug/zynq.S index de86b9247564..060cb5b49bfd 100644 --- a/arch/arm/include/debug/zynq.S +++ b/arch/arm/include/debug/zynq.S @@ -20,9 +20,9 @@ #define UART_SR_TXEMPTY 0x00000008 /* TX FIFO empty */ #define UART0_PHYS 0xE0000000 -#define UART0_VIRT 0xF0000000 +#define UART0_VIRT 0xF0800000 #define UART1_PHYS 0xE0001000 -#define UART1_VIRT 0xF0001000 +#define UART1_VIRT 0xF0801000 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1) # define LL_UART_PADDR UART1_PHYS