From nobody Sun Feb 8 17:22:11 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=1589992680; cv=none; d=zohomail.com; s=zohoarc; b=QpZ5fmhKr2h/LmgZvGbsDpML3QKgJDCRioti3I9PKp2BozxPN4VhzkZFu3PnN44nQc6tOg1M9wR2gmJHp0V/ZCUqGf7TQ1mAqijH3Cfff6Ub+dTafNLck36tJgjO4ifvI/CuFZjuC/rUEy+KY/YOdFXf3iOBVoMSGusY3bAG63I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589992680; h=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=s4qXEga9fs5KVUZzBKpPKn4s9vVWZFn9Om85gbLJ7x4=; b=SUWg0zWhCnUaYODYgdjLroV4YLoZOGyobWK/5iCXdtS6c2EzXagO0Y3Vled6V9MowliCWLjVeBXMzf1ooyY0hGwHEEId8K1d75TzTeBjkMdUp+M0lNC4pM6Ws0ugTVKbILuke81V5zUE9QbMt0Qi+TSc5lYvpDfyfAH63SuADFc= 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 158999268094399.51726733013254; Wed, 20 May 2020 09:38:00 -0700 (PDT) Received: from localhost ([::1]:58702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbRjD-0006pk-Ke for importer@patchew.org; Wed, 20 May 2020 12:37:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbRi0-0005Bz-OR; Wed, 20 May 2020 12:36:44 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:11695) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbRhy-0002lk-Sn; Wed, 20 May 2020 12:36:44 -0400 Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 21 May 2020 00:36:41 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2020 09:26:43 -0700 Received: from 96yhgc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.51]) by uls-op-cesaip02.wdc.com with ESMTP; 20 May 2020 09:36:40 -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=1589992603; x=1621528603; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O6p3SU0rWuvXbYL4jojiksBa0f7cc5aFdL7xeuzsdQE=; b=PUXU/mcR23A2GXRQHbcL4qVhEirJbTc3OCfWGdQOviw/s5rT6XS5CLKY ljZqvBQqq/7GBgM/95fkhPOZc+XzazdcrjSOZC1farPxvX8e8B2hlLd4I cjf+affYnadgN2TF1UneP/lI91SeoBJhEhFUcw205EfDvCeXxvlLkH7bn KAtufTbMp/Z4W4X1zMcYbKHq3AtBpISPrwX8uf++D0VrMSPkPTsISaIhS yQcNcLHNlZy8UqYBqgDI9cpCcaJGlKOAZvN6Guec4mAjGskYcCZRgS+ox JAsuKsUCyprnwXGpA1ZePsIyyNZPchsqmEAiubSYgPQKrFFLK4KBPOxhM g==; IronPort-SDR: 302vhv39QniYj31BVgsVtqTUJj9PPXC7QbufX86/J98nrrGNuyOE9THMB8kM7g1sNn1TDw78WA di/Y6vH9nSdki9EJe6uUaZ1o2utKtbwpTD8isHl4qRnIbKpHvixUkemSUxCsrHWs9UyjkdEFhs Y2J9jUj31F9nH2GMqEaQej6cu9Zez8V+jqpcKuMefQ0EB/AZOHqSwqUO0+zAbsyzZ4f15bT+MD 6YC84CZ0AevBUUwyY4wvSvCX5/dpCuimx8wbraI7fFhZsVhB76BItHCxUcbqvYYKiZNeQytHwl yfk= X-IronPort-AV: E=Sophos;i="5.73,414,1583164800"; d="scan'208";a="138468211" IronPort-SDR: wSVQlTZf/xlsGRFML+054qpgPOSlPECnimtjMwsjS1zqi0QjBPJYojnqT35rkhfA5WS5JmFwg3 hl6B9Hs2KuepTw8jQiPhJClPWBPpD6Nrg= IronPort-SDR: hYeWJ+dxBc2JrLpf1djsjbttFYHOtTPG2BTKeg2Hf3eEKN2RCNEA+ODjYv0q9YGVIfyElpVOw9 Vf91pTnvBhPQ== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 1/2] riscv: sifive_e: Manually define the machine Date: Wed, 20 May 2020 09:28:12 -0700 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 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.153.144; envelope-from=prvs=40290bcd2=alistair.francis@wdc.com; helo=esa5.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 12:36:38 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: alistair.francis@wdc.com, philmd@redhat.com, palmer@dabbelt.com, bmeng.cn@gmail.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- include/hw/riscv/sifive_e.h | 4 ++++ hw/riscv/sifive_e.c | 41 +++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 25ce7aa9d5..414992119e 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -47,6 +47,10 @@ typedef struct SiFiveEState { SiFiveESoCState soc; } SiFiveEState; =20 +#define TYPE_RISCV_E_MACHINE MACHINE_TYPE_NAME("sifive_e") +#define RISCV_E_MACHINE(obj) \ + OBJECT_CHECK(SiFiveEState, (obj), TYPE_RISCV_E_MACHINE) + enum { SIFIVE_E_DEBUG, SIFIVE_E_MROM, diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index b53109521e..472a98970b 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -79,7 +79,7 @@ static void riscv_sifive_e_init(MachineState *machine) { const struct MemmapEntry *memmap =3D sifive_e_memmap; =20 - SiFiveEState *s =3D g_new0(SiFiveEState, 1); + SiFiveEState *s =3D RISCV_E_MACHINE(machine); MemoryRegion *sys_mem =3D get_system_memory(); MemoryRegion *main_mem =3D g_new(MemoryRegion, 1); int i; @@ -115,6 +115,35 @@ static void riscv_sifive_e_init(MachineState *machine) } } =20 +static void sifive_e_machine_instance_init(Object *obj) +{ +} + +static void sifive_e_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + 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; +} + +static const TypeInfo sifive_e_machine_typeinfo =3D { + .name =3D MACHINE_TYPE_NAME("sifive_e"), + .parent =3D TYPE_MACHINE, + .class_init =3D sifive_e_machine_class_init, + .instance_init =3D sifive_e_machine_instance_init, + .instance_size =3D sizeof(SiFiveEState), +}; + +static void sifive_e_machine_init_register_types(void) +{ + type_register_static(&sifive_e_machine_typeinfo); +} + +type_init(sifive_e_machine_init_register_types) + static void riscv_sifive_e_soc_init(Object *obj) { MachineState *ms =3D MACHINE(qdev_get_machine()); @@ -214,16 +243,6 @@ static void riscv_sifive_e_soc_realize(DeviceState *de= v, Error **errp) &s->xip_mem); } =20 -static void riscv_sifive_e_machine_init(MachineClass *mc) -{ - 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; -} - -DEFINE_MACHINE("sifive_e", riscv_sifive_e_machine_init) - static void riscv_sifive_e_soc_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); --=20 2.26.2 From nobody Sun Feb 8 17:22:11 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=1589992681; cv=none; d=zohomail.com; s=zohoarc; b=I4IpPcg38Pp0lYbuQ1wG91/Ig1mF68SPNYpcrKYh4blabRcudirOREYXRhkCDf2ljfzV5Ab8UyD2fWcTJQGkGBbR+zaa8vzoDWFw2ZDPvIAJudY7ghFwCOLwea9TE6o98LiKi4vc5vWJu7/qkj8PrAyOCpj9MG9Bg2v6ogio+pg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589992681; h=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=iSYf1A60N54cTyqfB+PnaqsXB5gJHsI5/RrtlRNrRzE=; b=Zj+JLl0a4vTH3Wbkr0LsmxbW8hV47VDRdNmqfGu/nQXag5T8SIlYQzjRoYFvvU88wMqx7OhUrbFsZgyaWqWf97EcXKZg8MsrbjxjlrZI+1T7DMcMNQXyF25IBZ44auOUkOP9Zl4QYf0sJ4CViDEy8fJ+2sVyeZX9sde4JGyRfkA= 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 1589992681575202.5706938073173; Wed, 20 May 2020 09:38:01 -0700 (PDT) Received: from localhost ([::1]:58766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbRjE-0006rH-Ak for importer@patchew.org; Wed, 20 May 2020 12:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbRi2-0005CJ-0K; Wed, 20 May 2020 12:36:46 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:11692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbRi1-0002lX-6B; Wed, 20 May 2020 12:36:45 -0400 Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 21 May 2020 00:36:44 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2020 09:26:46 -0700 Received: from 96yhgc2.ad.shared (HELO risc6-mainframe.hgst.com) ([10.86.57.51]) by uls-op-cesaip02.wdc.com with ESMTP; 20 May 2020 09:36:43 -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=1589992605; x=1621528605; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DOagZFIyWIOdVZLyXWb+AMorfmw3jWNAx6DX9j9m1ns=; b=JYadaoSS+1z9J2fXqAgMLtEyHPEUWCcCLmGQ7ybEvTZGWJk5aHG57iKP 3ARROFDl0LANkd0i3+sJdkvn8LysyDYckgrCSn9/LGbtp+MlGYISrVL6E 98Gmi4JCsT4IcdfI4kgz75UH2fYCp/4oZe/7TxaWAG+uUzPlP+YANsDpe dPeioAHVFRV2BPIVhqi51SGz8a9mcWE3recz+l4I+4PsoLCi3YS3GgfGA bzm82rDpPAfeldQrF3hYQLtaoHAE06IDeg6Bzi40eFHIO0ESg/GPniPyg W6HPPm67m/JXl+/4ZGPLNXJV1WIE6ipqjLJmC1GbubpNe3HvsgjsNpw2A w==; IronPort-SDR: JNlcbRFmI/YXLsQp/CEPDQbu0LQk5a8GcqafmwcylkxAuDXVug/epTkP6zKMt0AiHi22ZOJH/L EOIzONzH/xZ7+DgoP1xpvPhCJzLU0iTnBavaugm29bl6IZkKhApguDMPM9n1t0GifuQGvnq8mC oS6IuNDZL6f6V5TQVlkLZIFwmlFS0BctxH/d/JbvS8Ml5iJQQvZxvT16kqkQoRtMxIZ/ykgrlx 4ophXDQnW/sBb9mOz+GVQ8ddCVqpHc7Wax7B7+wFU/RdqNjcAkDMlt4ckHkCmE+rvtwy3AZrUn PaQ= X-IronPort-AV: E=Sophos;i="5.73,414,1583164800"; d="scan'208";a="138468215" IronPort-SDR: THwWWngZAjQ84jL8glqVb88OIZ63FQpRMEFlOWX4dRH0aFNV+pXyFjy13CagFGTyu5pjpZpBlw RMtdit1SampdjxSVWgwnnEv2DyL9J6zkI= IronPort-SDR: BO2RXBNVmC0/n1sGE6nS4bygGRRdEcWAX/Y8QorFtY/bxftrqIza4LsjeD3i4yE1LK5jUV/SNo hoVvnN/8kyng== WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 2/2] sifive_e: Support the revB machine Date: Wed, 20 May 2020 09:28:15 -0700 Message-Id: <9a45e819e850f6c913340a03c475b93428e9d139.1589992028.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 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.153.144; envelope-from=prvs=40290bcd2=alistair.francis@wdc.com; helo=esa5.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 12:36:38 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_MED=-2.3, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: alistair.francis@wdc.com, philmd@redhat.com, palmer@dabbelt.com, bmeng.cn@gmail.com, alistair23@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- include/hw/riscv/sifive_e.h | 1 + hw/riscv/sifive_e.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/include/hw/riscv/sifive_e.h b/include/hw/riscv/sifive_e.h index 414992119e..0d3cd07fcc 100644 --- a/include/hw/riscv/sifive_e.h +++ b/include/hw/riscv/sifive_e.h @@ -45,6 +45,7 @@ typedef struct SiFiveEState { =20 /*< public >*/ SiFiveESoCState soc; + bool revb; } SiFiveEState; =20 #define TYPE_RISCV_E_MACHINE MACHINE_TYPE_NAME("sifive_e") diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 472a98970b..cb7818341b 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -98,10 +98,14 @@ static void riscv_sifive_e_init(MachineState *machine) memmap[SIFIVE_E_DTIM].base, main_mem); =20 /* Mask ROM reset vector */ - uint32_t reset_vec[2] =3D { - 0x204002b7, /* 0x1000: lui t0,0x20400 */ - 0x00028067, /* 0x1004: jr t0 */ - }; + uint32_t reset_vec[2]; + + if (s->revb) { + reset_vec[0] =3D 0x200102b7; /* 0x1000: lui t0,0x20010 = */ + } else { + reset_vec[0] =3D 0x204002b7; /* 0x1000: lui t0,0x20400 = */ + } + reset_vec[1] =3D 0x00028067; /* 0x1004: jr t0 */ =20 /* copy in the reset vector in little_endian byte order */ for (i =3D 0; i < sizeof(reset_vec) >> 2; i++) { @@ -115,8 +119,31 @@ static void riscv_sifive_e_init(MachineState *machine) } } =20 +static bool sifive_e_machine_get_revb(Object *obj, Error **errp) +{ + SiFiveEState *s =3D RISCV_E_MACHINE(obj); + + return s->revb; +} + +static void sifive_e_machine_set_revb(Object *obj, bool value, Error **err= p) +{ + SiFiveEState *s =3D RISCV_E_MACHINE(obj); + + s->revb =3D value; +} + static void sifive_e_machine_instance_init(Object *obj) { + SiFiveEState *s =3D RISCV_E_MACHINE(obj); + + s->revb =3D false; + object_property_add_bool(obj, "revb", sifive_e_machine_get_revb, + sifive_e_machine_set_revb, NULL); + object_property_set_description(obj, "revb", + "Set on to tell QEMU that it should mo= del " + "the revB HiFive1 board", + NULL); } =20 static void sifive_e_machine_class_init(ObjectClass *oc, void *data) --=20 2.26.2