Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1489337imu; Sat, 8 Dec 2018 00:41:11 -0800 (PST) X-Google-Smtp-Source: AFSGD/WzbSxXJlcB843Tk5It6aS/2Ub2pHNx8X2S2Y09zoIi+Bd8eJJncs3ZAsFrw385CX14Rz/B X-Received: by 2002:a63:480f:: with SMTP id v15mr4533683pga.308.1544258471504; Sat, 08 Dec 2018 00:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544258471; cv=none; d=google.com; s=arc-20160816; b=YW0ri+OkgK2rKmGNNFD1yZr8tBqylR7saoGRWMHFFWY2ixXD84zno3bufMZCYejaQP kHhYE3aTUY7JSb8qwCeI4hpMwA95ymrclaQ6SExZQi5sdiheWkLYdG7bGuSMHRqwVYrz 5vqRJWJGchWYBylg4RubRTvxWktAj0HkNNUM8wo0z3oCqlxdxp7aNfTWQJJvvRo/Jzmr h9B5k2PGxuWw5XF6L+3V8nDQQ2LcuH1RpxNE5QlkjDkSy+NW4/1srpRRjGqKWtEkREMZ iptA4j64ov3ougJvRQ+aCK5KjrhRLWaix0b0VnQoyb/yHyQxOCm35grlYoB5jLzST7IT UN8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from; bh=IT5AYd72EuPyt7eaQ1ceRyq6DXYvWhJfdLMggcsMoUc=; b=HRGG/8iz8TdpZWZFmtJ/2UceeThRI9T/5E9NNBOKkeGgG4qBbqpDQqulvOqp79Urmm V+lGvnvncDC2gDjA0rR/jnF8M9SOiLU4/omeWoVo7TCyyLNRtK3GIQK5IF3Bmz5GtyXn YHp5njw2TgVaH7MRDBNb1f6mJoysbLepIZF6WaIfwaE/QP7oEPA/6onNRsOwgmjYBBRB EiGoCbvt7onKqexBB0toMQKghqJG+4hnoynE4kzUVzNzjG/RWQUUuPLPIvrwcF2M0sNr gt5wVhsOALEueT2Hchd6vpCZ1aP2LKBCchyPKipp62m/WGfd2dnAmVcTkO+oOMZVf2xz oJag== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si5101455pls.16.2018.12.08.00.40.51; Sat, 08 Dec 2018 00:41:11 -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 S1726239AbeLHIj4 (ORCPT + 99 others); Sat, 8 Dec 2018 03:39:56 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:51922 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726103AbeLHIj4 (ORCPT ); Sat, 8 Dec 2018 03:39:56 -0500 X-UUID: 845ce37150b74b96bbee11bea4a5bd08-20181208 X-UUID: 845ce37150b74b96bbee11bea4a5bd08-20181208 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1371006552; Sat, 08 Dec 2018 16:39:48 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs03n2.mediatek.inc (172.21.101.182) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 8 Dec 2018 16:39:46 +0800 Received: from localhost.localdomain (10.17.3.153) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Sat, 8 Dec 2018 16:39:45 +0800 From: Yong Wu To: Joerg Roedel , Matthias Brugger , Robin Murphy , Rob Herring CC: Tomasz Figa , Will Deacon , , , , , , , , , , , Nicolas Boichat , Arvind Yadav Subject: [PATCH v4 00/18] MT8183 IOMMU SUPPORT Date: Sat, 8 Dec 2018 16:39:13 +0800 Message-ID: <1544258371-4600-1-git-send-email-yong.wu@mediatek.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 5D9489F3D3DCE600E02FB4332D14276E305A8AC80387BD9CCEEA9C865713C6252000:8 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patchset mainly adds support for mt8183 IOMMU and SMI. mt8183 has only one M4U like mt8173 and is also MTK IOMMU gen2 which uses ARM Short-Descriptor translation table format. The mt8183 M4U-SMI HW diagram is as below: EMI | M4U | ---------- | | gals0-rx gals1-rx | | | | gals0-tx gals1-tx | | ------------ SMI Common ------------ | +-----+-----+--------+-----+-----+-------+-------+ | | | | | | | | | | gals-rx gals-rx | gals-rx gals-rx gals-rx | | | | | | | | | | | | | | | | | | gals-tx gals-tx | gals-tx gals-tx gals-tx | | | | | | | | larb0 larb1 IPU0 IPU1 larb4 larb5 larb6 CCU disp vdec img cam venc img cam All the connections are HW fixed, SW can NOT adjust it. Compared with mt8173, we add a GALS(Global Async Local Sync) module between SMI-common and M4U, and additional GALS between larb2/3/5/6 and SMI-common. GALS can help synchronize for the modules in different clock frequency, it can be seen as a "asynchronous fifo". GALS can only help transfer the command/data while it doesn't have the configuring register, thus it has the special "smi" clock and it doesn't have the "apb" clock. From the diagram above, we add "gals0" and "gals1" clocks for smi-common and add a "gals" clock for smi-larb. From the diagram above, IPU0/IPU1(Image Processor Unit) and CCU(Camera Control Unit) is connected with smi-common directly, we can take them as "larb2", "larb3" and "larb7", and their register spaces are different with the normal larb. This is the general purpose of each patch in this patchset: the patch 1..10 add the iommu/smi support for mt8183; the patch 11/12/13 add mmu1 support; the last patches contain some minor changes: -patch 14 fix a issue. -patch 15 improve the code flow(add shutdown). -patch 16 cleanup some smi codes(delete need_larbid). -patch 17 switch to SPDX license. -patch 18 Constify iommu_ops from Arvind. this patchset don't contain the dtsi part since it need depend on the ccf and power-domain nodes which has not been accepted. Change notes: v4: 1) Add 3 preparing patches. Seperate some minor meaningful code into a new patch according to Matthias's suggestion. memory: mtk-smi: Add gals support iommu/mediatek: Add larb-id remapped support iommu/mediatek: Add bclk can be supported optionally 2) rebase on "iommu/mediatek: Make it explicitly non-modular" which was applied. https://lore.kernel.org/patchwork/patch/1020125/ 3) add some comment about "mediatek,larb-id" in the commit message of the patch "mtk-smi: Get rid of need_larbid". 4) Fix bus_sel value. v3: https://lists.linuxfoundation.org/pipermail/iommu/2018-November/031121.html 1) rebase on v4.20-rc1. 2) In the dt-binding, add a minor string "mt7623" which also use gen1 since Matthias added it in v4.20. 3) About v7s: a) for paddr_to_pte, change the param from "arm_v7s_io_pgtable" to "arm_pgtable_cfg", according to Robin suggestion. b) Don't use CONFIG_PHYS_ADDR_T_64BIT. c) add a little comment(pgtable address still don't over 4GB) in the commit message of the patch "Extend MediaTek 4GB Mode". 4) add "iommu/mediatek: Constify iommu_ops" into this patchset. this may be helpful for review and merge. https://lists.linuxfoundation.org/pipermail/iommu/2018-October/030637.html v2: https://lists.linuxfoundation.org/pipermail/iommu/2018-September/030164.html 1) Fix typo in the commit message of dt-binding. 2) Change larb2/larb3 to the special larbs. 3) Refactor the larb-id remapped array(larbid_remapped), then we don't need add the new function(mtk_iommu_get_larbid). 4) Add a new patch for v7s two helpers(paddr_to_iopte and iopte_to_paddr). 5) Change some comment for MTK 4GB mode. v1: base on v4.19-rc1. http://lists.infradead.org/pipermail/linux-mediatek/2018-September/014881.html Arvind Yadav (1): iommu/mediatek: Constify iommu_ops Yong Wu (17): dt-bindings: mediatek: Add binding for mt8183 IOMMU and SMI iommu/mediatek: Use a struct as the platform data memory: mtk-smi: Use a general config_port interface memory: mtk-smi: Use a struct for the platform data for smi-common iommu/io-pgtable-arm-v7s: Add paddr_to_iopte and iopte_to_paddr helpers iommu/io-pgtable-arm-v7s: Extend MediaTek 4GB Mode iommu/mediatek: Add bclk can be supported optionally iommu/mediatek: Add larb-id remapped support memory: mtk-smi: Add gals support iommu/mediatek: Add mt8183 IOMMU support iommu/mediatek: Add mmu1 support memory: mtk-smi: Invoke pm runtime_callback to enable clocks memory: mtk-smi: Add bus_sel for mt8183 iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend iommu/mediatek: Add shutdown callback memory: mtk-smi: Get rid of need_larbid iommu/mediatek: Switch to SPDX license identifier .../devicetree/bindings/iommu/mediatek,iommu.txt | 15 +- .../memory-controllers/mediatek,smi-common.txt | 11 +- .../memory-controllers/mediatek,smi-larb.txt | 3 + drivers/iommu/io-pgtable-arm-v7s.c | 72 ++++-- drivers/iommu/io-pgtable.h | 7 +- drivers/iommu/mtk_iommu.c | 141 +++++++---- drivers/iommu/mtk_iommu.h | 26 +- drivers/iommu/mtk_iommu_v1.c | 14 +- drivers/memory/mtk-smi.c | 269 ++++++++++++++------- include/dt-bindings/memory/mt2701-larb-port.h | 10 +- include/dt-bindings/memory/mt8173-larb-port.h | 10 +- include/dt-bindings/memory/mt8183-larb-port.h | 130 ++++++++++ include/soc/mediatek/smi.h | 10 +- 13 files changed, 501 insertions(+), 217 deletions(-) create mode 100644 include/dt-bindings/memory/mt8183-larb-port.h -- 1.9.1