From nobody Thu Nov 13 21:51:50 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=1583285855; cv=none; d=zohomail.com; s=zohoarc; b=jw+h4PAwmvkTZrEeLBv9sjtupaIZnOasX5+X5yxfekhpVOKqvyFIhxXR1MBufh73I7rSP0vb0y+frSvVhWp3OALsGJRUG8joTZExhj3YNQbEwjmekgE437e1bKTY4fSpnm1FE9Wiplh/g1VNER33ltl1eLtur8ExWufuUTGBogU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583285855; 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=nwQhULkTGIyFLq13grcnYgfpa9B6ft7wc1kNS0dnw3w=; b=k7XDsWY5HSfhCZ33cy0ljM7XR3yj/TgLwpepfYWZ5s0OipBO2o4vC4cHgoUnf/v/3OTxBAgVUpylIYpq+APJaBJo040Geioja4CGMF2mUO53LbSNhTXjfl52AQy1ezG/ZBdM7OcTQPYLXIUW2JUq8WF5xTS98FPUSpuWtzV6YnU= 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 1583285855526542.8054519478189; Tue, 3 Mar 2020 17:37:35 -0800 (PST) Received: from localhost ([::1]:56126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Iyc-0004C9-5p for importer@patchew.org; Tue, 03 Mar 2020 20:37:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47581) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9IxW-0003By-Gq for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9IxV-0004N6-B5 for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:26 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26811) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9IxU-0004Ky-VL; Tue, 03 Mar 2020 20:36:25 -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; 04 Mar 2020 09:36:24 +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; 03 Mar 2020 17:28:14 -0800 Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.158.235]) by uls-op-cesaip01.wdc.com with ESMTP; 03 Mar 2020 17:36:22 -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=1583285786; x=1614821786; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dpSnUXJsfXsvbPky0lT+EZH/OqTvD/6BTmdDhhB8700=; b=EK+o82aa0jdZaagNLcFMUoe6NJCP9bVyw+L+rvXWv2G/rzottXk0NULJ kPuzCc3WOXF8Jo78aT8yhlmccv8jVzLhXELZhMv+HRFXhnF0R5VYMUhqQ fwLnqPfyztRKOTWVLNXul5itYw1CQDPDEJRbF6RNuqeItXmJMnLD3eJsP 15uEHl5+0w0cA4AaDcrXkKhFK69ThQs3ODZodYgj04PIgr9N5C0XWHbxD Qts1cTR1okShrY8YTW4BO5Nx3tztrvI4mZOXcXnqLhZrED7iNNS9RLeZ+ I0lHpSzJAowobB2nf22KpFJPAyU0lC4WA6VINzBuqZqPrCSYd4K6jk+EH Q==; IronPort-SDR: Nio2yPUxEPcBGTKlum4bit4OoaZ6CusA4LlWyT/m3uUfh3BMG1LHcb+KYIWuaAdJcinY0KiLbo nLUv0K7C0t+B1FSftl36Ztj4wPywIjiOma3PX4NNBPxSElgAfSZruP26tLA3IgjJyfM2vq5Ufr WjAcN0JreUYaVE1UWBJfFAVH++d0yVnLGTZnNgYcz6ATOww2BGE71CKYMkrXOPY2JhGIt/gMrh V11yBAB8INcPUOOx2MDZxhrmTYzFwpadgY1/yGYmaqxZmZ84FrPryDAN6o8wtj4rRpUrN/1c/2 tCI= X-IronPort-AV: E=Sophos;i="5.70,511,1574092800"; d="scan'208";a="131866039" IronPort-SDR: 7Fc3Fiwxm3f8Hgybe5fBXiaM3Kz+UDKS090Gw+yzW1WyIW+pH1H9jfcjrzq3IhnYlfEmaIn6IS 1bYSE76uBQwtfujKGyCw3o4tO3sgWCTEAIH1A66zRwDiV1Tv+wyIpIyEAujZsa3MtsTDo23AAa uWBlrH97w80M5uLYZTuSDNlo2JemXG+gRw/OoudHKW0c28vMltx9CaZFwr1Nt0SsF3kEiUmnRG MFX2JwLISwsFAqpMKf8OeSWRO2PtGBL4PVsBWYJIf1BK4y0/ol5/ctAsjnyJYILtFl8yaZPjR9 Yb9hEUJq5OMRtERYS3mxNBdX IronPort-SDR: TS3hUjm8PVfy/0cd5gx1UeyGkD9BLkXojD54vlPz3T0EDj7wWjZxCHRMXcHvocGtywyAU7M2S3 8DbsvLB8fcOhbh/6qYK+b2wQ5RXjxUxwndp7ABGQmnXXUka0UYLlObelTW/3V0Og//xRNpY/0g Nd6edrF8/4d52kC5XjHH5il997kYDaaJPxIBKVplN/5v6Nvp4u+BqILkw+vtNMM8RrO6KBWupF AQJ5m6sYQZcxK+zq/gGCoPjebsXXfMscaGpsaQzsUg9vlmNZ856VYi4t2sR+QZkf2HRRDW6mTH EgA= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 1/3] riscv/sifive_u: Fix up file ordering Date: Tue, 3 Mar 2020 17:29:10 -0800 Message-Id: <3f5f5106d357f6ff911e4b81973840d414920b78.1583285287.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 X-Received-From: 216.71.153.144 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 --- hw/riscv/sifive_u.c | 107 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 53 deletions(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 156a003642..9a0145b5b4 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -399,6 +399,60 @@ static void riscv_sifive_u_init(MachineState *machine) &address_space_memory); } =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_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) + 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 21:51:50 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=1583285932; cv=none; d=zohomail.com; s=zohoarc; b=bdGo1wEDfLi0EXh660XAPW4vca02df7pYoIIfPzy3wpY7cTX5y6dRg73MPCICLZThsVZfodFjM2AdIzrSn6oeuIuxX8nWZy34MrLSryxstt+GozLRZvlNnR9nEYOncHj0OBUzL3pSL+lyYrW4CyuLNhC4ee8fVOkmZeoMvAZOPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583285932; 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=z5ethcH1fbfHWNvDVA0eOwpWg+qlsDFAs5pXWSfe86A=; b=lCFoLtVU7bcmgaxuiqm1wB7QSU8orxlrlMDVpsdS4SNvSLTCz0iDzLFqXY85mZJd0fRS7Vy8Kqjr1RVp2i+TcjKrfPh88Y9dHpUFnHO67WiXvuqsgjiDcOmEeVw4xebX8vcYDDSL4oU6MPX8A/Hk77b+8riA20u8C0/hfT5rd1M= 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 158328593221291.17692495805011; Tue, 3 Mar 2020 17:38:52 -0800 (PST) Received: from localhost ([::1]:56150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Izq-0005pN-V6 for importer@patchew.org; Tue, 03 Mar 2020 20:38:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47728) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9IxZ-0003CP-On for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9IxY-0004Rl-Jc for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:29 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9IxY-0004Pn-2B; Tue, 03 Mar 2020 20:36:28 -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; 04 Mar 2020 09:36:28 +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; 03 Mar 2020 17:28:18 -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; 03 Mar 2020 17:36:26 -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=1583285789; x=1614821789; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RZGMEj8rnsYsgj6Tk32enNLXX4pUHrwlRy91vxUcAFs=; b=eHHTBxC228ZNnaDMHOBhLBCE7pZaB8DDmyrRoH1VtDwIX58EP/0ekhSm G6Dg7DgqJSTtDNM4EL91UrQESLbjNzMmq2yOPShGhRPxioIgoS/+Ocf4E xi6hQ1Uz7/SAUrN4weYfsCdGe4w7jJh/CK3wl3Sh2e9Rx+Z4CDRQzhxbo 5iFUVA6J9OzWqxUZ0SRgxmbb0h7ZoTR+/D+tnCA6z3w3hkx2fXL8Cgl4L NQ+uWjFw+1XRtOjTIX9C4mtZ76SCVq+bSLCeLITFVzPqBZBtUuHcN7Yn+ G8MtXDc83XZ3BcAFS7MpSz5MDcTQq8b4qY7uquP2uCItUzEpWz/AFS5Zg g==; IronPort-SDR: UxCGwN7B8zlSZ4cpLNVPXQFsVHZeYEdSr5xrBsSLcNqM2ybk4pdUMLIEdQwqpvpkWOEph4gtEy Cau6hcVSUtm/MCseMYLlFsCJB53W53te2TFlZ3iZh85oG7y9dJW2p1TxA2TOSL4bDGOWPzE/Hy nsLrs0gci27pKNxXb7SYSkYAJmd9fUymuk02duC3nHYYREDB0oOzie3RkvuiTA6+P1ol9Q7+XQ mYBfpBuh9WHdQD4H+9WddhIpQPvqfgFeAMN2wD7/fM+s/A5Cdnsop4PpuEGPmNXcfuMSQ+bHDS F/0= X-IronPort-AV: E=Sophos;i="5.70,511,1574092800"; d="scan'208";a="131866061" IronPort-SDR: sOl+Bhyb4NFVap+qtqa3MaodzFHKbdv3TzGKq7SRRr+Glvq1Eg9rwO3kQkL9yPP8p6AKsqpAfo yXo7UUDBgKjGrqPCam4b3n1YqfwAgs+2e43MRQ/aCCtl6hGbynAG72suBFvXqUuIBCXB/1byAb ON4Gx0+uH0h6BWHcGhBqYSNE/KapC4cIWBvySaVx4kp5a9XAk5j0Q5HjA98+BE+bqRh4A7pLZ7 nzJuFQ09Z8BDViuwkjQJIdHsyoNyTIOi/Nog49pQTQ4OK0WOkM5X6dyQeFY9YaeLGjat+xbGpY Ee2oRZlUdOY+xLlsV/inCSmQ IronPort-SDR: 2j8N8RQsraNEVUYYYc9XRnf46+7QO4N73zwN3MultxmD0Y1gsL9Zjungj4vk+2sVK3YUHu5+Fk 0070HmnJHxnFsuR+mmTDzZnqomW0fgqGqjdQ+wCLVrfRZDMXPNkfl0E2iWyYiHPa1T1CpJmRsV SjrGi8mtINsMzx6vrfMG3C/8ypnL29+/cdKL/vnySBbjhoEHibi0S2JpE+U2o9RTKZURt8CQ4+ 5chBLeVFo5bw+A/TGWz+Q8bosi4JUG+ojnKJW/yoZhtnO893cQRCgMVcKqoiqapo/OEtjfkvPz oE4= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 2/3] riscv/sifive_u: Add a serial property to the sifive_u SoC Date: Tue, 3 Mar 2020 17:29:13 -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: 216.71.153.144 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 --- 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 9a0145b5b4..e52f9d0bd4 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -488,7 +488,7 @@ 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); + qdev_prop_set_uint32(DEVICE(&s->otp), "serial", s->serial); sysbus_init_child_obj(obj, "gem", &s->gem, sizeof(s->gem), TYPE_CADENCE_GEM); } @@ -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 21:51:50 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=1583285939; cv=none; d=zohomail.com; s=zohoarc; b=mkgetjUJapZkvS+ZQYWGF6sGqMkWMY7K3nkpOKAKbTCJFWrr6SugeZCx6/FAjFMZVJahLeXxTfZaIUbS80UGeeGRag6HWsS4o7ivjyp2UVJuTVz8G87uLqeMu5UuWCE5jbP2gbJjsoccybYZ4g36VStajCJ+IrOo7vRWmdrrQSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583285939; 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=+e5X3pzi2laLaLPkJWeGuxYz1iPp4DhNl+exJCPE84k=; b=hFco68R2NuE77yi1543v3EjGCTg3pINIF/3kD5z1mxYivW4cn2Hh/i7kG0VJIfgwE0VwGSuM8v11Yoi9Rz2nqfjzQwx1wh8Uxucw+j463KnTBU3s7Xt3R7UrRHNL0yKOPYmbwdtsVIfytF1Rks5OhOOxJQCVFVJUTBM/u15YdbE= 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 1583285939242474.649294141503; Tue, 3 Mar 2020 17:38:59 -0800 (PST) Received: from localhost ([::1]:56154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Izy-00061u-5q for importer@patchew.org; Tue, 03 Mar 2020 20:38:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47838) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Ixc-0003Ei-JR for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Ixb-0004W4-EM for qemu-devel@nongnu.org; Tue, 03 Mar 2020 20:36:32 -0500 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9Ixb-0004Pn-5U; Tue, 03 Mar 2020 20:36:31 -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; 04 Mar 2020 09:36:31 +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; 03 Mar 2020 17:28:21 -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; 03 Mar 2020 17:36:30 -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=1583285792; x=1614821792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hLfzBwQY0GHBELl4LwyEgvgs3lqC1dQdMfJRHFbzMPY=; b=VAGxd6+EdaiWi7MJ4eT8mf5kNabXeNB4ezQB5Uf47Z8cFrzh71k7483H Mxxicd6nVD5Y0ITvTSPWbBkmdWIDQGdgkZWk3VBm4xP/cxXshwWzEP3tz ff8RpDcdq0IacxLc4fUPcH52aHpd5Jf1jklFTqFdinl3WiofnrjfS94EI GkzJRTAVfmaFKhZcfM6bqo2CkumRAX35edS6Z87h9ppQjU/5NkbhGOunw cgjHxQIujCD9s+6c7H/jd7s1x9v8D6Ygg/0wq7Gjb44fasA59hFuOiUBR NLd+kQak/wwV48cx6Gn+aNz+VoQqX/kZls/uAqc33ui0vPyzomfRuqn5K g==; IronPort-SDR: RbUBcKzTaBXoQlSyelxrW+DOQKQOixwj5WrJHc3iIW4rs6XeBtRU6ZECKZOcv7RamPFFahN83Y glK5rY5qw9ZrK3QyQ/twnOY9eaoQDt8Bex7di0MW6xFUOEaJ6IfwvYtieuH4PyWjU1Br1VtEhF ywKeRc+5/CwadryLg54HOxI3q8Jp3EkYOd3+ahjCcy6CuqKuiyaqtE5wjP288b0JNihrONcV/A 93Zemzs9iayYKATevvrG6foxwnz1Ff+6JdEPUX0mCN6Cg2u4Shmtpok82VfmqIVxX9kdTQilPg VKQ= X-IronPort-AV: E=Sophos;i="5.70,511,1574092800"; d="scan'208";a="131866070" IronPort-SDR: +Rv7o+QWpKbJaMl0VCvcKjzrXQm4mH9kXjLwrksKm3AgRXISWaGC8zNgDhL1sMMhm0yjee0Dyo TS7jVp5AjST8IZR9crIR+dPipD0qesQ29uWEWjXeAEM6sXEmZuGeUcEqaUWt2Q6BhgwHw12bGi 6xg13OnoqW1wM6PnypJkb00ASUeD33OC5CJKQz/MHqKCUwqrI0e0wi48Bpi5bkKXptzlgTmadr h6eujJMvBxf9jf7Pk/dCsec5XcYa9diJ6zCo5wOn21iq5uq4GFnz9Psits+NtYU/4VmFiQQqFp 7BGFRydmGwN6sat3XQT1aAqY IronPort-SDR: AU/UdIHFl+8WWvgg1bZIN22I63oe+qy6xca90DwU4fJkuUoL7Akxh0aG6aZdyI9oEwvuK4wN8A 8/AVMLo7LX/uCm0rrz5r+FJNoABTr0SIl8KHd9Ht3EWXRpxUVshV4GLZNaTnv3y08UPANJCakN dWQn8KdlqDcHqC5X0mRPRuNhYa502oPOybIAUADOsZh4zQFcit+HP67uaHpNzcFRATn5fT33WC /w91QclCAJ4f5u0Laxz0VOWa4SycGdhMe2ROBUdVA2JVdhI9EubzPOxd9knHYn1l1yX1mcHOuS qs8= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v1 3/3] riscv/sifive_u: Add a serial property to the sifive_u machine Date: Tue, 3 Mar 2020 17:29:17 -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: 216.71.153.144 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 e52f9d0bd4..f3f67cc0e3 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 riscv_sifive_u_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_set_start_in_flash(Object *obj, b= ool value, Error **errp) s->start_in_flash =3D value; } =20 +static void sifive_u_get_serial(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + visit_type_uint32(v, name, (uint32_t *)opaque, errp); +} + +static void sifive_u_set_serial(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + visit_type_uint32(v, name, (uint32_t *)opaque, errp); +} + static void riscv_sifive_u_machine_instance_init(Object *obj) { SiFiveUState *s =3D RISCV_U_MACHINE(obj); @@ -424,6 +439,11 @@ static void riscv_sifive_u_machine_instance_init(Objec= t *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_get_serial, + sifive_u_set_serial, NULL, &s->serial, NULL); + 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