diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-11 12:37:19 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2022-05-11 12:37:19 -0300 |
| commit | 467cd948f8a92086441dd9b9859885132f1adc35 (patch) | |
| tree | df940b0e885f7c670ecf80249aeb760b2d09a663 /arch/x86/pci/xen.c | |
| parent | cad10ce36671c99dde850de7bd4ca0d8df66c47f (diff) | |
| parent | feb9c5e19e913b53cb536a7aa7c9f20107bb51ec (diff) | |
| download | linux-467cd948f8a92086441dd9b9859885132f1adc35.tar.gz linux-467cd948f8a92086441dd9b9859885132f1adc35.tar.bz2 linux-467cd948f8a92086441dd9b9859885132f1adc35.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
Get fixes sent via perf/urgent, etc.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/x86/pci/xen.c')
| -rw-r--r-- | arch/x86/pci/xen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 9bb1e2941179..b94f727251b6 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -467,7 +467,6 @@ static __init void xen_setup_pci_msi(void) else xen_msi_ops.setup_msi_irqs = xen_setup_msi_irqs; xen_msi_ops.teardown_msi_irqs = xen_pv_teardown_msi_irqs; - pci_msi_ignore_mask = 1; } else if (xen_hvm_domain()) { xen_msi_ops.setup_msi_irqs = xen_hvm_setup_msi_irqs; xen_msi_ops.teardown_msi_irqs = xen_teardown_msi_irqs; @@ -481,6 +480,11 @@ static __init void xen_setup_pci_msi(void) * in allocating the native domain and never use it. */ x86_init.irqs.create_pci_msi_domain = xen_create_pci_msi_domain; + /* + * With XEN PIRQ/Eventchannels in use PCI/MSI[-X] masking is solely + * controlled by the hypervisor. + */ + pci_msi_ignore_mask = 1; } #else /* CONFIG_PCI_MSI */ |