Skip to content

Commit

Permalink
nx: Don't abort on missing NX when using a QEMU machine
Browse files Browse the repository at this point in the history
These don't have an NX node (and probably never will) as they
don't provide any coprocessor. However, the DARN instruction
works so this abort is unnecessary.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
ozbenh authored and stewartsmith committed Nov 2, 2018
1 parent 3dd480d commit 95f7b3b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion hw/nx.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ static void p9_darn_init(void)
dt_for_each_compatible(dt_root, nx, "ibm,power9-nx")
break;
if (!nx) {
assert(nx);
if (!dt_node_is_compatible(dt_root, "qemu,powernv"))
assert(nx);
return;
}

Expand Down

0 comments on commit 95f7b3b

Please sign in to comment.