From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6417C433E0 for ; Fri, 19 Jun 2020 10:51:03 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 786102078D for ; Fri, 19 Jun 2020 10:51:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u41T8bgv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 786102078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 44309876A0; Fri, 19 Jun 2020 10:51:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AhlKlq0KQuOm; Fri, 19 Jun 2020 10:51:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 21B4C86E85; Fri, 19 Jun 2020 10:51:02 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1431FC0865; Fri, 19 Jun 2020 10:51:02 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id DB89BC016E for ; Fri, 19 Jun 2020 10:51:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D09DE88E29 for ; Fri, 19 Jun 2020 10:51:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nr1I3CcqNXcc for ; Fri, 19 Jun 2020 10:50:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by whitealder.osuosl.org (Postfix) with ESMTP id 91DB288AAD for ; Fri, 19 Jun 2020 10:50:58 +0000 (UTC) X-UUID: d4a0e3d3c90c4db28257144de8e7b092-20200619 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=gLyZez7zoj9lEggZKjZhObz4KPttckUsAiOpo+MoMv8=; b=u41T8bgvRxbYNhF5iQVVk9FXc6UvS0j/TVxf9jjgfTYUEvIpqYxdi9DtRJYFc4mruH/tkp3pffkU4VdX+ea5yNlDI85BUHBsrAU9SJLoKwbK46/wJVgOP27516TZimen906NIWrPxSePZCMT0lIr/b4ndjoABmnWnlSW7RXMzM4=; X-UUID: d4a0e3d3c90c4db28257144de8e7b092-20200619 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1334683904; Fri, 19 Jun 2020 18:50:53 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 18:50:50 +0800 Received: from [10.15.20.246] (10.15.20.246) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 19 Jun 2020 18:50:49 +0800 Message-ID: <1592563824.5692.1.camel@mbjsdccf07> Subject: Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support From: chao hao To: Matthias Brugger Date: Fri, 19 Jun 2020 18:50:24 +0800 In-Reply-To: <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> References: <20200617030029.4082-1-chao.hao@mediatek.com> <20200617030029.4082-8-chao.hao@mediatek.com> <64f63ccc-92a4-191c-3566-de00c9e04ca2@gmail.com> <1592481247.12647.9.camel@mbjsdccf07> <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Cc: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Thu, 2020-06-18 at 18:00 +0200, Matthias Brugger wrote: > > On 18/06/2020 13:54, chao hao wrote: > > On Wed, 2020-06-17 at 11:33 +0200, Matthias Brugger wrote: > >> > >> On 17/06/2020 05:00, Chao Hao wrote: > >>> 1. Start from mt6779, INVLDT_SEL move to offset=0x2c, so we add > >>> REG_MMU_INV_SEL_GEN2 definition and mt6779 uses it. > >>> 2. Change PROTECT_PA_ALIGN from 128 byte to 256 byte. > >>> 3. For REG_MMU_CTRL_REG register, we only need to change bit[2:0], > >>> others bits keep default value, ex: enable victim tlb. > >>> 4. Add mt6779_data to support mm_iommu HW init. > >>> > >>> Change since v3: > >>> 1. When setting MMU_CTRL_REG, we don't need to include mt8173. > >>> > >>> Cc: Yong Wu > >>> Signed-off-by: Chao Hao > >>> --- > >>> drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- > >>> drivers/iommu/mtk_iommu.h | 1 + > >>> 2 files changed, 19 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > >>> index c706bca6487e..def2e996683f 100644 > >>> --- a/drivers/iommu/mtk_iommu.c > >>> +++ b/drivers/iommu/mtk_iommu.c > >>> @@ -37,6 +37,11 @@ > >>> #define REG_MMU_INVLD_START_A 0x024 > >>> #define REG_MMU_INVLD_END_A 0x028 > >>> > >>> +/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. > >>> + * So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" > >>> + * and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". > >>> + */ > >> > >> Please delete the comment, this should be understandable from the git history > > > > ok, thanks > > > >> > >>> +#define REG_MMU_INV_SEL_GEN2 0x02c > >>> #define REG_MMU_INV_SEL_GEN1 0x038 > >>> #define F_INVLD_EN0 BIT(0) > >>> #define F_INVLD_EN1 BIT(1) > >>> @@ -98,7 +103,7 @@ > >>> #define F_MMU_INT_ID_LARB_ID(a) (((a) >> 7) & 0x7) > >>> #define F_MMU_INT_ID_PORT_ID(a) (((a) >> 2) & 0x1f) > >>> > >>> -#define MTK_PROTECT_PA_ALIGN 128 > >>> +#define MTK_PROTECT_PA_ALIGN 256 > >> > >> Do we need 512 bytes for all gen2 IOMMUs? > >> I'm not sure if we should add this in plat_data or if we should just bump up the > >> value for all SoCs. > >> In both cases this should be a separate patch. > >> > > From mt6779, MTK_PROTECT_PA_ALIGN is extend to 256 bytes and don't be > > changed for a long time from our HW designer comment. The legacy iommu > > also can use it, mabye it doesn't set it by platform. > > > > Ok then just bump it to 256 in a new patch. Thanks for clarification. Ok, thanks > > > >>> > >>> /* > >>> * Get the local arbiter ID and the portid within the larb arbiter > >>> @@ -543,11 +548,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > >>> return ret; > >>> } > >>> > >>> + regval = readl_relaxed(data->base + REG_MMU_CTRL_REG); > >>> if (data->plat_data->m4u_plat == M4U_MT8173) > >>> regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > >>> F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173; > >>> else > >>> - regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >>> + regval |= F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >> > >> Why do we change this, is it that the bootloader for mt6779 set some values in > >> the register we have to keep? In this case I think we should update the regval > >> accordingly. > > > > For REG_MMU_CTRL_REG, bit[12] represents victim_tlb_en feature and > > victim_tlb is enable defaultly(bit[12]=1),but if we use "regval = > > F_MMU_TF_PROT_TO_PROGRAM_ADDR", victim_tlb will disable, it will drop > > iommu performace for mt6779 > > > > Got it. Please put that in a separate patch then. > Ok, thanks > Regards, > Matthias > > > > >> > >>> writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > >>> > >>> regval = F_L2_MULIT_HIT_EN | > >>> @@ -797,6 +803,15 @@ static const struct mtk_iommu_plat_data mt2712_data = { > >>> .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, > >>> }; > >>> > >>> +static const struct mtk_iommu_plat_data mt6779_data = { > >>> + .m4u_plat = M4U_MT6779, > >>> + .has_sub_comm = true, > >>> + .has_wr_len = true, > >>> + .has_misc_ctrl = true, > >>> + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > >>> + .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, > >>> +}; > >>> + > >>> static const struct mtk_iommu_plat_data mt8173_data = { > >>> .m4u_plat = M4U_MT8173, > >>> .has_4gb_mode = true, > >>> @@ -815,6 +830,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > >>> > >>> static const struct of_device_id mtk_iommu_of_ids[] = { > >>> { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > >>> + { .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data}, > >>> { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > >>> { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > >>> {} > >>> diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > >>> index 9971cedd72ea..fb79e710c8d9 100644 > >>> --- a/drivers/iommu/mtk_iommu.h > >>> +++ b/drivers/iommu/mtk_iommu.h > >>> @@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg { > >>> enum mtk_iommu_plat { > >>> M4U_MT2701, > >>> M4U_MT2712, > >>> + M4U_MT6779, > >>> M4U_MT8173, > >>> M4U_MT8183, > >>> }; > >>> > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98365C433E0 for ; Fri, 19 Jun 2020 10:52:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69B61208B8 for ; Fri, 19 Jun 2020 10:52:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nCWllZZu"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u41T8bgv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69B61208B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5EIk92M6pWQCjjmYxPqFfd6N/DoMSWP5xvsvUXMyKuk=; b=nCWllZZuMfHu6e QKH1cFJdaxosUTxLHZ3p0mTP+Mygb1Q1CriUW+4LQIXl5ywmtzZ2l+TO5J5no/2IaDs5xLdkZTcVk 0NILvmwVaFsJ66C+9xHDyodIlZwNe+TIUfDv2P9UOTnaYYon4Wc1QfF/bM3nCzDWUiS/MrohaYHU/ RDN0caGQgWXED47+Ba+evQ4VNk6HEFTY1pvcAAeIT2cn+vQFkN9GjgBmbgaXT1texbvRwqnkWOhG1 otD655DNAJk4e81YiePCrCh5LlpPEysl6+M44iPe5/YZeFB2TahSpxvASK6Dftrk7qMjejcNvN3WV RJO7/8bKPbkr/SgmUhvg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmEdG-0000Ex-0p; Fri, 19 Jun 2020 10:52:26 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmEd3-0008WJ-BO; Fri, 19 Jun 2020 10:52:18 +0000 X-UUID: 50802570af7d4ff3b65cc8c556800f6f-20200619 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=gLyZez7zoj9lEggZKjZhObz4KPttckUsAiOpo+MoMv8=; b=u41T8bgvRxbYNhF5iQVVk9FXc6UvS0j/TVxf9jjgfTYUEvIpqYxdi9DtRJYFc4mruH/tkp3pffkU4VdX+ea5yNlDI85BUHBsrAU9SJLoKwbK46/wJVgOP27516TZimen906NIWrPxSePZCMT0lIr/b4ndjoABmnWnlSW7RXMzM4=; X-UUID: 50802570af7d4ff3b65cc8c556800f6f-20200619 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1348649251; Fri, 19 Jun 2020 02:50:52 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 03:50:52 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 18:50:50 +0800 Received: from [10.15.20.246] (10.15.20.246) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 19 Jun 2020 18:50:49 +0800 Message-ID: <1592563824.5692.1.camel@mbjsdccf07> Subject: Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support From: chao hao To: Matthias Brugger Date: Fri, 19 Jun 2020 18:50:24 +0800 In-Reply-To: <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> References: <20200617030029.4082-1-chao.hao@mediatek.com> <20200617030029.4082-8-chao.hao@mediatek.com> <64f63ccc-92a4-191c-3566-de00c9e04ca2@gmail.com> <1592481247.12647.9.camel@mbjsdccf07> <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200619_035213_418023_09E2DA10 X-CRM114-Status: GOOD ( 25.74 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Yong Wu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Thu, 2020-06-18 at 18:00 +0200, Matthias Brugger wrote: > > On 18/06/2020 13:54, chao hao wrote: > > On Wed, 2020-06-17 at 11:33 +0200, Matthias Brugger wrote: > >> > >> On 17/06/2020 05:00, Chao Hao wrote: > >>> 1. Start from mt6779, INVLDT_SEL move to offset=0x2c, so we add > >>> REG_MMU_INV_SEL_GEN2 definition and mt6779 uses it. > >>> 2. Change PROTECT_PA_ALIGN from 128 byte to 256 byte. > >>> 3. For REG_MMU_CTRL_REG register, we only need to change bit[2:0], > >>> others bits keep default value, ex: enable victim tlb. > >>> 4. Add mt6779_data to support mm_iommu HW init. > >>> > >>> Change since v3: > >>> 1. When setting MMU_CTRL_REG, we don't need to include mt8173. > >>> > >>> Cc: Yong Wu > >>> Signed-off-by: Chao Hao > >>> --- > >>> drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- > >>> drivers/iommu/mtk_iommu.h | 1 + > >>> 2 files changed, 19 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > >>> index c706bca6487e..def2e996683f 100644 > >>> --- a/drivers/iommu/mtk_iommu.c > >>> +++ b/drivers/iommu/mtk_iommu.c > >>> @@ -37,6 +37,11 @@ > >>> #define REG_MMU_INVLD_START_A 0x024 > >>> #define REG_MMU_INVLD_END_A 0x028 > >>> > >>> +/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. > >>> + * So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" > >>> + * and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". > >>> + */ > >> > >> Please delete the comment, this should be understandable from the git history > > > > ok, thanks > > > >> > >>> +#define REG_MMU_INV_SEL_GEN2 0x02c > >>> #define REG_MMU_INV_SEL_GEN1 0x038 > >>> #define F_INVLD_EN0 BIT(0) > >>> #define F_INVLD_EN1 BIT(1) > >>> @@ -98,7 +103,7 @@ > >>> #define F_MMU_INT_ID_LARB_ID(a) (((a) >> 7) & 0x7) > >>> #define F_MMU_INT_ID_PORT_ID(a) (((a) >> 2) & 0x1f) > >>> > >>> -#define MTK_PROTECT_PA_ALIGN 128 > >>> +#define MTK_PROTECT_PA_ALIGN 256 > >> > >> Do we need 512 bytes for all gen2 IOMMUs? > >> I'm not sure if we should add this in plat_data or if we should just bump up the > >> value for all SoCs. > >> In both cases this should be a separate patch. > >> > > From mt6779, MTK_PROTECT_PA_ALIGN is extend to 256 bytes and don't be > > changed for a long time from our HW designer comment. The legacy iommu > > also can use it, mabye it doesn't set it by platform. > > > > Ok then just bump it to 256 in a new patch. Thanks for clarification. Ok, thanks > > > >>> > >>> /* > >>> * Get the local arbiter ID and the portid within the larb arbiter > >>> @@ -543,11 +548,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > >>> return ret; > >>> } > >>> > >>> + regval = readl_relaxed(data->base + REG_MMU_CTRL_REG); > >>> if (data->plat_data->m4u_plat == M4U_MT8173) > >>> regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > >>> F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173; > >>> else > >>> - regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >>> + regval |= F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >> > >> Why do we change this, is it that the bootloader for mt6779 set some values in > >> the register we have to keep? In this case I think we should update the regval > >> accordingly. > > > > For REG_MMU_CTRL_REG, bit[12] represents victim_tlb_en feature and > > victim_tlb is enable defaultly(bit[12]=1),but if we use "regval = > > F_MMU_TF_PROT_TO_PROGRAM_ADDR", victim_tlb will disable, it will drop > > iommu performace for mt6779 > > > > Got it. Please put that in a separate patch then. > Ok, thanks > Regards, > Matthias > > > > >> > >>> writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > >>> > >>> regval = F_L2_MULIT_HIT_EN | > >>> @@ -797,6 +803,15 @@ static const struct mtk_iommu_plat_data mt2712_data = { > >>> .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, > >>> }; > >>> > >>> +static const struct mtk_iommu_plat_data mt6779_data = { > >>> + .m4u_plat = M4U_MT6779, > >>> + .has_sub_comm = true, > >>> + .has_wr_len = true, > >>> + .has_misc_ctrl = true, > >>> + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > >>> + .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, > >>> +}; > >>> + > >>> static const struct mtk_iommu_plat_data mt8173_data = { > >>> .m4u_plat = M4U_MT8173, > >>> .has_4gb_mode = true, > >>> @@ -815,6 +830,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > >>> > >>> static const struct of_device_id mtk_iommu_of_ids[] = { > >>> { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > >>> + { .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data}, > >>> { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > >>> { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > >>> {} > >>> diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > >>> index 9971cedd72ea..fb79e710c8d9 100644 > >>> --- a/drivers/iommu/mtk_iommu.h > >>> +++ b/drivers/iommu/mtk_iommu.h > >>> @@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg { > >>> enum mtk_iommu_plat { > >>> M4U_MT2701, > >>> M4U_MT2712, > >>> + M4U_MT6779, > >>> M4U_MT8173, > >>> M4U_MT8183, > >>> }; > >>> > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87648C433DF for ; Fri, 19 Jun 2020 10:52:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2BDF92078D for ; Fri, 19 Jun 2020 10:52:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PMXAE0Cj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u41T8bgv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BDF92078D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=erGyDlaR/Gmkm2MUa2DOaK1ADczKohgxcD+E+IEfnNk=; b=PMXAE0CjfTplzB Knu8UQGnvinigWcT8sFmxT04/OUNP18BL8zUwKJQBDBRmxhcie2Abvw7+El7VRrnI/mrZHg3KxrwU +L++ue2odcxy7E79JeZthWd9qVI4I3obYH/KVI8BJhJY2u3jO6IDu+CS1Kqr31CIgq9XgHOh6sgyT YBQ/5P4XxCXmBJ+cwUBY7hajB/meCH3hOaaxLC6qfZa/4y+6lgDRhr1HTpmE+3fmEqiYkJjgdCSoN eV00kLCv8KYCymVEtb8fYp7Ko8MR833ROvj1l78iyfTNBdmUt1Wts9j917ZKHrLq62bJNAW+v2ecS lQQQdQcebozLiNfrlugA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmEdI-0000Fx-TF; Fri, 19 Jun 2020 10:52:28 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmEd3-0008WJ-BO; Fri, 19 Jun 2020 10:52:18 +0000 X-UUID: 50802570af7d4ff3b65cc8c556800f6f-20200619 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=gLyZez7zoj9lEggZKjZhObz4KPttckUsAiOpo+MoMv8=; b=u41T8bgvRxbYNhF5iQVVk9FXc6UvS0j/TVxf9jjgfTYUEvIpqYxdi9DtRJYFc4mruH/tkp3pffkU4VdX+ea5yNlDI85BUHBsrAU9SJLoKwbK46/wJVgOP27516TZimen906NIWrPxSePZCMT0lIr/b4ndjoABmnWnlSW7RXMzM4=; X-UUID: 50802570af7d4ff3b65cc8c556800f6f-20200619 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1348649251; Fri, 19 Jun 2020 02:50:52 -0800 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 03:50:52 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 18:50:50 +0800 Received: from [10.15.20.246] (10.15.20.246) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 19 Jun 2020 18:50:49 +0800 Message-ID: <1592563824.5692.1.camel@mbjsdccf07> Subject: Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support From: chao hao To: Matthias Brugger Date: Fri, 19 Jun 2020 18:50:24 +0800 In-Reply-To: <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> References: <20200617030029.4082-1-chao.hao@mediatek.com> <20200617030029.4082-8-chao.hao@mediatek.com> <64f63ccc-92a4-191c-3566-de00c9e04ca2@gmail.com> <1592481247.12647.9.camel@mbjsdccf07> <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200619_035213_418023_09E2DA10 X-CRM114-Status: GOOD ( 25.74 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Yong Wu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2020-06-18 at 18:00 +0200, Matthias Brugger wrote: > > On 18/06/2020 13:54, chao hao wrote: > > On Wed, 2020-06-17 at 11:33 +0200, Matthias Brugger wrote: > >> > >> On 17/06/2020 05:00, Chao Hao wrote: > >>> 1. Start from mt6779, INVLDT_SEL move to offset=0x2c, so we add > >>> REG_MMU_INV_SEL_GEN2 definition and mt6779 uses it. > >>> 2. Change PROTECT_PA_ALIGN from 128 byte to 256 byte. > >>> 3. For REG_MMU_CTRL_REG register, we only need to change bit[2:0], > >>> others bits keep default value, ex: enable victim tlb. > >>> 4. Add mt6779_data to support mm_iommu HW init. > >>> > >>> Change since v3: > >>> 1. When setting MMU_CTRL_REG, we don't need to include mt8173. > >>> > >>> Cc: Yong Wu > >>> Signed-off-by: Chao Hao > >>> --- > >>> drivers/iommu/mtk_iommu.c | 20 ++++++++++++++++++-- > >>> drivers/iommu/mtk_iommu.h | 1 + > >>> 2 files changed, 19 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > >>> index c706bca6487e..def2e996683f 100644 > >>> --- a/drivers/iommu/mtk_iommu.c > >>> +++ b/drivers/iommu/mtk_iommu.c > >>> @@ -37,6 +37,11 @@ > >>> #define REG_MMU_INVLD_START_A 0x024 > >>> #define REG_MMU_INVLD_END_A 0x028 > >>> > >>> +/* In latest Coda, MMU_INV_SEL's offset is changed to 0x02c. > >>> + * So we named offset = 0x02c to "REG_MMU_INV_SEL_GEN2" > >>> + * and offset = 0x038 to "REG_MMU_INV_SEL_GEN1". > >>> + */ > >> > >> Please delete the comment, this should be understandable from the git history > > > > ok, thanks > > > >> > >>> +#define REG_MMU_INV_SEL_GEN2 0x02c > >>> #define REG_MMU_INV_SEL_GEN1 0x038 > >>> #define F_INVLD_EN0 BIT(0) > >>> #define F_INVLD_EN1 BIT(1) > >>> @@ -98,7 +103,7 @@ > >>> #define F_MMU_INT_ID_LARB_ID(a) (((a) >> 7) & 0x7) > >>> #define F_MMU_INT_ID_PORT_ID(a) (((a) >> 2) & 0x1f) > >>> > >>> -#define MTK_PROTECT_PA_ALIGN 128 > >>> +#define MTK_PROTECT_PA_ALIGN 256 > >> > >> Do we need 512 bytes for all gen2 IOMMUs? > >> I'm not sure if we should add this in plat_data or if we should just bump up the > >> value for all SoCs. > >> In both cases this should be a separate patch. > >> > > From mt6779, MTK_PROTECT_PA_ALIGN is extend to 256 bytes and don't be > > changed for a long time from our HW designer comment. The legacy iommu > > also can use it, mabye it doesn't set it by platform. > > > > Ok then just bump it to 256 in a new patch. Thanks for clarification. Ok, thanks > > > >>> > >>> /* > >>> * Get the local arbiter ID and the portid within the larb arbiter > >>> @@ -543,11 +548,12 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > >>> return ret; > >>> } > >>> > >>> + regval = readl_relaxed(data->base + REG_MMU_CTRL_REG); > >>> if (data->plat_data->m4u_plat == M4U_MT8173) > >>> regval = F_MMU_PREFETCH_RT_REPLACE_MOD | > >>> F_MMU_TF_PROT_TO_PROGRAM_ADDR_MT8173; > >>> else > >>> - regval = F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >>> + regval |= F_MMU_TF_PROT_TO_PROGRAM_ADDR; > >> > >> Why do we change this, is it that the bootloader for mt6779 set some values in > >> the register we have to keep? In this case I think we should update the regval > >> accordingly. > > > > For REG_MMU_CTRL_REG, bit[12] represents victim_tlb_en feature and > > victim_tlb is enable defaultly(bit[12]=1),but if we use "regval = > > F_MMU_TF_PROT_TO_PROGRAM_ADDR", victim_tlb will disable, it will drop > > iommu performace for mt6779 > > > > Got it. Please put that in a separate patch then. > Ok, thanks > Regards, > Matthias > > > > >> > >>> writel_relaxed(regval, data->base + REG_MMU_CTRL_REG); > >>> > >>> regval = F_L2_MULIT_HIT_EN | > >>> @@ -797,6 +803,15 @@ static const struct mtk_iommu_plat_data mt2712_data = { > >>> .larbid_remap = {{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}}, > >>> }; > >>> > >>> +static const struct mtk_iommu_plat_data mt6779_data = { > >>> + .m4u_plat = M4U_MT6779, > >>> + .has_sub_comm = true, > >>> + .has_wr_len = true, > >>> + .has_misc_ctrl = true, > >>> + .inv_sel_reg = REG_MMU_INV_SEL_GEN2, > >>> + .larbid_remap = {{0}, {1}, {2}, {3}, {5}, {7, 8}, {10}, {9}}, > >>> +}; > >>> + > >>> static const struct mtk_iommu_plat_data mt8173_data = { > >>> .m4u_plat = M4U_MT8173, > >>> .has_4gb_mode = true, > >>> @@ -815,6 +830,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > >>> > >>> static const struct of_device_id mtk_iommu_of_ids[] = { > >>> { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > >>> + { .compatible = "mediatek,mt6779-m4u", .data = &mt6779_data}, > >>> { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > >>> { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > >>> {} > >>> diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > >>> index 9971cedd72ea..fb79e710c8d9 100644 > >>> --- a/drivers/iommu/mtk_iommu.h > >>> +++ b/drivers/iommu/mtk_iommu.h > >>> @@ -31,6 +31,7 @@ struct mtk_iommu_suspend_reg { > >>> enum mtk_iommu_plat { > >>> M4U_MT2701, > >>> M4U_MT2712, > >>> + M4U_MT6779, > >>> M4U_MT8173, > >>> M4U_MT8183, > >>> }; > >>> > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E30CC433E1 for ; Fri, 19 Jun 2020 10:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 053C6208B8 for ; Fri, 19 Jun 2020 10:51:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u41T8bgv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732367AbgFSKvB (ORCPT ); Fri, 19 Jun 2020 06:51:01 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:18235 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1732362AbgFSKu7 (ORCPT ); Fri, 19 Jun 2020 06:50:59 -0400 X-UUID: d4a0e3d3c90c4db28257144de8e7b092-20200619 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=gLyZez7zoj9lEggZKjZhObz4KPttckUsAiOpo+MoMv8=; b=u41T8bgvRxbYNhF5iQVVk9FXc6UvS0j/TVxf9jjgfTYUEvIpqYxdi9DtRJYFc4mruH/tkp3pffkU4VdX+ea5yNlDI85BUHBsrAU9SJLoKwbK46/wJVgOP27516TZimen906NIWrPxSePZCMT0lIr/b4ndjoABmnWnlSW7RXMzM4=; X-UUID: d4a0e3d3c90c4db28257144de8e7b092-20200619 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1334683904; Fri, 19 Jun 2020 18:50:53 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 19 Jun 2020 18:50:50 +0800 Received: from [10.15.20.246] (10.15.20.246) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 19 Jun 2020 18:50:49 +0800 Message-ID: <1592563824.5692.1.camel@mbjsdccf07> Subject: Re: [PATCH v4 7/7] iommu/mediatek: Add mt6779 basic support From: chao hao To: Matthias Brugger CC: Joerg Roedel , Rob Herring , , , , , , , Yong Wu , FY Yang , Chao Hao Date: Fri, 19 Jun 2020 18:50:24 +0800 In-Reply-To: <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> References: <20200617030029.4082-1-chao.hao@mediatek.com> <20200617030029.4082-8-chao.hao@mediatek.com> <64f63ccc-92a4-191c-3566-de00c9e04ca2@gmail.com> <1592481247.12647.9.camel@mbjsdccf07> <9618cc95-99ac-63d0-f502-335e38819842@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org T24gVGh1LCAyMDIwLTA2LTE4IGF0IDE4OjAwICswMjAwLCBNYXR0aGlhcyBCcnVnZ2VyIHdyb3Rl Og0KPiANCj4gT24gMTgvMDYvMjAyMCAxMzo1NCwgY2hhbyBoYW8gd3JvdGU6DQo+ID4gT24gV2Vk LCAyMDIwLTA2LTE3IGF0IDExOjMzICswMjAwLCBNYXR0aGlhcyBCcnVnZ2VyIHdyb3RlOg0KPiA+ Pg0KPiA+PiBPbiAxNy8wNi8yMDIwIDA1OjAwLCBDaGFvIEhhbyB3cm90ZToNCj4gPj4+IDEuIFN0 YXJ0IGZyb20gbXQ2Nzc5LCBJTlZMRFRfU0VMIG1vdmUgdG8gb2Zmc2V0PTB4MmMsIHNvIHdlIGFk ZA0KPiA+Pj4gICAgUkVHX01NVV9JTlZfU0VMX0dFTjIgZGVmaW5pdGlvbiBhbmQgbXQ2Nzc5IHVz ZXMgaXQuDQo+ID4+PiAyLiBDaGFuZ2UgUFJPVEVDVF9QQV9BTElHTiBmcm9tIDEyOCBieXRlIHRv IDI1NiBieXRlLg0KPiA+Pj4gMy4gRm9yIFJFR19NTVVfQ1RSTF9SRUcgcmVnaXN0ZXIsIHdlIG9u bHkgbmVlZCB0byBjaGFuZ2UgYml0WzI6MF0sDQo+ID4+PiAgICBvdGhlcnMgYml0cyBrZWVwIGRl ZmF1bHQgdmFsdWUsIGV4OiBlbmFibGUgdmljdGltIHRsYi4NCj4gPj4+IDQuIEFkZCBtdDY3Nzlf ZGF0YSB0byBzdXBwb3J0IG1tX2lvbW11IEhXIGluaXQuDQo+ID4+Pg0KPiA+Pj4gQ2hhbmdlIHNp bmNlIHYzOg0KPiA+Pj4gMS4gV2hlbiBzZXR0aW5nIE1NVV9DVFJMX1JFRywgd2UgZG9uJ3QgbmVl ZCB0byBpbmNsdWRlIG10ODE3My4NCj4gPj4+DQo+ID4+PiBDYzogWW9uZyBXdSA8eW9uZy53dUBt ZWRpYXRlay5jb20+DQo+ID4+PiBTaWduZWQtb2ZmLWJ5OiBDaGFvIEhhbyA8Y2hhby5oYW9AbWVk aWF0ZWsuY29tPg0KPiA+Pj4gLS0tDQo+ID4+PiAgZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuYyB8 IDIwICsrKysrKysrKysrKysrKysrKy0tDQo+ID4+PiAgZHJpdmVycy9pb21tdS9tdGtfaW9tbXUu aCB8ICAxICsNCj4gPj4+ICAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIgZGVs ZXRpb25zKC0pDQo+ID4+Pg0KPiA+Pj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvbXRrX2lv bW11LmMgYi9kcml2ZXJzL2lvbW11L210a19pb21tdS5jDQo+ID4+PiBpbmRleCBjNzA2YmNhNjQ4 N2UuLmRlZjJlOTk2NjgzZiAxMDA2NDQNCj4gPj4+IC0tLSBhL2RyaXZlcnMvaW9tbXUvbXRrX2lv bW11LmMNCj4gPj4+ICsrKyBiL2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmMNCj4gPj4+IEBAIC0z Nyw2ICszNywxMSBAQA0KPiA+Pj4gICNkZWZpbmUgUkVHX01NVV9JTlZMRF9TVEFSVF9BCQkJMHgw MjQNCj4gPj4+ICAjZGVmaW5lIFJFR19NTVVfSU5WTERfRU5EX0EJCQkweDAyOA0KPiA+Pj4gIA0K PiA+Pj4gKy8qIEluIGxhdGVzdCBDb2RhLCBNTVVfSU5WX1NFTCdzIG9mZnNldCBpcyBjaGFuZ2Vk IHRvIDB4MDJjLg0KPiA+Pj4gKyAqIFNvIHdlIG5hbWVkIG9mZnNldCA9IDB4MDJjIHRvICJSRUdf TU1VX0lOVl9TRUxfR0VOMiINCj4gPj4+ICsgKiBhbmQgb2Zmc2V0ID0gMHgwMzggdG8gIlJFR19N TVVfSU5WX1NFTF9HRU4xIi4NCj4gPj4+ICsgKi8NCj4gPj4NCj4gPj4gUGxlYXNlIGRlbGV0ZSB0 aGUgY29tbWVudCwgdGhpcyBzaG91bGQgYmUgdW5kZXJzdGFuZGFibGUgZnJvbSB0aGUgZ2l0IGhp c3RvcnkNCj4gPiANCj4gPiBvaywgdGhhbmtzDQo+ID4gDQo+ID4+DQo+ID4+PiArI2RlZmluZSBS RUdfTU1VX0lOVl9TRUxfR0VOMgkJCTB4MDJjDQo+ID4+PiAgI2RlZmluZSBSRUdfTU1VX0lOVl9T RUxfR0VOMQkJCTB4MDM4DQo+ID4+PiAgI2RlZmluZSBGX0lOVkxEX0VOMAkJCQlCSVQoMCkNCj4g Pj4+ICAjZGVmaW5lIEZfSU5WTERfRU4xCQkJCUJJVCgxKQ0KPiA+Pj4gQEAgLTk4LDcgKzEwMyw3 IEBADQo+ID4+PiAgI2RlZmluZSBGX01NVV9JTlRfSURfTEFSQl9JRChhKQkJCSgoKGEpID4+IDcp ICYgMHg3KQ0KPiA+Pj4gICNkZWZpbmUgRl9NTVVfSU5UX0lEX1BPUlRfSUQoYSkJCQkoKChhKSA+ PiAyKSAmIDB4MWYpDQo+ID4+PiAgDQo+ID4+PiAtI2RlZmluZSBNVEtfUFJPVEVDVF9QQV9BTElH TgkJCTEyOA0KPiA+Pj4gKyNkZWZpbmUgTVRLX1BST1RFQ1RfUEFfQUxJR04JCQkyNTYNCj4gPj4N Cj4gPj4gRG8gd2UgbmVlZCA1MTIgYnl0ZXMgZm9yIGFsbCBnZW4yIElPTU1Vcz8NCj4gPj4gSSdt IG5vdCBzdXJlIGlmIHdlIHNob3VsZCBhZGQgdGhpcyBpbiBwbGF0X2RhdGEgb3IgaWYgd2Ugc2hv dWxkIGp1c3QgYnVtcCB1cCB0aGUNCj4gPj4gdmFsdWUgZm9yIGFsbCBTb0NzLg0KPiA+PiBJbiBi b3RoIGNhc2VzIHRoaXMgc2hvdWxkIGJlIGEgc2VwYXJhdGUgcGF0Y2guDQo+ID4+DQo+ID4gRnJv bSBtdDY3NzksIE1US19QUk9URUNUX1BBX0FMSUdOIGlzIGV4dGVuZCB0byAyNTYgYnl0ZXMgYW5k IGRvbid0IGJlDQo+ID4gY2hhbmdlZCBmb3IgYSBsb25nIHRpbWUgZnJvbSBvdXIgSFcgZGVzaWdu ZXIgY29tbWVudC4gVGhlIGxlZ2FjeSBpb21tdQ0KPiA+IGFsc28gY2FuIHVzZSBpdCwgbWFieWUg aXQgZG9lc24ndCBzZXQgaXQgYnkgcGxhdGZvcm0uDQo+ID4gDQo+IA0KPiBPayB0aGVuIGp1c3Qg YnVtcCBpdCB0byAyNTYgaW4gYSBuZXcgcGF0Y2guIFRoYW5rcyBmb3IgY2xhcmlmaWNhdGlvbi4N Cg0KICBPaywgdGhhbmtzDQoNCj4gPiANCj4gPj4+ICANCj4gPj4+ICAvKg0KPiA+Pj4gICAqIEdl dCB0aGUgbG9jYWwgYXJiaXRlciBJRCBhbmQgdGhlIHBvcnRpZCB3aXRoaW4gdGhlIGxhcmIgYXJi aXRlcg0KPiA+Pj4gQEAgLTU0MywxMSArNTQ4LDEyIEBAIHN0YXRpYyBpbnQgbXRrX2lvbW11X2h3 X2luaXQoY29uc3Qgc3RydWN0IG10a19pb21tdV9kYXRhICpkYXRhKQ0KPiA+Pj4gIAkJcmV0dXJu IHJldDsNCj4gPj4+ICAJfQ0KPiA+Pj4gIA0KPiA+Pj4gKwlyZWd2YWwgPSByZWFkbF9yZWxheGVk KGRhdGEtPmJhc2UgKyBSRUdfTU1VX0NUUkxfUkVHKTsNCj4gPj4+ICAJaWYgKGRhdGEtPnBsYXRf ZGF0YS0+bTR1X3BsYXQgPT0gTTRVX01UODE3MykNCj4gPj4+ICAJCXJlZ3ZhbCA9IEZfTU1VX1BS RUZFVENIX1JUX1JFUExBQ0VfTU9EIHwNCj4gPj4+ICAJCQkgRl9NTVVfVEZfUFJPVF9UT19QUk9H UkFNX0FERFJfTVQ4MTczOw0KPiA+Pj4gIAllbHNlDQo+ID4+PiAtCQlyZWd2YWwgPSBGX01NVV9U Rl9QUk9UX1RPX1BST0dSQU1fQUREUjsNCj4gPj4+ICsJCXJlZ3ZhbCB8PSBGX01NVV9URl9QUk9U X1RPX1BST0dSQU1fQUREUjsNCj4gPj4NCj4gPj4gV2h5IGRvIHdlIGNoYW5nZSB0aGlzLCBpcyBp dCB0aGF0IHRoZSBib290bG9hZGVyIGZvciBtdDY3Nzkgc2V0IHNvbWUgdmFsdWVzIGluDQo+ID4+ IHRoZSByZWdpc3RlciB3ZSBoYXZlIHRvIGtlZXA/IEluIHRoaXMgY2FzZSBJIHRoaW5rIHdlIHNo b3VsZCB1cGRhdGUgdGhlIHJlZ3ZhbA0KPiA+PiBhY2NvcmRpbmdseS4NCj4gPiANCj4gPiBGb3Ig UkVHX01NVV9DVFJMX1JFRywgYml0WzEyXSByZXByZXNlbnRzIHZpY3RpbV90bGJfZW4gZmVhdHVy ZSBhbmQNCj4gPiB2aWN0aW1fdGxiIGlzIGVuYWJsZSBkZWZhdWx0bHkoYml0WzEyXT0xKSxidXQg aWYgd2UgdXNlICJyZWd2YWwgPQ0KPiA+IEZfTU1VX1RGX1BST1RfVE9fUFJPR1JBTV9BRERSIiwg dmljdGltX3RsYiB3aWxsIGRpc2FibGUsIGl0IHdpbGwgZHJvcA0KPiA+IGlvbW11IHBlcmZvcm1h Y2UgZm9yIG10Njc3OQ0KPiA+IA0KPiANCj4gR290IGl0LiBQbGVhc2UgcHV0IHRoYXQgaW4gYSBz ZXBhcmF0ZSBwYXRjaCB0aGVuLg0KPiANCiAgT2ssIHRoYW5rcw0KDQo+IFJlZ2FyZHMsDQo+IE1h dHRoaWFzDQo+IA0KPiA+IA0KPiA+Pg0KPiA+Pj4gIAl3cml0ZWxfcmVsYXhlZChyZWd2YWwsIGRh dGEtPmJhc2UgKyBSRUdfTU1VX0NUUkxfUkVHKTsNCj4gPj4+ICANCj4gPj4+ICAJcmVndmFsID0g Rl9MMl9NVUxJVF9ISVRfRU4gfA0KPiA+Pj4gQEAgLTc5Nyw2ICs4MDMsMTUgQEAgc3RhdGljIGNv bnN0IHN0cnVjdCBtdGtfaW9tbXVfcGxhdF9kYXRhIG10MjcxMl9kYXRhID0gew0KPiA+Pj4gIAku bGFyYmlkX3JlbWFwICAgPSB7ezB9LCB7MX0sIHsyfSwgezN9LCB7NH0sIHs1fSwgezZ9LCB7N319 LA0KPiA+Pj4gIH07DQo+ID4+PiAgDQo+ID4+PiArc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfaW9t bXVfcGxhdF9kYXRhIG10Njc3OV9kYXRhID0gew0KPiA+Pj4gKwkubTR1X3BsYXQgICAgICA9IE00 VV9NVDY3NzksDQo+ID4+PiArCS5oYXNfc3ViX2NvbW0gID0gdHJ1ZSwNCj4gPj4+ICsJLmhhc193 cl9sZW4gICAgPSB0cnVlLA0KPiA+Pj4gKwkuaGFzX21pc2NfY3RybCA9IHRydWUsDQo+ID4+PiAr CS5pbnZfc2VsX3JlZyAgID0gUkVHX01NVV9JTlZfU0VMX0dFTjIsDQo+ID4+PiArCS5sYXJiaWRf cmVtYXAgID0ge3swfSwgezF9LCB7Mn0sIHszfSwgezV9LCB7NywgOH0sIHsxMH0sIHs5fX0sDQo+ ID4+PiArfTsNCj4gPj4+ICsNCj4gPj4+ICBzdGF0aWMgY29uc3Qgc3RydWN0IG10a19pb21tdV9w bGF0X2RhdGEgbXQ4MTczX2RhdGEgPSB7DQo+ID4+PiAgCS5tNHVfcGxhdCAgICAgPSBNNFVfTVQ4 MTczLA0KPiA+Pj4gIAkuaGFzXzRnYl9tb2RlID0gdHJ1ZSwNCj4gPj4+IEBAIC04MTUsNiArODMw LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfaW9tbXVfcGxhdF9kYXRhIG10ODE4M19kYXRh ID0gew0KPiA+Pj4gIA0KPiA+Pj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG10 a19pb21tdV9vZl9pZHNbXSA9IHsNCj4gPj4+ICAJeyAuY29tcGF0aWJsZSA9ICJtZWRpYXRlayxt dDI3MTItbTR1IiwgLmRhdGEgPSAmbXQyNzEyX2RhdGF9LA0KPiA+Pj4gKwl7IC5jb21wYXRpYmxl ID0gIm1lZGlhdGVrLG10Njc3OS1tNHUiLCAuZGF0YSA9ICZtdDY3NzlfZGF0YX0sDQo+ID4+PiAg CXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4MTczLW00dSIsIC5kYXRhID0gJm10ODE3M19k YXRhfSwNCj4gPj4+ICAJeyAuY29tcGF0aWJsZSA9ICJtZWRpYXRlayxtdDgxODMtbTR1IiwgLmRh dGEgPSAmbXQ4MTgzX2RhdGF9LA0KPiA+Pj4gIAl7fQ0KPiA+Pj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvaW9tbXUvbXRrX2lvbW11LmggYi9kcml2ZXJzL2lvbW11L210a19pb21tdS5oDQo+ID4+PiBp bmRleCA5OTcxY2VkZDcyZWEuLmZiNzllNzEwYzhkOSAxMDA2NDQNCj4gPj4+IC0tLSBhL2RyaXZl cnMvaW9tbXUvbXRrX2lvbW11LmgNCj4gPj4+ICsrKyBiL2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11 LmgNCj4gPj4+IEBAIC0zMSw2ICszMSw3IEBAIHN0cnVjdCBtdGtfaW9tbXVfc3VzcGVuZF9yZWcg ew0KPiA+Pj4gIGVudW0gbXRrX2lvbW11X3BsYXQgew0KPiA+Pj4gIAlNNFVfTVQyNzAxLA0KPiA+ Pj4gIAlNNFVfTVQyNzEyLA0KPiA+Pj4gKwlNNFVfTVQ2Nzc5LA0KPiA+Pj4gIAlNNFVfTVQ4MTcz LA0KPiA+Pj4gIAlNNFVfTVQ4MTgzLA0KPiA+Pj4gIH07DQo+ID4+Pg0KPiA+IA0KDQo=