Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp504094pxb; Thu, 23 Sep 2021 05:05:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxI1NKs/ksPFo5msob/PaeNmMlxcamGPuNF4ElA/iZSIhwg/+4pxcoGZyCQVlUg/+aw8u6j X-Received: by 2002:a50:9dc4:: with SMTP id l4mr4999344edk.208.1632398754826; Thu, 23 Sep 2021 05:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632398754; cv=none; d=google.com; s=arc-20160816; b=BO5wvwulIxYo13NJIRmeOYmiMQNEI3wkhJdEH4AW+LyfPEuc6EK7xXjiQzlJUP0R2p 7ORPWVINMTIEzQAjIX/S7ojt1+giiisnjq9zkYct7vIqTXPEWQz+xHEbnTL0BeJKKXCf DIEEqsOCO5QP0FsJpMhSXRo0ddb4Xv6Vcma9uZuDC3AWnASI72A1WQicA/Bky2gfJbUl Lp3tzga+TPZjZ0y+n2GS0MftDZiacYPMH0j71rF3aS3ieptJoVXOtVGAp+fAtDFfaFf2 yE0grPJwAkmGzlvEG1f0J7oOxIOne8PJQcgb/A3U4Yo83ShcHYvnXiI71yf62rBjH9BK XZ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=WQAE9hrQlhCHiYJmJf6uBEhyWBXYVfISyESlel1NbRM=; b=YJeRMqX2dA0oqGAqi+MSAd54+PUAJop7FN/XeL3IxRXLfxJisLi0LnrCQuPdqzpoiY X9Y4Dchi/5/Nmid1oDH0dMdsrJ8/lFxpuqjzL7zYzVZmZnJrZCVL/8OmuprOFrQE2+4r ux3m89vaTVtswCU5u2phJ6uUiI73tO6Q5z9i54TIv5tT3toZme+2S/3vregiPH37JN18 k1kjogIDZCeThCOXoRgxyuPxnFKuthnu/NhUJo/PX2D4y021BWz6/oafaB9Z8y7nANwV 54/xA/UMif62U88qEj5V6AT14qZ5+tyMM3iQiwDwOPd4rsXDc+dJFV13mjZah5vVDvS2 xd3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v10si5078970ejv.612.2021.09.23.05.05.30; Thu, 23 Sep 2021 05:05:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240754AbhIWMFA (ORCPT + 99 others); Thu, 23 Sep 2021 08:05:00 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:55078 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S240979AbhIWMEw (ORCPT ); Thu, 23 Sep 2021 08:04:52 -0400 X-UUID: 28f4b306fed9448d97470deac95a3e67-20210923 X-UUID: 28f4b306fed9448d97470deac95a3e67-20210923 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1394957760; Thu, 23 Sep 2021 20:03:19 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Sep 2021 20:03:17 +0800 Received: from localhost.localdomain (10.17.3.154) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Sep 2021 20:03:17 +0800 From: Yong Wu To: Joerg Roedel , Rob Herring , Matthias Brugger , Will Deacon , Robin Murphy CC: Krzysztof Kozlowski , Tomasz Figa , , , , , , , Hsin-Yi Wang , , , , , Subject: [PATCH v3 28/33] iommu/mediatek: Add bank_nr and bank_enable Date: Thu, 23 Sep 2021 19:58:35 +0800 Message-ID: <20210923115840.17813-29-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210923115840.17813-1-yong.wu@mediatek.com> References: <20210923115840.17813-1-yong.wu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Prepare for supporting multi banks, Adds two variables in the plat_data: bank_nr: the bank number that this SoC support; bank_enable: list if the banks is enabled. Add them for all the current SoC, bank_nr always is 1 and only bank_enable[0] is enabled. Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 18 ++++++++++++++++++ drivers/iommu/mtk_iommu.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index c139675d99e6..4ad85469f68f 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -1134,6 +1134,8 @@ static const struct mtk_iommu_plat_data mt2712_data = { NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, @@ -1144,6 +1146,8 @@ static const struct mtk_iommu_plat_data mt6779_data = { .flags = HAS_SUB_COMM_2BITS | OUT_ORDER_WR_EN | WR_THROT_EN | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, @@ -1154,6 +1158,8 @@ static const struct mtk_iommu_plat_data mt8167_data = { .flags = RESET_AXI | HAS_LEGACY_IVRP_PADDR | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}}, /* Linear mapping. */ @@ -1165,6 +1171,8 @@ static const struct mtk_iommu_plat_data mt8173_data = { HAS_LEGACY_IVRP_PADDR | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}}, /* Linear mapping. */ @@ -1174,6 +1182,8 @@ static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .flags = RESET_AXI | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), .larbid_remap = {{0}, {4}, {5}, {6}, {7}, {2}, {3}, {1}}, @@ -1185,6 +1195,8 @@ static const struct mtk_iommu_plat_data mt8192_data = { WR_THROT_EN | IOVA_34_EN | NOT_STD_AXI_MODE | MTK_IOMMU_TYPE_MM, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{0}, {1}, {4, 5}, {7}, {2}, {9, 11, 19, 20}, @@ -1196,6 +1208,8 @@ static const struct mtk_iommu_plat_data mt8195_data_infra = { .flags = WR_THROT_EN | DCM_DISABLE | MTK_IOMMU_TYPE_INFRA | IFA_IOMMU_PCIe_SUPPORT, .pericfg_comp_str = "mediatek,mt8195-pericfg_ao", + .bank_nr = 1, + .bank_enable = {true}, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), @@ -1208,6 +1222,8 @@ static const struct mtk_iommu_plat_data mt8195_data_vdo = { SHARE_PGTABLE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{2, 0}, {21}, {24}, {7}, {19}, {9, 10, 11}, @@ -1221,6 +1237,8 @@ static const struct mtk_iommu_plat_data mt8195_data_vpp = { SHARE_PGTABLE | MTK_IOMMU_TYPE_MM, .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN2, + .bank_nr = 1, + .bank_enable = {true}, .iova_region = mt8192_multi_dom, .iova_region_nr = ARRAY_SIZE(mt8192_multi_dom), .larbid_remap = {{1}, {3}, {22, 0, 0, 0, 23}, {8}, diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index 881fade8d39a..dc0190edebf0 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -62,6 +62,9 @@ struct mtk_iommu_plat_data { struct list_head *hw_list; unsigned int iova_region_nr; const struct mtk_iommu_iova_region *iova_region; + + unsigned int bank_nr; + bool bank_enable[MTK_IOMMU_BANK_MAX]; unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; }; -- 2.18.0