From patchwork Tue Apr 18 08:35:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yong Wu X-Patchwork-Id: 8346 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2682365vqo; Tue, 18 Apr 2023 01:41:13 -0700 (PDT) X-Google-Smtp-Source: AKy350Yd2dBfjigbW5UaDGqM9DtUklwVubhZWrQZ3ce6kKhbQ838Y8FrOGcQoqROvb/ZWYl4c+Rx X-Received: by 2002:a05:6a00:1791:b0:63b:8b47:454f with SMTP id s17-20020a056a00179100b0063b8b47454fmr10391914pfg.13.1681807272793; Tue, 18 Apr 2023 01:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681807272; cv=none; d=google.com; s=arc-20160816; b=OkygV1VFPq5EQK1IsPOrKcztbeelz0rplZSRx5jNU1q9JMwlG90FZZxINuqu8G7sd4 OQFQN34zHLrzgw181gCTzeICQtRJs9D+VEbhtWxJTvAlCMADslnJbxMzFAcLFHS4FJce /Ipd/k5FKon3jWY7Af50sxjflR6/Z+Y9QWqoZ0e95v8qwYBV67QuQAPmM3fap5uswBKU GPhjthuA3Kk4tXccglvISv+SdselPY93ouQHt34eNWKf3NFFlb9+naOp9G3C4ShCcqWB U0+87o0I+Afz6qvR+qzz+fx2adeDYTTLFroxViTSClXFOwPSmSy6cen/P1DgPMlI7wFf ndtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=qbg0mnbwR6twTu3H/yDUm3cuc5CKQs07i1Hp6wm5VKU=; b=CIOfCbFK4cyM8eZDU4DUe0hyLywW/njJcotaq/Rj0JZFZw6pJOaRprDJ1Y9xGSvmH0 TNG5RNCv6dkGwq29xwlQ1VFNSFSwrylFCl4hAHABb5LEcWvgQSFzHTTq1mNrZeuTt8T+ sQM03YEgCVRJXIzRY4wx1Mb/xKPTmK89KE64Obj8QWLXbR9UP+DQPJ8aHAO/eE0YG+4M IBpDvQ4BMgAsLoameq3G6uqX+CJMzJsIsGC8g74mgOEmleMJlQIoJOxPbI1JWXMBib1d 5UDT5cLtIgk537NAZomyINvhs7iN0wxfk6V0F+d2810ZsZVQ0AKJM2BwHHCou6EuUUkh aFsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=qauMBK4m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bc22-20020a656d96000000b00518b499da59si12530170pgb.901.2023.04.18.01.40.57; Tue, 18 Apr 2023 01:41:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=qauMBK4m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbjDRIfs (ORCPT + 99 others); Tue, 18 Apr 2023 04:35:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230364AbjDRIfk (ORCPT ); Tue, 18 Apr 2023 04:35:40 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EC011BFD; Tue, 18 Apr 2023 01:35:27 -0700 (PDT) X-UUID: f3c6410addc311edb6b9f13eb10bd0fe-20230418 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=qbg0mnbwR6twTu3H/yDUm3cuc5CKQs07i1Hp6wm5VKU=; b=qauMBK4mbYJ41PxUyL7UnkC9WSRXzZ+hYSdiWiMvQm4j4yTPZKqKUyH+jkvpcxf+uA5YE2R2VHhpEzLUVTjOaZWJV2T2B2UUWGmUUUtE8AhrgrGN8le/9moaJpCk1BjXsYBfjMS0sFnOOWxedOU9iOJQhyqv6pQSe8YC4nUQBqU=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:dccee0eb-c8ab-4bb6-9a41-d392bfeb1e67,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:120426c,CLOUDID:062eb6a1-8fcb-430b-954a-ba3f00fa94a5,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:1,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: f3c6410addc311edb6b9f13eb10bd0fe-20230418 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 470080237; Tue, 18 Apr 2023 16:35:19 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Tue, 18 Apr 2023 16:35:18 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.25 via Frontend Transport; Tue, 18 Apr 2023 16:35:17 +0800 From: Yong Wu To: Joerg Roedel , Will Deacon , Rob Herring , Matthias Brugger CC: Robin Murphy , Krzysztof Kozlowski , Yong Wu , AngeloGioacchino Del Regno , , , , , , , , , Subject: [PATCH v11 0/7] MT8188 IOMMU SUPPORT Date: Tue, 18 Apr 2023 16:35:07 +0800 Message-ID: <20230418083514.4379-1-yong.wu@mediatek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,RDNS_NONE, SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE,T_SPF_TEMPERROR,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763502742748365209?= X-GMAIL-MSGID: =?utf-8?q?1763502742748365209?= MT8188 have 3 IOMMU HWs. 2 IOMMU HW is for multimedia, and 1 IOMMU HW is for infra-master, like PCIe. About the 2 MM IOMMU HW, the connection could be something like this: IOMMU(VDO) IOMMU(VPP) | | SMI_COMMON(VDO) SMI_COMMON(VPP) --------------- ---------------- | | ... | | ... larb0 larb2 ... larb1 larb3 ... INFRA IOMMU does not have SMI, the master connects to IOMMU directly. Although multiple banks supported in MT8188, we only use one of them, which means PCIe is put in bank0 of INFRA IOMMU. So we have two pgtable for MT8188, specifically, these two MM IOMMU HW share a pgtable while INFRA IOMMU HW use a independent pgtable. Another change is that we add some SMC command for INFRA master to enable/disable INFRA IOMMU in ATF considering security concerns. We also adjust the flow of mtk_iommu_config to reduce indention. change in v11: - Just add a new entry in MAINTAINERS from AngeloGioacchino. change in v10: https://lore.kernel.org/linux-mediatek/20230417073606.25729-1-yong.wu@mediatek.com/ - Add a Fixes tag for [2/7]. - Rebase on mtk-iommu-dma-range-v7: https://lore.kernel.org/linux-mediatek/20230411093144.2690-1-yong.wu@mediatek.com/ change since v9: https://lore.kernel.org/linux-mediatek/20230317085541.20447-1-yong.wu@mediatek.com/ - Move the patch about setting set_dma_mask out from this patchset. - Add a MAINTAINER patch since the header file was added a prefix "mediatek," change since v8: https://lore.kernel.org/linux-mediatek/20230307080555.14399-1-yong.wu@mediatek.com/ - Base on v6.3-rc1 and mtk-iommu-dma-range-v5: https://lore.kernel.org/linux-mediatek/20230307023507.13306-1-yong.wu@mediatek.com/ - Add a new patch set_dma_mask about since mt8188 support the PA of pgtable 35bits. changes since v7: https://lore.kernel.org/linux-mediatek/20230216053322.11596-1-yong.wu@mediatek.com/ - Base on mtk-iommu-dma-range-v4: https://lore.kernel.org/linux-mediatek/20230215062544.8677-1-yong.wu@mediatek.com/ - Add a new patch for two IOMMU share pagetable issue. - Add a new patch for adding iova_region_larb_msk for mt8188. - Add the comment in the dt-binding header file about larb index. This is for readable when updating the iova_region_larb_msk. Since there is something wrong for chengci's mail account when sending to devicetree mail list, we don't know why. I help send this patchset. https://lore.kernel.org/linux-mediatek/5a916595-12ee-92e6-d380-84146dd75218@linaro.org/ changes since v6: https://lore.kernel.org/linux-mediatek/20221223101439.494-1-chengci.xu@mediatek.com/ - base on tag: next-20221220. - update commit message of patch[2/4]. changes since v5: - base on tag: next-20221205. - add flag PGTABLE_PA_35_EN for all IOMMU in MT8188. - modify the type of "portid_msk" from "u32" to "unsigned long". changes since v4: - base on tag: next-20221018. - add patch[2/4] to reduce indention by adjust mtk_iommu_config flow. changes since v3: - base on tag: next-20220916. - use license "GPL-2.0-only OR BSD-2-Clause" in bingings head file. - drop redundant "portid" assignment when configure infra master. - reduce indentation by using "else if" when config infra master. - update probe flow about "pericfg" for CFG_IFA_MASTER_IN_ATF. - drop unused "pericfg_comp_str" in mt8188_data_infra. - drop words like "This commit/patch". changes since v2: - base on tag: next-20220831. - rename "mt8188-memory-port.h" to "mediatek,mt8188-memory-port.h". - use dual-license in "mediatek,mt8188-memory-port.h" - remove unnecessary "()" when define SMI_LARB_ID changes since v1: - base on tag: next-20220803. - adds MT8188 IOMMU support. Chengci.Xu (5): dt-bindings: mediatek: mt8188: Add binding for MM & INFRA IOMMU iommu/mediatek: Fix two IOMMU share pagetable issue iommu/mediatek: Adjust mtk_iommu_config flow iommu/mediatek: Add enable IOMMU SMC command for INFRA masters iommu/mediatek: Add MT8188 IOMMU Support Yong Wu (2): iommu/mediatek: mt8188: Add iova_region_larb_msk MAINTAINERS: iommu/mediatek: Update the header file name .../bindings/iommu/mediatek,iommu.yaml | 12 +- MAINTAINERS | 1 + drivers/iommu/mtk_iommu.c | 151 ++++-- .../memory/mediatek,mt8188-memory-port.h | 489 ++++++++++++++++++ include/soc/mediatek/smi.h | 1 + 5 files changed, 622 insertions(+), 32 deletions(-) create mode 100644 include/dt-bindings/memory/mediatek,mt8188-memory-port.h