From nobody Tue Feb 10 10:20:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.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=wdc.com ARC-Seal: i=1; a=rsa-sha256; t=1588192973; cv=none; d=zohomail.com; s=zohoarc; b=K5/qd9hhLLecyeIrOXyHyDIjHzGguBY6oJv4dBYo4j/3nxZ99NNXlMpKDyg/e2PqxWbUb9aSb0Zweli+6N77VV+610R+2Pe4mNzxai4PIyOmYrjWPmC0pqfX4QUwwCzKeNUSKNlfaAuvmWtGQyPqJqoTfz9QZ9L3rvrcbHWE7Yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588192973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+lyPpbjfSt/tnhgD71G9ed8Rl/BG7RiS4qywvh9DYhM=; b=GYhKdJ7NNYCqQ2ou1+qwOtVOw7cltw972GK2Ya0zBdGFrJtHepwwYuwCkUvsoBCxWNKSKt5y8L0p6VXHN+ZwfgcX3zojs1dPgfmTsnykiFGycv7MMvFhWn0TXqnbkdFZvuwW3vC6NdReRPHTeOq+v/rOcKdPNTBlOlLHlq9MbOw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail header.i=@wdc.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 1588192973850849.679603528053; Wed, 29 Apr 2020 13:42:53 -0700 (PDT) Received: from localhost ([::1]:57246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTtXg-00020u-GN for importer@patchew.org; Wed, 29 Apr 2020 16:42:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53852) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTtOn-0007z5-8F for qemu-devel@nongnu.org; Wed, 29 Apr 2020 16:37:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTtO8-0006lL-Kc for qemu-devel@nongnu.org; Wed, 29 Apr 2020 16:33:41 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:7549) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTtK0-00065w-U8; Wed, 29 Apr 2020 16:28:45 -0400 Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 30 Apr 2020 04:28:39 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 13:18:44 -0700 Received: from usa004631.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.56.145]) by uls-op-cesaip01.wdc.com with ESMTP; 29 Apr 2020 13:28:39 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1588192124; x=1619728124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uth3SOy7J70UXYgMlMkEumsDQFWDBmDIt0wImRmilQQ=; b=CInufT5QIry+5TVFNuDGmECWHSosy5MAMd+fJ437Kd/LH61T7H7HTX/H 8kwsSV0alIOQgR6DyiV1/Zd2PzgTKwnSNwSJBlhXRodz+FfDMpgJrz4cX Rp2Snp0m6yRrImQVwBUhVctyrZfvsNLpQnZ5XmmIgTH8WnuvJU1yf/XgV OQU1qr7jWyqB+GQrPt9MspDmh3OVkKxjXeOBn3pfiTt6rCYi30UskESB5 0T8uV0arXVf/hHvaC06RzVUadBJpqY0Wm5vqPw/k4qsviTRy3jWXUqm2G kjV0g2eSDkG3L0qFf+nEPUbLpFYhHlMxVMhqkcLXNBrVxKgufTqMqPW08 w==; IronPort-SDR: b27eH1A+s0qP/z64xg7nWNYBHR+UI9ZfJirahk/AkctP7Q4/Q+VgJ3MdSYfOW/+F6GTlmZKLbt 3Pb82dDMvQ1sEgZlJajte22rzOd2mHc+jhJquZu46wentsKsU6bvDehv556YxTAdpUGm8c1b0D INI1X/KDWEAnTd5K8EghRO/KbYH3SGGFEXa6sNStb5wosMtk9LFk8pjy7PVWWofnpg0mQMcV64 FQq0HplZ+Ixy/jEEmhOK9XSv8kqMBwPtCj9NZ5LOunagAdSbXpCxK+BDsZlJtBVLZZuYGrlvAD 7NE= X-IronPort-AV: E=Sophos;i="5.73,333,1583164800"; d="scan'208";a="136507038" IronPort-SDR: Kis4ERPScIy2758QWisgEwJ2CNGsJAAZefnpuhm5lEZxKMYUaBZa5QVk2UY1MC25AbekU1Ec/+ q3mFcEohof4dWsl8h0UqXP+wR/Hth2HKA= IronPort-SDR: qg+Tyy5KToGzlMg6u7XK3w/0KKOHfI75CiQs7Eq+0CDK2/irXonsp0/FG1uvELBsYaM4jWrCFN +N/8c50BFh6g== WDCIronportException: Internal From: Alistair Francis To: peter.maydell@linaro.org Subject: [PULL v2 08/14] riscv: sifive_e: Support changing CPU type Date: Wed, 29 Apr 2020 13:20:00 -0700 Message-Id: <20200429202006.775322-9-alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200429202006.775322-1-alistair.francis@wdc.com> References: <20200429202006.775322-1-alistair.francis@wdc.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=216.71.154.42; envelope-from=prvs=381fbd49e=alistair.francis@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 16:28:37 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 216.71.154.42 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: qemu-riscv@nongnu.org, Corey Wharton , palmerdabbelt@google.com, qemu-devel@nongnu.org, Alistair Francis , Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Corey Wharton Allows the CPU to be changed from the default via the -cpu command line option. Signed-off-by: Corey Wharton Reviewed-by: Bin Meng Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20200313193429.8035-2-coreyw7@fb.com Message-Id: <20200313193429.8035-2-coreyw7@fb.com> [ Changes by AF: - Set "cpu-type" from the machine and not SoC ] Signed-off-by: Alistair Francis --- hw/riscv/sifive_e.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 646553a7c3..b53109521e 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -123,8 +123,6 @@ static void riscv_sifive_e_soc_init(Object *obj) object_initialize_child(obj, "cpus", &s->cpus, sizeof(s->cpus), TYPE_RISCV_HART_ARRAY, &error_abort, NULL); - object_property_set_str(OBJECT(&s->cpus), SIFIVE_E_CPU, "cpu-type", - &error_abort); object_property_set_int(OBJECT(&s->cpus), ms->smp.cpus, "num-harts", &error_abort); sysbus_init_child_obj(obj, "riscv.sifive.e.gpio0", @@ -141,6 +139,8 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev= , Error **errp) SiFiveESoCState *s =3D RISCV_E_SOC(dev); MemoryRegion *sys_mem =3D get_system_memory(); =20 + object_property_set_str(OBJECT(&s->cpus), ms->cpu_type, "cpu-type", + &error_abort); object_property_set_bool(OBJECT(&s->cpus), true, "realized", &error_abort); =20 @@ -219,6 +219,7 @@ static void riscv_sifive_e_machine_init(MachineClass *m= c) mc->desc =3D "RISC-V Board compatible with SiFive E SDK"; mc->init =3D riscv_sifive_e_init; mc->max_cpus =3D 1; + mc->default_cpu_type =3D SIFIVE_E_CPU; } =20 DEFINE_MACHINE("sifive_e", riscv_sifive_e_machine_init) --=20 2.26.2