hw/riscv: Add a serial property to the sifive_u machine
Subsystems (2)
v2 cover hw/riscv: Add a serial property to the sifive_u machine
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.
v2:
- Fix the serial setting so it correctly sets
Alistair Francis (2):
riscv/sifive_u: Fix up file ordering riscv/sifive_u: Add a serial property to the sifive_u SoC
Bin Meng (1):
riscv/sifive_u: Add a serial property to the sifive_u machine
hw/riscv/sifive_u.c | 135 +++++++++++++++++++++--------------- include/hw/riscv/sifive_u.h | 3 + 2 files changed, 84 insertions(+), 54 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/3 riscv/sifive_u: Fix up file ordering
Split the file into clear machine and SoC sections.
--- hw/riscv/sifive_u.c | 107 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 53 deletions(-)
hw/riscv/sifive_u.c +54 -53
@@ -399,6 +399,60 @@ static void riscv_sifive_u_init(MachineState *machine) &address_space_memory); } +static bool sifive_u_get_start_in_flash (Object *obj,Error **errp) +{ +SiFiveUState *s =RISCV_U_MACHINE (obj); + +return s->start_in_flash; +} + +static void sifive_u_set_start_in_flash (Object *obj,bool value,Error **errp) +{ +SiFiveUState *s =RISCV_U_MACHINE (obj); + + s->start_in_flash = value; +} + +static void riscv_sifive_u_machine_instance_init (Object *obj) +{ +SiFiveUState *s =RISCV_U_MACHINE (obj); + + s->start_in_flash = 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 DRAM" , +NULL ); +} + + +static void riscv_sifive_u_machine_class_init (ObjectClass *oc,void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); + + mc->desc ="RISC-V Board compatible with SiFive U SDK" ; + mc->init = riscv_sifive_u_init; + mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; + mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; + mc->default_cpus = mc->min_cpus; +} + +static const TypeInfo riscv_sifive_u_machine_typeinfo = { + .name =MACHINE_TYPE_NAME ("sifive_u" ), + .parent =TYPE_MACHINE , + .class_init = riscv_sifive_u_machine_class_init, + .instance_init = riscv_sifive_u_machine_instance_init, + .instance_size =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 =MACHINE (qdev_get_machine ());
@@ -439,33 +493,6 @@ static void riscv_sifive_u_soc_init(Object *obj) TYPE_CADENCE_GEM); } -static bool sifive_u_get_start_in_flash (Object *obj,Error **errp) -{ -SiFiveUState *s =RISCV_U_MACHINE (obj); - -return s->start_in_flash; -} - -static void sifive_u_set_start_in_flash (Object *obj,bool value,Error **errp) -{ -SiFiveUState *s =RISCV_U_MACHINE (obj); - - s->start_in_flash = value; -} - -static void riscv_sifive_u_machine_instance_init (Object *obj) -{ -SiFiveUState *s =RISCV_U_MACHINE (obj); - - s->start_in_flash = 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 DRAM" , -NULL ); -} -static void riscv_sifive_u_soc_realize (DeviceState *dev,Error **errp) {MachineState *ms =MACHINE (qdev_get_machine ());
@@ -603,29 +630,3 @@ static void riscv_sifive_u_soc_register_types(void) }type_init (riscv_sifive_u_soc_register_types) - -static void riscv_sifive_u_machine_class_init(ObjectClass *oc, void *data) -{ -MachineClass *mc =MACHINE_CLASS (oc); - - mc->desc ="RISC-V Board compatible with SiFive U SDK" ; - mc->init = riscv_sifive_u_init; - mc->max_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +SIFIVE_U_COMPUTE_CPU_COUNT ; - mc->min_cpus =SIFIVE_U_MANAGEMENT_CPU_COUNT +1 ; - mc->default_cpus = mc->min_cpus; -} - -static const TypeInfo riscv_sifive_u_machine_typeinfo = { - .name =MACHINE_TYPE_NAME ("sifive_u" ), - .parent =TYPE_MACHINE , - .class_init = riscv_sifive_u_machine_class_init, - .instance_init = riscv_sifive_u_machine_instance_init, - .instance_size =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)
Signature · 1 line
2.25.1
PATCH v2 2/3 riscv/sifive_u: Add a serial property to the sifive_u SoC
In reply to Alistair FrancisAt 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.
--- hw/riscv/sifive_u.c | 8 +++++++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-)
hw/riscv/sifive_u.c +7 -1
@@ -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 ].base); +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);
@@ -607,10 +607,16 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) memmap[SIFIVE_U_GEM_MGMT].base, memmap[SIFIVE_U_GEM_MGMT].size); } +static Property riscv_sifive_u_soc_props[] = { +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 =DEVICE_CLASS (oc); +device_class_set_props (dc, riscv_sifive_u_soc_props); dc->realize = riscv_sifive_u_soc_realize;/* Reason: Uses serial_hds in realize function, thus can't be used twice */ dc->user_creatable = false;
include/hw/riscv/sifive_u.h +2 -0
@@ -42,6 +42,8 @@ typedef struct SiFiveUSoCState {SiFiveUPRCIState prci;SiFiveUOTPState otp;CadenceGEMState gem; + +uint32_t serial; } SiFiveUSoCState;#define TYPE_RISCV_U_MACHINE MACHINE_TYPE_NAME("sifive_u")
Signature · 1 line
2.25.1
Re: [PATCH v2 2/3] riscv/sifive_u: Add a serial property to the sifive_u SoC
Quoted 12 lines · Alistair Francis
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_uSoC to specify the board serial number. When not given, the default serial number 1 is used.
Quoted 7 lines
Suggested-by Bin Meng <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- hw/riscv/sifive_u.c | 8 +++++++- include/hw/riscv/sifive_u.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-)
PATCH v2 3/3 riscv/sifive_u: Add a serial property to the sifive_u machine
In reply to Alistair FrancisFrom: Bin Meng <[email protected]>
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.
Message-Id: <[email protected]> [ Changed by AF:
- Use the SoC's serial property to pass the info to the SoC
- Fixup commit title
- Rebase on file restructuring
]
--- hw/riscv/sifive_u.c | 20 ++++++++++++++++++++ include/hw/riscv/sifive_u.h | 1 + 2 files changed, 21 insertions(+)
hw/riscv/sifive_u.c +20 -0
@@ -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);
@@ -413,6 +416,18 @@ static void sifive_u_set_start_in_flash(Object *obj, bool value, Error **errp) s->start_in_flash = value; } +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 =RISCV_U_MACHINE (obj);
@@ -424,6 +439,11 @@ static void riscv_sifive_u_machine_instance_init(Object *obj)"Set on to tell QEMU's ROM to jump to " \"flash. Otherwise QEMU will jump to DRAM" , NULL); + + s->serial =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 ); }
include/hw/riscv/sifive_u.h +1 -0
@@ -61,6 +61,7 @@ typedef struct SiFiveUState {int fdt_size;bool start_in_flash; +uint32_t serial; } SiFiveUState;enum {
Signature · 1 line
2.25.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
**
ERROR:/tmp/qemu-test/src/tests/qtest/migration-helpers.c:119:check_migration_status: assertion failed (current_status != "completed"): ("completed" != "completed")
ERROR - Bail out! ERROR:/tmp/qemu-test/src/tests/qtest/migration-helpers.c:119:check_migration_status: assertion failed (current_status != "completed"): ("completed" != "completed")
make: *** [check-qtest-x86_64] Error 1
make: *** Waiting for unfinished jobs....
TEST iotest-qcow2: 061
TEST iotest-qcow2: 062
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--label', 'com.qemu.instance.uuid=7818f7bb68234e3daee3c182689ac0db', '-u', '1003', '--security-opt', 'seccomp=unconfined', '--rm', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-fgt66d82/src/docker-src.2020-03-04-18.40.35.9848:/var/tmp/qemu:z,ro', 'qemu:centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=7818f7bb68234e3daee3c182689ac0db
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-fgt66d82/src'
make: *** [docker-run-test-quick@centos7] Error 2
real 12m6.842s
user 0m5.918s
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]