From patchwork Tue Mar 7 02:34:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?WW9uZyBXdSAo5ZC05YuHKQ==?= X-Patchwork-Id: 13162626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 445A8C6FA99 for ; Tue, 7 Mar 2023 02:35:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbjCGCfp (ORCPT ); Mon, 6 Mar 2023 21:35:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229953AbjCGCfn (ORCPT ); Mon, 6 Mar 2023 21:35:43 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF8D0311F5; Mon, 6 Mar 2023 18:35:37 -0800 (PST) X-UUID: b8e548e6bc9011ed945fc101203acc17-20230307 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=lf+PVZFQWI6nZ5SzPH7f9NR7S7VT6l6jo9uDdU0cP8s=; b=g79rJyjY0eVzaAu8pmLSfTEP05X9A4Q3QqasstR7ysm5COiozcrvNwReJvkc1hrq+KURkFkVyITC53BfAc7dzdDkwG2tq6NQ+1hZtLuABX1Qs1KnKpF7xIgs9UkXeZ4/tmfABxh40XuGFYjutcQSIScBwFGqXoFyO8/YMlvmY5U=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.20,REQID:e6e54902-298a-4a5d-8455-ae961af1e0de,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:70 X-CID-INFO: VERSION:1.1.20,REQID:e6e54902-298a-4a5d-8455-ae961af1e0de,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTI ON:quarantine,TS:70 X-CID-META: VersionHash:25b5999,CLOUDID:41ca8827-564d-42d9-9875-7c868ee415ec,B ulkID:230307103529G618LALZ,BulkQuantity:0,Recheck:0,SF:38|29|28|17|19|48,T C:nil,Content:0,EDM:-3,IP:nil,URL:1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-UUID: b8e548e6bc9011ed945fc101203acc17-20230307 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 445458080; Tue, 07 Mar 2023 10:35:28 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Tue, 7 Mar 2023 10:35:26 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Tue, 7 Mar 2023 10:35:25 +0800 From: Yong Wu To: Joerg Roedel , Matthias Brugger , Mauro Carvalho Chehab , Rob Herring CC: Will Deacon , Robin Murphy , Krzysztof Kozlowski , Hans Verkuil , , , , , , , , AngeloGioacchino Del Regno , , , , Yunfei Dong , kyrie wu , , , Subject: [PATCH v5 00/11] Adjust the dma-ranges for MTK IOMMU Date: Tue, 7 Mar 2023 10:34:56 +0800 Message-ID: <20230307023507.13306-1-yong.wu@mediatek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org After commit f1ad5338a4d5 ("of: Fix "dma-ranges" handling for bus controllers"), the dma-ranges is not allowed for dts leaf node. but we still would like to separate the different masters into different iova regions. Thus we adjust the internal flow, separate the 16GB iova range by the master HW larbid/portid and add the dma-ranges property in the parent "soc" node. This also could avoid the users forget/abuse the iova regions. The commit f1ad5338a4d5 did affect the mt8195 venc, But it is not a fatal issue, it could also work well at 0-4GB iova. thus I don't add "Fixes:" tag. In this series, I add functions for mt8192/mt8195/mt8186, mt8188 will be in its special patchset. and the previous mt8173/mt8183...support 0-4GB only, no need this function. Change note: v5: Nothing change. Just rebase on v6.3-rc1. v4: https://lore.kernel.org/linux-mediatek/20230215062544.8677-1-yong.wu@mediatek.com/ Improve the comment in the code from AngeloGioacchino. v3: https://lore.kernel.org/linux-mediatek/20230214031114.926-1-yong.wu@mediatek.com/ Add a new patch only for comment more in the code. v2: https://lore.kernel.org/linux-mediatek/20230208053643.28249-1-yong.wu@mediatek.com/ a) Base on next-20230206 since mt8195 jpeg node is applied which affect this patch. b) Reword the commit message [1/10][2/10] to explain effect. v1: https://lore.kernel.org/linux-mediatek/20230113060133.9394-1-yong.wu@mediatek.com/ Base on v6.2-rc3. Yong Wu (11): dt-bindings: media: mediatek,vcodec: Remove dma-ranges property dt-bindings: media: mediatek,jpeg: Remove dma-ranges property iommu/mediatek: Improve comment for the current region/bank iommu/mediatek: Get regionid from larb/port id iommu/mediatek: mt8192: Add iova_region_larb_msk iommu/mediatek: mt8195: Add iova_region_larb_msk iommu/mediatek: mt8186: Add iova_region_larb_msk iommu/mediatek: Add a gap for the iova regions arm64: dts: mt8195: Add dma-ranges for the parent "soc" node arm64: dts: mt8195: Remove the unnecessary dma-ranges arm64: dts: mt8186: Add dma-ranges for the parent "soc" node .../media/mediatek,mt8195-jpegdec.yaml | 7 - .../media/mediatek,mt8195-jpegenc.yaml | 7 - .../media/mediatek,vcodec-decoder.yaml | 5 - .../media/mediatek,vcodec-encoder.yaml | 5 - .../media/mediatek,vcodec-subdev-decoder.yaml | 7 - .../bindings/media/mediatek-jpeg-encoder.yaml | 5 - arch/arm64/boot/dts/mediatek/mt8186.dtsi | 1 + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 4 +- drivers/iommu/mtk_iommu.c | 143 ++++++++++++++---- 9 files changed, 114 insertions(+), 70 deletions(-)