mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
pci: add a segment parameter to pci_hide_device
No functional change expected. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
677053fac1
commit
5278906d5d
5 files changed
+15
-9
No files matched your search
@@ -1362,7 +1362,7 @@ static void __init ehci_dbgp_init_postirq(struct serial_port *port)
|
||||
|
||||
ehci_dbgp_setup_postirq(dbgp);
|
||||
|
||||
pci_hide_device(dbgp->bus, PCI_DEVFN(dbgp->slot, dbgp->func));
|
||||
pci_hide_device(0, dbgp->bus, PCI_DEVFN(dbgp->slot, dbgp->func));
|
||||
}
|
||||
|
||||
static int ehci_dbgp_check_release(struct ehci_dbgp *dbgp)
|
||||
|
||||
@@ -761,7 +761,7 @@ static void __init ns16550_init_postirq(struct serial_port *port)
|
||||
if ( uart->bar || uart->ps_bdf_enable )
|
||||
{
|
||||
if ( !uart->param )
|
||||
pci_hide_device(uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1],
|
||||
pci_hide_device(0, uart->ps_bdf[0], PCI_DEVFN(uart->ps_bdf[1],
|
||||
uart->ps_bdf[2]));
|
||||
else
|
||||
{
|
||||
|
||||
@@ -440,17 +440,23 @@ static void _pci_hide_device(struct pci_dev *pdev)
|
||||
list_add(&pdev->domain_list, &dom_xen->arch.pdev_list);
|
||||
}
|
||||
|
||||
int __init pci_hide_device(int bus, int devfn)
|
||||
int __init pci_hide_device(unsigned int seg, unsigned int bus,
|
||||
unsigned int devfn)
|
||||
{
|
||||
struct pci_dev *pdev;
|
||||
struct pci_seg *pseg;
|
||||
int rc = -ENOMEM;
|
||||
|
||||
pcidevs_lock();
|
||||
pdev = alloc_pdev(get_pseg(0), bus, devfn);
|
||||
if ( pdev )
|
||||
pseg = alloc_pseg(seg);
|
||||
if ( pseg )
|
||||
{
|
||||
_pci_hide_device(pdev);
|
||||
rc = 0;
|
||||
pdev = alloc_pdev(pseg, bus, devfn);
|
||||
if ( pdev )
|
||||
{
|
||||
_pci_hide_device(pdev);
|
||||
rc = 0;
|
||||
}
|
||||
}
|
||||
pcidevs_unlock();
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ void __init video_endboot(void)
|
||||
{
|
||||
printk(XENLOG_INFO "Boot video device %02x:%02x.%u\n",
|
||||
bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
|
||||
pci_hide_device(bus, devfn);
|
||||
pci_hide_device(0, bus, devfn);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,7 +150,7 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn,
|
||||
const struct pci_dev_info *, nodeid_t node);
|
||||
int pci_remove_device(u16 seg, u8 bus, u8 devfn);
|
||||
int pci_ro_device(int seg, int bus, int devfn);
|
||||
int pci_hide_device(int bus, int devfn);
|
||||
int pci_hide_device(unsigned int seg, unsigned int bus, unsigned int devfn);
|
||||
struct pci_dev *pci_get_pdev(int seg, int bus, int devfn);
|
||||
struct pci_dev *pci_get_real_pdev(int seg, int bus, int devfn);
|
||||
struct pci_dev *pci_get_pdev_by_domain(const struct domain *, int seg,
|
||||
|
||||