From patchwork Thu Oct 26 15:18:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Chou X-Patchwork-Id: 1855853 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=Jo2bdQcY; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SGV0H70Dzz23jr for ; Fri, 27 Oct 2023 02:22:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qw29s-0006kB-67; Thu, 26 Oct 2023 11:20:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qw29r-0006iS-Ey for qemu-devel@nongnu.org; Thu, 26 Oct 2023 11:20:27 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qw29p-0006IV-EB for qemu-devel@nongnu.org; Thu, 26 Oct 2023 11:20:27 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-27e1eea2f0dso800087a91.1 for ; Thu, 26 Oct 2023 08:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1698333623; x=1698938423; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lAUDHg5SvFHq8f6WzNLKNQdJ5ooAkR6tXZ2miRiTziU=; b=Jo2bdQcYWJwLWsgbPtgmZInTtgWWCW+QPeD6ICePN51jZ3cHsplIoDqudLGQlhsTV0 tk9gXc8zREyKJYKGxHZvL59C6pNwvPn6I/6/nynEYXKidiiEwMYLhxGgjbLeuiwp6q8K X6m3zFZgr7Szv9qoO2BTEzJDtE1b5klDbq8iuCwKodQB78D08izcKSy/uZm/b9hRiwhC wTiYnyK+RSoweQojoBhOY7PJKNYwvDG7GnU0m0ajMmT6BeTOqTpCuq/IVfIv9o47RGJo s/hGaQQLsvTmz4q3tLts2OHTiGMqabpTsu2Eobgpz4X2iuyQGVNcj7Ui467LsQhLLdCR cawQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698333623; x=1698938423; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lAUDHg5SvFHq8f6WzNLKNQdJ5ooAkR6tXZ2miRiTziU=; b=iPb6sNIAUojdVuyrUn2L8AALlh8LiyQCIzxfa/Uvxixq5PdDQZ0t/k4reD7w98/byB dHTZUF8gICLSuHznVZBztSf2FHQ7R3XTAnBB7gkPkOFqgFLQqLRgsGPhmiuIIenzd/iX gB9Cy0+ebR3heIJ/Wl9wIe31SN791OU1eT1w+FdTz9Z+etXU0kDTsHEFQrhg2msWm/2j LXkn8hADPgFSmbEvnOawWSQ+MPr1zsn0NWL7yUXzuoacA2PQlhu2aNN/HApKKsBYGhOx t3EXnCfcQiS1evCmYy/YWMXDg7OIQgevb5pphnyKrkm/o5US5E7mSn4BM4Vs16F73Mnw WjoA== X-Gm-Message-State: AOJu0YxsfokRZPaRXzP3Id2Nza68R3v/h7EpNC/zBNDtVTAtOE4DVXfZ 0+I77wNRjGqp0QJXn2gnH8xm4bTM1P+XjYJn5Mq05w2nBm2Tc8OAF6tQQ57JiiaQn1qlKB+0sbj vaYCuxJIfXAFlvfJeccAEAurA/Ll+Zw09yeCla4q8ClwDoZfydMo7gFbz+QAZbtvtzXdp1P7pxf kl X-Google-Smtp-Source: AGHT+IFJeP8lzwUg2cYbxY8BScLPjbXfHXAZMLWr21z6bmlpJBEjrUUKgGOYMnPtuck/xLmuW1osrA== X-Received: by 2002:a17:90a:94cc:b0:27d:af4:c8b with SMTP id j12-20020a17090a94cc00b0027d0af40c8bmr15795377pjw.36.1698333623196; Thu, 26 Oct 2023 08:20:23 -0700 (PDT) Received: from duncan.localdomain (125-228-20-175.hinet-ip.hinet.net. [125.228.20.175]) by smtp.gmail.com with ESMTPSA id nv18-20020a17090b1b5200b0027fee011cebsm1326061pjb.10.2023.10.26.08.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 08:20:23 -0700 (PDT) From: Max Chou To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: Max Chou , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , Andrew Jones Subject: [PATCH v2 03/14] target/riscv: Add cfg property for Zvkb extension Date: Thu, 26 Oct 2023 23:18:10 +0800 Message-Id: <20231026151828.754279-4-max.chou@sifive.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026151828.754279-1-max.chou@sifive.com> References: <20231026151828.754279-1-max.chou@sifive.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=max.chou@sifive.com; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org After vector crypto spec v1.0.0-rc3 release, the Zvkb extension is defined as a proper subset of the Zvbb extension. And both the Zvkn and Zvks shorthand extensions replace the included Zvbb extension by Zvkb extnesion. Signed-off-by: Max Chou Reviewed-by: Daniel Henrique Barboza Acked-by: Alistair Francis --- target/riscv/cpu_cfg.h | 1 + target/riscv/tcg/tcg-cpu.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h index d8d17dedeed..935335e5721 100644 --- a/target/riscv/cpu_cfg.h +++ b/target/riscv/cpu_cfg.h @@ -88,6 +88,7 @@ struct RISCVCPUConfig { bool ext_zve64d; bool ext_zvbb; bool ext_zvbc; + bool ext_zvkb; bool ext_zvkg; bool ext_zvkned; bool ext_zvknha; diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index b9eaecb699c..1b08f27eee4 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -508,9 +508,9 @@ void riscv_cpu_validate_set_extensions(RISCVCPU *cpu, Error **errp) * In principle Zve*x would also suffice here, were they supported * in qemu */ - if ((cpu->cfg.ext_zvbb || cpu->cfg.ext_zvkg || cpu->cfg.ext_zvkned || - cpu->cfg.ext_zvknha || cpu->cfg.ext_zvksed || cpu->cfg.ext_zvksh) && - !cpu->cfg.ext_zve32f) { + if ((cpu->cfg.ext_zvbb || cpu->cfg.ext_zvkb || cpu->cfg.ext_zvkg || + cpu->cfg.ext_zvkned || cpu->cfg.ext_zvknha || cpu->cfg.ext_zvksed || + cpu->cfg.ext_zvksh) && !cpu->cfg.ext_zve32f) { error_setg(errp, "Vector crypto extensions require V or Zve* extensions"); return;