0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
50 lines
2.1 KiB
Diff
50 lines
2.1 KiB
Diff
# HG changeset patch
|
|
# User Keir Fraser <keir.fraser@citrix.com>
|
|
# Date 1277739919 -3600
|
|
# Node ID 059a12afce52a213db56bd8e9442d9eeadfdd34c
|
|
# Parent 7e46fdbe8a1187cee2ab609256300d7967f37f06
|
|
vtd: Only kill_timer() an init_timer()'ed timer.
|
|
|
|
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
|
|
|
|
Index: xen-4.0.2-testing/xen/drivers/passthrough/io.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/io.c
|
|
+++ xen-4.0.2-testing/xen/drivers/passthrough/io.c
|
|
@@ -27,7 +27,7 @@
|
|
|
|
static void hvm_dirq_assist(unsigned long _d);
|
|
|
|
-static int pt_irq_need_timer(uint32_t flags)
|
|
+bool_t pt_irq_need_timer(uint32_t flags)
|
|
{
|
|
return !(flags & (HVM_IRQ_DPCI_GUEST_MSI | HVM_IRQ_DPCI_TRANSLATE));
|
|
}
|
|
Index: xen-4.0.2-testing/xen/drivers/passthrough/pci.c
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/pci.c
|
|
+++ xen-4.0.2-testing/xen/drivers/passthrough/pci.c
|
|
@@ -257,7 +257,9 @@ static void pci_clean_dpci_irqs(struct d
|
|
i = find_next_bit(hvm_irq_dpci->mapping, d->nr_pirqs, i + 1) )
|
|
{
|
|
pirq_guest_unbind(d, i);
|
|
- kill_timer(&hvm_irq_dpci->hvm_timer[domain_pirq_to_irq(d, i)]);
|
|
+
|
|
+ if ( pt_irq_need_timer(hvm_irq_dpci->mirq[i].flags) )
|
|
+ kill_timer(&hvm_irq_dpci->hvm_timer[domain_pirq_to_irq(d, i)]);
|
|
|
|
list_for_each_safe ( digl_list, tmp,
|
|
&hvm_irq_dpci->mirq[i].digl_list )
|
|
Index: xen-4.0.2-testing/xen/include/xen/iommu.h
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/xen/include/xen/iommu.h
|
|
+++ xen-4.0.2-testing/xen/include/xen/iommu.h
|
|
@@ -106,6 +106,7 @@ void hvm_dpci_isairq_eoi(struct domain *
|
|
struct hvm_irq_dpci *domain_get_irq_dpci(struct domain *domain);
|
|
int domain_set_irq_dpci(struct domain *domain, struct hvm_irq_dpci *dpci);
|
|
void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci);
|
|
+bool_t pt_irq_need_timer(uint32_t flags);
|
|
|
|
#define PT_IRQ_TIME_OUT MILLISECS(8)
|
|
#define VTDPREFIX "[VT-D]"
|