From patchwork Mon Sep 21 04:09:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11788297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6639E112C for ; Mon, 21 Sep 2020 04:09:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D05620866 for ; Mon, 21 Sep 2020 04:09:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Z6YRPgwq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D05620866 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B212E6E133; Mon, 21 Sep 2020 04:09:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6D2636E133 for ; Mon, 21 Sep 2020 04:09:11 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4BvrXz6Zr1z9sSn; Mon, 21 Sep 2020 14:09:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600661349; bh=3v9jQEpjc+WZkN+YkJLb/PKJrBJXSbxO/6dNR1q9i3k=; h=Date:From:To:Cc:Subject:From; b=Z6YRPgwqot5pxF1eMLIKHe7pIBbntu6oTB2JQKB5OUK2iJMI4IRfDOlq2v21yvzCb KQXfZzntW+aXi7bUJ4XLAuLuNeSfsslL284l0JmjYTSEh0Et+0mWqp2w4AefvNBKmx hFPKhH352a1Ob+T+NDTtpgX9GZGMyhpi42cS2YHGm6p1Q7vicuEv4BtDilc15fOQs4 AAoyBtCT2NTcysdqBUCluU0nJxfwYMxQvAtBCRV/LEal/TQoEAW/2lDbcaPSwKIiku mQSXWy1ZVN6X2uFzTqAOJL3rKZq2pLgOKuk21kVuY7xsr8NPJ/0ZT6OOh04eB44nje cYrRNVKZ9xy1g== Date: Mon, 21 Sep 2020 14:09:01 +1000 From: Stephen Rothwell To: Joerg Roedel , Rob Clark , Sean Paul Subject: linux-next: build failure after merge of the iommu tree Message-ID: <20200921140901.16adf8c2@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dave Airlie , Linux Kernel Mailing List , Tom Murphy , Linux Next Mailing List , DRI Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, After merging the iommu tree, today's linux-next build (arm multi_v7_defconfig) failed like this: drivers/gpu/drm/msm/msm_iommu.c: In function 'msm_iommu_pagetable_unmap': drivers/gpu/drm/msm/msm_iommu.c:46:2: error: implicit declaration of function 'iommu_flush_tlb_all'; did you mean 'iommu_flush_iotlb_all'? [-Werror=implicit-function-declaration] 46 | iommu_flush_tlb_all(to_msm_iommu(pagetable->parent)->domain); | ^~~~~~~~~~~~~~~~~~~ | iommu_flush_iotlb_all Caused by commit aae4c8e27bd7 ("iommu: Rename iommu_tlb_* functions to iommu_iotlb_*") interacting with commit b145c6e65eb0 ("drm/msm: Add support to create a local pagetable") from the drm-msm tree. I have applied the following merge fix patch. Someone will need to tell Linus about this fix up when the trees get merged. From: Stephen Rothwell Date: Mon, 21 Sep 2020 14:04:14 +1000 Subject: [PATCH] merge fix upt for iommu_flush_iotlb_all() rename Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/msm/msm_iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 3a83ffdb3b90..22ac7c692a81 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -43,7 +43,7 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova, size -= 4096; } - iommu_flush_tlb_all(to_msm_iommu(pagetable->parent)->domain); + iommu_flush_iotlb_all(to_msm_iommu(pagetable->parent)->domain); return (unmapped == size) ? 0 : -EINVAL; } @@ -199,7 +199,7 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent) /* * TODO we would like each set of page tables to have a unique ASID - * to optimize TLB invalidation. But iommu_flush_tlb_all() will + * to optimize TLB invalidation. But iommu_flush_iotlb_all() will * end up flushing the ASID used for TTBR1 pagetables, which is not * what we want. So for now just use the same ASID as TTBR1. */