Commit 535d8e8f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: enable DMAR by default
  xen: disable interrupts early, as start_kernel expects
  gpu/drm, x86, PAT: io_mapping_create_wc and resource_size_t
  gpu/drm, x86, PAT: Handle io_mapping_create_wc() errors in a clean way
  x86, Voyager: fix compile by lifting the degeneracy of phys_cpu_present_map
  x86, doc: fix references to Documentation/x86/i386/boot.txt
parents 6febf65b f6be37fd

Documentation/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ In addition, the following text indicates that the option: 
Parameters denoted with BOOT are actually interpreted by the boot

loader, and have no meaning to the kernel directly.

Do not modify the syntax of boot loader parameters without extreme

need or coordination with <Documentation/x86/i386/boot.txt>.

need or coordination with <Documentation/x86/boot.txt>.



There are also arch-specific kernel-parameters not documented here.

See for example <Documentation/x86/x86_64/boot-options.txt>.
@@ -2451,7 +2451,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			See Documentation/fb/modedb.txt.



	vga=		[BOOT,X86-32] Select a particular video mode

			See Documentation/x86/i386/boot.txt and

			See Documentation/x86/boot.txt and

			Documentation/svga.txt.

			Use vga=ask for menu.

			This is actually a boot loader parameter; the value is

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1803,7 +1803,7 @@ config DMAR 
	  remapping devices.



config DMAR_DEFAULT_ON

	def_bool n

	def_bool y

	prompt "Enable DMA Remapping Devices by default"

	depends on DMAR

	help

arch/x86/include/asm/iomap.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include <asm/pgtable.h>

#include <asm/tlbflush.h>



int

is_io_mapping_possible(resource_size_t base, unsigned long size);



void *

iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);

arch/x86/mach-voyager/voyager_smp.c

+12 −12
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static volatile unsigned long smp_invalidate_needed; 


/* Bitmask of CPUs present in the system - exported by i386_syms.c, used

 * by scheduler but indexed physically */

cpumask_t phys_cpu_present_map = CPU_MASK_NONE;

static cpumask_t voyager_phys_cpu_present_map = CPU_MASK_NONE;



/* The internal functions */

static void send_CPI(__u32 cpuset, __u8 cpi);
@@ -366,19 +366,19 @@ void __init find_smp_config(void) 
	/* set up everything for just this CPU, we can alter

	 * this as we start the other CPUs later */

	/* now get the CPU disposition from the extended CMOS */

	cpus_addr(phys_cpu_present_map)[0] =

	cpus_addr(voyager_phys_cpu_present_map)[0] =

	    voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK);

	cpus_addr(phys_cpu_present_map)[0] |=

	cpus_addr(voyager_phys_cpu_present_map)[0] |=

	    voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 1) << 8;

	cpus_addr(phys_cpu_present_map)[0] |=

	cpus_addr(voyager_phys_cpu_present_map)[0] |=

	    voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK +

				       2) << 16;

	cpus_addr(phys_cpu_present_map)[0] |=

	cpus_addr(voyager_phys_cpu_present_map)[0] |=

	    voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK +

				       3) << 24;

	init_cpu_possible(&phys_cpu_present_map);

	printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n",

	       cpus_addr(phys_cpu_present_map)[0]);

	init_cpu_possible(&voyager_phys_cpu_present_map);

	printk("VOYAGER SMP: voyager_phys_cpu_present_map = 0x%lx\n",

	       cpus_addr(voyager_phys_cpu_present_map)[0]);

	/* Here we set up the VIC to enable SMP */

	/* enable the CPIs by writing the base vector to their register */

	outb(VIC_DEFAULT_CPI_BASE, VIC_CPI_BASE_REGISTER);
@@ -628,15 +628,15 @@ void __init smp_boot_cpus(void) 
		/* now that the cat has probed the Voyager System Bus, sanity

		 * check the cpu map */

		if (((voyager_quad_processors | voyager_extended_vic_processors)

		     & cpus_addr(phys_cpu_present_map)[0]) !=

		    cpus_addr(phys_cpu_present_map)[0]) {

		     & cpus_addr(voyager_phys_cpu_present_map)[0]) !=

		    cpus_addr(voyager_phys_cpu_present_map)[0]) {

			/* should panic */

			printk("\n\n***WARNING*** "

			       "Sanity check of CPU present map FAILED\n");

		}

	} else if (voyager_level == 4)

		voyager_extended_vic_processors =

		    cpus_addr(phys_cpu_present_map)[0];

		    cpus_addr(voyager_phys_cpu_present_map)[0];



	/* this sets up the idle task to run on the current cpu */

	voyager_extended_cpus = 1;
@@ -670,7 +670,7 @@ void __init smp_boot_cpus(void) 
	/* loop over all the extended VIC CPUs and boot them.  The

	 * Quad CPUs must be bootstrapped by their extended VIC cpu */

	for (i = 0; i < nr_cpu_ids; i++) {

		if (i == boot_cpu_id || !cpu_isset(i, phys_cpu_present_map))

		if (i == boot_cpu_id || !cpu_isset(i, voyager_phys_cpu_present_map))

			continue;

		do_boot_cpu(i);

		/* This udelay seems to be needed for the Quad boots

arch/x86/mm/iomap_32.c

+18 −0
Original line number Diff line number Diff line
@@ -20,6 +20,24 @@ 
#include <asm/pat.h>

#include <linux/module.h>



#ifdef CONFIG_X86_PAE

int

is_io_mapping_possible(resource_size_t base, unsigned long size)

{

	return 1;

}

#else

int

is_io_mapping_possible(resource_size_t base, unsigned long size)

{

	/* There is no way to map greater than 1 << 32 address without PAE */

	if (base + size > 0x100000000ULL)

		return 0;



	return 1;

}

#endif



/* Map 'pfn' using fixed map 'type' and protections 'prot'

 */

void *

CRA Git | Maintained and supported by SUSTech CRA and CCSE