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 C64FFC001DF for ; Mon, 31 Jul 2023 06:28:42 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SP5lqyyZ4GrYGZTBD1kmI1F7SeSyCJFUyJh2NSFKhus=; b=qK2X1J5S210ytB FcUyWaKKzDYzwE4C+2trHMETV9FA5JRN47bQ4tOrSq3n8z6IdvkhCcnxhLTCNWDoHNrAvr5Hu0qeT NvSEqoNhh+kb7NJdsQj/xtap3PsX6kwda8icWoIrRl31eAIW7p0Xqq0qmUZWH7Dns3pD+4i08d6hf 7IVsDlmJ9YdqFL56x89BAQjb18OpblJoswzHxvJx37IgvdS95Zg5ynXQPd9Kdt63ph6fSzrySSYNH RUKg2lPnrflbRnyCL3ZawE8f39DqMaUXe4cAvSFc2A/ZVQwvIzCgxvaKPWOwro9zfcZlGZMVEab5x kmODDmv/xoZQRJS0AY8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qQMOD-00E7mY-08; Mon, 31 Jul 2023 06:28:21 +0000 Received: from szxga02-in.huawei.com ([45.249.212.188]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qQMO9-00E7lh-26 for linux-arm-kernel@lists.infradead.org; Mon, 31 Jul 2023 06:28:19 +0000 Received: from dggpemm500003.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RDp9w0QbxzNmbs; Mon, 31 Jul 2023 14:24:36 +0800 (CST) Received: from localhost.localdomain (10.28.77.120) by dggpemm500003.china.huawei.com (7.185.36.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 31 Jul 2023 14:28:00 +0800 From: wangwudi To: , , CC: Rui Zhu , Will Deacon , Robin Murphy , Joerg Roedel , Lu Baolu , Jason Gunthorpe , Yicong Yang , Tomas Krcka , Jean-Philippe Brucker , Nicolin Chen Subject: [PATCH 1/1] Revert "iommu/arm-smmu-v3: Set TTL invalidation hint better" Date: Mon, 31 Jul 2023 14:21:22 +0800 Message-ID: <1690784482-30028-1-git-send-email-wangwudi@hisilicon.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.28.77.120] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500003.china.huawei.com (7.185.36.56) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230730_232817_903109_A44570D4 X-CRM114-Status: GOOD ( 12.39 ) 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Rui Zhu This reverts commit 6833b8f2e19945a41e4d5efd8c6d9f4cae9a5b7d. This constraint violates the protocol. When tg is not 0 but ttl, scale, and num are 0, the hardware reports the CERROR_IL gerror. In the protocol, leaf is not a prerequisite for TTL. Cc: Will Deacon Cc: Robin Murphy Cc: Joerg Roedel Cc: Lu Baolu Cc: Jason Gunthorpe Cc: Yicong Yang Cc: Tomas Krcka Cc: Jean-Philippe Brucker Cc: Nicolin Chen Cc: Rui Zhu Signed-off-by: Rui Zhu --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9b0dc3505601..098e84cfa82f 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1898,13 +1898,8 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, /* Convert page size of 12,14,16 (log2) to 1,2,3 */ cmd->tlbi.tg = (tg - 10) / 2; - /* - * Determine what level the granule is at. For non-leaf, io-pgtable - * assumes .tlb_flush_walk can invalidate multiple levels at once, - * so ignore the nominal last-level granule and leave TTL=0. - */ - if (cmd->tlbi.leaf) - cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); + /* Determine what level the granule is at */ + cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); num_pages = size >> tg; } -- 1.8.3.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel