Merge branch 'pci/jiang-get-domain-bus-slot' into next
* pci/jiang-get-domain-bus-slot: xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot() PCI: Use hotplug-safe pci_get_domain_bus_and_slot() PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot() PCI/vga: Use hotplug-safe pci_get_domain_bus_and_slot() ia64/PCI: Use hotplug-safe pci_get_domain_bus_and_slot()
This commit is contained in:
commit
b895e663f4
|
@ -229,7 +229,6 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info,
|
|||
{
|
||||
int segment = pci_domain_nr(dev->bus);
|
||||
struct pcibus_bussoft *bs;
|
||||
struct pci_bus *host_pci_bus;
|
||||
struct pci_dev *host_pci_dev;
|
||||
unsigned int bus_no, devfn;
|
||||
|
||||
|
@ -245,8 +244,7 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info,
|
|||
|
||||
bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
|
||||
devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff;
|
||||
host_pci_bus = pci_find_bus(segment, bus_no);
|
||||
host_pci_dev = pci_get_slot(host_pci_bus, devfn);
|
||||
host_pci_dev = pci_get_domain_bus_and_slot(segment, bus_no, devfn);
|
||||
|
||||
pcidev_info->host_pci_dev = host_pci_dev;
|
||||
pcidev_info->pdi_linux_pcidev = dev;
|
||||
|
|
|
@ -1066,7 +1066,6 @@ 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;
|
||||
|
||||
|
@ -1085,19 +1084,11 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
|
|||
pr_debug("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos,
|
||||
domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
|
||||
|
||||
pbus = pci_find_bus(domain, bus);
|
||||
pr_debug("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);
|
||||
pdev = pci_get_domain_bus_and_slot(domain, bus, devfn);
|
||||
pr_debug("vgaarb: pdev %p\n", pdev);
|
||||
if (!pdev) {
|
||||
pr_err("vgaarb: invalid PCI address %x:%x\n",
|
||||
bus, devfn);
|
||||
pr_err("vgaarb: invalid PCI address %x:%x:%x\n",
|
||||
domain, bus, devfn);
|
||||
ret_val = -ENODEV;
|
||||
goto done;
|
||||
}
|
||||
|
|
|
@ -154,12 +154,8 @@ static int __init cpcihp_generic_init(void)
|
|||
if(!r)
|
||||
return -EBUSY;
|
||||
|
||||
bus = pci_find_bus(0, bridge_busnr);
|
||||
if (!bus) {
|
||||
err("Invalid bus number %d", bridge_busnr);
|
||||
return -EINVAL;
|
||||
}
|
||||
dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
|
||||
dev = pci_get_domain_bus_and_slot(0, bridge_busnr,
|
||||
PCI_DEVFN(bridge_slot, 0));
|
||||
if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
|
||||
err("Invalid bridge device %s", bridge);
|
||||
pci_dev_put(dev);
|
||||
|
|
|
@ -152,15 +152,11 @@ failed1:
|
|||
static void virtfn_remove(struct pci_dev *dev, int id, int reset)
|
||||
{
|
||||
char buf[VIRTFN_ID_LEN];
|
||||
struct pci_bus *bus;
|
||||
struct pci_dev *virtfn;
|
||||
struct pci_sriov *iov = dev->sriov;
|
||||
|
||||
bus = pci_find_bus(pci_domain_nr(dev->bus), virtfn_bus(dev, id));
|
||||
if (!bus)
|
||||
return;
|
||||
|
||||
virtfn = pci_get_slot(bus, virtfn_devfn(dev, id));
|
||||
virtfn = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus),
|
||||
virtfn_bus(dev, id), virtfn_devfn(dev, id));
|
||||
if (!virtfn)
|
||||
return;
|
||||
|
||||
|
|
|
@ -982,7 +982,6 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
|
|||
int err = 0;
|
||||
int i, num_devs;
|
||||
unsigned int domain, bus, slot, func;
|
||||
struct pci_bus *pci_bus;
|
||||
struct pci_dev *pci_dev;
|
||||
char str[64];
|
||||
|
||||
|
@ -1032,13 +1031,8 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
|
|||
goto out;
|
||||
}
|
||||
|
||||
pci_bus = pci_find_bus(domain, bus);
|
||||
if (!pci_bus) {
|
||||
dev_dbg(&pdev->xdev->dev, "Cannot get bus %04x:%02x\n",
|
||||
domain, bus);
|
||||
continue;
|
||||
}
|
||||
pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));
|
||||
pci_dev = pci_get_domain_bus_and_slot(domain, bus,
|
||||
PCI_DEVFN(slot, func));
|
||||
if (!pci_dev) {
|
||||
dev_dbg(&pdev->xdev->dev,
|
||||
"Cannot get PCI device %04x:%02x:%02x.%d\n",
|
||||
|
|
Loading…
Reference in a new issue