From patchwork Fri Aug 4 10:20:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 797725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="fNZl8CLj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xP2yf6Pxnz9s78 for ; Fri, 4 Aug 2017 20:21:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323AbdHDKVa (ORCPT ); Fri, 4 Aug 2017 06:21:30 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33297 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751278AbdHDKV3 (ORCPT ); Fri, 4 Aug 2017 06:21:29 -0400 Received: by mail-wr0-f195.google.com with SMTP id y43so2692623wrd.0 for ; Fri, 04 Aug 2017 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Scsd74WtFBJpi4iyYSxTjztxbXvT9tnVa+uNXrMItY8=; b=fNZl8CLjV6udUxC8TAo7er1TCwA/c0ZGMl6aQGyunLFIVP80tjPY99cFJW7RbahI6x FIGiqNACaopOK46loeo6vOwsMvPArRD7PDEIzqtbsE/TlnrUiFrdcmVt6806LSRkBv7P xPzTtglbk8WUc/nDvOSyr6bi7W4of84JWWDQU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Scsd74WtFBJpi4iyYSxTjztxbXvT9tnVa+uNXrMItY8=; b=RC4aUwB0S/RlD4zkW/DHGfJwV+k+8qQR121RhCrU9u9OTMtW5LRLppvN95FLcxnEyQ LjD8BWBND8MB4kjZYkkV6MB1SBd5u3Rj5TZYwwLF+aWf/kEMTpIn3PETSTzDRCMcD2h6 6ft5QdX9HvuDqI73R1UKNUia464q5Vj99NoZTXverdARqLv85ClE5m5mcBcoXVM1GICr W0BQ8q/GgcZNul0woeEFoerhEQAXSY0lw9/ymPNShgCVvaWCnIu0STmPQ44rrXhs/OxY 4YGm/MLqISQhu2ntn6AdEFniqnm2XM9foBoscA0+odAVNMqRsi8dzQxQGwEp31B0sBCx 9Tag== X-Gm-Message-State: AIVw113QSwvKWKhZrLmrS63QM61d05zFl2rTrQeDfyx+Q9idEJMbDpgF 4hTkIlkvCwx2hXw50Ic46A== X-Received: by 10.223.175.5 with SMTP id z5mr1217531wrc.11.1501842087950; Fri, 04 Aug 2017 03:21:27 -0700 (PDT) Received: from localhost.localdomain (uk.sesame.canonical.com. [91.189.88.154]) by smtp.gmail.com with ESMTPSA id g93sm4037467wrd.11.2017.08.04.03.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 03:21:27 -0700 (PDT) From: Daniel Axtens To: linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Cc: benh@kernel.crashing.org, z.liuxinliang@hisilicon.com, zourongrong@gmail.com, catalin.marinas@arm.com, will.deacon@arm.com, gabriele.paoloni@huawei.com, bhelgaas@google.com, airlied@linux.ie, daniel.vetter@intel.com, alex.williamson@redhat.com, Daniel Axtens , Brian King Subject: [PATCH 1/3] powerpc: simplify and fix VGA default device behaviour Date: Fri, 4 Aug 2017 20:20:31 +1000 Message-Id: <20170804102033.27731-2-dja@axtens.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170804102033.27731-1-dja@axtens.net> References: <20170804102033.27731-1-dja@axtens.net> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Some powerpc devices provide a PCI display that isn't picked up by the VGA arbiter, presumably because it doesn't support the PCI legacy VGA ranges. Commit c2e1d84523ad ("powerpc: Set default VGA device") introduced an arch quirk to mark these devices as default to fix X autoconfig. The commit message stated that the patch: Ensures a default VGA is always set if a graphics adapter is present, even if firmware did not initialize it. If more than one graphics adapter is present, ensure the one initialized by firmware is set as the default VGA device. The patch used the following test to decide whether or not to mark a device as default: pci_read_config_word(pdev, PCI_COMMAND, &cmd); if ((cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) || !vga_default_device()) vga_set_default_device(pdev); This doesn't seem like it works quite as intended. Because of the logical OR, the default device will be set in 2 cases: 1) if there is no default device OR 2) if this device has normal memory/IO decoding turned on This will work as intended if there is only one device, but if there are multiple devices, we may override the device the VGA arbiter picked. Instead, set a device as default if there is no default device AND this device decodes. This will not change behaviour on single-headed systems. Cc: Brian King Signed-off-by: Daniel Axtens --- Tested in TCG (the card provided by qemu doesn't automatically register with vgaarb, so the relevant code path has been tested) but I would appreciate any tests on real hardware. Informal benh ack: https://patchwork.kernel.org/patch/9850235/ --- arch/powerpc/kernel/pci-common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 341a7469cab8..c95fdda3a2dc 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1746,8 +1746,11 @@ static void fixup_vga(struct pci_dev *pdev) { u16 cmd; + if (vga_default_device()) + return; + pci_read_config_word(pdev, PCI_COMMAND, &cmd); - if ((cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) || !vga_default_device()) + if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) vga_set_default_device(pdev); }