mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
KVM: enable PCI multiple-segments for pass-through device
Enable optional parameter (default 0) - PCI segment (or domain) besides BDF, when assigning PCI device to guest. Signed-off-by: Zhai Edwin <[email protected]> Acked-by: Chris Wright <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]>
This commit is contained in:
parent
6d3e435e70
commit
ab9f4ecbb6
5 changed files with 14 additions and 5 deletions
|
|
@ -526,7 +526,8 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
|
|||
r = -ENOMEM;
|
||||
goto out;
|
||||
}
|
||||
dev = pci_get_bus_and_slot(assigned_dev->busnr,
|
||||
dev = pci_get_domain_bus_and_slot(assigned_dev->segnr,
|
||||
assigned_dev->busnr,
|
||||
assigned_dev->devfn);
|
||||
if (!dev) {
|
||||
printk(KERN_INFO "%s: host device not found\n", __func__);
|
||||
|
|
@ -548,6 +549,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm,
|
|||
pci_reset_function(dev);
|
||||
|
||||
match->assigned_dev_id = assigned_dev->assigned_dev_id;
|
||||
match->host_segnr = assigned_dev->segnr;
|
||||
match->host_busnr = assigned_dev->busnr;
|
||||
match->host_devfn = assigned_dev->devfn;
|
||||
match->flags = assigned_dev->flags;
|
||||
|
|
|
|||
|
|
@ -106,7 +106,8 @@ int kvm_assign_device(struct kvm *kvm,
|
|||
|
||||
r = iommu_attach_device(domain, &pdev->dev);
|
||||
if (r) {
|
||||
printk(KERN_ERR "assign device %x:%x.%x failed",
|
||||
printk(KERN_ERR "assign device %x:%x:%x.%x failed",
|
||||
pci_domain_nr(pdev->bus),
|
||||
pdev->bus->number,
|
||||
PCI_SLOT(pdev->devfn),
|
||||
PCI_FUNC(pdev->devfn));
|
||||
|
|
@ -127,7 +128,8 @@ int kvm_assign_device(struct kvm *kvm,
|
|||
goto out_unmap;
|
||||
}
|
||||
|
||||
printk(KERN_DEBUG "assign device: host bdf = %x:%x:%x\n",
|
||||
printk(KERN_DEBUG "assign device %x:%x:%x.%x\n",
|
||||
assigned_dev->host_segnr,
|
||||
assigned_dev->host_busnr,
|
||||
PCI_SLOT(assigned_dev->host_devfn),
|
||||
PCI_FUNC(assigned_dev->host_devfn));
|
||||
|
|
@ -154,7 +156,8 @@ int kvm_deassign_device(struct kvm *kvm,
|
|||
|
||||
iommu_detach_device(domain, &pdev->dev);
|
||||
|
||||
printk(KERN_DEBUG "deassign device: host bdf = %x:%x:%x\n",
|
||||
printk(KERN_DEBUG "deassign device %x:%x:%x.%x\n",
|
||||
assigned_dev->host_segnr,
|
||||
assigned_dev->host_busnr,
|
||||
PCI_SLOT(assigned_dev->host_devfn),
|
||||
PCI_FUNC(assigned_dev->host_devfn));
|
||||
|
|
|
|||
Loading…
Reference in a new issue