From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755894Ab0ARSe5 (ORCPT ); Mon, 18 Jan 2010 13:34:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755888Ab0ARSey (ORCPT ); Mon, 18 Jan 2010 13:34:54 -0500 Received: from relay2.sgi.com ([192.48.179.30]:57634 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755859Ab0ARSew (ORCPT ); Mon, 18 Jan 2010 13:34:52 -0500 Message-Id: <20100118183444.775580000@alcatraz.americas.sgi.com> References: <20100118183412.560438000@alcatraz.americas.sgi.com> User-Agent: quilt/0.46-1 Date: Mon, 18 Jan 2010 12:34:15 -0600 From: Mike Travis To: Jesse Barnes , Ingo Molnar Cc: Russ Anderson , Dave Airlie , Alex Chiang , Thomas Gleixner , Cyrill Gorcunov , Benjamin Herrenschmidt , Robin Holt , "Rafael J. Wysocki" , Adam Jackson , Kenji Kaneshige , Andrew Morton , Gaetan Nadon , "H. Peter Anvin" , Aaron Plattner , Jack Steiner , Tiago Vignatti , Cliff Wickman , Matthew Wilcox , Christian Zander , Yu Zhao , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, x86@kernel.org Subject: [PATCH 3/4] vgaarb: Fix VGA Arbiter to accept PCI Domains other than 0 Content-Disposition: inline; filename=update-vgaarb Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the VGA Arbiter to accept PCI Domains other than 0. Signed-off-by: Mike Travis Cc: Dave Airlie Cc: Alex Chiang Cc: Thomas Gleixner Cc: Cyrill Gorcunov Cc: Benjamin Herrenschmidt Cc: Robin Holt Cc: Rafael J. Wysocki Cc: Adam Jackson Cc: Kenji Kaneshige Cc: Andrew Morton Cc: Gaetan Nadon Cc: H. Peter Anvin Cc: Aaron Plattner Cc: Jack Steiner Cc: Tiago Vignatti Cc: Cliff Wickman Cc: Matthew Wilcox Cc: Christian Zander Cc: Yu Zhao Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Cc: x86@kernel.org --- drivers/gpu/vga/vgaarb.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) --- linux.orig/drivers/gpu/vga/vgaarb.c +++ linux/drivers/gpu/vga/vgaarb.c @@ -954,6 +954,7 @@ } } else if (strncmp(curr_pos, "target ", 7) == 0) { + struct pci_bus *pbus; unsigned int domain, bus, devfn; struct vga_device *vgadev; @@ -969,18 +970,31 @@ ret_val = -EPROTO; goto done; } + pr_devel("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos, + domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); - pdev = pci_get_bus_and_slot(bus, devfn); + pbus = pci_find_bus(domain, bus); + pr_devel("vgaarb: pbus %p\n", pbus); + if (pbus == NULL) { + pr_err("vgaarb: invalid PCI domain and/or bus address %x:%x\n", + domain, bus); + ret_val = -ENODEV; + goto done; + } + pdev = pci_get_slot(pbus, devfn); + pr_devel("vgaarb: pdev %p\n", pdev); if (!pdev) { - pr_info("vgaarb: invalid PCI address!\n"); + pr_err("vgaarb: invalid PCI address %x:%x\n", + bus, devfn); ret_val = -ENODEV; goto done; } } vgadev = vgadev_find(pdev); + pr_devel("vgaarb: vgadev %p\n", vgadev); if (vgadev == NULL) { - pr_info("vgaarb: this pci device is not a vga device\n"); + pr_err("vgaarb: this pci device is not a vga device\n"); pci_dev_put(pdev); ret_val = -ENODEV; goto done; @@ -998,7 +1012,8 @@ } } if (i == MAX_USER_CARDS) { - pr_err("vgaarb: maximum user cards number reached!\n"); + pr_err("vgaarb: maximum user cards (%d) number reached!\n", + MAX_USER_CARDS); pci_dev_put(pdev); /* XXX: which value to return? */ ret_val = -ENOMEM; --