Skip to contentSkip to conversation

hw/ppc: on 40p machine, change default firmware to OpenBIOS

PATCH Applied Hervé Poussineau 3 participants 6 messages Aug 10, 2018 – Sep 4, 2018

v1 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/ppc: on 40p machine, change default firmware to OpenBIOS

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/prep.c +1 -1
index 3401570d98..1558855247 100644
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
Signature · 1 line
2.11.0
Applied
#1 lore raw
Quoted 4 lines · Hervé Poussineau

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

Applied to ppc-for-3.1, thanks.

Quoted 17 lines
---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/prep.c +1 -1
index 3401570d98..1558855247 100644
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
Acked-by on v1 1/1
#5 lore raw
In reply to Hervé Poussineau
Quoted 13 lines · Hervé Poussineau

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/prep.c +0 -0
index 3401570d98..1558855247 100644

hw/ppc/prep.c static void ibm_40p_init(MachineState *machine) · line 742

Quoted 8 lines
hw/ppc/prep.c +1 -1
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);

Great news!

ATB,

Mark.

#2 lore raw
In reply to David Gibson
Quoted 7 lines · David Gibson
Quoted 4 lines · Hervé Poussineau

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

Applied to ppc-for-3.1, thanks.

But I'm afraid I've had to pull it out. This breaks boot-serial-test, because the new firmware prints different messages than the old one did and the testcase isn't looking for them.

I tried fixing it, but ran into complications I didn't have time to debug. So I'm afraid this will miss my coming-soon pull request.

You should be able to reproduce the problem with "make check SPEED=slow", can you fix this up and resubmit.

Quoted 19 lines
Quoted 18 lines
---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ppc/prep.c +1 -1
index 3401570d98..1558855247 100644
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#3 lore raw
Quoted 24 lines · David Gibson
Quoted 7 lines · David Gibson
Quoted 4 lines · Hervé Poussineau

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

Applied to ppc-for-3.1, thanks.

But I'm afraid I've had to pull it out. This breaks boot-serial-test, because the new firmware prints different messages than the old one did and the testcase isn't looking for them.

I tried fixing it, but ran into complications I didn't have time to debug. So I'm afraid this will miss my coming-soon pull request.

You should be able to reproduce the problem with "make check SPEED=slow", can you fix this up and resubmit.

Quoted 5 lines
Quoted 5 lines
---
 hw/ppc/prep.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
hw/ppc/prep.c +0 -0
index 3401570d98..1558855247 100644
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
Quoted 8 lines

hw/ppc/prep.c static void ibm_40p_init(MachineState *machine) · line 742

Quoted 8 lines
hw/ppc/prep.c +1 -1
     /* PCI host */
     dev = qdev_create(NULL, "raven-pcihost");
     if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
     }
     qdev_prop_set_string(dev, "bios-name", bios_name);
     qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);

Thanks to Thomas on IRC, I was able come up with the diff below which fixes boot-serial-test when this patch is applied:

tests/boot-serial-test.c +2 -2
index f123b15e3e..f865822e32 100644
@@ -75,12 +75,12 @@ typedef struct testdef {
 static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
     { "ppc", "ppce500", "", "U-Boot" },
-    { "ppc", "40p", "-boot d", "Booting from device d" },
+    { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
     { "ppc", "g3beige", "", "PowerPC,750" },
     { "ppc", "mac99", "", "PowerPC,G4" },
     { "ppc", "sam460ex", "-m 256", "DRAM:  256 MiB" },
     { "ppc64", "ppce500", "", "U-Boot" },
-    { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
+    { "ppc64", "40p", "-m 192", "Memory: 192M" },
     { "ppc64", "mac99", "", "PowerPC,970FX" },
     { "ppc64", "pseries", "", "Open Firmware" },
     { "ppc64", "powernv", "-cpu POWER8", "OPAL" },

Hervé, can you confirm that this fixes "make check" for you? If so it should just be a simple case of squashing into the above patch and then resubmitting a v2.

ATB,

Mark.

#4 lore raw

Le 31/08/2018 à 16:16, Mark Cave-Ayland a écrit :

Quoted 63 lines · David Gibson
Quoted 25 lines · David Gibson
Quoted 7 lines · Hervé Poussineau
Quoted 4 lines

OpenBIOS gained 40p support in 5b20e4cacecb62fb2bdc6867c11d44cddd77c4ff Use it, instead of relying on an unmaintained and very limited firmware.

Applied to ppc-for-3.1, thanks.

But I'm afraid I've had to pull it out. This breaks boot-serial-test, because the new firmware prints different messages than the old one did and the testcase isn't looking for them.

I tried fixing it, but ran into complications I didn't have time to debug. So I'm afraid this will miss my coming-soon pull request.

You should be able to reproduce the problem with "make check SPEED=slow", can you fix this up and resubmit.

Quoted 5 lines
Quoted 5 lines
---
  hw/ppc/prep.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
hw/ppc/prep.c +0 -0
index 3401570d98..1558855247 100644
@@ -736,7 +736,7 @@ static void ibm_40p_init(MachineState *machine)
Quoted 8 lines

hw/ppc/prep.c static void ibm_40p_init(MachineState *machine) · line 742

Quoted 8 lines
hw/ppc/prep.c +1 -1
      /* PCI host */
      dev = qdev_create(NULL, "raven-pcihost");
      if (!bios_name) {
-        bios_name = BIOS_FILENAME;
+        bios_name = "openbios-ppc";
      }
      qdev_prop_set_string(dev, "bios-name", bios_name);
      qdev_prop_set_uint32(dev, "elf-machine", PPC_ELF_MACHINE);

Thanks to Thomas on IRC, I was able come up with the diff below which fixes boot-serial-test when this patch is applied:

tests/boot-serial-test.c +2 -2
index f123b15e3e..f865822e32 100644
@@ -75,12 +75,12 @@ typedef struct testdef {
  static testdef_t tests[] = {
      { "alpha", "clipper", "", "PCI:" },
      { "ppc", "ppce500", "", "U-Boot" },
-    { "ppc", "40p", "-boot d", "Booting from device d" },
+    { "ppc", "40p", "-vga none -boot d", "Trying cd:," },
      { "ppc", "g3beige", "", "PowerPC,750" },
      { "ppc", "mac99", "", "PowerPC,G4" },
      { "ppc", "sam460ex", "-m 256", "DRAM:  256 MiB" },
      { "ppc64", "ppce500", "", "U-Boot" },
-    { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
+    { "ppc64", "40p", "-m 192", "Memory: 192M" },
      { "ppc64", "mac99", "", "PowerPC,970FX" },
      { "ppc64", "pseries", "", "Open Firmware" },
      { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
Quoted 3 lines

Hervé, can you confirm that this fixes "make check" for you? If so it should just be a simple case of squashing into the above patch and then resubmitting a v2.

Yes, this also fixes "make check" for me.
v2 sent at http://lists.gnu.org/archive/html/qemu-devel/2018-09/msg00362.html

Thanks for the help.

Hervé