From nobody Thu Nov 13 23:42:04 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=1583363510; cv=none; d=zohomail.com; s=zohoarc; b=lemNQMKeMUBg6Tz/ZfmytD6qGfLgUkO4zCkw+K+jBnwMHEQenVXf+9evdGw8jjECpBfbQED4TPfKC/KLoa5jc4RXVMmLNyERa+U9KiXUmir5TWanEd3lZVcziHHv1unosO547ICoIi0kkfPJ/KHFtkouq4wcBdVqFcYOjeWtKlI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583363510; 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=+ci60ptC1rOQF2+RingTlcob5A4kRSevT7sU2vQ5AuY=; b=Aqs00IeFe39+ryFysy4CwxQevuTT9LsGiVXtpSH+BKyNmx2vBX6pKYCxS/nVJiA1sUZWw2rgM/zVhyEXXBrAdZWVUv5w2AFzlqRrQT4XSTetlEVPsJHTfoFLeqgMfb1Iyz3n6zq2WvrDVguD8UBaglODf4GmSBuXgjcrdHJhzL4= 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 158336351023527.853329179552475; Wed, 4 Mar 2020 15:11:50 -0800 (PST) Received: from localhost ([::1]:40982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9dAT-00087t-Ld for importer@patchew.org; Wed, 04 Mar 2020 18:11:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43463) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9d9A-0006SO-0z for qemu-devel@nongnu.org; Wed, 04 Mar 2020 18:09:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9d98-0004h1-AK for qemu-devel@nongnu.org; Wed, 04 Mar 2020 18:09:47 -0500 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:51004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j9d98-0004Sp-1U; Wed, 04 Mar 2020 18:09:46 -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; 05 Mar 2020 07:09:45 +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; 04 Mar 2020 15:01:34 -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; 04 Mar 2020 15:09:45 -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=1583363385; x=1614899385; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=piq3GJJCoPHXlSP1vfQ7BZnPzHD9F56ACnt/w7CyrmA=; b=TR5oRXXVPQNzwcspI8zBQoTXafSbDk7UHyQlfG52OYy392eyTNL26PT6 BydyII/ea3QAQDSkRAnkOXPr8rkvGTuCWa67MUPmOnRq3xvO8a0E1K1kV bzkOpzQ2A9Brbs+9NQ2RqOWMhG97LI2ia/jPuwiNa+uglzxu6C+qORRmG kqcnGMXcJ8geAuOVQ7NdPHCrdEaM0Qcma5wStjvQbqqd630JBLrDrFZQW lSul929raVaC33PEzg76njCGIJBCeIKmuacCoD0s8ap9B50FJRDUG9Tmx rhCcEymjLg222o2NalI1ZKdgeIvIhuDuP/RgNene7i4tsUNX8YZTNfTr3 w==; IronPort-SDR: +Z2Ki2NKCmDD2c/Ggb0n390E9/SnssQAsaoEd7sOQgUjDG/e537Om5m503164FzBV+UWP+1Rmm zLEQ+XF6mATd5LTfK0n+opJpo37NJCruieys5RuburiLLKzTxgodIcGrS7uT3fmzpXeE/HWtpx nidIoLQVWZoRxcUdwlcLZno7h9oB4TqINV+0owxMsvLXWFIIVJVKwCYClIBVxjpr/NnQk6uH9H o5YdbOBzOrZnmz5DGXXd0na2J1fs8a/C8xkkOiriga7X7f8rvFwfITYKt/RGKCyVLKbZS9RUqY uMg= X-IronPort-AV: E=Sophos;i="5.70,515,1574092800"; d="scan'208";a="131477239" IronPort-SDR: mXx/M+fkVMlPhSnK8MAZZYKq+xj0WxVlB3slTPDX+xipXNQYhh3c88QeMbA8F2GX89ftL/MEMP YX/RufuNkI7lSxlDNQpKFbEIOfBhaIoCAWDRsSn3dvnbtlO+7EEC7wBdpOQPTaj5n6pxRkFEvF XQHsHOAHOA5HXW6gtlThayF4ygSj4oCoG4Z8+ckx8QJ7rZKWJMLeXewNVRG5rAkwQukdBCXsDo whT4cAdAnLjn2wlUzreSU3GrDOeLmARvvH0G1Iv2lz30sXHVs/mU3Sn3lfaBt5mEBe75QyHyIE WQXtW6pT1jjEzy3+sKKvlZub IronPort-SDR: ECRiPOqgWAO8YOzvludlC6jnZxYt7E/CK8CTv1YcKuGws4xmBhZ/5cPciDkm0QpRpWGwACNkPB O9NiYt53m0Pa22PIObeEWxCgHKFKEzGvwPfIuldR0YNj6K2yA3x++YDZ459NsTij6kb2mwoxfe kHv1UcMdFPQjLDGSBFdCizESOlfKqorKBbQ4wj2vkr1ymXWUQB4DZkVkp40LznkSObQmOf6sUY PfHbTtMzg2+ztYBX8m998NNir7DykAjH+YOXr7MbzoRD6s3I5vdq2gvqV10TzXcZmxp01y+25W cG0= WDCIronportException: Internal From: Alistair Francis To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 2/3] riscv/sifive_u: Add a serial property to the sifive_u SoC Date: Wed, 4 Mar 2020 15:02:30 -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.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: 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 9a0145b5b4..aed8249d0b 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