From patchwork Wed Jun 25 17:50:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Covington X-Patchwork-Id: 4422621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 097FABEEAA for ; Wed, 25 Jun 2014 17:52:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42737201F4 for ; Wed, 25 Jun 2014 17:52:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BD5C201D5 for ; Wed, 25 Jun 2014 17:52:48 +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 1WzrLg-0007va-JK; Wed, 25 Jun 2014 17:51:08 +0000 Received: from smtp.codeaurora.org ([198.145.11.231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzrLd-0007po-S1 for linux-arm-kernel@lists.infradead.org; Wed, 25 Jun 2014 17:51:06 +0000 Received: from smtp.codeaurora.org (localhost [127.0.0.1]) by smtp.codeaurora.org (Postfix) with ESMTP id 8E91B140233; Wed, 25 Jun 2014 17:50:42 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 486) id 6862A140235; Wed, 25 Jun 2014 17:50:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from keeshans.qualcomm.com (rrcs-67-52-130-30.west.biz.rr.com [67.52.130.30]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: cov@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6D418140233; Wed, 25 Jun 2014 17:50:40 +0000 (UTC) From: Christopher Covington To: Russell King , Arnd Bergmann , Catalin Marinas Subject: [PATCH v2] ARM: virt, vexpress: Use 64-bit DMA for LPAE Date: Wed, 25 Jun 2014 13:50:28 -0400 Message-Id: <1403718631-25194-1-git-send-email-cov@codeaurora.org> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <5331B14B.7040103@codeaurora.org> References: <5331B14B.7040103@codeaurora.org> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140625_105105_926436_9EA6BD37 X-CRM114-Status: GOOD ( 14.91 ) X-Spam-Score: -0.0 (/) Cc: Rob Herring , Stephen Warren , Pawel Moll , Matthew Leach , Sudeep KarkadaNagesha , Viresh Kumar , Nicolas Pitre , Stephen Boyd , linux-kernel@vger.kernel.org, Christopher Covington , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On an LPAE system, the physical addresses used by VirtIO-MMIO may be higher than 32 bits. For example on a Versatile Express system with 4G RAM, the following error surfaces when trying to use a VirtIO-MMIO block device. EXT2-fs (vda): error: ext2_check_page: bad entry in directory #2: : unaligned directory entry - offset=0, inode=3755990991, rec_len=57311, name_len=223 To fix this, select ARCH_DMA_ADDR_T_64BIT when LPAE is selected and mach-vexpress, mach-virt, or both are being built. Signed-off-by: Christopher Covington --- arch/arm/Kconfig | 1 + arch/arm/mach-vexpress/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 245058b..8407c28 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -901,6 +901,7 @@ endmenu config ARCH_VIRT bool "Dummy Virtual Machine" if ARCH_MULTI_V7 + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARM_AMBA select ARM_GIC select ARM_PSCI diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 99c1f15..5f33e16 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_VEXPRESS bool "ARM Ltd. Versatile Express family" if ARCH_MULTI_V7 + select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE select ARCH_REQUIRE_GPIOLIB select ARCH_SUPPORTS_BIG_ENDIAN select ARM_AMBA