From patchwork Mon Feb 29 09:19:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102653 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1124799lbc; Mon, 29 Feb 2016 01:20:22 -0800 (PST) X-Received: by 10.98.67.8 with SMTP id q8mr20568211pfa.133.1456737622177; Mon, 29 Feb 2016 01:20:22 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d67si3520639pfb.46.2016.02.29.01.20.21; Mon, 29 Feb 2016 01:20:22 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752598AbcB2JUU (ORCPT + 30 others); Mon, 29 Feb 2016 04:20:20 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:58425 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053AbcB2JUP (ORCPT ); Mon, 29 Feb 2016 04:20:15 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LZf8m-1aBBNk0NcS-00lUog; Mon, 29 Feb 2016 10:19:20 +0100 From: Arnd Bergmann To: Joerg Roedel , Joerg Roedel Cc: linux-arm-kernel@lists.infradead.org, Yong Wu , Robin Murphy , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] iommu/mediatek: select ARM_DMA_USE_IOMMU Date: Mon, 29 Feb 2016 10:19:06 +0100 Message-Id: <1456737553-496245-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:3je/oPWVzp3CPxMigV8X/GBRI+xJjdjy4cOj4sn1g7f3rTW0lO6 qXXaQ8iBgqrGYdWjlQBuB0tVkYno5wPAIsrzXhVxTYP9utBwUEoU8oirgrzt1mGlAlQFygy kjiMznCYhhjWzirm2XiSAVyrp3CqI3d5OIp4quRhw0Mrb64yBYeiyZFICADioPQn8kKbrjl L+zXr5uVEbWusP0QRUIAQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:BVZUw/j6RNk=:O/2fiCHSl46Xx1NlVcCOnN M2iF6yrA6kOxmDSDaBW8gMQmjRq8x84cWZdE5r8FqWsj6WRRyhicxQes8xjoVOcsavosD983e 5QyStzTRNo3uo8nx+rcEf6+nbTXh1OBnB5kqfoMvxqMnmpXgMmumTmME8zj+TQNoju9RQm65s EFuG/MxDxKqHryRUiaAk1cqbLiWFqTxn3woR9Lz4mvPGqTbL99u5P3j+gTWxHuraoo7obJej4 fsSgJk67qJVIhWRVz68JKysQBHI8yIr78rVd7vdWHtVrctsRzLNtp5vRPhHZh6wt1XLGwdy41 FEIdD0Sgt0NsILMerXRYOjRAxYR0jgYB5jfzaqHB69LaPY+K+rGZILxPwKB4n0l8nBQMXPWJe qi29XxrNVepVyny79fG/vdgXFu9HDnIPpDp3KFQH7g4Ld/JwqxoCndKa8TQkvs9NLUGB+4hqx /3gm4r9H/gf2DxlufreRdKuPPfR8yflDzSrpvDuqSiAaoYbl0txlJ0cPwGCF3KcIyy6OEl3ZN xYIQzP+Qke7APKuq83hczhcTNwpfUMV+k9aESts0brQVF5BpQFSMDWiIQACYAc4LxZfXoWm+P LnT6R20hcOuIbT5pKJV0JNHTtDakRVTf92aoIQqZgw/uMuLynZ76YWFGSa3Lvik3tErBdiKyP ISYpt/+kDjk2zFxwZZvumET9ScS/9jFG1PHiIg9cVU1UhlnMOoffX9ImBKFTgNYO3znA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The newly added Mediatek IOMMU driver uses the IOMMU_DMA infrastructure, but unlike other such drivers, it does not select 'ARM_DMA_USE_IOMMU', which is a prerequisite, leading to a link error: warning: (MTK_IOMMU) selects IOMMU_DMA which has unmet direct dependencies (IOMMU_SUPPORT && NEED_SG_DMA_LENGTH) drivers/iommu/built-in.o: In function `iommu_put_dma_cookie': mtk_iommu.c:(.text+0x11fe): undefined reference to `put_iova_domain' drivers/iommu/built-in.o: In function `iommu_dma_init_domain': mtk_iommu.c:(.text+0x1316): undefined reference to `init_iova_domain' drivers/iommu/built-in.o: In function `__iommu_dma_unmap': mtk_iommu.c:(.text+0x1380): undefined reference to `find_iova' This adds the same select that the other drivers have. On a related note, I wonder if we should just always select ARM_DMA_USE_IOMMU whenever any IOMMU driver is enabled. Are there any cases where we would enable an IOMMU but not use it? Signed-off-by: Arnd Bergmann Fixes: 0df4fabe208d ("iommu/mediatek: Add mt8173 IOMMU driver") --- drivers/iommu/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.7.0 diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index b325954cf8f8..ea0998921702 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -341,6 +341,7 @@ config MTK_IOMMU bool "MTK IOMMU Support" depends on ARM || ARM64 depends on ARCH_MEDIATEK || COMPILE_TEST + select ARM_DMA_USE_IOMMU select IOMMU_API select IOMMU_DMA select IOMMU_IO_PGTABLE_ARMV7S