Skip to contentSkip to conversation

hw/riscv: microchip_pfsoc: specify XIP image

PATCH In review Vitaly Wool 3 participants 4 messages Dec 19, 2020 – Jan 15, 2021 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/riscv: microchip_pfsoc: specify XIP image

Add command line parameter to microchip_pfsoc machine to be able to specify XIP kernel image file. To pass over XIP image file, it will be enough to run

$ qemu-system-riscv64 -M microchip-icicle-kit,xipImage=<image> ...
---
 hw/riscv/microchip_pfsoc.c         | 42 +++++++++++++++++++++++++++---
 include/hw/riscv/microchip_pfsoc.h |  1 +
 2 files changed, 39 insertions(+), 4 deletions(-)
hw/riscv/microchip_pfsoc.c +38 -4
index e952b49e8c..04d81d52fe 100644
@@ -181,6 +181,7 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)
 static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
 {
     MachineState *ms = MACHINE(qdev_get_machine());
+    MicrochipIcicleKitState *mks = MICROCHIP_ICICLE_KIT_MACHINE(ms);
     MicrochipPFSoCState *s = MICROCHIP_PFSOC(dev);
     const struct MemmapEntry *memmap = microchip_pfsoc_memmap;
     MemoryRegion *system_memory = get_system_memory();
@@ -415,10 +416,19 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
                     memmap[MICROCHIP_PFSOC_IOSCB].base);
 
     /* QSPI Flash */
-    memory_region_init_rom(qspi_xip_mem, OBJECT(dev),
-                           "microchip.pfsoc.qspi_xip",
-                           memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
-                           &error_fatal);
+    if (mks->xip_image) {
+        memory_region_init_ram_from_file(qspi_xip_mem, OBJECT(dev),
+                                         "microchip.pfsoc.qspi_xip",
+                                         memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                                         0x10000 /* align */, 0 /* ram_flags */,
+                                         mks->xip_image, &error_fatal);
+        qspi_xip_mem->readonly = true;
+    } else {
+        memory_region_init_rom(qspi_xip_mem, OBJECT(dev),
+                               "microchip.pfsoc.qspi_xip",
+                               memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                               &error_fatal);
+    }
     memory_region_add_subregion(system_memory,
                                 memmap[MICROCHIP_PFSOC_QSPI_XIP].base,
                                 qspi_xip_mem);
@@ -517,6 +527,24 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
     }
 }
 
+static void microchip_pfsoc_prop_set_xipimage(Object *obj,
+                                              const char *value,
+                                              Error **errp)
+{
+    MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(obj);
+
+    g_free(s->xip_image);
+    s->xip_image = g_strdup(value);
+}
+
+static char *microchip_pfsoc_prop_get_xipimage(Object *obj,
+                                               Error **errp)
+{
+    MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(obj);
+
+    return g_strdup(s->xip_image);
+}
+
 static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
@@ -536,6 +564,12 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data)
      * See memory_tests() in mss_ddr.c in the HSS source code.
      */
     mc->default_ram_size = 1537 * MiB;
+
+    object_class_property_add_str(oc, "xipImage",
+                            microchip_pfsoc_prop_get_xipimage,
+                            microchip_pfsoc_prop_set_xipimage);
+    object_class_property_set_description(oc, "xipImage",
+                                    "Kernel XIP image to run from QSPI NOR");
 }
 
 static const TypeInfo microchip_icicle_kit_machine_typeinfo = {
include/hw/riscv/microchip_pfsoc.h +1 -0
index d0c666aae0..a7b180a5d4 100644
@@ -65,6 +65,7 @@ typedef struct MicrochipIcicleKitState {
 
     /*< public >*/
     MicrochipPFSoCState soc;
+    char *xip_image;
 } MicrochipIcicleKitState;
 
 #define TYPE_MICROCHIP_ICICLE_KIT_MACHINE \
Signature · 1 line
2.20.1
#1 lore raw

+Alistair Francis

Quoted 26 lines · Vitaly Wool

Add command line parameter to microchip_pfsoc machine to be able to specify XIP kernel image file. To pass over XIP image file, it will be enough to run

$ qemu-system-riscv64 -M microchip-icicle-kit,xipImage=<image> ...
---
 hw/riscv/microchip_pfsoc.c         | 42 +++++++++++++++++++++++++++---
 include/hw/riscv/microchip_pfsoc.h |  1 +
 2 files changed, 39 insertions(+), 4 deletions(-)
hw/riscv/microchip_pfsoc.c +1 -0
index e952b49e8c..04d81d52fe 100644
@@ -181,6 +181,7 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)
 static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
 {
     MachineState *ms = MACHINE(qdev_get_machine());
+    MicrochipIcicleKitState *mks = MICROCHIP_ICICLE_KIT_MACHINE(ms);
     MicrochipPFSoCState *s = MICROCHIP_PFSOC(dev);
     const struct MemmapEntry *memmap = microchip_pfsoc_memmap;
     MemoryRegion *system_memory = get_system_memory();

hw/riscv/microchip_pfsoc.c static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) · line 418

Quoted 4 lines
hw/riscv/microchip_pfsoc.c +0 -1
@@ -415,10 +416,19 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
                     memmap[MICROCHIP_PFSOC_IOSCB].base);
 
     /* QSPI Flash */
-    memory_region_init_rom(qspi_xip_mem, OBJECT(dev),

I believe we only need to change this to memory_region_init_ram(), then use the device loader the load the XIP image into this space. The remove the need to introduce the XIP image property as you did.

Quoted 20 lines
hw/riscv/microchip_pfsoc.c +13 -3
-                           "microchip.pfsoc.qspi_xip",
-                           memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
-                           &error_fatal);
+    if (mks->xip_image) {
+        memory_region_init_ram_from_file(qspi_xip_mem, OBJECT(dev),
+                                         "microchip.pfsoc.qspi_xip",
+                                         memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                                         0x10000 /* align */, 0 /* ram_flags */,
+                                         mks->xip_image, &error_fatal);
+        qspi_xip_mem->readonly = true;
+    } else {
+        memory_region_init_rom(qspi_xip_mem, OBJECT(dev),
+                               "microchip.pfsoc.qspi_xip",
+                               memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                               &error_fatal);
+    }
     memory_region_add_subregion(system_memory,
                                 memmap[MICROCHIP_PFSOC_QSPI_XIP].base,
                                 qspi_xip_mem);

hw/riscv/microchip_pfsoc.c static void microchip_icicle_kit_machine_init(MachineState *machine) · line 529

Quoted 3 lines
hw/riscv/microchip_pfsoc.c +0 -0
@@ -517,6 +527,24 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
     }
 }
 

Regards,
Bin

#2 lore raw

Hi Bin,

Quoted 32 lines · Bin Meng

+Alistair Francis

Quoted 28 lines · Vitaly Wool

Add command line parameter to microchip_pfsoc machine to be able to specify XIP kernel image file. To pass over XIP image file, it will be enough to run

$ qemu-system-riscv64 -M microchip-icicle-kit,xipImage=<image> ...
---
 hw/riscv/microchip_pfsoc.c         | 42 +++++++++++++++++++++++++++---
 include/hw/riscv/microchip_pfsoc.h |  1 +
 2 files changed, 39 insertions(+), 4 deletions(-)
hw/riscv/microchip_pfsoc.c +1 -0
index e952b49e8c..04d81d52fe 100644
@@ -181,6 +181,7 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)
 static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
 {
     MachineState *ms = MACHINE(qdev_get_machine());
+    MicrochipIcicleKitState *mks = MICROCHIP_ICICLE_KIT_MACHINE(ms);
     MicrochipPFSoCState *s = MICROCHIP_PFSOC(dev);
     const struct MemmapEntry *memmap = microchip_pfsoc_memmap;
     MemoryRegion *system_memory = get_system_memory();
@@ -415,10 +416,19 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
                     memmap[MICROCHIP_PFSOC_IOSCB].base);
 
Quoted 6 lines

hw/riscv/microchip_pfsoc.c static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) · line 418

Quoted 2 lines
hw/riscv/microchip_pfsoc.c +0 -1
     /* QSPI Flash */
-    memory_region_init_rom(qspi_xip_mem, OBJECT(dev),

I believe we only need to change this to memory_region_init_ram(), then use the device loader the load the XIP image into this space. The remove the need to introduce the XIP image property as you did.

I think it should be possible to use the device loader with rom as well, and in this case we can skip this patch altogether. However, my idea was that specifying explicitly it's not just a random data being loaded but a kernel image in the XIP format would make things clearer. OTOH, I would then introduce a property that isn't strictly speaking necessary. I'll let Alistair decide what is the best way to go :)

~Vitaly

Quoted 27 lines
Quoted 21 lines
hw/riscv/microchip_pfsoc.c +13 -3
-                           "microchip.pfsoc.qspi_xip",
-                           memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
-                           &error_fatal);
+    if (mks->xip_image) {
+        memory_region_init_ram_from_file(qspi_xip_mem, OBJECT(dev),
+                                         "microchip.pfsoc.qspi_xip",
+                                         memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                                         0x10000 /* align */, 0 /* ram_flags */,
+                                         mks->xip_image, &error_fatal);
+        qspi_xip_mem->readonly = true;
+    } else {
+        memory_region_init_rom(qspi_xip_mem, OBJECT(dev),
+                               "microchip.pfsoc.qspi_xip",
+                               memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                               &error_fatal);
+    }
     memory_region_add_subregion(system_memory,
                                 memmap[MICROCHIP_PFSOC_QSPI_XIP].base,
                                 qspi_xip_mem);

hw/riscv/microchip_pfsoc.c static void microchip_icicle_kit_machine_init(MachineState *machine) · line 529

Quoted 3 lines
hw/riscv/microchip_pfsoc.c +0 -0
@@ -517,6 +527,24 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
     }
 }
 

Regards,
Bin

#3 lore raw
Quoted 43 lines · Vitaly Wool

Hi Bin,

Quoted 32 lines · Bin Meng

+Alistair Francis

Quoted 28 lines · Vitaly Wool

Add command line parameter to microchip_pfsoc machine to be able to specify XIP kernel image file. To pass over XIP image file, it will be enough to run

$ qemu-system-riscv64 -M microchip-icicle-kit,xipImage=<image> ...
---
 hw/riscv/microchip_pfsoc.c         | 42 +++++++++++++++++++++++++++---
 include/hw/riscv/microchip_pfsoc.h |  1 +
 2 files changed, 39 insertions(+), 4 deletions(-)
hw/riscv/microchip_pfsoc.c +1 -0
index e952b49e8c..04d81d52fe 100644
@@ -181,6 +181,7 @@ static void microchip_pfsoc_soc_instance_init(Object *obj)
 static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
 {
     MachineState *ms = MACHINE(qdev_get_machine());
+    MicrochipIcicleKitState *mks = MICROCHIP_ICICLE_KIT_MACHINE(ms);
     MicrochipPFSoCState *s = MICROCHIP_PFSOC(dev);
     const struct MemmapEntry *memmap = microchip_pfsoc_memmap;
     MemoryRegion *system_memory = get_system_memory();
@@ -415,10 +416,19 @@ static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp)
                     memmap[MICROCHIP_PFSOC_IOSCB].base);
 
Quoted 6 lines

hw/riscv/microchip_pfsoc.c static void microchip_pfsoc_soc_realize(DeviceState *dev, Error **errp) · line 418

Quoted 2 lines
hw/riscv/microchip_pfsoc.c +0 -1
     /* QSPI Flash */
-    memory_region_init_rom(qspi_xip_mem, OBJECT(dev),

I believe we only need to change this to memory_region_init_ram(), then use the device loader the load the XIP image into this space. The remove the need to introduce the XIP image property as you did.

Quoted 6 lines

I think it should be possible to use the device loader with rom as well, and in this case we can skip this patch altogether. However, my idea was that specifying explicitly it's not just a random data being loaded but a kernel image in the XIP format would make things clearer. OTOH, I would then introduce a property that isn't strictly speaking necessary. I'll let Alistair decide what is the best way to go :)

In general I would say let's avoid machine properties. The more aligned we can be to general QEMU arguments the better. That way someone swapping from some other platform shouldn't have too much trouble getting started.

Ideally we want to use either the device loader or the -drive argument for loading these images. The RISC-V virt machine has -drive support, maybe that is what you want here instead?

Alistair

Quoted 31 lines

~Vitaly

Quoted 27 lines
Quoted 21 lines
hw/riscv/microchip_pfsoc.c +13 -3
-                           "microchip.pfsoc.qspi_xip",
-                           memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
-                           &error_fatal);
+    if (mks->xip_image) {
+        memory_region_init_ram_from_file(qspi_xip_mem, OBJECT(dev),
+                                         "microchip.pfsoc.qspi_xip",
+                                         memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                                         0x10000 /* align */, 0 /* ram_flags */,
+                                         mks->xip_image, &error_fatal);
+        qspi_xip_mem->readonly = true;
+    } else {
+        memory_region_init_rom(qspi_xip_mem, OBJECT(dev),
+                               "microchip.pfsoc.qspi_xip",
+                               memmap[MICROCHIP_PFSOC_QSPI_XIP].size,
+                               &error_fatal);
+    }
     memory_region_add_subregion(system_memory,
                                 memmap[MICROCHIP_PFSOC_QSPI_XIP].base,
                                 qspi_xip_mem);

hw/riscv/microchip_pfsoc.c static void microchip_icicle_kit_machine_init(MachineState *machine) · line 529

Quoted 3 lines
hw/riscv/microchip_pfsoc.c +0 -0
@@ -517,6 +527,24 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
     }
 }
 

Regards,
Bin