Skip to contentSkip to conversation

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

PATCH Superseded Hervé Poussineau 3 participants 5 messages Sep 4, 2018 – Sep 7, 2018

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 +-
 tests/boot-serial-test.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
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);
tests/boot-serial-test.c +2 -2
index 952a2e7ead..276ca14c97 100644
@@ -76,13 +76,13 @@ static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
     { "ppc", "ppce500", "", "U-Boot" },
     { "ppc", "prep", "-m 96", "Memory size: 96 MB" },
-    { "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", "prep", "-boot e", "Booting from device e" },
-    { "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" },
Signature · 1 line
2.11.0
#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.

Uh.. against current ppc-for-3.1, plase.

Quoted 38 lines
---
 hw/ppc/prep.c            | 2 +-
 tests/boot-serial-test.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
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);
tests/boot-serial-test.c +2 -2
index 952a2e7ead..276ca14c97 100644
@@ -76,13 +76,13 @@ static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
     { "ppc", "ppce500", "", "U-Boot" },
     { "ppc", "prep", "-m 96", "Memory size: 96 MB" },
-    { "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", "prep", "-boot e", "Booting from device e" },
-    { "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" },
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
#2 lore raw
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.

Uh.. against current ppc-for-3.1, plase.

I was a bit confused as to why this failed to apply since the original had been part of a local branch for a while, but just noticed it was because of this change to Hervé's original which I had missed:

[dwg: Drop prep from boot-serial test to avoid deprecation warnings]

Included below is the new diff against ppc-for-3.1: David, is this enough for you to be able to fix up manually without a v3?

hw/ppc/prep.c +1 -1
index 162b27a3b8..baca1d7c04 100644
@@ -651,7 +651,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);
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" },

ATB,

Mark.

#3 lore raw
Quoted 10 lines · Mark Cave-Ayland
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.

Uh.. against current ppc-for-3.1, plase.

Quoted 8 lines

I was a bit confused as to why this failed to apply since the original had been part of a local branch for a while, but just noticed it was because of this change to Hervé's original which I had missed:

[dwg: Drop prep from boot-serial test to avoid deprecation warnings]

Included below is the new diff against ppc-for-3.1: David, is this enough for you to be able to fix up manually without a v3?

Well, I could have fixed it up manually from v2 - but I'm pushing that busy work back on you as a contributor, because I'm having trouble enough finding dtc maintenance time as it is.

Quoted 38 lines
hw/ppc/prep.c +1 -1
index 162b27a3b8..baca1d7c04 100644
@@ -651,7 +651,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);
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" },

ATB,

Mark.

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
#4 lore raw
Quoted 15 lines · David Gibson
Quoted 14 lines · Mark Cave-Ayland
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.

Uh.. against current ppc-for-3.1, plase.

I was a bit confused as to why this failed to apply since the original had been part of a local branch for a while, but just noticed it was because of this change to Hervé's original which I had missed:

Quoted 8 lines
Quoted 4 lines

[dwg: Drop prep from boot-serial test to avoid deprecation warnings]

Included below is the new diff against ppc-for-3.1: David, is this enough for you to be able to fix up manually without a v3?

Well, I could have fixed it up manually from v2 - but I'm pushing that busy work back on you as a contributor, because I'm having trouble enough finding dtc maintenance time as it is.

Fair comment :) Although I do have a few 40p-related patches waiting on this, I'm keen for this particular patch to come from Hervé, since it's quite a big change and I'm not a PReP maintainer.

ATB,

Mark.