Commit 76a8df7b authored May 04, 2012 by David Vrabel Committed by Konrad Rzeszutek Wilk May 07, 2012

xen/pci: don't use PCI BIOS service for configuration space accesses



The accessing PCI configuration space with the PCI BIOS32 service does
not work in PV guests.

On systems without MMCONFIG or where the BIOS hasn't marked the
MMCONFIG region as reserved in the e820 map, the BIOS service is
probed (even though direct access is preferred) and this hangs.

CC: stable@kernel.org
Acked-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
[v1: Fixed compile error when CONFIG_PCI is not set]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

parent b7e5ffe5

arch/x86/xen/enlighten.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@
		#include <asm/stackprotector.h>
		#include <asm/hypervisor.h>
		#include <asm/mwait.h>
		#include <asm/pci_x86.h>

		#ifdef CONFIG_ACPI
		#include <linux/acpi.h>
		@@ -1398,8 +1399,10 @@ asmlinkage void __init xen_start_kernel(void)
		/* Make sure ACS will be enabled */
		pci_request_acs();
		}


		#ifdef CONFIG_PCI
		/* PCI BIOS service won't work from a PV guest. */
		pci_probe &= ~PCI_PROBE_BIOS;
		#endif
		xen_raw_console_write("about to get started...\n");

		xen_setup_runstate_info(0);

Admin message