From nobody Thu Nov 13 23:32:44 2025 Delivered-To: importer@patchew.org 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; 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=1583531107; cv=none; d=zohomail.com; s=zohoarc; b=MKA1VMlwTiHcTtM4oHIP8UYoEzR2j/u7/bfI6D8PgaoqvGYZ24LcYBdNg3ojdg0Yu5nxKbRDQKd2rrslOPMj8rWChjgZwEtXrMEkotDiPb0vvkWpv69F/P6D16tF35fpOysmas9MTEe/Lm0wXn9ILiqwNcl2DPsXT2f0odjCejo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583531107; 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=xcJGl9WmJXpmtiY//RxurzZRqLc5y8xSwrKCzt00mOY=; b=gT40y8abXcJuVFjyuokQjFODiut70GKXMyClK+uFfM9GdbuPke/U+M6GtnsN6385AMKlIjksxhx6NW9ri+2a7kIEfeix2SfzRasyUkKqvbfDI7ZkAPm3Ugy9zo+hXKv2J20PBOrM4TRtoDKPCMk5US9C46SQV2c3nhe+KpoxQPg= 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 1583531107685759.1878505772338; Fri, 6 Mar 2020 13:45:07 -0800 (PST) Received: from localhost ([::1]:42574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKmH-0000y0-Lk for importer@patchew.org; Fri, 06 Mar 2020 16:45:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKlP-0008Vr-GB for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAKlO-0002T4-3E for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:11 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5208) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAKlN-0002PM-QB; Fri, 06 Mar 2020 16:44:10 -0500 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Mar 2020 05:44:08 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2020 13:35:52 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Mar 2020 13:44:07 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1583531054; x=1615067054; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=05Q1mBpOGmEOAS6Fful2qHlv72Yzd6EzLEwaVFrElcg=; b=rb3lspD/A5+FH/RZzVfg3hldak8+gpsElC1JGJhJAGqHfp5hAlm/8b+i FBxJSHzSg7s/o4+cvjGOQDFQb5EgQlbByz4E280h4HQQU9HRy4R0x8ON4 3XeKbyrCFZiUeUnMi0hSqklzTnHFTX6fknPZlhQZSXr8HHaSp+eJiPi8G L7bnzyY1tVBkHeZlUbOTcOqWdmotwUnMCX4HfqH9gnypl0K0YsMCgDdQM pAqyn2pibqvxB8LEAAVG81T2JkRnJ8+bNDkZkEPPN51cs0FRY+vZ/4Y/T XnnnorDAJJT0618TTvdWZ1fgufI8mkXgPNLLSbiBabMaty0AJZzLBH8GV Q==; IronPort-SDR: /rCpoR6/JoQeWjZqlxn8h9dkJKsjY/BbjJ0qt9tkEuOycwsom1JFukJsEHNHCxUNRpNGCWMbPv WeVUhZpHV5gtHT3X3cnoL5qcPC51m8NLZLJ/1te+JZuLTwPe6+mA+1cgphAknkO2/RfXqkHZih XX6/Ip/vvxLDYLs864gtUZsO3CjtL0Bdk9Hub4uyIIQXmg02iuS7VKaYL8Ngs69WAxwBB9/wYV JN7SeWWt4MAWWNM5lFHFDbpWbdr2DdOO4dYFM5mox2K1oEX9WGXWqvbKdqU7Cqu1fCg71MdQ1U gP0= X-IronPort-AV: E=Sophos;i="5.70,523,1574092800"; d="scan'208";a="233784271" IronPort-SDR: EnvuAOlnYxCmFXTBIro8FdSq6bdSc0IxLNbvXhhcqLOMnhMtEtG3X5kSWInJP4h8iKJJu+puAG aq3qwTaYmRoFmlRSGn2RjFxtHOrYDj8tcWH7DCsRjl88nM0mDIlZbp0wSxPSIOmC1TXBFYBd6+ I8nngBlSMhvUdpNIb+IT2ctuEznxOrg/Lb96vOLIPEtEb2uwd/QyRE2h5oobo+giu/OgdlVpAC GlvS78wI2hVvOjjyvcBbVperYuYqDed1w14tmF9HP/LtRV9QDDFvPhmEN7MkHyAZWbDJ+yCCBV FkvFthrt+szMmziTo+97YHQQ IronPort-SDR: nH/w6hAdohxTcymeNl5wzeCRd8cJDJoh8f1NcjM2LHH3zPPPAejXn7ufbYRA45arRQxlFK3XXm ++ZFfI/0atFMGGHFV4M/pQKiWiCznAAjpQLpOTJz7g2aWZlajbWKxLC4GLBeL57nsNX25zToRO 11P1Vnxh8gS93sNiEShcLwwkdYc6uwgsBm/IrgF3t/7o9JXfClCDz0s6rjANdMq+vTlH3+XzMH rLNLXu873oetn3qK77w0KImt2BpRgK3p2U1K6KBywdBfYMoHetT/E6TAR0xfISW28eJARg97tm eiQ= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v3 1/3] riscv/sifive_u: Fix up file ordering Date: Fri, 6 Mar 2020 13:36:47 -0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.143.124 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, palmer@dabbelt.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" Split the file into clear machine and SoC sections. Signed-off-by: Alistair Francis Reviewed-by: Bin Meng --- hw/riscv/sifive_u.c | 109 ++++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 156a003642..4688837216 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -308,7 +308,7 @@ static void create_fdt(SiFiveUState *s, const struct Me= mmapEntry *memmap, g_free(nodename); } =20 -static void riscv_sifive_u_init(MachineState *machine) +static void sifive_u_machine_init(MachineState *machine) { const struct MemmapEntry *memmap =3D sifive_u_memmap; SiFiveUState *s =3D RISCV_U_MACHINE(machine); @@ -399,6 +399,60 @@ static void riscv_sifive_u_init(MachineState *machine) &address_space_memory); } =20 +static bool sifive_u_machine_get_start_in_flash(Object *obj, Error **errp) +{ + SiFiveUState *s =3D RISCV_U_MACHINE(obj); + + return s->start_in_flash; +} + +static void sifive_u_machine_set_start_in_flash(Object *obj, bool value, E= rror **errp) +{ + SiFiveUState *s =3D RISCV_U_MACHINE(obj); + + s->start_in_flash =3D value; +} + +static void sifive_u_machine_instance_init(Object *obj) +{ + SiFiveUState *s =3D RISCV_U_MACHINE(obj); + + s->start_in_flash =3D false; + object_property_add_bool(obj, "start-in-flash", sifive_u_machine_get_s= tart_in_flash, + sifive_u_machine_set_start_in_flash, NULL); + object_property_set_description(obj, "start-in-flash", + "Set on to tell QEMU's ROM to jump to = " \ + "flash. Otherwise QEMU will jump to DR= AM", + NULL); +} + + +static void sifive_u_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "RISC-V Board compatible with SiFive U SDK"; + mc->init =3D sifive_u_machine_init; + mc->max_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_= COUNT; + mc->min_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; + mc->default_cpus =3D mc->min_cpus; +} + +static const TypeInfo sifive_u_machine_typeinfo =3D { + .name =3D MACHINE_TYPE_NAME("sifive_u"), + .parent =3D TYPE_MACHINE, + .class_init =3D sifive_u_machine_class_init, + .instance_init =3D sifive_u_machine_instance_init, + .instance_size =3D sizeof(SiFiveUState), +}; + +static void sifive_u_machine_init_register_types(void) +{ + type_register_static(&sifive_u_machine_typeinfo); +} + +type_init(sifive_u_machine_init_register_types) + static void riscv_sifive_u_soc_init(Object *obj) { MachineState *ms =3D MACHINE(qdev_get_machine()); @@ -439,33 +493,6 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_CADENCE_GEM); } =20 -static bool sifive_u_get_start_in_flash(Object *obj, Error **errp) -{ - SiFiveUState *s =3D RISCV_U_MACHINE(obj); - - return s->start_in_flash; -} - -static void sifive_u_set_start_in_flash(Object *obj, bool value, Error **e= rrp) -{ - SiFiveUState *s =3D RISCV_U_MACHINE(obj); - - s->start_in_flash =3D value; -} - -static void riscv_sifive_u_machine_instance_init(Object *obj) -{ - SiFiveUState *s =3D RISCV_U_MACHINE(obj); - - s->start_in_flash =3D false; - object_property_add_bool(obj, "start-in-flash", sifive_u_get_start_in_= flash, - sifive_u_set_start_in_flash, NULL); - object_property_set_description(obj, "start-in-flash", - "Set on to tell QEMU's ROM to jump to = " \ - "flash. Otherwise QEMU will jump to DR= AM", - NULL); -} - static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) { MachineState *ms =3D MACHINE(qdev_get_machine()); @@ -603,29 +630,3 @@ static void riscv_sifive_u_soc_register_types(void) } =20 type_init(riscv_sifive_u_soc_register_types) - -static void riscv_sifive_u_machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc =3D MACHINE_CLASS(oc); - - mc->desc =3D "RISC-V Board compatible with SiFive U SDK"; - mc->init =3D riscv_sifive_u_init; - mc->max_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_= COUNT; - mc->min_cpus =3D SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; - mc->default_cpus =3D mc->min_cpus; -} - -static const TypeInfo riscv_sifive_u_machine_typeinfo =3D { - .name =3D MACHINE_TYPE_NAME("sifive_u"), - .parent =3D TYPE_MACHINE, - .class_init =3D riscv_sifive_u_machine_class_init, - .instance_init =3D riscv_sifive_u_machine_instance_init, - .instance_size =3D sizeof(SiFiveUState), -}; - -static void riscv_sifive_u_machine_init_register_types(void) -{ - type_register_static(&riscv_sifive_u_machine_typeinfo); -} - -type_init(riscv_sifive_u_machine_init_register_types) --=20 2.25.1 From nobody Thu Nov 13 23:32:44 2025 Delivered-To: importer@patchew.org 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; 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=1583531221; cv=none; d=zohomail.com; s=zohoarc; b=MbiO3V6h0WF/NnK4YUu26mDoSrS03KgD0/m164qRxHfFfNfVOSDU8guw0jjt4D+SgVABZ+6YpTR4Bey1UaMiOSEEOgqZpQI93lKlqvI3fnQ0kDhub952tdD5PsaDV6Hvhg4sRUlhFLMNy8T7tesVSVgAa3iTDo+vFotH6PLlsMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583531221; 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=PqrXl8lRzSNtDQlTIHNtxsB35sFihsKu7ozNDA9LQv8=; b=SCHcLwoWw7DhfGPDYSihRfg5CMmroAxgTjBLu2XG/BGo6p6As4IyZVfzgBE0NxKEDAgl26VlwvT02uO6ZVc9s164L2vG0D8wOYVy21+AKzHSYczOW7N2kwqcx0fuX39lfAVnnSzGYtUPDqUHOWtw9B6FwkHU/lYmWo4WU8XKCS0= 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 1583531221652996.4566365055878; Fri, 6 Mar 2020 13:47:01 -0800 (PST) Received: from localhost ([::1]:42628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKo8-0003Qz-Mr for importer@patchew.org; Fri, 06 Mar 2020 16:47:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35207) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKlP-0008Vw-KY for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAKlO-0002TW-6D for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:11 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5183) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAKlN-0002H3-Su; Fri, 06 Mar 2020 16:44:10 -0500 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Mar 2020 05:44:12 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2020 13:35:55 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Mar 2020 13:44:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1583531054; x=1615067054; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tEzL81El13tYmLmo6YAcOeK5VWAlJ13nWzj+eXR7lfk=; b=fL0qbioqL/XAv7LfQbveyDTd1tsEEEOHkQwFgs2TVWhEOlIMzD2M46ya RGDk02X+YBM0WZq2gkkT4Va3VK4jYg9snvMAZSPqNrgkZvC9C43duLG34 5djFPHL+WNYO4dn1MSj6w2y9659TUWeqctOMt0Su13dEqfC0UMJLlOGO3 Jv5Enb8SH+V11i/KZdHteAl2ZgUXvxKnsjPv0q0T5MFdDAJmOVEDXKt4U UkN3uFKQstg9LkXjMcuykEoE0gTEEgBULhdZ8DuU7em9Rjngxumha8d8H x0ozFFOT6W63el8DlJn4W1Z3l5R+ReRasRcB60ErRj5Gk0c2hOkVZ4R0a w==; IronPort-SDR: xR+CnMLaASdk/pNNLYHR4i21bLy2FvSH2P8RSj1nZUlKNs/teafnD4RpasNLAQoyvlwNHViwst c3PrvxO7dU/RebWjF+ArTP46JJVS/QZyaB82f8cc8drJN1ceeRJ9j0/ZEBREW8Tiqp8mMj7OlP JQtenTulSBx8R2O4L5OOcOeyOzEtkchNFD23E3Vf3OTRo78VfqUeh6mfY55mH84zsgtnLghkPY dlAfW4W+0pXw2SpmQOBJPRv/XmU0LrhrVBBFfk3Qj7ld2t/Vb9b2LXa+03dgt4ApIj1Ijn4386 ZdM= X-IronPort-AV: E=Sophos;i="5.70,523,1574092800"; d="scan'208";a="233784281" IronPort-SDR: Pj/xc92iQ7KecwDlwgkTNrI7Qqy4kFp1BvSB+CJ0HK7qkyQ2XhAHbA5AlCJPlImihziHvvDHzk obc6NSM7CYKl56yXaOCPPn8W/LEF3meA2y+wrI+S/VtK6ZYvEOGJlZazH2DGBN/gc9p3taYq5H YKOGWfd5b1V+jHk8xq25VqFDK5VvaN5sH6K2TEtcBlmw6otBc2/BTuDcvknBCEGvIwGheDsf45 pS9C3eA+GZDETRx5dBWqHgQBkM+y0RDix5EnUQUXwpiH1OCGi2phO8USPDxG6DGmSu9s626XAN 0RS8OxULfpuG8gaauo8Nqam5 IronPort-SDR: L5hd0MYa3rZv5REWrK7xpr3Y4w+/MnpR4HdqW+x5hvapx3mSd0EHAVTzuUoEbr1ciQSCjRmobj QKiKONOwfGi0ag08H4j9u/1sfkJQ5dpDQxUdBExasgfF5T/lRqJRCgO8qzmdF9zah3LtzbVQLG oSZ5WcRp4vtnOwuVJAa3eC27SCFJAm1KQ6M2NzOQ6iUySQv2DF1hIbJef/HmWVIcHeUbhsZGun qRttz4ibgmirH/E6jse1NBzyq3VJ2o0XHQJMjpWK2qlhZ+grRJerwJg0sj5vuVYFHMtPuawDnC mos= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v3 2/3] riscv/sifive_u: Add a serial property to the sifive_u SoC Date: Fri, 6 Mar 2020 13:36:50 -0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.143.124 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, palmer@dabbelt.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" At present the board serial number is hard-coded to 1, and passed to OTP model during initialization. Firmware (FSBL, U-Boot) uses the serial number to generate a unique MAC address for the on-chip ethernet controller. When multiple QEMU 'sifive_u' instances are created and connected to the same subnet, they all have the same MAC address hence it creates a unusable network. A new "serial" property is introduced to the sifive_u SoC to specify the board serial number. When not given, the default serial number 1 is used. Suggested-by: Bin Meng Signed-off-by: Alistair Francis Reviewed-by: Bin Meng Tested-by: Bin Meng --- hw/riscv/sifive_u.c | 8 +++++++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 4688837216..dc572c761a 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -488,7 +488,6 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_SIFIVE_U_PRCI); sysbus_init_child_obj(obj, "otp", &s->otp, sizeof(s->otp), TYPE_SIFIVE_U_OTP); - qdev_prop_set_uint32(DEVICE(&s->otp), "serial", OTP_SERIAL); sysbus_init_child_obj(obj, "gem", &s->gem, sizeof(s->gem), TYPE_CADENCE_GEM); } @@ -581,6 +580,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev= , Error **errp) object_property_set_bool(OBJECT(&s->prci), true, "realized", &err); sysbus_mmio_map(SYS_BUS_DEVICE(&s->prci), 0, memmap[SIFIVE_U_PRCI].bas= e); =20 + qdev_prop_set_uint32(DEVICE(&s->otp), "serial", s->serial); object_property_set_bool(OBJECT(&s->otp), true, "realized", &err); sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_OTP].base); =20 @@ -607,10 +607,16 @@ static void riscv_sifive_u_soc_realize(DeviceState *d= ev, Error **errp) memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } =20 +static Property riscv_sifive_u_soc_props[] =3D { + DEFINE_PROP_UINT32("serial", SiFiveUSoCState, serial, OTP_SERIAL), + DEFINE_PROP_END_OF_LIST() +}; + static void riscv_sifive_u_soc_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); =20 + device_class_set_props(dc, riscv_sifive_u_soc_props); dc->realize =3D riscv_sifive_u_soc_realize; /* Reason: Uses serial_hds in realize function, thus can't be used twi= ce */ dc->user_creatable =3D false; diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index 82667b5746..a2baa1de5f 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -42,6 +42,8 @@ typedef struct SiFiveUSoCState { SiFiveUPRCIState prci; SiFiveUOTPState otp; CadenceGEMState gem; + + uint32_t serial; } SiFiveUSoCState; =20 #define TYPE_RISCV_U_MACHINE MACHINE_TYPE_NAME("sifive_u") --=20 2.25.1 From nobody Thu Nov 13 23:32:44 2025 Delivered-To: importer@patchew.org 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; 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=1583531221; cv=none; d=zohomail.com; s=zohoarc; b=UGZeP0Rxv3zYCMGB3TcB4OGUHM/dk1by8LItiGu8ZCBkeoKLQuq/OS4E+ct0GQYH6dqh4H8gRQ96Nf32weNu5UmnQ6FyuoLgwAPwuX8hhD6lzsjALXvg91lNTaT7Wa/qZOZ4u72xR2PHROX5A/5TgX6QWpTNldS0sT1XXbSPoYA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583531221; 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=Ag5cVC05Az6hBVESvtBsS004ZE2fHOqEO510FoOmg/8=; b=IiNVoKKqU4sNdyWFevdK+2flEM0KOZnua/9a5RGBjwuHaGMkJa4cP78/znWMUsdNb2/WNkttjtLniwfL9sas3RUqXZ4F7NY79ENhvZgVQ9jDGNxuZmgdHLTqQ/1ogTi55Dt+6qDThnRwl2V4hTihRxT7i8JLuboJQ38Dhfe7EZk= 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 1583531221443778.0838744651987; Fri, 6 Mar 2020 13:47:01 -0800 (PST) Received: from localhost ([::1]:42632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKo8-0003Rw-6a for importer@patchew.org; Fri, 06 Mar 2020 16:47:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35271) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAKlR-0008WA-Oy for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAKlQ-0002YW-Jf for qemu-devel@nongnu.org; Fri, 06 Mar 2020 16:44:13 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:5222) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAKlQ-0002Wr-BD; Fri, 06 Mar 2020 16:44:12 -0500 Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 07 Mar 2020 05:44:16 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2020 13:35:57 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip02.wdc.com with ESMTP; 06 Mar 2020 13:44:12 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1583531058; x=1615067058; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oUDyZha+UP2T6K4Wg1D/+zB6S5n/oFK58M6oTJnOjPI=; b=Di/ChBGOByJMOKF/Wc2OAHfUD28xGsLnr0HRtEZ2OK1OJJJs5CC5VIXC zWgkc4IX1kdPjEGD7ucd2sV4fpCGkuNvcu5n1L/FFf1vh7neYppCzvIQn MXDXkrXzLR46zKN0j68T6OSG2AupjhwzZiQBDXcppr2FhVqFUHMtNbusl 9W0F5frV6YRAT+CJrqCTvF/0xEAH5zVc2Npcaa6itCmcXYRUx7cioMlJt S5OEUtGnG5VrbE2XKqugryUJZ/yH4s+1R0YaU6NbtFwO+sxSXhxG4PY6Y t3yb8Vodt9DWYQq2glQ1A+SisqIlLs4KLd2anD6l3paiVxy9BKA/1aGUN w==; IronPort-SDR: 75X+OYJkTMlSbyAbOkK4fGalRgO55Qe7hts7huQfz2aSyGg/omWN8yBXSeS+0617Eu3mRBTfjb kGx0V/kQp+o6ltLBrmr7qE2UZ69Jcwk6eiJQ+2yZitbZGoSaXbTdeBC30UzdtFRjLhFrG8/g4w An5wPww1XRRZ4qs2mtgq13Oe6/YYLKkCVYCofxr4uoSBGS/CYfA4WfmlBOdJTn5+1toSgxHy18 W78/kCYubx/eQRhhkOwHZxm/MGzhg5Csxj17saQ8ZgNObWHl0PP/Cxmfyq5HEG5+vTnAFrJn2b tm4= X-IronPort-AV: E=Sophos;i="5.70,523,1574092800"; d="scan'208";a="233784294" IronPort-SDR: eHtLSfL1ruD7D79YqyC+O7apdxR/hcaHf/bpa6vAI2fISuoz1MoZ6zvza2IoXiFSTVZELDILTP V/ZxVRNQL66T03tD26ptv/QeBQ+2FuzvlTvx6PZ0TzX4GyLtmVQoM63KdYc7DGb7X8C9o9nyO3 AEb2TwYU9oVlqZkeIN736XRo6WsMSuUdjQOM7861NOU87NAbC1NBlhoTcLGwxmwBWoXxT/egou 0Aceo2fJywI1i6loIOV0xqFMd9ib6OzaS24iEyXwkCnc5gPmn4YipX344kEza0l6Os6cWstIWK Kp5zl45Zy6qZ+MIVrw1vGMYF IronPort-SDR: Nvy4I/rMYB8hPlDRenNn91bQ0srciovlVXPUOEYD+Lm9DQB6whh8gBc6W6DokYzT2bqS/tV6ds HFZOvlUV48h6wmYohRGkdMAhAzTeON0nW+GSlrEGCFhVYd3mdAYv34Y/Jlj1CDrU/hMFbd/gQr 25Vj/Z5P+tCeda6C/8Si19NCagpMTC7uJwSLeXECEGkwF+0djj8eDu7h7xQXW01sCOr7j74EL+ 19xRg9iIOQJ8d6oxLiCsuPbFYUTog0JuIiumwAf8eoXmwdZHJujZ85edo37pFJhT+FeIVaGAsC bF4= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v3 3/3] riscv/sifive_u: Add a serial property to the sifive_u machine Date: Fri, 6 Mar 2020 13:36:52 -0800 Message-Id: <6132e0b3554868acd16b45eb8ca365cae68a4712.1583530528.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 68.232.143.124 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, palmer@dabbelt.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" From: Bin Meng At present the board serial number is hard-coded to 1, and passed to OTP model during initialization. Firmware (FSBL, U-Boot) uses the serial number to generate a unique MAC address for the on-chip ethernet controller. When multiple QEMU 'sifive_u' instances are created and connected to the same subnet, they all have the same MAC address hence it creates a unusable network. A new "serial" property is introduced to specify the board serial number. When not given, the default serial number 1 is used. Signed-off-by: Bin Meng Reviewed-by: Palmer Dabbelt Reviewed-by: Alistair Francis Message-Id: <1573916930-19068-1-git-send-email-bmeng.cn@gmail.com> [ Changed by AF: - Use the SoC's serial property to pass the info to the SoC - Fixup commit title - Rebase on file restructuring ] Signed-off-by: Alistair Francis --- hw/riscv/sifive_u.c | 20 ++++++++++++++++++++ include/hw/riscv/sifive_u.h | 1 + 2 files changed, 21 insertions(+) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index dc572c761a..44cb72f09e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -34,6 +34,7 @@ #include "qemu/log.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "qapi/visitor.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/sysbus.h" @@ -322,6 +323,8 @@ static void sifive_u_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc), TYPE_RISCV_U_SOC, &error_abort, NULL); + object_property_set_uint(OBJECT(&s->soc), s->serial, "serial", + &error_abort); object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_abort); =20 @@ -413,6 +416,18 @@ static void sifive_u_machine_set_start_in_flash(Object= *obj, bool value, Error * s->start_in_flash =3D value; } =20 +static void sifive_u_machine_get_serial(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + visit_type_uint32(v, name, (uint32_t *)opaque, errp); +} + +static void sifive_u_machine_set_serial(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + visit_type_uint32(v, name, (uint32_t *)opaque, errp); +} + static void sifive_u_machine_instance_init(Object *obj) { SiFiveUState *s =3D RISCV_U_MACHINE(obj); @@ -424,6 +439,11 @@ static void sifive_u_machine_instance_init(Object *obj) "Set on to tell QEMU's ROM to jump to = " \ "flash. Otherwise QEMU will jump to DR= AM", NULL); + + s->serial =3D OTP_SERIAL; + object_property_add(obj, "serial", "uint32", sifive_u_machine_get_seri= al, + sifive_u_machine_set_serial, NULL, &s->serial, NUL= L); + object_property_set_description(obj, "serial", "Board serial number", = NULL); } =20 =20 diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h index a2baa1de5f..16c297ec5f 100644 --- a/include/hw/riscv/sifive_u.h +++ b/include/hw/riscv/sifive_u.h @@ -61,6 +61,7 @@ typedef struct SiFiveUState { int fdt_size; =20 bool start_in_flash; + uint32_t serial; } SiFiveUState; =20 enum { --=20 2.25.1