From patchwork Thu Nov 1 04:12:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Herrenschmidt X-Patchwork-Id: 991805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42lsHz5J30z9sR2 for ; Thu, 1 Nov 2018 15:13:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.crashing.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 42lsHz42rszF3LK for ; Thu, 1 Nov 2018 15:13:03 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.crashing.org X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=permerror (mailfrom) smtp.mailfrom=kernel.crashing.org (client-ip=63.228.1.57; helo=gate.crashing.org; envelope-from=benh@kernel.crashing.org; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.crashing.org Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42lsHt5YJ7zF3K8 for ; Thu, 1 Nov 2018 15:12:57 +1100 (AEDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.14.1) with ESMTP id wA14CoG2013424 for ; Wed, 31 Oct 2018 23:12:51 -0500 Message-ID: From: Benjamin Herrenschmidt To: skiboot@lists.ozlabs.org Date: Thu, 01 Nov 2018 15:12:50 +1100 User-Agent: Evolution 3.30.1 (3.30.1-1.fc29) Mime-Version: 1.0 Subject: [Skiboot] [PATCH] nx: Don't abort on missing NX when using a QEMU machine X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" 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 --- hw/nx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/nx.c b/hw/nx.c index 1fedee77..d3746aea 100644 --- a/hw/nx.c +++ b/hw/nx.c @@ -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; }