D46245.id141960.diff
No OneTemporary
Actions

Size

947 B

Referenced Files

None

Subscribers

None

D46245.id141960.diff
View Options

	diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
	--- a/sys/amd64/vmm/io/ppt.c
	+++ b/sys/amd64/vmm/io/ppt.c
	@@ -376,6 +376,18 @@
	pci_power_reset(dev);
	}

	+static bool
	+ppt_has_mem_bar(struct pptdev *ppt)
	+{
	+ struct pci_map *pm;
	+
	+ for (pm = pci_first_bar(ppt->dev); pm != NULL; pm = pci_next_bar(pm)) {
	+ if (PCI_BAR_MEM(pm->pm_value))
	+ return (true);
	+ }
	+ return (false);
	+}
	+
	int
	ppt_assign_device(struct vm *vm, int bus, int slot, int func)
	{
	@@ -392,6 +404,9 @@
	pci_restore_state(ppt->dev);
	ppt->vm = vm;
	iommu_add_device(vm_iommu_domain(vm), pci_get_rid(ppt->dev));
	+ pci_enable_busmaster(ppt->dev);
	+ if (ppt_has_mem_bar(ppt))
	+ pci_enable_io(ppt->dev, SYS_RES_MEMORY);
	return (0);
	}

	@@ -405,6 +420,8 @@
	if (error)
	return (error);

	+ pci_disable_io(ppt->dev, SYS_RES_MEMORY);
	+ pci_disable_busmaster(ppt->dev);
	pci_save_state(ppt->dev);
	ppt_pci_reset(ppt->dev);
	pci_restore_state(ppt->dev);