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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id ED273EE14D4 for ; Thu, 7 Sep 2023 08:22:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rqFs2jf15/aYBEs2rSBM0AROu4V4b9NCpFy3Ovg2QJM=; b=vb5eQLs8Yk06Vy dbV+UB4nbD1QnqI4vKXUJg5WHy6TPvgYGwdnGihjjTh91B3ZuB2x3a8jgmD1csDNAUobOzPv6QdIV OmQf6cKGM9hk+D/1/NbLCGVDoHIZGae7UkGvIww5ojDGYf8pMMRFEeQNLUq4cycyHf40XE7+4ZNS6 Ql/6IzJsslDYuDVU74FW7cDghduazCJOBDPldSJb4Oa6pzBavhN4Q19VGfvO2eTwtvHuRDFHsrIPj Q6dHm3MwdEg8UGnrdEzQydDXaIP2sjn1IQZ6jEs+OgpiFv5R5Fx4Y1Bskd3k6b8tZaj9k+WBYb4Y6 1aHgFfRdH1ZUMBtbesDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qeAHO-00Ba4T-0Q; Thu, 07 Sep 2023 08:22:22 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qeAHJ-00Ba2X-1P; Thu, 07 Sep 2023 08:22:19 +0000 Received: from [192.168.1.100] (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 95C2566072BE; Thu, 7 Sep 2023 09:22:13 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694074934; bh=0QQVv6jlMc3BXhzBHqUu8xLqyScvz33I/+GvzdQguMU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=g4NZCvLeUZCbl/IEdNcZBmNQtxVQUqWVm3hFjqIfmd1kifIQvSsgonlPl8Mu8TQyX 3J2qi/yywlOtky+59zLO+SDWIWtxSrgC1TdHZxoGkz0F0v7ApBYtE+p6tmp9V/TAte nt3AmylDPwnKOh3YGg+yy+8wBLdMgTFvPxFb45EuV1zF+Ody5zNbBCCEFs2dePBbO/ 0fsInLcpoybezFl/JlTlaaO7PQCfXNvj/P34sXSLIajcRJoPTmMo/jm88fGsDhxmM2 +d5HQ7CbZQV8b/vKC6W8L4HQcqWv85IJKEYp4LkWcR52h89R0uDVgfNW/w4w3JxqE7 LA18ulLzj6Fyw== Message-ID: <21e6631e-a99c-0b09-feb4-23407465ea55@collabora.com> Date: Thu, 7 Sep 2023 10:22:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: [PATCH] iommu/mediatek: Fix share pgtable for iova over 4GB To: Yong Wu , Joerg Roedel , Will Deacon , Matthias Brugger Cc: Robin Murphy , iommu@lists.linux.dev, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Laura Nao References: <20230819081443.8333-1-yong.wu@mediatek.com> Content-Language: en-US From: AngeloGioacchino Del Regno In-Reply-To: <20230819081443.8333-1-yong.wu@mediatek.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230907_012217_638570_93EFBF64 X-CRM114-Status: GOOD ( 20.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Il 19/08/23 10:14, Yong Wu ha scritto: > In mt8192/mt8186, there is only one MM IOMMU that supports 16GB iova > space, which is shared by display, vcodec and camera. These two SoC use > one pgtable and have not the flag SHARE_PGTABLE, we should also keep > share pgtable for this case. > > In mtk_iommu_domain_finalise, MM IOMMU always share pgtable, thus remove > the flag SHARE_PGTABLE checking. Infra IOMMU always uses independent > pgtable. > > Fixes: cf69ef46dbd9 ("iommu/mediatek: Fix two IOMMU share pagetable issue") > Reported-by: Laura Nao > Closes: https://lore.kernel.org/linux-iommu/20230818154156.314742-1-laura.nao@collabora.com/ > Signed-off-by: Yong Wu Reviewed-by: AngeloGioacchino Del Regno This is urgent. Fixes multiple machines. > --- > Base on next-20230818. > --- > drivers/iommu/mtk_iommu.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index b17d3e7288a7..b5fcba305d2a 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -262,7 +262,7 @@ struct mtk_iommu_data { > struct device *smicomm_dev; > > struct mtk_iommu_bank_data *bank; > - struct mtk_iommu_domain *share_dom; /* For 2 HWs share pgtable */ > + struct mtk_iommu_domain *share_dom; > > struct regmap *pericfg; > struct mutex mutex; /* Protect m4u_group/m4u_dom above */ > @@ -643,8 +643,8 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, > struct mtk_iommu_domain *share_dom = data->share_dom; > const struct mtk_iommu_iova_region *region; > > - /* Always use share domain in sharing pgtable case */ > - if (MTK_IOMMU_HAS_FLAG(data->plat_data, SHARE_PGTABLE) && share_dom) { > + /* Share pgtable when 2 MM IOMMU share the pgtable or one IOMMU use multiple iova ranges */ > + if (share_dom) { > dom->iop = share_dom->iop; > dom->cfg = share_dom->cfg; > dom->domain.pgsize_bitmap = share_dom->cfg.pgsize_bitmap; > @@ -677,8 +677,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, > /* Update our support page sizes bitmap */ > dom->domain.pgsize_bitmap = dom->cfg.pgsize_bitmap; > > - if (MTK_IOMMU_HAS_FLAG(data->plat_data, SHARE_PGTABLE)) > - data->share_dom = dom; > + data->share_dom = dom; > > update_iova_region: > /* Update the iova region for this domain */ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel