From patchwork Tue Sep 12 13:24:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 1833011 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=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=kT5yyXRw; 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 4RlPXH3lDmz1yh0 for ; Tue, 12 Sep 2023 23:27:43 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qg3OB-0002pF-NK; Tue, 12 Sep 2023 09:25:11 -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 1qg3Nx-0002fV-HN for qemu-devel@nongnu.org; Tue, 12 Sep 2023 09:25:00 -0400 Received: from mail-ot1-x32c.google.com ([2607:f8b0:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qg3Ns-0003YO-Pg for qemu-devel@nongnu.org; Tue, 12 Sep 2023 09:24:54 -0400 Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6bdacc5ed66so2973548a34.1 for ; Tue, 12 Sep 2023 06:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1694525091; x=1695129891; 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=PEnrPGnN8UgdKRZchTMIfrKsvseI97NnNCUUb/fgNms=; b=kT5yyXRw3O+jCANVxE8bpkF4IIddQikPL8PGQZaStXGBp+nlVxUQxMUsjWjM2QGfxJ eykbNNGV8J7rFm7pSX4gGZCzNImGPSeRQ+zzLFSkLNOeuFQ2EjPhizazDQLPNadHFexD 1hrAElwIzwyuG4zjnsXaUM7j9S5UTE3mD6/M61mahs3YChugnHQSUTLhYU8VDNevuYVg G6+X5OgHFwaAtqp9vYAoC3DZReaE/axwOiqBe0Jc4FRh+QvtNDJ0CsDl1/avgCfa8IAt duQEBkwb85CUP1pWFrMH9MLYB4Xvr0vef2dLuOVcRx2OhgoIn7++IeW+BBMkfT/lXn0e nQ7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694525091; x=1695129891; 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=PEnrPGnN8UgdKRZchTMIfrKsvseI97NnNCUUb/fgNms=; b=LJSzAojM8/h5aGQK0uCoQHHY7WqHswuRyoFpQHiybOypBHJItlkOlQMMNyqUROeg76 d8IjcPelSPvLH84yTMLTSmU+eVomA/prpr5Euga5fCgNlDuWMSv41BsSYWgRCBW5IhWR 0gJX+RhQu1WuUogNrAkvEDJbStr6cG+DSy3EcMgDJr1Gg7tgLotHUw6S7Cnz/yjIattT fBU+FBrx/JKXdCqH6mjxbEooHJKeWhMYbihzFmB65peHe8QM9DSZ0aVDR8zCuidamVru Iduws1RrdllpLpPB57aI+6UhtmBFiPcLjDkBVSBHuCY3sSMv87SwhBKW90yLxi4cOE22 7sGQ== X-Gm-Message-State: AOJu0Yz13C/rECqtE2tHSe5Z9jWWBty4SBdloON4mXG96mr8Ai6+Wfwk nbRTqQjFZI6ct5B2a5Qh+AF46C89mF4+D8ehAbs= X-Google-Smtp-Source: AGHT+IEOuOHUijHxMTiwgaTlUIIunTqeFOUKQU6g/1rWTeJZd/V5pJ+63gUbmGZXUuwU6DCpBO1HMQ== X-Received: by 2002:a05:6830:270b:b0:6bc:aec3:6eb1 with SMTP id j11-20020a056830270b00b006bcaec36eb1mr1722707otu.1.1694525091460; Tue, 12 Sep 2023 06:24:51 -0700 (PDT) Received: from grind.. ([177.9.182.82]) by smtp.gmail.com with ESMTPSA id p15-20020a0568301d4f00b006af9d8af435sm3991255oth.50.2023.09.12.06.24.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 06:24:50 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, philmd@linaro.org, Daniel Henrique Barboza Subject: [PATCH v10 06/20] target/riscv/cpu.c: split vendor exts from riscv_cpu_extensions[] Date: Tue, 12 Sep 2023 10:24:09 -0300 Message-ID: <20230912132423.268494-7-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912132423.268494-1-dbarboza@ventanamicro.com> References: <20230912132423.268494-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::32c; envelope-from=dbarboza@ventanamicro.com; helo=mail-ot1-x32c.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 Our goal is to make riscv_cpu_extensions[] hold only ratified, non-vendor extensions. Create a new riscv_cpu_vendor_exts[] array for them, changing riscv_cpu_add_user_properties() and riscv_cpu_add_kvm_properties() accordingly. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Reviewed-by: Andrew Jones --- target/riscv/cpu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 83b44900a5..9111a83a02 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1867,7 +1867,10 @@ static Property riscv_cpu_extensions[] = { DEFINE_PROP_BOOL("zcmt", RISCVCPU, cfg.ext_zcmt, false), DEFINE_PROP_BOOL("zicond", RISCVCPU, cfg.ext_zicond, false), - /* Vendor-specific custom extensions */ + DEFINE_PROP_END_OF_LIST(), +}; + +static Property riscv_cpu_vendor_exts[] = { DEFINE_PROP_BOOL("xtheadba", RISCVCPU, cfg.ext_xtheadba, false), DEFINE_PROP_BOOL("xtheadbb", RISCVCPU, cfg.ext_xtheadbb, false), DEFINE_PROP_BOOL("xtheadbs", RISCVCPU, cfg.ext_xtheadbs, false), @@ -1976,6 +1979,10 @@ void kvm_riscv_cpu_add_kvm_properties(Object *obj) riscv_cpu_add_kvm_unavail_prop(obj, prop->name); } + for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) { + riscv_cpu_add_kvm_unavail_prop(obj, prop->name); + } + for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) { riscv_cpu_add_kvm_unavail_prop(obj, prop->name); } @@ -2020,6 +2027,10 @@ static void riscv_cpu_add_user_properties(Object *obj) qdev_property_add_static(dev, prop); } + for (prop = riscv_cpu_vendor_exts; prop && prop->name; prop++) { + qdev_property_add_static(dev, prop); + } + for (prop = riscv_cpu_experimental_exts; prop && prop->name; prop++) { qdev_property_add_static(dev, prop); }