Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp11412634imu; Mon, 31 Dec 2018 22:02:07 -0800 (PST) X-Google-Smtp-Source: ALg8bN5s3MEP3ksXu/M+4VmfJi86iqWn/bPaOyDE4Nxk8OkDW+OmyBbawYppzn9uFzzylomX5bet X-Received: by 2002:a63:9e19:: with SMTP id s25mr9757938pgd.203.1546322527850; Mon, 31 Dec 2018 22:02:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546322527; cv=none; d=google.com; s=arc-20160816; b=ejXSiSmcaNIIiExUMCI8GiP5TMq6Kp5qAY6oBEUZZ35kNT9KMWoC1fygLCiL36sKNt SNvNtECbdimg0nF1NxCyAJNy9rD3+vhx1RztsAS1DxYJXmoVVn9uPv4kjdZMtLgF7YHj Bj+P0B+voX/BMcoe2jFm9oNOBnb+9JgQ8tf0A96KYuvkFIXPT+KEmeUpS2VkZxwd5/Yb brgyaz4QfyoMYPQAFE+hEqAmKxYpC69I39zO/TvFBTkL8M+xBeFQaVukJv2omxo82W3T VbrgawELqobo9DMvWRUm8Ri7Snb7sPAu5BuL8t/UQAkyuK7UzuuVD2oZnGvbPPiyIDbu Kt6Q== 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=WCq1RaQBaeirUCBchl/gda7d9oCBmI4fL6bFgsm1n8Y=; b=csOy0cHD+UPgCYXNUZsbeDgx5Oyzkj/B9xvdHepVNCASJwquaVdZyOcclRnWU2FwB8 It8VcuCCIGObApwnira3h+Tph9qZGHZbo7m48QixGMvwhu2b1BryGV1U7+e5L4aT4bpP nIjnK3QvAZzYM0Iif0xSx26DR3gWTDk7gsfMXI0j4hN8xZDMfk69KT5D9kiBHI253Oym Ejc6Jz/4vOWwqc/6nMBtczE+49OgTfLLeWrGAvhhrTtLfj+Uak2jm5vSAdgCd1w9zuPR rrfJ0HDvYwDujQ7H+TBs44LqgVaQHox25HvM4d/Cdm5LGkVTbZwsMEW08M8cT9RFckcb ETSg== 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 p5si17268584pls.338.2018.12.31.22.01.32; Mon, 31 Dec 2018 22:02:07 -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 S1727590AbfAAD40 (ORCPT + 99 others); Mon, 31 Dec 2018 22:56:26 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:7850 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726686AbfAAD40 (ORCPT ); Mon, 31 Dec 2018 22:56:26 -0500 X-UUID: 449f02124d7242f0992976839458eb9f-20190101 X-UUID: 449f02124d7242f0992976839458eb9f-20190101 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 946421805; Tue, 01 Jan 2019 11:56:16 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs03n1.mediatek.inc (172.21.101.181) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 1 Jan 2019 11:56:14 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 1 Jan 2019 11:56:14 +0800 From: Yong Wu To: Joerg Roedel , Matthias Brugger , Robin Murphy , Rob Herring CC: Tomasz Figa , Will Deacon , , , , , , , , , , , Nicolas Boichat Subject: [PATCH v5 00/18] MT8183 IOMMU SUPPORT Date: Tue, 1 Jan 2019 11:55:32 +0800 Message-ID: <1546314952-15990-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-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..13 add the iommu/smi support for mt8183; the patch 14..16 add mmu1 support; the last patches contain some minor changes: -patch 17 cleanup some smi codes(delete need_larbid). -patch 18 fix a issue(fix vld_pa_rng). -patch 19 improve the code flow(add shutdown). -patch 20 switch to SPDX license. The dtsi was included at [1] since it should depend on power-domain and ccf nodes. [1] http://lists.infradead.org/pipermail/linux-mediatek/2018-December/016539.html Change notes: v5: 1) Remove this patch "iommu/mediatek: Constify iommu_ops" for here as it was applied for v4.21. 2) Again, add 3 preparing patches. Move two property into the plat_data. iommu/mediatek: Move vld_pa_rng into plat_data iommu/mediatek: Move reset_axi into plat_data iommu/mediatek: Refine protect memory definition 3) Change the string "larb_special_mask" to "larb_direct_to_common_mask". 4) Add shutdown callback for mtk_iommu_v1 in patch[19/20]. v4: http://lists.infradead.org/pipermail/linux-mediatek/2018-December/016205.html 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 Yong Wu (20): 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 iommu/mediatek: Refine protect memory definition iommu/mediatek: Move reset_axi into plat_data iommu/mediatek: Move vld_pa_rng into plat_data 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 memory: mtk-smi: Get rid of need_larbid iommu/mediatek: Fix VLD_PA_RANGE register backup when suspend iommu/mediatek: Add shutdown callback 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 | 145 ++++++----- drivers/iommu/mtk_iommu.h | 25 +- drivers/iommu/mtk_iommu_v1.c | 16 +- drivers/memory/mtk-smi.c | 270 ++++++++++++++------- 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, 505 insertions(+), 219 deletions(-) create mode 100644 include/dt-bindings/memory/mt8183-larb-port.h -- 1.9.1