vgaarb: Fix VGA arbiter to accept PCI domains other than 0
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Commit-ID: 773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b Gitweb: http://git.kernel.org/tip/773a38dbdad03474c5ee235f7d9bf9f51c9e3c2b Author: Mike Travis <[email protected]> AuthorDate: Tue, 2 Feb 2010 14:38:15 -0800 Committer: H. Peter Anvin <[email protected]> CommitDate: Fri, 5 Feb 2010 14:05:41 -0800
vgaarb: Fix VGA arbiter to accept PCI domains other than 0
Update the VGA Arbiter to accept PCI Domains other than 0.
Signed-off-by Mike Travis <[email protected]>
LKML-Reference: <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Robin Holt <[email protected]>
Cc Jack Steiner <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jesse Barnes <[email protected]>
Cc David Airlie <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by H. Peter Anvin <[email protected]>
--- drivers/gpu/vga/vgaarb.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/vga/vgaarb.c +20 -5
@@ -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 ;