From patchwork Thu Nov 10 11:51:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 693179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tF1cS5WPGz9t1L for ; Thu, 10 Nov 2016 22:52:08 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tF1cS4gMBzDvhN for ; Thu, 10 Nov 2016 22:52:08 +1100 (AEDT) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tF1cL0CPHzDvgq for ; Thu, 10 Nov 2016 22:52:01 +1100 (AEDT) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 67AEEC05AA60; Thu, 10 Nov 2016 11:51:59 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAABpvgA009608; Thu, 10 Nov 2016 06:51:58 -0500 From: Thomas Huth To: slof@lists.ozlabs.org Date: Thu, 10 Nov 2016 12:51:57 +0100 Message-Id: <1478778717-3312-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 10 Nov 2016 11:52:00 +0000 (UTC) Subject: [SLOF] [PATCH] Do not try to use virtio-gpu in VGA mode X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" virtio-gpu and virtio-vga share the same PCI ID (but have a different PCI class). But since virtio-gpu does not have the VGA register interface anymore, we should never try to use these registers in SLOF, i.e. we must not include qemu-vga.fs in this case. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1375166 Signed-off-by: Thomas Huth --- board-qemu/slof/pci-device_1af4_1050.fs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/board-qemu/slof/pci-device_1af4_1050.fs b/board-qemu/slof/pci-device_1af4_1050.fs index 516056a..9448006 100644 --- a/board-qemu/slof/pci-device_1af4_1050.fs +++ b/board-qemu/slof/pci-device_1af4_1050.fs @@ -10,6 +10,13 @@ \ * IBM Corporation - initial implementation \ ****************************************************************************/ -s" virtio [ vga ]" type cr +\ Note: The PCI ID 1af4:1050 is used for both, virtio-vga and virtio-gpu +\ devices. Only the first one provides a VGA interface that we currently +\ support in SLOF. -s" qemu-vga.fs" included +my-space pci-class@ 30000 = IF + s" virtio [ vga ]" type cr + s" qemu-vga.fs" included +ELSE + s" virtio [ gpu ]" type cr +THEN