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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 5E64BC433B4 for ; Wed, 19 May 2021 09:46:46 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 28A3D610A8 for ; Wed, 19 May 2021 09:46:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28A3D610A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=LZ5KJHVHruRO/5PGPW6xTz+bfZXQHHStTxUfQBCTF98=; b=SdUn+WAbyOG/MUxppO/PwK1fQ lJol59r8IBHTdARFg7KZ/FFXwu1yJ4K/BdEPnfsH9veAXxw5wBCXBrp0KpHxHluj9wh8n595cr4Lf DzPdUidN5vftVGosOGuEutRJhxm/PNGqEgPgup2cCwWD4Wp4CDaxUcI5jP/IWLv/oE6R3ZTP/Pesh capiLVGmyeVlt7Pf1DWv8zEIBCcFl0fbOC4J0/fpFTHveNtV24jMx8XHQnUwcRbNRztt/ILrMtuTQ faI7pk7iIb3jymuvV1jB/KEuvKwwGmTGDQuNEo4XGfzUiC8z+i49y/U8W5Zo7HlT0lLmUpD+CcPWf ZFnP9Xd/Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljIkl-003TmS-Ok; Wed, 19 May 2021 09:44:36 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljIke-003TlP-Tm for linux-arm-kernel@desiato.infradead.org; Wed, 19 May 2021 09:44:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Sender:Reply-To:Content-ID:Content-Description; bh=wnlzya3ui+lqz77AcBOjinV91UUjGxTOrd/NQG4xs0A=; b=1H+U4Qj0VoBAGBZe8uhB5+S+3a lbSjOkhriNYtW4BaZWu2SsAlZD3pQYVlsod5p4uLSJmIWp+tirAVJ3BWuZdy0F9U7qELGKp9zgwZe Lk427JAzhSho7e+edcXNyuLO0kPgBnuPg8SGxe+o2tvKxf59CmdADIuktn4CyovB1t2y3V1cFhPdD AjLKZ7P+FZD4Jbdfvutb7EX1ZZuxMOeKITlo3d4+hOPoTB2OQltka7PKhFC1jQM9z48EKd4Zisg6/ 0K9GnVG1NnpV1bwwnYrU7lzBJQLI1EqpSAKgk/pWfDsNxhRe7HIeMh7Hdyt6c+tvunIG7OdpMDIfQ U/brxFuA==; Received: from szxga04-in.huawei.com ([45.249.212.190]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1ljIkc-00FKHv-5q for linux-arm-kernel@lists.infradead.org; Wed, 19 May 2021 09:44:27 +0000 Received: from dggems705-chm.china.huawei.com (unknown [172.30.72.60]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FlSYs1SQnz1BP0l; Wed, 19 May 2021 17:41:37 +0800 (CST) Received: from dggema765-chm.china.huawei.com (10.1.198.207) by dggems705-chm.china.huawei.com (10.3.19.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Wed, 19 May 2021 17:44:23 +0800 Received: from DESKTOP-6NKE0BC.china.huawei.com (10.174.185.210) by dggema765-chm.china.huawei.com (10.1.198.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Wed, 19 May 2021 17:44:22 +0800 From: Kunkun Jiang To: Will Deacon , Robin Murphy , "Eric Auger" , "moderated list:ARM SMMU DRIVERS" , "open list:IOMMU DRIVERS" , open list CC: , Keqian Zhu , "Zenghui Yu" , Kunkun Jiang Subject: [RFC PATCH v1 2/2] iommu/arm-smmu-v3: Standardize granule size when support RIL Date: Wed, 19 May 2021 17:43:07 +0800 Message-ID: <20210519094307.3275-3-jiangkunkun@huawei.com> X-Mailer: git-send-email 2.26.2.windows.1 In-Reply-To: <20210519094307.3275-1-jiangkunkun@huawei.com> References: <20210519094307.3275-1-jiangkunkun@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.185.210] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggema765-chm.china.huawei.com (10.1.198.207) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210519_024426_402273_B5568863 X-CRM114-Status: GOOD ( 11.69 ) 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 In __arm_smmu_tlb_inv_range(), the field 'ttl' of TLB invalidation command is caculated based on granule size when the SMMU supports RIL. There are some scenarious we need to avoid, which are pointed out in the SMMUv3 spec(page 143-144, Version D.a). Adding a check to ensure that the granule size is supported by the SMMU before set the 'ttl' value. Reported-by: Nianyao Tang Signed-off-by: Kunkun Jiang --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 5 +++++ 1 file changed, 5 insertions(+) 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 8a2cacbb1ef8..77ff283ca329 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1711,6 +1711,11 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, cmd->tlbi.tg = (tg - 10) / 2; /* Determine what level the granule is at */ + if (!(granule & smmu_domain->domain.pgsize_bitmap) || + (granule & (granule - 1))) { + granule = leaf_pgsize; + iova = ALIGN_DOWN(iova, leaf_pgsize); + } cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); /* Align size with the leaf page size upwards */ -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel