[Skiboot] [PATCH v2 3/3] nx: remove check on the "qemu, powernv" property

Cédric Le Goater clg at kaod.org
Fri Apr 12 00:45:38 AEST 2019


commit 95f7b3b9698b ("nx: Don't abort on missing NX when using a QEMU
machine") introduced a check on the property "qemu,powernv" to skip NX
initialization when running under a QEMU machine.

The QEMU platforms now expose a QUIRK_NO_RNG in the chip. Testing the
"qemu,powernv" property is not necessary anymore.

Signed-off-by: Cédric Le Goater <clg at kaod.org>
---
 hw/nx.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hw/nx.c b/hw/nx.c
index d3746aeaa852..9a4a9b121d9f 100644
--- a/hw/nx.c
+++ b/hw/nx.c
@@ -44,11 +44,7 @@ static void p9_darn_init(void)
 	 */
 	dt_for_each_compatible(dt_root, nx, "ibm,power9-nx")
 		break;
-	if (!nx) {
-		if (!dt_node_is_compatible(dt_root, "qemu,powernv"))
-			assert(nx);
-		return;
-	}
+	assert(nx);
 
 	phys_map_get(dt_get_chip_id(nx), NX_RNG, 0, &default_bar, NULL);
 
-- 
2.20.1



More information about the Skiboot mailing list