Skip to contentSkip to conversation

ppc/pegasos2: Add support for -initrd command line option

PATCH In review BALATON Zoltan 4 participants 5 messages Jul 4, 2023 – Jul 5, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc/pegasos2: Add support for -initrd command line option

---
 hw/ppc/pegasos2.c | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)
hw/ppc/pegasos2.c +31 -1
index af5489de26..9c9944188b 100644
@@ -44,6 +44,8 @@
 #define PROM_ADDR     0xfff00000
 #define PROM_SIZE     0x80000
 
+#define INITRD_MIN_ADDR 0x600000
+
 #define KVMPPC_HCALL_BASE    0xf000
 #define KVMPPC_H_RTAS        (KVMPPC_HCALL_BASE + 0x0)
 #define KVMPPC_H_VOF_CLIENT  (KVMPPC_HCALL_BASE + 0x5)
@@ -80,6 +82,8 @@ struct Pegasos2MachineState {
     uint64_t kernel_addr;
     uint64_t kernel_entry;
     uint64_t kernel_size;
+    uint64_t initrd_addr;
+    uint64_t initrd_size;
 };
 
 static void *build_fdt(MachineState *machine, int *fdt_size);
@@ -117,7 +121,8 @@ static void pegasos2_init(MachineState *machine)
     I2CBus *i2c_bus;
     const char *fwname = machine->firmware ?: PROM_FILENAME;
     char *filename;
-    int i, sz;
+    int i;
+    ssize_t sz;
     uint8_t *spd_data;
 
     /* init CPU */
@@ -213,6 +218,20 @@ static void pegasos2_init(MachineState *machine)
         warn_report("Using Virtual OpenFirmware but no -kernel option.");
     }
 
+    if (machine->initrd_filename) {
+        pm->initrd_addr = pm->kernel_addr + pm->kernel_size + 64 * KiB;
+        pm->initrd_addr = ROUND_UP(pm->initrd_addr, 4);
+        pm->initrd_addr = MAX(pm->initrd_addr, INITRD_MIN_ADDR);
+        sz = load_image_targphys(machine->initrd_filename, pm->initrd_addr,
+                                 machine->ram_size - pm->initrd_addr);
+        if (sz <= 0) {
+            error_report("Could not load initrd '%s'",
+                         machine->initrd_filename);
+            exit(1);
+        }
+        pm->initrd_size = sz;
+    }
+
     if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) {
         warn_report("Option -append may be ineffective with -bios.");
     }
@@ -335,6 +354,11 @@ static void pegasos2_machine_reset(MachineState *machine, ShutdownCause reason)
         error_report("Memory for kernel is in use");
         exit(1);
     }
+    if (pm->initrd_size &&
+        vof_claim(pm->vof, pm->initrd_addr, pm->initrd_size, 0) == -1) {
+        error_report("Memory for initrd is in use");
+        exit(1);
+    }
     fdt = build_fdt(machine, &sz);
     /* FIXME: VOF assumes entry is same as load address */
     d[0] = cpu_to_be64(pm->kernel_entry);
@@ -966,6 +990,12 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
     qemu_fdt_setprop_string(fdt, "/memory@0", "name", "memory");
 
     qemu_fdt_add_subnode(fdt, "/chosen");
+    if (pm->initrd_addr && pm->initrd_size) {
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
+                              pm->initrd_addr + pm->initrd_size);
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
+                              pm->initrd_addr);
+    }
     qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
                             machine->kernel_cmdline ?: "");
     qemu_fdt_setprop_string(fdt, "/chosen", "name", "chosen");
Signature · 1 line
2.30.9
#1 lore raw

On Tue, 4 Jul 2023, BALATON Zoltan wrote:

Forgot to add commit message here:

This also changes type of sz local variable to ssize_t because it is used to store return value of load_elf() and load_image_targphys() that return ssize_t.

Should I resend for this or you can ammend on commit?

Regards,
BALATON Zoltan

Quoted 84 lines

---
hw/ppc/pegasos2.c | 32 +++++++++++++++++++++++++++++++-

1 file changed, 31 insertions(+), 1 deletion(-)
hw/ppc/pegasos2.c +31 -1
index af5489de26..9c9944188b 100644
@@ -44,6 +44,8 @@
 #define PROM_ADDR     0xfff00000
 #define PROM_SIZE     0x80000
 
+#define INITRD_MIN_ADDR 0x600000
+
 #define KVMPPC_HCALL_BASE    0xf000
 #define KVMPPC_H_RTAS        (KVMPPC_HCALL_BASE + 0x0)
 #define KVMPPC_H_VOF_CLIENT  (KVMPPC_HCALL_BASE + 0x5)
@@ -80,6 +82,8 @@ struct Pegasos2MachineState {
    uint64_t kernel_addr;
    uint64_t kernel_entry;
    uint64_t kernel_size;
+    uint64_t initrd_addr;
+    uint64_t initrd_size;
 };
 
 static void *build_fdt(MachineState *machine, int *fdt_size);
@@ -117,7 +121,8 @@ static void pegasos2_init(MachineState *machine)
    I2CBus *i2c_bus;
    const char *fwname = machine->firmware ?: PROM_FILENAME;
    char *filename;
-    int i, sz;
+    int i;
+    ssize_t sz;
    uint8_t *spd_data;
 
    /* init CPU */
@@ -213,6 +218,20 @@ static void pegasos2_init(MachineState *machine)
        warn_report("Using Virtual OpenFirmware but no -kernel option.");
    }
 
+    if (machine->initrd_filename) {
+        pm->initrd_addr = pm->kernel_addr + pm->kernel_size + 64 * KiB;
+        pm->initrd_addr = ROUND_UP(pm->initrd_addr, 4);
+        pm->initrd_addr = MAX(pm->initrd_addr, INITRD_MIN_ADDR);
+        sz = load_image_targphys(machine->initrd_filename, pm->initrd_addr,
+                                 machine->ram_size - pm->initrd_addr);
+        if (sz <= 0) {
+            error_report("Could not load initrd '%s'",
+                         machine->initrd_filename);
+            exit(1);
+        }
+        pm->initrd_size = sz;
+    }
+
    if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) {
        warn_report("Option -append may be ineffective with -bios.");
    }
@@ -335,6 +354,11 @@ static void pegasos2_machine_reset(MachineState *machine, ShutdownCause reason)
        error_report("Memory for kernel is in use");
        exit(1);
    }
+    if (pm->initrd_size &&
+        vof_claim(pm->vof, pm->initrd_addr, pm->initrd_size, 0) == -1) {
+        error_report("Memory for initrd is in use");
+        exit(1);
+    }
    fdt = build_fdt(machine, &sz);
    /* FIXME: VOF assumes entry is same as load address */
    d[0] = cpu_to_be64(pm->kernel_entry);
@@ -966,6 +990,12 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
    qemu_fdt_setprop_string(fdt, "/memory@0", "name", "memory");
 
    qemu_fdt_add_subnode(fdt, "/chosen");
+    if (pm->initrd_addr && pm->initrd_size) {
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
+                              pm->initrd_addr + pm->initrd_size);
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
+                              pm->initrd_addr);
+    }
    qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
                            machine->kernel_cmdline ?: "");
    qemu_fdt_setprop_string(fdt, "/chosen", "name", "chosen");
Reviewed-by on v1 1/1
#2 lore raw
In reply to BALATON Zoltan
Quoted 2 lines · BALATON Zoltan

---

And pushed to ppc-next after amending the commit msg.

Daniel

Quoted 81 lines
  hw/ppc/pegasos2.c | 32 +++++++++++++++++++++++++++++++-
  1 file changed, 31 insertions(+), 1 deletion(-)
hw/ppc/pegasos2.c +31 -1
index af5489de26..9c9944188b 100644
@@ -44,6 +44,8 @@
  #define PROM_ADDR     0xfff00000
  #define PROM_SIZE     0x80000
 
+#define INITRD_MIN_ADDR 0x600000
+
  #define KVMPPC_HCALL_BASE    0xf000
  #define KVMPPC_H_RTAS        (KVMPPC_HCALL_BASE + 0x0)
  #define KVMPPC_H_VOF_CLIENT  (KVMPPC_HCALL_BASE + 0x5)
@@ -80,6 +82,8 @@ struct Pegasos2MachineState {
      uint64_t kernel_addr;
      uint64_t kernel_entry;
      uint64_t kernel_size;
+    uint64_t initrd_addr;
+    uint64_t initrd_size;
  };
 
  static void *build_fdt(MachineState *machine, int *fdt_size);
@@ -117,7 +121,8 @@ static void pegasos2_init(MachineState *machine)
      I2CBus *i2c_bus;
      const char *fwname = machine->firmware ?: PROM_FILENAME;
      char *filename;
-    int i, sz;
+    int i;
+    ssize_t sz;
      uint8_t *spd_data;
 
      /* init CPU */
@@ -213,6 +218,20 @@ static void pegasos2_init(MachineState *machine)
          warn_report("Using Virtual OpenFirmware but no -kernel option.");
      }
 
+    if (machine->initrd_filename) {
+        pm->initrd_addr = pm->kernel_addr + pm->kernel_size + 64 * KiB;
+        pm->initrd_addr = ROUND_UP(pm->initrd_addr, 4);
+        pm->initrd_addr = MAX(pm->initrd_addr, INITRD_MIN_ADDR);
+        sz = load_image_targphys(machine->initrd_filename, pm->initrd_addr,
+                                 machine->ram_size - pm->initrd_addr);
+        if (sz <= 0) {
+            error_report("Could not load initrd '%s'",
+                         machine->initrd_filename);
+            exit(1);
+        }
+        pm->initrd_size = sz;
+    }
+
      if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) {
          warn_report("Option -append may be ineffective with -bios.");
      }
@@ -335,6 +354,11 @@ static void pegasos2_machine_reset(MachineState *machine, ShutdownCause reason)
          error_report("Memory for kernel is in use");
          exit(1);
      }
+    if (pm->initrd_size &&
+        vof_claim(pm->vof, pm->initrd_addr, pm->initrd_size, 0) == -1) {
+        error_report("Memory for initrd is in use");
+        exit(1);
+    }
      fdt = build_fdt(machine, &sz);
      /* FIXME: VOF assumes entry is same as load address */
      d[0] = cpu_to_be64(pm->kernel_entry);
@@ -966,6 +990,12 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
      qemu_fdt_setprop_string(fdt, "/memory@0", "name", "memory");
 
      qemu_fdt_add_subnode(fdt, "/chosen");
+    if (pm->initrd_addr && pm->initrd_size) {
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
+                              pm->initrd_addr + pm->initrd_size);
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
+                              pm->initrd_addr);
+    }
      qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
                              machine->kernel_cmdline ?: "");
      qemu_fdt_setprop_string(fdt, "/chosen", "name", "chosen");
#3 lore raw
In reply to BALATON Zoltan

Hello,

Quoted 1 line · BALATON Zoltan

The patch is not a oneliner, it deserves a minimal commit log.

Thanks,

C.

Quoted 82 lines
---
  hw/ppc/pegasos2.c | 32 +++++++++++++++++++++++++++++++-
  1 file changed, 31 insertions(+), 1 deletion(-)
hw/ppc/pegasos2.c +31 -1
index af5489de26..9c9944188b 100644
@@ -44,6 +44,8 @@
  #define PROM_ADDR     0xfff00000
  #define PROM_SIZE     0x80000
 
+#define INITRD_MIN_ADDR 0x600000
+
  #define KVMPPC_HCALL_BASE    0xf000
  #define KVMPPC_H_RTAS        (KVMPPC_HCALL_BASE + 0x0)
  #define KVMPPC_H_VOF_CLIENT  (KVMPPC_HCALL_BASE + 0x5)
@@ -80,6 +82,8 @@ struct Pegasos2MachineState {
      uint64_t kernel_addr;
      uint64_t kernel_entry;
      uint64_t kernel_size;
+    uint64_t initrd_addr;
+    uint64_t initrd_size;
  };
 
  static void *build_fdt(MachineState *machine, int *fdt_size);
@@ -117,7 +121,8 @@ static void pegasos2_init(MachineState *machine)
      I2CBus *i2c_bus;
      const char *fwname = machine->firmware ?: PROM_FILENAME;
      char *filename;
-    int i, sz;
+    int i;
+    ssize_t sz;
      uint8_t *spd_data;
 
      /* init CPU */
@@ -213,6 +218,20 @@ static void pegasos2_init(MachineState *machine)
          warn_report("Using Virtual OpenFirmware but no -kernel option.");
      }
 
+    if (machine->initrd_filename) {
+        pm->initrd_addr = pm->kernel_addr + pm->kernel_size + 64 * KiB;
+        pm->initrd_addr = ROUND_UP(pm->initrd_addr, 4);
+        pm->initrd_addr = MAX(pm->initrd_addr, INITRD_MIN_ADDR);
+        sz = load_image_targphys(machine->initrd_filename, pm->initrd_addr,
+                                 machine->ram_size - pm->initrd_addr);
+        if (sz <= 0) {
+            error_report("Could not load initrd '%s'",
+                         machine->initrd_filename);
+            exit(1);
+        }
+        pm->initrd_size = sz;
+    }
+
      if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) {
          warn_report("Option -append may be ineffective with -bios.");
      }
@@ -335,6 +354,11 @@ static void pegasos2_machine_reset(MachineState *machine, ShutdownCause reason)
          error_report("Memory for kernel is in use");
          exit(1);
      }
+    if (pm->initrd_size &&
+        vof_claim(pm->vof, pm->initrd_addr, pm->initrd_size, 0) == -1) {
+        error_report("Memory for initrd is in use");
+        exit(1);
+    }
      fdt = build_fdt(machine, &sz);
      /* FIXME: VOF assumes entry is same as load address */
      d[0] = cpu_to_be64(pm->kernel_entry);
@@ -966,6 +990,12 @@ static void *build_fdt(MachineState *machine, int *fdt_size)
      qemu_fdt_setprop_string(fdt, "/memory@0", "name", "memory");
 
      qemu_fdt_add_subnode(fdt, "/chosen");
+    if (pm->initrd_addr && pm->initrd_size) {
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
+                              pm->initrd_addr + pm->initrd_size);
+        qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
+                              pm->initrd_addr);
+    }
      qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
                              machine->kernel_cmdline ?: "");
      qemu_fdt_setprop_string(fdt, "/chosen", "name", "chosen");