Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Enable NMI on all cpus on UV
  vgaarb: Add user selectability of the number of GPUS in a system
  vgaarb: Fix VGA arbiter to accept PCI domains other than 0
  x86, uv: Update UV arch to target Legacy VGA I/O correctly.
  pci: Update pci_set_vga_state() to call arch functions

2 files changed, 29 insertions, 6 deletions

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 790e675b13eb..0920492cea0a 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -8,3 +8,11 @@ config VGA_ARB
           are accessed at same time they need some kind of coordination. Please
           see Documentation/vgaarbiter.txt for more details. Select this to
           enable VGA arbiter.
+
+config VGA_ARB_MAX_GPUS
+        int "Maximum number of GPUs"
+        default 16
+        depends on VGA_ARB
+        help
+          Reserves space in the kernel to maintain resource locking for
+          multiple GPUS.  The overhead for each GPU is very small.
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 2f6cf69ecb39..8827814d0735 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -688,7 +688,7 @@ EXPORT_SYMBOL(vga_client_register);
  * the arbiter.
  */
 
-#define MAX_USER_CARDS         16
+#define MAX_USER_CARDS         CONFIG_VGA_ARB_MAX_GPUS
 #define PCI_INVALID_CARD       ((struct pci_dev *)-1UL)
 
 /*
@@ -954,6 +954,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                 }
 
         } 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 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                                 ret_val = -EPROTO;
                                 goto done;
                         }
-
-                        pdev = pci_get_bus_and_slot(bus, devfn);
+                        pr_devel("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos,
+                                domain, bus, PCI_SLOT(devfn), PCI_FUNC(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 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                         }
                 }
                 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;