From nobody Sun Sep 22 04:37:53 2024 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 D88E2C433F5 for ; Wed, 18 May 2022 10:19:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235076AbiERKTG (ORCPT ); Wed, 18 May 2022 06:19:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235056AbiERKTC (ORCPT ); Wed, 18 May 2022 06:19:02 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D218131506; Wed, 18 May 2022 03:18:59 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: kholk11) with ESMTPSA id BE2931F447BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652869137; bh=zFkZi1otInHhCJhlsxh3M6ORDfmM8tcKsLwrRUm2a7M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J6qPTWHEDHCSNB6+4W3n02+ZWZTr1V3bX7yY9M0nYuwOO0egcECGzvfU8Isp6xxXh AgyEL4a4d5Sw5F2QFsmamRqyHLiFK3mf0cNNEGQpkAvKtmk+s7WcU9mNQ28bdVICdu +kJSk2C+nUvNyzBKfPW0IrIn68e3A4s75bLNts1q9aUzJHBTmyHyYEcd89DjFjRlLv CE5uHGajMeGSjFG/cXnCYh3vOuGWq5BjnafchRAQyiVNQEPl2huLSE3dLN+KDKoBay L/CiiTTL3B5dXs/3rv0FMxmPI1YnrnGH74Duj4TCP5K97I9Nu/XttM+yeqesondr1D 4EkjI2O1YhFJA== From: AngeloGioacchino Del Regno To: yong.wu@mediatek.com Cc: joro@8bytes.org, will@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, konrad.dybcio@somainline.org, marijn.suijten@somainline.org, martin.botka@somainline.org, ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, paul.bouchara@somainline.org, AngeloGioacchino Del Regno Subject: [PATCH v2 2/2] iommu: mtk_iommu: Add support for MT6795 Helio X10 M4Us Date: Wed, 18 May 2022 12:18:49 +0200 Message-Id: <20220518101849.46804-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518101849.46804-1-angelogioacchino.delregno@collabora.com> References: <20220518101849.46804-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add support for the M4Us found in the MT6795 Helio X10 SoC. Signed-off-by: AngeloGioacchino Del Regno --- drivers/iommu/mtk_iommu.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 090cf6e15f85..97ff30ed2d0f 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -159,6 +159,7 @@ enum mtk_iommu_plat { M4U_MT2712, M4U_MT6779, + M4U_MT6795, M4U_MT8167, M4U_MT8173, M4U_MT8183, @@ -954,7 +955,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_dat= a *data, unsigned int ban * Global control settings are in bank0. May re-init these global registe= rs * since no sure if there is bank0 consumers. */ - if (data->plat_data->m4u_plat =3D=3D M4U_MT8173) { + if (data->plat_data->m4u_plat =3D=3D M4U_MT6795 || + data->plat_data->m4u_plat =3D=3D M4U_MT8173) { regval =3D F_MMU_PREFETCH_RT_REPLACE_MOD | F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173; } else { @@ -1422,6 +1424,18 @@ static const struct mtk_iommu_plat_data mt6779_data = =3D { .larbid_remap =3D {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, }; =20 +static const struct mtk_iommu_plat_data mt6795_data =3D { + .m4u_plat =3D M4U_MT6795, + .flags =3D HAS_4GB_MODE | HAS_BCLK | RESET_AXI | + HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM, + .inv_sel_reg =3D REG_MMU_INV_SEL_GEN1, + .banks_num =3D 1, + .banks_enable =3D {true}, + .iova_region =3D single_domain, + .iova_region_nr =3D ARRAY_SIZE(single_domain), + .larbid_remap =3D {{0}, {1}, {2}, {3}, {4}}, /* Linear mapping. */ +}; + static const struct mtk_iommu_plat_data mt8167_data =3D { .m4u_plat =3D M4U_MT8167, .flags =3D RESET_AXI | HAS_LEGACY_IVRP_PADDR | MTK_IOMMU_TYPE_MM, @@ -1533,6 +1547,7 @@ static const struct mtk_iommu_plat_data mt8195_data_v= pp =3D { static const struct of_device_id mtk_iommu_of_ids[] =3D { { .compatible =3D "mediatek,mt2712-m4u", .data =3D &mt2712_data}, { .compatible =3D "mediatek,mt6779-m4u", .data =3D &mt6779_data}, + { .compatible =3D "mediatek,mt6795-m4u", .data =3D &mt6795_data}, { .compatible =3D "mediatek,mt8167-m4u", .data =3D &mt8167_data}, { .compatible =3D "mediatek,mt8173-m4u", .data =3D &mt8173_data}, { .compatible =3D "mediatek,mt8183-m4u", .data =3D &mt8183_data}, --=20 2.35.1