From nobody Wed May 1 22:29:37 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1617358055; cv=none; d=zohomail.com; s=zohoarc; b=Cje5de094anl3V+5BhjKoFqzl1p3jWoPNaAYTyN9y6Sm6CIKL5FP+0gtks3vhzEcWCiJ4HltNTs7A2ZuFcxlB8oUBYp2w01XdTzMZProC/LYIzqPWzeRfrimwZpc44wznVQfrZ2lqpbrqyo8iSNbEPZ5St7ttL1KKiEm0sqG2io= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617358055; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8bNvV5ohHuOEJMXQHmTAuS7JTmdOnOrzQWQYUQGg6+M=; b=TrO4Cakeh5424h43TLZl8GkxcdKNybj8HYR64TWI+HaWNTu9myBZNfoG5Cz307pvBaPcTp6yTa6L/VP5nSKGTrv5IG/yz9pyp/l1wRF7DK9AIR8URHmhsqosOP1kUcakqmC2KtGQb7aOMaL93L5bs2up1m0BuMQoV0YpNfWKabo= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617358055630991.061740643782; Fri, 2 Apr 2021 03:07:35 -0700 (PDT) Received: from localhost ([::1]:45532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lSGiD-0001Mj-V2 for importer@patchew.org; Fri, 02 Apr 2021 06:07:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSGgK-0000Fg-Lh; Fri, 02 Apr 2021 06:05:37 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:4105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lSGg8-0004hq-U2; Fri, 02 Apr 2021 06:05:34 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4FBbGH3PHZz9vwQ; Fri, 2 Apr 2021 18:03:03 +0800 (CST) Received: from DESKTOP-8RFUVS3.china.huawei.com (10.174.185.179) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Fri, 2 Apr 2021 18:05:03 +0800 From: Zenghui Yu To: , , , Subject: [PATCH] hw/arm/smmuv3: Emulate CFGI_STE_RANGE for an aligned range of StreamIDs Date: Fri, 2 Apr 2021 18:04:49 +0800 Message-ID: <20210402100449.528-1-yuzenghui@huawei.com> X-Mailer: git-send-email 2.23.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.174.185.179] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=yuzenghui@huawei.com; helo=szxga07-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zenghui Yu , wanghaibin.wang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In emulation of the CFGI_STE_RANGE command, we now take StreamID as the start of the invalidation range, regardless of whatever the Range is, whilst the spec clearly states that - "Invalidation is performed for an *aligned* range of 2^(Range+1) StreamIDs." - "The bottom Range+1 bits of the StreamID parameter are IGNORED, aligning the range to its size." Take CFGI_ALL (where Range =3D=3D 31) as an example, if there are some rand= om bits in the StreamID field, we'll fail to perform the full invalidation but get a strange range (e.g., SMMUSIDRange=3D{.start=3D1, .end=3D0}) instead. = Rework the emulation a bit to get rid of the discrepancy with the spec. Signed-off-by: Zenghui Yu Acked-by: Eric Auger --- hw/arm/smmuv3.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 3b87324ce2..8705612535 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -980,16 +980,20 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) } case SMMU_CMD_CFGI_STE_RANGE: /* same as SMMU_CMD_CFGI_ALL */ { - uint32_t start =3D CMD_SID(&cmd); + uint32_t sid =3D CMD_SID(&cmd), mask; uint8_t range =3D CMD_STE_RANGE(&cmd); - uint64_t end =3D start + (1ULL << (range + 1)) - 1; - SMMUSIDRange sid_range =3D {start, end}; + SMMUSIDRange sid_range; =20 if (CMD_SSEC(&cmd)) { cmd_error =3D SMMU_CERROR_ILL; break; } - trace_smmuv3_cmdq_cfgi_ste_range(start, end); + + mask =3D (1ULL << (range + 1)) - 1; + sid_range.start =3D sid & ~mask; + sid_range.end =3D sid_range.start + mask; + + trace_smmuv3_cmdq_cfgi_ste_range(sid_range.start, sid_range.en= d); g_hash_table_foreach_remove(bs->configs, smmuv3_invalidate_ste, &sid_range); break; --=20 2.19.1