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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 E1106EB64D7 for ; Fri, 30 Jun 2023 10:08:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFB3J-00053n-Mv; Fri, 30 Jun 2023 06:08:33 -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 1qFB3I-00053T-18 for qemu-riscv@nongnu.org; Fri, 30 Jun 2023 06:08:32 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFB3G-0000lf-E1 for qemu-riscv@nongnu.org; Fri, 30 Jun 2023 06:08:31 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-1b059dd7c0cso1518175fac.0 for ; Fri, 30 Jun 2023 03:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1688119709; x=1690711709; 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=km63VptoNpmFF0VFthKpLfqOI63lOxKo41bM7IfLkl4=; b=gGKM+yQM/E3UDzdcwLnbMUMy0WVeSHJa2s1FiDGqECogTzlhJeeNyNadFsLtu0I7iY 0WGJUTgn8FwhcI5DBoLrEwwL/OuistPzeHPH1uya9A3UsQL1pKdiMl4ZPOsuv93Mjovr eYGSXaqLgAxJu9I77gxokV7is3CswKc94DvYOnPBbyNNHA3k39KgFcVBhcTSCc0n62XZ Fjt4NUBMk653GaLagK06cGmD0WCbWjbyedNsweujzUwE0nCJ4thHl/3KawoZFJiQ7bfn YvZ/T0Syc7z/+pDcVVLChAkRLnsjGiokyuAJ6Pbsdl/oBvq6AeG8RsklU60WYnczQ5P0 JwdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688119709; x=1690711709; 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=km63VptoNpmFF0VFthKpLfqOI63lOxKo41bM7IfLkl4=; b=FXyayLhIVYBa9yPBYdlnltWz5U75ctLebIYwYuo5Gh0T1ujeVEZJ7M0GB4XgD8eL9B 2vj/Adi3FNlkx2Hv6nEs2LgguLljbyKGMAKqoUByzshVYYwJ+KHxAbtvL2gOgqivPMmH AgZxzBs1R2vI5CirpUwIIO/2nRhm2YLRMbmvY47smCDID+HBSO5COpiaUxewea/WPXZo lVisbgDlItmYFIRrRzdOnney1ie4ayFE0NoVR/tCWGk8SNpTdOxFSdTl59lX1Xv65vt0 +sXUPjRUsTIPk3GaZqtLo3nrG5v6/nHizVZwgMpQF3h22HCB3Lg+3HQSyxSx5yjI71cW Czog== X-Gm-Message-State: ABy/qLY3j099XGIs60yzQJFWdczO3evDu9frWoJsEQuXGAq/Stab/WC0 GpcKQq51uzGaKGKFkMKu0R0vuQ== X-Google-Smtp-Source: APBJJlEbrKzE0e7Ky+UcHU3/u+++MsN8dZSA9upw0Vw8MPL6rQNPyP677NfWGCJ6Y1c+UEOngnxPQw== X-Received: by 2002:a05:6870:1b15:b0:1b0:897d:183d with SMTP id hl21-20020a0568701b1500b001b0897d183dmr3276616oab.20.1688119709221; Fri, 30 Jun 2023 03:08:29 -0700 (PDT) Received: from grind.. (201-69-66-110.dial-up.telesp.net.br. [201.69.66.110]) by smtp.gmail.com with ESMTPSA id eh18-20020a056870f59200b001a663e49523sm8707467oab.36.2023.06.30.03.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 03:08:28 -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 v7 03/20] target/riscv/cpu.c: restrict 'mvendorid' value Date: Fri, 30 Jun 2023 07:07:54 -0300 Message-ID: <20230630100811.287315-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230630100811.287315-1-dbarboza@ventanamicro.com> References: <20230630100811.287315-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4860:4864:20::2c; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x2c.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@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-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org Sender: qemu-riscv-bounces+qemu-riscv=archiver.kernel.org@nongnu.org We're going to change the handling of mvendorid/marchid/mimpid by the KVM driver. Since these are always present in all CPUs let's put the same validation for everyone. It doesn't make sense to allow 'mvendorid' to be different than it is already set in named (vendor) CPUs. Generic (dynamic) CPUs can have any 'mvendorid' they want. Change 'mvendorid' to be a class property created via 'object_class_property_add', instead of using the DEFINE_PROP_UINT32() macro. This allow us to define a custom setter for it that will verify, for named CPUs, if mvendorid is different than it is already set by the CPU. This is the error thrown for the 'veyron-v1' CPU if 'mvendorid' is set to an invalid value: $ qemu-system-riscv64 -M virt -nographic -cpu veyron-v1,mvendorid=2 qemu-system-riscv64: can't apply global veyron-v1-riscv-cpu.mvendorid=2: Unable to change veyron-v1-riscv-cpu mvendorid (0x61f) Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index bbb201a2b3..652988db25 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1730,7 +1730,6 @@ static void riscv_cpu_add_user_properties(Object *obj) static Property riscv_cpu_properties[] = { DEFINE_PROP_BOOL("debug", RISCVCPU, cfg.debug, true), - DEFINE_PROP_UINT32("mvendorid", RISCVCPU, cfg.mvendorid, 0), DEFINE_PROP_UINT64("marchid", RISCVCPU, cfg.marchid, RISCV_CPU_MARCHID), DEFINE_PROP_UINT64("mimpid", RISCVCPU, cfg.mimpid, RISCV_CPU_MIMPID), @@ -1817,6 +1816,40 @@ static const struct TCGCPUOps riscv_tcg_ops = { #endif /* !CONFIG_USER_ONLY */ }; +static bool riscv_cpu_is_dynamic(Object *cpu_obj) +{ + return object_dynamic_cast(cpu_obj, TYPE_RISCV_DYNAMIC_CPU) != NULL; +} + +static void cpu_set_mvendorid(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + bool dynamic_cpu = riscv_cpu_is_dynamic(obj); + RISCVCPU *cpu = RISCV_CPU(obj); + uint32_t prev_val = cpu->cfg.mvendorid; + uint32_t value; + + if (!visit_type_uint32(v, name, &value, errp)) { + return; + } + + if (!dynamic_cpu && prev_val != value) { + error_setg(errp, "Unable to change %s mvendorid (0x%x)", + object_get_typename(obj), prev_val); + return; + } + + cpu->cfg.mvendorid = value; +} + +static void cpu_get_mvendorid(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + bool value = RISCV_CPU(obj)->cfg.mvendorid; + + visit_type_bool(v, name, &value, errp); +} + static void riscv_cpu_class_init(ObjectClass *c, void *data) { RISCVCPUClass *mcc = RISCV_CPU_CLASS(c); @@ -1848,6 +1881,9 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_get_dynamic_xml = riscv_gdb_get_dynamic_xml; cc->tcg_ops = &riscv_tcg_ops; + object_class_property_add(c, "mvendorid", "uint32", cpu_get_mvendorid, + cpu_set_mvendorid, NULL, NULL); + device_class_set_props(dc, riscv_cpu_properties); } -- 2.41.0