diff options
184 files changed, 6482 insertions, 3900 deletions
diff --git a/Documentation/x86_64/mm.txt b/Documentation/x86_64/mm.txt index b89b6d2bebfa..efce75097369 100644 --- a/Documentation/x86_64/mm.txt +++ b/Documentation/x86_64/mm.txt | |||
| @@ -11,9 +11,8 @@ ffffc10000000000 - ffffc1ffffffffff (=40 bits) hole | |||
| 11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space | 11 | ffffc20000000000 - ffffe1ffffffffff (=45 bits) vmalloc/ioremap space |
| 12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) | 12 | ffffe20000000000 - ffffe2ffffffffff (=40 bits) virtual memory map (1TB) |
| 13 | ... unused hole ... | 13 | ... unused hole ... |
| 14 | ffffffff80000000 - ffffffff82800000 (=40 MB) kernel text mapping, from phys 0 | 14 | ffffffff80000000 - ffffffffa0000000 (=512 MB) kernel text mapping, from phys 0 |
| 15 | ... unused hole ... | 15 | ffffffffa0000000 - fffffffffff00000 (=1536 MB) module mapping space |
| 16 | ffffffff88000000 - fffffffffff00000 (=1919 MB) module mapping space | ||
| 17 | 16 | ||
| 18 | The direct mapping covers all memory in the system up to the highest | 17 | The direct mapping covers all memory in the system up to the highest |
| 19 | memory address (this means in some cases it can also include PCI memory | 18 | memory address (this means in some cases it can also include PCI memory |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index bf07b6f50fa1..5d2858119930 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -251,7 +251,7 @@ config X86_ELAN | |||
| 251 | 251 | ||
| 252 | config X86_VOYAGER | 252 | config X86_VOYAGER |
| 253 | bool "Voyager (NCR)" | 253 | bool "Voyager (NCR)" |
| 254 | depends on X86_32 && (SMP || BROKEN) | 254 | depends on X86_32 && (SMP || BROKEN) && !PCI |
| 255 | help | 255 | help |
| 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
| 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
| @@ -263,7 +263,7 @@ config X86_VOYAGER | |||
| 263 | 263 | ||
| 264 | config X86_NUMAQ | 264 | config X86_NUMAQ |
| 265 | bool "NUMAQ (IBM/Sequent)" | 265 | bool "NUMAQ (IBM/Sequent)" |
| 266 | depends on SMP && X86_32 | 266 | depends on SMP && X86_32 && PCI |
| 267 | select NUMA | 267 | select NUMA |
| 268 | help | 268 | help |
| 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA |
| @@ -293,7 +293,7 @@ config X86_BIGSMP | |||
| 293 | 293 | ||
| 294 | config X86_VISWS | 294 | config X86_VISWS |
| 295 | bool "SGI 320/540 (Visual Workstation)" | 295 | bool "SGI 320/540 (Visual Workstation)" |
| 296 | depends on X86_32 | 296 | depends on X86_32 && !PCI |
| 297 | help | 297 | help |
| 298 | The SGI Visual Workstation series is an IA32-based workstation | 298 | The SGI Visual Workstation series is an IA32-based workstation |
| 299 | based on SGI systems chips with some legacy PC hardware attached. | 299 | based on SGI systems chips with some legacy PC hardware attached. |
| @@ -337,7 +337,7 @@ config X86_RDC321X | |||
| 337 | config X86_VSMP | 337 | config X86_VSMP |
| 338 | bool "Support for ScaleMP vSMP" | 338 | bool "Support for ScaleMP vSMP" |
| 339 | select PARAVIRT | 339 | select PARAVIRT |
| 340 | depends on X86_64 | 340 | depends on X86_64 && !PCI |
| 341 | help | 341 | help |
| 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
| 343 | supposed to run on these EM64T-based machines. Only choose this option | 343 | supposed to run on these EM64T-based machines. Only choose this option |
| @@ -417,35 +417,19 @@ config PARAVIRT_CLOCK | |||
| 417 | 417 | ||
| 418 | endif | 418 | endif |
| 419 | 419 | ||
| 420 | config MEMTEST_BOOTPARAM | 420 | config MEMTEST |
| 421 | bool "Memtest boot parameter" | 421 | bool "Memtest" |
| 422 | depends on X86_64 | 422 | depends on X86_64 |
| 423 | default y | 423 | default y |
| 424 | help | 424 | help |
| 425 | This option adds a kernel parameter 'memtest', which allows memtest | 425 | This option adds a kernel parameter 'memtest', which allows memtest |
| 426 | to be disabled at boot. If this option is selected, memtest | 426 | to be set. |
| 427 | functionality can be disabled with memtest=0 on the kernel | 427 | memtest=0, mean disabled; -- default |
| 428 | command line. The purpose of this option is to allow a single | 428 | memtest=1, mean do 1 test pattern; |
| 429 | kernel image to be distributed with memtest built in, but not | 429 | ... |
| 430 | necessarily enabled. | 430 | memtest=4, mean do 4 test patterns. |
| 431 | |||
| 432 | If you are unsure how to answer this question, answer Y. | 431 | If you are unsure how to answer this question, answer Y. |
| 433 | 432 | ||
| 434 | config MEMTEST_BOOTPARAM_VALUE | ||
| 435 | int "Memtest boot parameter default value (0-4)" | ||
| 436 | depends on MEMTEST_BOOTPARAM | ||
| 437 | range 0 4 | ||
| 438 | default 0 | ||
| 439 | help | ||
| 440 | This option sets the default value for the kernel parameter | ||
| 441 | 'memtest', which allows memtest to be disabled at boot. If this | ||
| 442 | option is set to 0 (zero), the memtest kernel parameter will | ||
| 443 | default to 0, disabling memtest at bootup. If this option is | ||
| 444 | set to 4, the memtest kernel parameter will default to 4, | ||
| 445 | enabling memtest at bootup, and use that as pattern number. | ||
| 446 | |||
| 447 | If you are unsure how to answer this question, answer 0. | ||
| 448 | |||
| 449 | config ACPI_SRAT | 433 | config ACPI_SRAT |
| 450 | def_bool y | 434 | def_bool y |
| 451 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 435 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) |
| @@ -563,18 +547,18 @@ config IOMMU_HELPER | |||
| 563 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 547 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) |
| 564 | 548 | ||
| 565 | config NR_CPUS | 549 | config NR_CPUS |
| 566 | int "Maximum number of CPUs (2-255)" | 550 | int "Maximum number of CPUs (2-4096)" |
| 567 | range 2 255 | 551 | range 2 4096 |
| 568 | depends on SMP | 552 | depends on SMP |
| 569 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 553 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
| 570 | default "8" | 554 | default "8" |
| 571 | help | 555 | help |
| 572 | This allows you to specify the maximum number of CPUs which this | 556 | This allows you to specify the maximum number of CPUs which this |
| 573 | kernel will support. The maximum supported value is 255 and the | 557 | kernel will support. The maximum supported value is 4096 and the |
| 574 | minimum value which makes sense is 2. | 558 | minimum value which makes sense is 2. |
| 575 | 559 | ||
| 576 | This is purely to save memory - each supported CPU adds | 560 | This is purely to save memory - each supported CPU adds |
| 577 | approximately eight kilobytes to the kernel image. | 561 | approximately one kilobyte to the kernel image. |
| 578 | 562 | ||
| 579 | config SCHED_SMT | 563 | config SCHED_SMT |
| 580 | bool "SMT (Hyperthreading) scheduler support" | 564 | bool "SMT (Hyperthreading) scheduler support" |
| @@ -1475,8 +1459,7 @@ endmenu | |||
| 1475 | menu "Bus options (PCI etc.)" | 1459 | menu "Bus options (PCI etc.)" |
| 1476 | 1460 | ||
| 1477 | config PCI | 1461 | config PCI |
| 1478 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1462 | bool "PCI support" |
| 1479 | depends on !X86_VOYAGER | ||
| 1480 | default y | 1463 | default y |
| 1481 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1464 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
| 1482 | help | 1465 | help |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 2ad6301849a1..3d22bb8175b4 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
| @@ -399,6 +399,10 @@ config X86_TSC | |||
| 399 | def_bool y | 399 | def_bool y |
| 400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 | 400 | depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64 |
| 401 | 401 | ||
| 402 | config X86_CMPXCHG64 | ||
| 403 | def_bool y | ||
| 404 | depends on X86_PAE || X86_64 | ||
| 405 | |||
| 402 | # this should be set for all -march=.. options where the compiler | 406 | # this should be set for all -march=.. options where the compiler |
| 403 | # generates cmov. | 407 | # generates cmov. |
| 404 | config X86_CMOV | 408 | config X86_CMOV |
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 3cff3c894cf3..5df0d1e330b1 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
| @@ -210,12 +210,12 @@ all: bzImage | |||
| 210 | 210 | ||
| 211 | # KBUILD_IMAGE specify target image being built | 211 | # KBUILD_IMAGE specify target image being built |
| 212 | KBUILD_IMAGE := $(boot)/bzImage | 212 | KBUILD_IMAGE := $(boot)/bzImage |
| 213 | zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage | 213 | zImage zlilo zdisk: KBUILD_IMAGE := $(boot)/zImage |
| 214 | 214 | ||
| 215 | zImage bzImage: vmlinux | 215 | zImage bzImage: vmlinux |
| 216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) | 216 | $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE) |
| 217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot | 217 | $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot |
| 218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/bzImage | 218 | $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@ |
| 219 | 219 | ||
| 220 | compressed: zImage | 220 | compressed: zImage |
| 221 | 221 | ||
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index d8819efac81d..1d5dff4123e1 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <asm/page.h> | 30 | #include <asm/page.h> |
| 31 | #include <asm/boot.h> | 31 | #include <asm/boot.h> |
| 32 | #include <asm/msr.h> | 32 | #include <asm/msr.h> |
| 33 | #include <asm/processor-flags.h> | ||
| 33 | #include <asm/asm-offsets.h> | 34 | #include <asm/asm-offsets.h> |
| 34 | 35 | ||
| 35 | .section ".text.head" | 36 | .section ".text.head" |
| @@ -109,7 +110,7 @@ startup_32: | |||
| 109 | 110 | ||
| 110 | /* Enable PAE mode */ | 111 | /* Enable PAE mode */ |
| 111 | xorl %eax, %eax | 112 | xorl %eax, %eax |
| 112 | orl $(1 << 5), %eax | 113 | orl $(X86_CR4_PAE), %eax |
| 113 | movl %eax, %cr4 | 114 | movl %eax, %cr4 |
| 114 | 115 | ||
| 115 | /* | 116 | /* |
| @@ -170,7 +171,7 @@ startup_32: | |||
| 170 | pushl %eax | 171 | pushl %eax |
| 171 | 172 | ||
| 172 | /* Enter paged protected Mode, activating Long Mode */ | 173 | /* Enter paged protected Mode, activating Long Mode */ |
| 173 | movl $0x80000001, %eax /* Enable Paging and Protected mode */ | 174 | movl $(X86_CR0_PG | X86_CR0_PE), %eax /* Enable Paging and Protected mode */ |
| 174 | movl %eax, %cr0 | 175 | movl %eax, %cr0 |
| 175 | 176 | ||
| 176 | /* Jump from 32bit compatibility mode into 64bit mode. */ | 177 | /* Jump from 32bit compatibility mode into 64bit mode. */ |
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c index 40ecb8d7688c..b939cb476dec 100644 --- a/arch/x86/boot/video-vga.c +++ b/arch/x86/boot/video-vga.c | |||
| @@ -259,8 +259,7 @@ static int vga_probe(void) | |||
| 259 | return mode_count[adapter]; | 259 | return mode_count[adapter]; |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | __videocard video_vga = | 262 | __videocard video_vga = { |
| 263 | { | ||
| 264 | .card_name = "VGA", | 263 | .card_name = "VGA", |
| 265 | .probe = vga_probe, | 264 | .probe = vga_probe, |
| 266 | .set_mode = vga_set_mode, | 265 | .set_mode = vga_set_mode, |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index ad7ddaaff588..9bc34e2033ec 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
| @@ -1,54 +1,103 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:02 2008 |
| 5 | # | 5 | # |
| 6 | # CONFIG_64BIT is not set | ||
| 6 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
| 8 | # CONFIG_X86_64 is not set | ||
| 9 | CONFIG_X86=y | ||
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/i386_defconfig" | ||
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
| 7 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 13 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
| 8 | CONFIG_CLOCKSOURCE_WATCHDOG=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
| 9 | CONFIG_GENERIC_CLOCKEVENTS=y | 15 | CONFIG_GENERIC_CLOCKEVENTS=y |
| 10 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | 16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y |
| 11 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
| 12 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
| 13 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 14 | CONFIG_X86=y | 20 | CONFIG_FAST_CMPXCHG_LOCAL=y |
| 15 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
| 16 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
| 17 | CONFIG_QUICKLIST=y | ||
| 18 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
| 19 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
| 20 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
| 21 | CONFIG_GENERIC_HWEIGHT=y | 26 | CONFIG_GENERIC_HWEIGHT=y |
| 27 | # CONFIG_GENERIC_GPIO is not set | ||
| 22 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
| 23 | CONFIG_DMI=y | 29 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set |
| 24 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 30 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | ||
| 34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 35 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | ||
| 36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
| 37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
| 38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 39 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set | ||
| 40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 42 | # CONFIG_ZONE_DMA32 is not set | ||
| 43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 44 | # CONFIG_AUDIT_ARCH is not set | ||
| 45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
| 47 | CONFIG_GENERIC_HARDIRQS=y | ||
| 48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 50 | CONFIG_X86_SMP=y | ||
| 51 | CONFIG_X86_32_SMP=y | ||
| 52 | CONFIG_X86_HT=y | ||
| 53 | CONFIG_X86_BIOS_REBOOT=y | ||
| 54 | CONFIG_X86_TRAMPOLINE=y | ||
| 55 | CONFIG_KTIME_SCALAR=y | ||
| 25 | 56 | ||
| 26 | # | 57 | # |
| 27 | # Code maturity level options | 58 | # General setup |
| 28 | # | 59 | # |
| 29 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
| 30 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
| 31 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 32 | |||
| 33 | # | ||
| 34 | # General setup | ||
| 35 | # | ||
| 36 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
| 37 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
| 38 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
| 39 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
| 40 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
| 41 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
| 42 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
| 43 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 44 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
| 45 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
| 46 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
| 47 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
| 48 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
| 49 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
| 50 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
| 78 | # CONFIG_IKCONFIG is not set | ||
| 79 | CONFIG_LOG_BUF_SHIFT=17 | ||
| 80 | CONFIG_CGROUPS=y | ||
| 81 | # CONFIG_CGROUP_DEBUG is not set | ||
| 82 | CONFIG_CGROUP_NS=y | ||
| 83 | # CONFIG_CGROUP_DEVICE is not set | ||
| 84 | CONFIG_CPUSETS=y | ||
| 85 | CONFIG_GROUP_SCHED=y | ||
| 86 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 87 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 88 | # CONFIG_USER_SCHED is not set | ||
| 89 | CONFIG_CGROUP_SCHED=y | ||
| 90 | CONFIG_CGROUP_CPUACCT=y | ||
| 91 | CONFIG_RESOURCE_COUNTERS=y | ||
| 92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
| 93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 94 | CONFIG_PROC_PID_CPUSET=y | ||
| 51 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
| 96 | CONFIG_NAMESPACES=y | ||
| 97 | CONFIG_UTS_NS=y | ||
| 98 | CONFIG_IPC_NS=y | ||
| 99 | CONFIG_USER_NS=y | ||
| 100 | CONFIG_PID_NS=y | ||
| 52 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
| 53 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
| 54 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -56,13 +105,15 @@ CONFIG_SYSCTL=y | |||
| 56 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
| 57 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
| 58 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 59 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 60 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 61 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 62 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
| 63 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
| 64 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
| 65 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
| 116 | # CONFIG_COMPAT_BRK is not set | ||
| 66 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
| 67 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
| 68 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
| @@ -76,6 +127,17 @@ CONFIG_SLUB_DEBUG=y | |||
| 76 | # CONFIG_SLAB is not set | 127 | # CONFIG_SLAB is not set |
| 77 | CONFIG_SLUB=y | 128 | CONFIG_SLUB=y |
| 78 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
| 130 | CONFIG_PROFILING=y | ||
| 131 | CONFIG_MARKERS=y | ||
| 132 | # CONFIG_OPROFILE is not set | ||
| 133 | CONFIG_HAVE_OPROFILE=y | ||
| 134 | CONFIG_KPROBES=y | ||
| 135 | CONFIG_KRETPROBES=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | ||
| 137 | CONFIG_HAVE_KRETPROBES=y | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 140 | CONFIG_SLABINFO=y | ||
| 79 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 80 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 81 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| @@ -87,10 +149,10 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
| 87 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
| 88 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
| 89 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
| 90 | CONFIG_LBD=y | 152 | # CONFIG_LBD is not set |
| 91 | # CONFIG_BLK_DEV_IO_TRACE is not set | 153 | CONFIG_BLK_DEV_IO_TRACE=y |
| 92 | # CONFIG_LSF is not set | 154 | # CONFIG_LSF is not set |
| 93 | # CONFIG_BLK_DEV_BSG is not set | 155 | CONFIG_BLK_DEV_BSG=y |
| 94 | 156 | ||
| 95 | # | 157 | # |
| 96 | # IO Schedulers | 158 | # IO Schedulers |
| @@ -103,7 +165,8 @@ CONFIG_IOSCHED_CFQ=y | |||
| 103 | # CONFIG_DEFAULT_DEADLINE is not set | 165 | # CONFIG_DEFAULT_DEADLINE is not set |
| 104 | CONFIG_DEFAULT_CFQ=y | 166 | CONFIG_DEFAULT_CFQ=y |
| 105 | # CONFIG_DEFAULT_NOOP is not set | 167 | # CONFIG_DEFAULT_NOOP is not set |
| 106 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 168 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 169 | CONFIG_CLASSIC_RCU=y | ||
| 107 | 170 | ||
| 108 | # | 171 | # |
| 109 | # Processor type and features | 172 | # Processor type and features |
| @@ -111,18 +174,21 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
| 111 | CONFIG_TICK_ONESHOT=y | 174 | CONFIG_TICK_ONESHOT=y |
| 112 | CONFIG_NO_HZ=y | 175 | CONFIG_NO_HZ=y |
| 113 | CONFIG_HIGH_RES_TIMERS=y | 176 | CONFIG_HIGH_RES_TIMERS=y |
| 177 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 114 | CONFIG_SMP=y | 178 | CONFIG_SMP=y |
| 115 | # CONFIG_X86_PC is not set | 179 | CONFIG_X86_PC=y |
| 116 | # CONFIG_X86_ELAN is not set | 180 | # CONFIG_X86_ELAN is not set |
| 117 | # CONFIG_X86_VOYAGER is not set | 181 | # CONFIG_X86_VOYAGER is not set |
| 118 | # CONFIG_X86_NUMAQ is not set | 182 | # CONFIG_X86_NUMAQ is not set |
| 119 | # CONFIG_X86_SUMMIT is not set | 183 | # CONFIG_X86_SUMMIT is not set |
| 120 | # CONFIG_X86_BIGSMP is not set | 184 | # CONFIG_X86_BIGSMP is not set |
| 121 | # CONFIG_X86_VISWS is not set | 185 | # CONFIG_X86_VISWS is not set |
| 122 | CONFIG_X86_GENERICARCH=y | 186 | # CONFIG_X86_GENERICARCH is not set |
| 123 | # CONFIG_X86_ES7000 is not set | 187 | # CONFIG_X86_ES7000 is not set |
| 124 | # CONFIG_PARAVIRT is not set | 188 | # CONFIG_X86_RDC321X is not set |
| 125 | CONFIG_X86_CYCLONE_TIMER=y | 189 | # CONFIG_X86_VSMP is not set |
| 190 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
| 191 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 126 | # CONFIG_M386 is not set | 192 | # CONFIG_M386 is not set |
| 127 | # CONFIG_M486 is not set | 193 | # CONFIG_M486 is not set |
| 128 | # CONFIG_M586 is not set | 194 | # CONFIG_M586 is not set |
| @@ -130,9 +196,8 @@ CONFIG_X86_CYCLONE_TIMER=y | |||
| 130 | # CONFIG_M586MMX is not set | 196 | # CONFIG_M586MMX is not set |
| 131 | # CONFIG_M686 is not set | 197 | # CONFIG_M686 is not set |
| 132 | # CONFIG_MPENTIUMII is not set | 198 | # CONFIG_MPENTIUMII is not set |
| 133 | CONFIG_MPENTIUMIII=y | 199 | # CONFIG_MPENTIUMIII is not set |
| 134 | # CONFIG_MPENTIUMM is not set | 200 | # CONFIG_MPENTIUMM is not set |
| 135 | # CONFIG_MCORE2 is not set | ||
| 136 | # CONFIG_MPENTIUM4 is not set | 201 | # CONFIG_MPENTIUM4 is not set |
| 137 | # CONFIG_MK6 is not set | 202 | # CONFIG_MK6 is not set |
| 138 | # CONFIG_MK7 is not set | 203 | # CONFIG_MK7 is not set |
| @@ -147,14 +212,14 @@ CONFIG_MPENTIUMIII=y | |||
| 147 | # CONFIG_MCYRIXIII is not set | 212 | # CONFIG_MCYRIXIII is not set |
| 148 | # CONFIG_MVIAC3_2 is not set | 213 | # CONFIG_MVIAC3_2 is not set |
| 149 | # CONFIG_MVIAC7 is not set | 214 | # CONFIG_MVIAC7 is not set |
| 150 | CONFIG_X86_GENERIC=y | 215 | # CONFIG_MPSC is not set |
| 216 | CONFIG_MCORE2=y | ||
| 217 | # CONFIG_GENERIC_CPU is not set | ||
| 218 | # CONFIG_X86_GENERIC is not set | ||
| 219 | CONFIG_X86_CPU=y | ||
| 151 | CONFIG_X86_CMPXCHG=y | 220 | CONFIG_X86_CMPXCHG=y |
| 152 | CONFIG_X86_L1_CACHE_SHIFT=7 | 221 | CONFIG_X86_L1_CACHE_SHIFT=6 |
| 153 | CONFIG_X86_XADD=y | 222 | CONFIG_X86_XADD=y |
| 154 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
| 155 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
| 156 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
| 157 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 158 | CONFIG_X86_WP_WORKS_OK=y | 223 | CONFIG_X86_WP_WORKS_OK=y |
| 159 | CONFIG_X86_INVLPG=y | 224 | CONFIG_X86_INVLPG=y |
| 160 | CONFIG_X86_BSWAP=y | 225 | CONFIG_X86_BSWAP=y |
| @@ -162,106 +227,120 @@ CONFIG_X86_POPAD_OK=y | |||
| 162 | CONFIG_X86_GOOD_APIC=y | 227 | CONFIG_X86_GOOD_APIC=y |
| 163 | CONFIG_X86_INTEL_USERCOPY=y | 228 | CONFIG_X86_INTEL_USERCOPY=y |
| 164 | CONFIG_X86_USE_PPRO_CHECKSUM=y | 229 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 230 | CONFIG_X86_P6_NOP=y | ||
| 165 | CONFIG_X86_TSC=y | 231 | CONFIG_X86_TSC=y |
| 166 | CONFIG_X86_CMOV=y | 232 | CONFIG_X86_MINIMUM_CPU_FAMILY=6 |
| 167 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 | 233 | CONFIG_X86_DEBUGCTLMSR=y |
| 168 | CONFIG_HPET_TIMER=y | 234 | CONFIG_HPET_TIMER=y |
| 169 | CONFIG_HPET_EMULATE_RTC=y | 235 | CONFIG_HPET_EMULATE_RTC=y |
| 170 | CONFIG_NR_CPUS=32 | 236 | CONFIG_DMI=y |
| 171 | CONFIG_SCHED_SMT=y | 237 | # CONFIG_IOMMU_HELPER is not set |
| 238 | CONFIG_NR_CPUS=4 | ||
| 239 | # CONFIG_SCHED_SMT is not set | ||
| 172 | CONFIG_SCHED_MC=y | 240 | CONFIG_SCHED_MC=y |
| 173 | # CONFIG_PREEMPT_NONE is not set | 241 | # CONFIG_PREEMPT_NONE is not set |
| 174 | CONFIG_PREEMPT_VOLUNTARY=y | 242 | CONFIG_PREEMPT_VOLUNTARY=y |
| 175 | # CONFIG_PREEMPT is not set | 243 | # CONFIG_PREEMPT is not set |
| 176 | CONFIG_PREEMPT_BKL=y | ||
| 177 | CONFIG_X86_LOCAL_APIC=y | 244 | CONFIG_X86_LOCAL_APIC=y |
| 178 | CONFIG_X86_IO_APIC=y | 245 | CONFIG_X86_IO_APIC=y |
| 179 | CONFIG_X86_MCE=y | 246 | # CONFIG_X86_MCE is not set |
| 180 | CONFIG_X86_MCE_NONFATAL=y | ||
| 181 | CONFIG_X86_MCE_P4THERMAL=y | ||
| 182 | CONFIG_VM86=y | 247 | CONFIG_VM86=y |
| 183 | # CONFIG_TOSHIBA is not set | 248 | # CONFIG_TOSHIBA is not set |
| 184 | # CONFIG_I8K is not set | 249 | # CONFIG_I8K is not set |
| 185 | # CONFIG_X86_REBOOTFIXUPS is not set | 250 | # CONFIG_X86_REBOOTFIXUPS is not set |
| 186 | CONFIG_MICROCODE=y | 251 | # CONFIG_MICROCODE is not set |
| 187 | CONFIG_MICROCODE_OLD_INTERFACE=y | ||
| 188 | CONFIG_X86_MSR=y | 252 | CONFIG_X86_MSR=y |
| 189 | CONFIG_X86_CPUID=y | 253 | CONFIG_X86_CPUID=y |
| 190 | |||
| 191 | # | ||
| 192 | # Firmware Drivers | ||
| 193 | # | ||
| 194 | # CONFIG_EDD is not set | ||
| 195 | # CONFIG_DELL_RBU is not set | ||
| 196 | # CONFIG_DCDBAS is not set | ||
| 197 | CONFIG_DMIID=y | ||
| 198 | # CONFIG_NOHIGHMEM is not set | 254 | # CONFIG_NOHIGHMEM is not set |
| 199 | CONFIG_HIGHMEM4G=y | 255 | CONFIG_HIGHMEM4G=y |
| 200 | # CONFIG_HIGHMEM64G is not set | 256 | # CONFIG_HIGHMEM64G is not set |
| 201 | CONFIG_PAGE_OFFSET=0xC0000000 | 257 | CONFIG_PAGE_OFFSET=0xC0000000 |
| 202 | CONFIG_HIGHMEM=y | 258 | CONFIG_HIGHMEM=y |
| 203 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 259 | CONFIG_NEED_NODE_MEMMAP_SIZE=y |
| 260 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
| 261 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 262 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 204 | CONFIG_SELECT_MEMORY_MODEL=y | 263 | CONFIG_SELECT_MEMORY_MODEL=y |
| 205 | CONFIG_FLATMEM_MANUAL=y | 264 | # CONFIG_FLATMEM_MANUAL is not set |
| 206 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 265 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
| 207 | # CONFIG_SPARSEMEM_MANUAL is not set | 266 | CONFIG_SPARSEMEM_MANUAL=y |
| 208 | CONFIG_FLATMEM=y | 267 | CONFIG_SPARSEMEM=y |
| 209 | CONFIG_FLAT_NODE_MEM_MAP=y | 268 | CONFIG_HAVE_MEMORY_PRESENT=y |
| 210 | # CONFIG_SPARSEMEM_STATIC is not set | 269 | CONFIG_SPARSEMEM_STATIC=y |
| 270 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
| 271 | |||
| 272 | # | ||
| 273 | # Memory hotplug is currently incompatible with Software Suspend | ||
| 274 | # | ||
| 275 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 211 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 276 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 212 | CONFIG_RESOURCES_64BIT=y | 277 | CONFIG_RESOURCES_64BIT=y |
| 213 | CONFIG_ZONE_DMA_FLAG=1 | 278 | CONFIG_ZONE_DMA_FLAG=1 |
| 214 | CONFIG_BOUNCE=y | 279 | CONFIG_BOUNCE=y |
| 215 | CONFIG_NR_QUICK=1 | ||
| 216 | CONFIG_VIRT_TO_BUS=y | 280 | CONFIG_VIRT_TO_BUS=y |
| 217 | # CONFIG_HIGHPTE is not set | 281 | # CONFIG_HIGHPTE is not set |
| 218 | # CONFIG_MATH_EMULATION is not set | 282 | # CONFIG_MATH_EMULATION is not set |
| 219 | CONFIG_MTRR=y | 283 | CONFIG_MTRR=y |
| 220 | # CONFIG_EFI is not set | 284 | # CONFIG_X86_PAT is not set |
| 285 | CONFIG_EFI=y | ||
| 221 | # CONFIG_IRQBALANCE is not set | 286 | # CONFIG_IRQBALANCE is not set |
| 222 | CONFIG_SECCOMP=y | 287 | CONFIG_SECCOMP=y |
| 223 | # CONFIG_HZ_100 is not set | 288 | # CONFIG_HZ_100 is not set |
| 224 | CONFIG_HZ_250=y | 289 | # CONFIG_HZ_250 is not set |
| 225 | # CONFIG_HZ_300 is not set | 290 | # CONFIG_HZ_300 is not set |
| 226 | # CONFIG_HZ_1000 is not set | 291 | CONFIG_HZ_1000=y |
| 227 | CONFIG_HZ=250 | 292 | CONFIG_HZ=1000 |
| 228 | # CONFIG_KEXEC is not set | 293 | CONFIG_SCHED_HRTICK=y |
| 229 | # CONFIG_CRASH_DUMP is not set | 294 | CONFIG_KEXEC=y |
| 230 | CONFIG_PHYSICAL_START=0x100000 | 295 | CONFIG_CRASH_DUMP=y |
| 231 | # CONFIG_RELOCATABLE is not set | 296 | CONFIG_PHYSICAL_START=0x1000000 |
| 232 | CONFIG_PHYSICAL_ALIGN=0x100000 | 297 | CONFIG_RELOCATABLE=y |
| 233 | # CONFIG_HOTPLUG_CPU is not set | 298 | CONFIG_PHYSICAL_ALIGN=0x200000 |
| 234 | CONFIG_COMPAT_VDSO=y | 299 | CONFIG_HOTPLUG_CPU=y |
| 300 | # CONFIG_COMPAT_VDSO is not set | ||
| 235 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 301 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
| 236 | 302 | ||
| 237 | # | 303 | # |
| 238 | # Power management options (ACPI, APM) | 304 | # Power management options |
| 239 | # | 305 | # |
| 240 | CONFIG_PM=y | 306 | CONFIG_PM=y |
| 241 | CONFIG_PM_LEGACY=y | 307 | CONFIG_PM_DEBUG=y |
| 242 | # CONFIG_PM_DEBUG is not set | 308 | # CONFIG_PM_VERBOSE is not set |
| 243 | 309 | CONFIG_CAN_PM_TRACE=y | |
| 244 | # | 310 | CONFIG_PM_TRACE=y |
| 245 | # ACPI (Advanced Configuration and Power Interface) Support | 311 | CONFIG_PM_TRACE_RTC=y |
| 246 | # | 312 | CONFIG_PM_SLEEP_SMP=y |
| 313 | CONFIG_PM_SLEEP=y | ||
| 314 | CONFIG_SUSPEND=y | ||
| 315 | CONFIG_SUSPEND_FREEZER=y | ||
| 316 | CONFIG_HIBERNATION=y | ||
| 317 | CONFIG_PM_STD_PARTITION="" | ||
| 247 | CONFIG_ACPI=y | 318 | CONFIG_ACPI=y |
| 319 | CONFIG_ACPI_SLEEP=y | ||
| 248 | CONFIG_ACPI_PROCFS=y | 320 | CONFIG_ACPI_PROCFS=y |
| 321 | CONFIG_ACPI_PROCFS_POWER=y | ||
| 322 | CONFIG_ACPI_SYSFS_POWER=y | ||
| 323 | CONFIG_ACPI_PROC_EVENT=y | ||
| 249 | CONFIG_ACPI_AC=y | 324 | CONFIG_ACPI_AC=y |
| 250 | CONFIG_ACPI_BATTERY=y | 325 | CONFIG_ACPI_BATTERY=y |
| 251 | CONFIG_ACPI_BUTTON=y | 326 | CONFIG_ACPI_BUTTON=y |
| 252 | CONFIG_ACPI_FAN=y | 327 | CONFIG_ACPI_FAN=y |
| 253 | # CONFIG_ACPI_DOCK is not set | 328 | CONFIG_ACPI_DOCK=y |
| 329 | # CONFIG_ACPI_BAY is not set | ||
| 254 | CONFIG_ACPI_PROCESSOR=y | 330 | CONFIG_ACPI_PROCESSOR=y |
| 331 | CONFIG_ACPI_HOTPLUG_CPU=y | ||
| 255 | CONFIG_ACPI_THERMAL=y | 332 | CONFIG_ACPI_THERMAL=y |
| 333 | # CONFIG_ACPI_WMI is not set | ||
| 256 | # CONFIG_ACPI_ASUS is not set | 334 | # CONFIG_ACPI_ASUS is not set |
| 257 | # CONFIG_ACPI_TOSHIBA is not set | 335 | # CONFIG_ACPI_TOSHIBA is not set |
| 258 | CONFIG_ACPI_BLACKLIST_YEAR=2001 | 336 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
| 259 | CONFIG_ACPI_DEBUG=y | 337 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 338 | # CONFIG_ACPI_DEBUG is not set | ||
| 260 | CONFIG_ACPI_EC=y | 339 | CONFIG_ACPI_EC=y |
| 261 | CONFIG_ACPI_POWER=y | 340 | CONFIG_ACPI_POWER=y |
| 262 | CONFIG_ACPI_SYSTEM=y | 341 | CONFIG_ACPI_SYSTEM=y |
| 263 | CONFIG_X86_PM_TIMER=y | 342 | CONFIG_X86_PM_TIMER=y |
| 264 | # CONFIG_ACPI_CONTAINER is not set | 343 | CONFIG_ACPI_CONTAINER=y |
| 265 | # CONFIG_ACPI_SBS is not set | 344 | # CONFIG_ACPI_SBS is not set |
| 266 | # CONFIG_APM is not set | 345 | # CONFIG_APM is not set |
| 267 | 346 | ||
| @@ -271,15 +350,17 @@ CONFIG_X86_PM_TIMER=y | |||
| 271 | CONFIG_CPU_FREQ=y | 350 | CONFIG_CPU_FREQ=y |
| 272 | CONFIG_CPU_FREQ_TABLE=y | 351 | CONFIG_CPU_FREQ_TABLE=y |
| 273 | CONFIG_CPU_FREQ_DEBUG=y | 352 | CONFIG_CPU_FREQ_DEBUG=y |
| 274 | CONFIG_CPU_FREQ_STAT=y | 353 | # CONFIG_CPU_FREQ_STAT is not set |
| 275 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 354 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 276 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
| 277 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 356 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
| 357 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 278 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 359 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 279 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 360 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| 280 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 361 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
| 281 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 362 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
| 282 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 363 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
| 283 | 364 | ||
| 284 | # | 365 | # |
| 285 | # CPUFreq processor drivers | 366 | # CPUFreq processor drivers |
| @@ -287,8 +368,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |||
| 287 | CONFIG_X86_ACPI_CPUFREQ=y | 368 | CONFIG_X86_ACPI_CPUFREQ=y |
| 288 | # CONFIG_X86_POWERNOW_K6 is not set | 369 | # CONFIG_X86_POWERNOW_K6 is not set |
| 289 | # CONFIG_X86_POWERNOW_K7 is not set | 370 | # CONFIG_X86_POWERNOW_K7 is not set |
| 290 | CONFIG_X86_POWERNOW_K8=y | 371 | # CONFIG_X86_POWERNOW_K8 is not set |
| 291 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
| 292 | # CONFIG_X86_GX_SUSPMOD is not set | 372 | # CONFIG_X86_GX_SUSPMOD is not set |
| 293 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | 373 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set |
| 294 | # CONFIG_X86_SPEEDSTEP_ICH is not set | 374 | # CONFIG_X86_SPEEDSTEP_ICH is not set |
| @@ -302,43 +382,72 @@ CONFIG_X86_POWERNOW_K8_ACPI=y | |||
| 302 | # | 382 | # |
| 303 | # shared options | 383 | # shared options |
| 304 | # | 384 | # |
| 305 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 385 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
| 306 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 386 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
| 387 | CONFIG_CPU_IDLE=y | ||
| 388 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
| 389 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
| 307 | 390 | ||
| 308 | # | 391 | # |
| 309 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | 392 | # Bus options (PCI etc.) |
| 310 | # | 393 | # |
| 311 | CONFIG_PCI=y | 394 | CONFIG_PCI=y |
| 312 | # CONFIG_PCI_GOBIOS is not set | 395 | # CONFIG_PCI_GOBIOS is not set |
| 313 | # CONFIG_PCI_GOMMCONFIG is not set | 396 | # CONFIG_PCI_GOMMCONFIG is not set |
| 314 | # CONFIG_PCI_GODIRECT is not set | 397 | # CONFIG_PCI_GODIRECT is not set |
| 315 | CONFIG_PCI_GOANY=y | 398 | CONFIG_PCI_GOANY=y |
| 399 | # CONFIG_PCI_GOOLPC is not set | ||
| 316 | CONFIG_PCI_BIOS=y | 400 | CONFIG_PCI_BIOS=y |
| 317 | CONFIG_PCI_DIRECT=y | 401 | CONFIG_PCI_DIRECT=y |
| 318 | CONFIG_PCI_MMCONFIG=y | 402 | CONFIG_PCI_MMCONFIG=y |
| 319 | # CONFIG_PCIEPORTBUS is not set | 403 | CONFIG_PCI_DOMAINS=y |
| 404 | CONFIG_PCIEPORTBUS=y | ||
| 405 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
| 406 | CONFIG_PCIEAER=y | ||
| 407 | # CONFIG_PCIEASPM is not set | ||
| 320 | CONFIG_ARCH_SUPPORTS_MSI=y | 408 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 321 | CONFIG_PCI_MSI=y | 409 | CONFIG_PCI_MSI=y |
| 410 | # CONFIG_PCI_LEGACY is not set | ||
| 322 | # CONFIG_PCI_DEBUG is not set | 411 | # CONFIG_PCI_DEBUG is not set |
| 323 | # CONFIG_HT_IRQ is not set | 412 | CONFIG_HT_IRQ=y |
| 324 | CONFIG_ISA_DMA_API=y | 413 | CONFIG_ISA_DMA_API=y |
| 325 | # CONFIG_ISA is not set | 414 | # CONFIG_ISA is not set |
| 326 | # CONFIG_MCA is not set | 415 | # CONFIG_MCA is not set |
| 327 | # CONFIG_SCx200 is not set | 416 | # CONFIG_SCx200 is not set |
| 417 | # CONFIG_OLPC is not set | ||
| 328 | CONFIG_K8_NB=y | 418 | CONFIG_K8_NB=y |
| 329 | 419 | CONFIG_PCCARD=y | |
| 330 | # | 420 | # CONFIG_PCMCIA_DEBUG is not set |
| 331 | # PCCARD (PCMCIA/CardBus) support | 421 | CONFIG_PCMCIA=y |
| 332 | # | 422 | CONFIG_PCMCIA_LOAD_CIS=y |
| 333 | # CONFIG_PCCARD is not set | 423 | CONFIG_PCMCIA_IOCTL=y |
| 334 | # CONFIG_HOTPLUG_PCI is not set | 424 | CONFIG_CARDBUS=y |
| 335 | 425 | ||
| 336 | # | 426 | # |
| 337 | # Executable file formats | 427 | # PC-card bridges |
| 428 | # | ||
| 429 | CONFIG_YENTA=y | ||
| 430 | CONFIG_YENTA_O2=y | ||
| 431 | CONFIG_YENTA_RICOH=y | ||
| 432 | CONFIG_YENTA_TI=y | ||
| 433 | CONFIG_YENTA_ENE_TUNE=y | ||
| 434 | CONFIG_YENTA_TOSHIBA=y | ||
| 435 | # CONFIG_PD6729 is not set | ||
| 436 | # CONFIG_I82092 is not set | ||
| 437 | CONFIG_PCCARD_NONSTATIC=y | ||
| 438 | CONFIG_HOTPLUG_PCI=y | ||
| 439 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
| 440 | # CONFIG_HOTPLUG_PCI_IBM is not set | ||
| 441 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
| 442 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
| 443 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
| 444 | |||
| 445 | # | ||
| 446 | # Executable file formats / Emulations | ||
| 338 | # | 447 | # |
| 339 | CONFIG_BINFMT_ELF=y | 448 | CONFIG_BINFMT_ELF=y |
| 340 | # CONFIG_BINFMT_AOUT is not set | 449 | # CONFIG_BINFMT_AOUT is not set |
| 341 | # CONFIG_BINFMT_MISC is not set | 450 | CONFIG_BINFMT_MISC=y |
| 342 | 451 | ||
| 343 | # | 452 | # |
| 344 | # Networking | 453 | # Networking |
| @@ -349,59 +458,142 @@ CONFIG_NET=y | |||
| 349 | # Networking options | 458 | # Networking options |
| 350 | # | 459 | # |
| 351 | CONFIG_PACKET=y | 460 | CONFIG_PACKET=y |
| 352 | # CONFIG_PACKET_MMAP is not set | 461 | CONFIG_PACKET_MMAP=y |
| 353 | CONFIG_UNIX=y | 462 | CONFIG_UNIX=y |
| 354 | CONFIG_XFRM=y | 463 | CONFIG_XFRM=y |
| 355 | # CONFIG_XFRM_USER is not set | 464 | CONFIG_XFRM_USER=y |
| 356 | # CONFIG_XFRM_SUB_POLICY is not set | 465 | # CONFIG_XFRM_SUB_POLICY is not set |
| 357 | # CONFIG_XFRM_MIGRATE is not set | 466 | # CONFIG_XFRM_MIGRATE is not set |
| 467 | # CONFIG_XFRM_STATISTICS is not set | ||
| 358 | # CONFIG_NET_KEY is not set | 468 | # CONFIG_NET_KEY is not set |
| 359 | CONFIG_INET=y | 469 | CONFIG_INET=y |
| 360 | CONFIG_IP_MULTICAST=y | 470 | CONFIG_IP_MULTICAST=y |
| 361 | # CONFIG_IP_ADVANCED_ROUTER is not set | 471 | CONFIG_IP_ADVANCED_ROUTER=y |
| 472 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 473 | # CONFIG_IP_FIB_TRIE is not set | ||
| 362 | CONFIG_IP_FIB_HASH=y | 474 | CONFIG_IP_FIB_HASH=y |
| 363 | CONFIG_IP_PNP=y | 475 | CONFIG_IP_MULTIPLE_TABLES=y |
| 364 | CONFIG_IP_PNP_DHCP=y | 476 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 365 | # CONFIG_IP_PNP_BOOTP is not set | 477 | CONFIG_IP_ROUTE_VERBOSE=y |
| 366 | # CONFIG_IP_PNP_RARP is not set | 478 | # CONFIG_IP_PNP is not set |
| 367 | # CONFIG_NET_IPIP is not set | 479 | # CONFIG_NET_IPIP is not set |
| 368 | # CONFIG_NET_IPGRE is not set | 480 | # CONFIG_NET_IPGRE is not set |
| 369 | # CONFIG_IP_MROUTE is not set | 481 | CONFIG_IP_MROUTE=y |
| 482 | CONFIG_IP_PIMSM_V1=y | ||
| 483 | CONFIG_IP_PIMSM_V2=y | ||
| 370 | # CONFIG_ARPD is not set | 484 | # CONFIG_ARPD is not set |
| 371 | # CONFIG_SYN_COOKIES is not set | 485 | CONFIG_SYN_COOKIES=y |
| 372 | # CONFIG_INET_AH is not set | 486 | # CONFIG_INET_AH is not set |
| 373 | # CONFIG_INET_ESP is not set | 487 | # CONFIG_INET_ESP is not set |
| 374 | # CONFIG_INET_IPCOMP is not set | 488 | # CONFIG_INET_IPCOMP is not set |
| 375 | # CONFIG_INET_XFRM_TUNNEL is not set | 489 | # CONFIG_INET_XFRM_TUNNEL is not set |
| 376 | CONFIG_INET_TUNNEL=y | 490 | CONFIG_INET_TUNNEL=y |
| 377 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 491 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 378 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 492 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 379 | # CONFIG_INET_XFRM_MODE_BEET is not set | 493 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 380 | CONFIG_INET_DIAG=y | 494 | CONFIG_INET_LRO=y |
| 381 | CONFIG_INET_TCP_DIAG=y | 495 | # CONFIG_INET_DIAG is not set |
| 382 | # CONFIG_TCP_CONG_ADVANCED is not set | 496 | CONFIG_TCP_CONG_ADVANCED=y |
| 497 | # CONFIG_TCP_CONG_BIC is not set | ||
| 383 | CONFIG_TCP_CONG_CUBIC=y | 498 | CONFIG_TCP_CONG_CUBIC=y |
| 499 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
| 500 | # CONFIG_TCP_CONG_HTCP is not set | ||
| 501 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 502 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 503 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 504 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 505 | # CONFIG_TCP_CONG_LP is not set | ||
| 506 | # CONFIG_TCP_CONG_VENO is not set | ||
| 507 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 508 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 509 | # CONFIG_DEFAULT_BIC is not set | ||
| 510 | CONFIG_DEFAULT_CUBIC=y | ||
| 511 | # CONFIG_DEFAULT_HTCP is not set | ||
| 512 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 513 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 514 | # CONFIG_DEFAULT_RENO is not set | ||
| 384 | CONFIG_DEFAULT_TCP_CONG="cubic" | 515 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 385 | # CONFIG_TCP_MD5SIG is not set | 516 | CONFIG_TCP_MD5SIG=y |
| 517 | # CONFIG_IP_VS is not set | ||
| 386 | CONFIG_IPV6=y | 518 | CONFIG_IPV6=y |
| 387 | # CONFIG_IPV6_PRIVACY is not set | 519 | # CONFIG_IPV6_PRIVACY is not set |
| 388 | # CONFIG_IPV6_ROUTER_PREF is not set | 520 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 389 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 521 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
| 390 | # CONFIG_INET6_AH is not set | 522 | CONFIG_INET6_AH=y |
| 391 | # CONFIG_INET6_ESP is not set | 523 | CONFIG_INET6_ESP=y |
| 392 | # CONFIG_INET6_IPCOMP is not set | 524 | # CONFIG_INET6_IPCOMP is not set |
| 393 | # CONFIG_IPV6_MIP6 is not set | 525 | # CONFIG_IPV6_MIP6 is not set |
| 394 | # CONFIG_INET6_XFRM_TUNNEL is not set | 526 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 395 | # CONFIG_INET6_TUNNEL is not set | 527 | # CONFIG_INET6_TUNNEL is not set |
| 396 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y | 528 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
| 397 | CONFIG_INET6_XFRM_MODE_TUNNEL=y | 529 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 398 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 530 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 399 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 531 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 400 | CONFIG_IPV6_SIT=y | 532 | CONFIG_IPV6_SIT=y |
| 533 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 401 | # CONFIG_IPV6_TUNNEL is not set | 534 | # CONFIG_IPV6_TUNNEL is not set |
| 402 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 535 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 403 | # CONFIG_NETWORK_SECMARK is not set | 536 | # CONFIG_IPV6_MROUTE is not set |
| 404 | # CONFIG_NETFILTER is not set | 537 | CONFIG_NETLABEL=y |
| 538 | CONFIG_NETWORK_SECMARK=y | ||
| 539 | CONFIG_NETFILTER=y | ||
| 540 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 541 | # CONFIG_NETFILTER_ADVANCED is not set | ||
| 542 | |||
| 543 | # | ||
| 544 | # Core Netfilter Configuration | ||
| 545 | # | ||
| 546 | CONFIG_NETFILTER_NETLINK=y | ||
| 547 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
| 548 | CONFIG_NF_CONNTRACK=y | ||
| 549 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
| 550 | CONFIG_NF_CONNTRACK_FTP=y | ||
| 551 | CONFIG_NF_CONNTRACK_IRC=y | ||
| 552 | CONFIG_NF_CONNTRACK_SIP=y | ||
| 553 | CONFIG_NF_CT_NETLINK=y | ||
| 554 | CONFIG_NETFILTER_XTABLES=y | ||
| 555 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
| 556 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
| 557 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
| 558 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
| 559 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
| 560 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
| 561 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
| 562 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
| 563 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
| 564 | |||
| 565 | # | ||
| 566 | # IP: Netfilter Configuration | ||
| 567 | # | ||
| 568 | CONFIG_NF_CONNTRACK_IPV4=y | ||
| 569 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
| 570 | CONFIG_IP_NF_IPTABLES=y | ||
| 571 | CONFIG_IP_NF_FILTER=y | ||
| 572 | CONFIG_IP_NF_TARGET_REJECT=y | ||
| 573 | CONFIG_IP_NF_TARGET_LOG=y | ||
| 574 | CONFIG_IP_NF_TARGET_ULOG=y | ||
| 575 | CONFIG_NF_NAT=y | ||
| 576 | CONFIG_NF_NAT_NEEDED=y | ||
| 577 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
| 578 | CONFIG_NF_NAT_FTP=y | ||
| 579 | CONFIG_NF_NAT_IRC=y | ||
| 580 | # CONFIG_NF_NAT_TFTP is not set | ||
| 581 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 582 | # CONFIG_NF_NAT_PPTP is not set | ||
| 583 | # CONFIG_NF_NAT_H323 is not set | ||
| 584 | CONFIG_NF_NAT_SIP=y | ||
| 585 | CONFIG_IP_NF_MANGLE=y | ||
| 586 | |||
| 587 | # | ||
| 588 | # IPv6: Netfilter Configuration | ||
| 589 | # | ||
| 590 | CONFIG_NF_CONNTRACK_IPV6=y | ||
| 591 | CONFIG_IP6_NF_IPTABLES=y | ||
| 592 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
| 593 | CONFIG_IP6_NF_FILTER=y | ||
| 594 | CONFIG_IP6_NF_TARGET_LOG=y | ||
| 595 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
| 596 | CONFIG_IP6_NF_MANGLE=y | ||
| 405 | # CONFIG_IP_DCCP is not set | 597 | # CONFIG_IP_DCCP is not set |
| 406 | # CONFIG_IP_SCTP is not set | 598 | # CONFIG_IP_SCTP is not set |
| 407 | # CONFIG_TIPC is not set | 599 | # CONFIG_TIPC is not set |
| @@ -409,6 +601,7 @@ CONFIG_IPV6_SIT=y | |||
| 409 | # CONFIG_BRIDGE is not set | 601 | # CONFIG_BRIDGE is not set |
| 410 | # CONFIG_VLAN_8021Q is not set | 602 | # CONFIG_VLAN_8021Q is not set |
| 411 | # CONFIG_DECNET is not set | 603 | # CONFIG_DECNET is not set |
| 604 | CONFIG_LLC=y | ||
| 412 | # CONFIG_LLC2 is not set | 605 | # CONFIG_LLC2 is not set |
| 413 | # CONFIG_IPX is not set | 606 | # CONFIG_IPX is not set |
| 414 | # CONFIG_ATALK is not set | 607 | # CONFIG_ATALK is not set |
| @@ -416,28 +609,99 @@ CONFIG_IPV6_SIT=y | |||
| 416 | # CONFIG_LAPB is not set | 609 | # CONFIG_LAPB is not set |
| 417 | # CONFIG_ECONET is not set | 610 | # CONFIG_ECONET is not set |
| 418 | # CONFIG_WAN_ROUTER is not set | 611 | # CONFIG_WAN_ROUTER is not set |
| 419 | 612 | CONFIG_NET_SCHED=y | |
| 420 | # | 613 | |
| 421 | # QoS and/or fair queueing | 614 | # |
| 422 | # | 615 | # Queueing/Scheduling |
| 423 | # CONFIG_NET_SCHED is not set | 616 | # |
| 617 | # CONFIG_NET_SCH_CBQ is not set | ||
| 618 | # CONFIG_NET_SCH_HTB is not set | ||
| 619 | # CONFIG_NET_SCH_HFSC is not set | ||
| 620 | # CONFIG_NET_SCH_PRIO is not set | ||
| 621 | # CONFIG_NET_SCH_RR is not set | ||
| 622 | # CONFIG_NET_SCH_RED is not set | ||
| 623 | # CONFIG_NET_SCH_SFQ is not set | ||
| 624 | # CONFIG_NET_SCH_TEQL is not set | ||
| 625 | # CONFIG_NET_SCH_TBF is not set | ||
| 626 | # CONFIG_NET_SCH_GRED is not set | ||
| 627 | # CONFIG_NET_SCH_DSMARK is not set | ||
| 628 | # CONFIG_NET_SCH_NETEM is not set | ||
| 629 | # CONFIG_NET_SCH_INGRESS is not set | ||
| 630 | |||
| 631 | # | ||
| 632 | # Classification | ||
| 633 | # | ||
| 634 | CONFIG_NET_CLS=y | ||
| 635 | # CONFIG_NET_CLS_BASIC is not set | ||
| 636 | # CONFIG_NET_CLS_TCINDEX is not set | ||
| 637 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
| 638 | # CONFIG_NET_CLS_FW is not set | ||
| 639 | # CONFIG_NET_CLS_U32 is not set | ||
| 640 | # CONFIG_NET_CLS_RSVP is not set | ||
| 641 | # CONFIG_NET_CLS_RSVP6 is not set | ||
| 642 | # CONFIG_NET_CLS_FLOW is not set | ||
| 643 | CONFIG_NET_EMATCH=y | ||
| 644 | CONFIG_NET_EMATCH_STACK=32 | ||
| 645 | # CONFIG_NET_EMATCH_CMP is not set | ||
| 646 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
| 647 | # CONFIG_NET_EMATCH_U32 is not set | ||
| 648 | # CONFIG_NET_EMATCH_META is not set | ||
| 649 | # CONFIG_NET_EMATCH_TEXT is not set | ||
| 650 | CONFIG_NET_CLS_ACT=y | ||
| 651 | # CONFIG_NET_ACT_POLICE is not set | ||
| 652 | # CONFIG_NET_ACT_GACT is not set | ||
| 653 | # CONFIG_NET_ACT_MIRRED is not set | ||
| 654 | # CONFIG_NET_ACT_IPT is not set | ||
| 655 | # CONFIG_NET_ACT_NAT is not set | ||
| 656 | # CONFIG_NET_ACT_PEDIT is not set | ||
| 657 | # CONFIG_NET_ACT_SIMP is not set | ||
| 658 | CONFIG_NET_SCH_FIFO=y | ||
| 424 | 659 | ||
| 425 | # | 660 | # |
| 426 | # Network testing | 661 | # Network testing |
| 427 | # | 662 | # |
| 428 | # CONFIG_NET_PKTGEN is not set | 663 | # CONFIG_NET_PKTGEN is not set |
| 429 | # CONFIG_NET_TCPPROBE is not set | 664 | # CONFIG_NET_TCPPROBE is not set |
| 430 | # CONFIG_HAMRADIO is not set | 665 | CONFIG_HAMRADIO=y |
| 666 | |||
| 667 | # | ||
| 668 | # Packet Radio protocols | ||
| 669 | # | ||
| 670 | # CONFIG_AX25 is not set | ||
| 671 | # CONFIG_CAN is not set | ||
| 431 | # CONFIG_IRDA is not set | 672 | # CONFIG_IRDA is not set |
| 432 | # CONFIG_BT is not set | 673 | # CONFIG_BT is not set |
| 433 | # CONFIG_AF_RXRPC is not set | 674 | # CONFIG_AF_RXRPC is not set |
| 675 | CONFIG_FIB_RULES=y | ||
| 434 | 676 | ||
| 435 | # | 677 | # |
| 436 | # Wireless | 678 | # Wireless |
| 437 | # | 679 | # |
| 438 | # CONFIG_CFG80211 is not set | 680 | CONFIG_CFG80211=y |
| 439 | # CONFIG_WIRELESS_EXT is not set | 681 | CONFIG_NL80211=y |
| 440 | # CONFIG_MAC80211 is not set | 682 | CONFIG_WIRELESS_EXT=y |
| 683 | CONFIG_MAC80211=y | ||
| 684 | |||
| 685 | # | ||
| 686 | # Rate control algorithm selection | ||
| 687 | # | ||
| 688 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 689 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 690 | |||
| 691 | # | ||
| 692 | # Selecting 'y' for an algorithm will | ||
| 693 | # | ||
| 694 | |||
| 695 | # | ||
| 696 | # build the algorithm into mac80211. | ||
| 697 | # | ||
| 698 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 699 | CONFIG_MAC80211_RC_PID=y | ||
| 700 | # CONFIG_MAC80211_MESH is not set | ||
| 701 | CONFIG_MAC80211_LEDS=y | ||
| 702 | # CONFIG_MAC80211_DEBUGFS is not set | ||
| 703 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 704 | # CONFIG_MAC80211_DEBUG is not set | ||
| 441 | # CONFIG_IEEE80211 is not set | 705 | # CONFIG_IEEE80211 is not set |
| 442 | # CONFIG_RFKILL is not set | 706 | # CONFIG_RFKILL is not set |
| 443 | # CONFIG_NET_9P is not set | 707 | # CONFIG_NET_9P is not set |
| @@ -449,13 +713,15 @@ CONFIG_IPV6_SIT=y | |||
| 449 | # | 713 | # |
| 450 | # Generic Driver Options | 714 | # Generic Driver Options |
| 451 | # | 715 | # |
| 716 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 452 | CONFIG_STANDALONE=y | 717 | CONFIG_STANDALONE=y |
| 453 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 718 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 454 | CONFIG_FW_LOADER=y | 719 | CONFIG_FW_LOADER=y |
| 455 | # CONFIG_DEBUG_DRIVER is not set | 720 | # CONFIG_DEBUG_DRIVER is not set |
| 456 | # CONFIG_DEBUG_DEVRES is not set | 721 | CONFIG_DEBUG_DEVRES=y |
| 457 | # CONFIG_SYS_HYPERVISOR is not set | 722 | # CONFIG_SYS_HYPERVISOR is not set |
| 458 | # CONFIG_CONNECTOR is not set | 723 | CONFIG_CONNECTOR=y |
| 724 | CONFIG_PROC_EVENTS=y | ||
| 459 | # CONFIG_MTD is not set | 725 | # CONFIG_MTD is not set |
| 460 | # CONFIG_PARPORT is not set | 726 | # CONFIG_PARPORT is not set |
| 461 | CONFIG_PNP=y | 727 | CONFIG_PNP=y |
| @@ -466,7 +732,7 @@ CONFIG_PNP=y | |||
| 466 | # | 732 | # |
| 467 | CONFIG_PNPACPI=y | 733 | CONFIG_PNPACPI=y |
| 468 | CONFIG_BLK_DEV=y | 734 | CONFIG_BLK_DEV=y |
| 469 | CONFIG_BLK_DEV_FD=y | 735 | # CONFIG_BLK_DEV_FD is not set |
| 470 | # CONFIG_BLK_CPQ_DA is not set | 736 | # CONFIG_BLK_CPQ_DA is not set |
| 471 | # CONFIG_BLK_CPQ_CISS_DA is not set | 737 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 472 | # CONFIG_BLK_DEV_DAC960 is not set | 738 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -479,8 +745,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 479 | # CONFIG_BLK_DEV_UB is not set | 745 | # CONFIG_BLK_DEV_UB is not set |
| 480 | CONFIG_BLK_DEV_RAM=y | 746 | CONFIG_BLK_DEV_RAM=y |
| 481 | CONFIG_BLK_DEV_RAM_COUNT=16 | 747 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 482 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 748 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
| 483 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 749 | # CONFIG_BLK_DEV_XIP is not set |
| 484 | # CONFIG_CDROM_PKTCDVD is not set | 750 | # CONFIG_CDROM_PKTCDVD is not set |
| 485 | # CONFIG_ATA_OVER_ETH is not set | 751 | # CONFIG_ATA_OVER_ETH is not set |
| 486 | CONFIG_MISC_DEVICES=y | 752 | CONFIG_MISC_DEVICES=y |
| @@ -489,73 +755,17 @@ CONFIG_MISC_DEVICES=y | |||
| 489 | # CONFIG_EEPROM_93CX6 is not set | 755 | # CONFIG_EEPROM_93CX6 is not set |
| 490 | # CONFIG_SGI_IOC4 is not set | 756 | # CONFIG_SGI_IOC4 is not set |
| 491 | # CONFIG_TIFM_CORE is not set | 757 | # CONFIG_TIFM_CORE is not set |
| 758 | # CONFIG_ACER_WMI is not set | ||
| 759 | # CONFIG_ASUS_LAPTOP is not set | ||
| 760 | # CONFIG_FUJITSU_LAPTOP is not set | ||
| 761 | # CONFIG_TC1100_WMI is not set | ||
| 762 | # CONFIG_MSI_LAPTOP is not set | ||
| 492 | # CONFIG_SONY_LAPTOP is not set | 763 | # CONFIG_SONY_LAPTOP is not set |
| 493 | # CONFIG_THINKPAD_ACPI is not set | 764 | # CONFIG_THINKPAD_ACPI is not set |
| 494 | CONFIG_IDE=y | 765 | # CONFIG_INTEL_MENLOW is not set |
| 495 | CONFIG_BLK_DEV_IDE=y | 766 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 496 | 767 | CONFIG_HAVE_IDE=y | |
| 497 | # | 768 | # CONFIG_IDE is not set |
| 498 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 499 | # | ||
| 500 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 501 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
| 502 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 503 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 504 | CONFIG_BLK_DEV_IDECD=y | ||
| 505 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 506 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 507 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 508 | CONFIG_BLK_DEV_IDEACPI=y | ||
| 509 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 510 | CONFIG_IDE_PROC_FS=y | ||
| 511 | |||
| 512 | # | ||
| 513 | # IDE chipset support/bugfixes | ||
| 514 | # | ||
| 515 | CONFIG_IDE_GENERIC=y | ||
| 516 | # CONFIG_BLK_DEV_CMD640 is not set | ||
| 517 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
| 518 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 519 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 520 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
| 521 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 522 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 523 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 524 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
| 525 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 526 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 527 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 528 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 529 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 530 | CONFIG_BLK_DEV_AMD74XX=y | ||
| 531 | # CONFIG_BLK_DEV_ATIIXP is not set | ||
| 532 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 533 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 534 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 535 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 536 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 537 | # CONFIG_BLK_DEV_CS5535 is not set | ||
| 538 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 539 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 540 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 541 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 542 | CONFIG_BLK_DEV_PIIX=y | ||
| 543 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 544 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 545 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 546 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 547 | # CONFIG_BLK_DEV_PDC202XX_NEW is not set | ||
| 548 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 549 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 550 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
| 551 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 552 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 553 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 554 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 555 | # CONFIG_IDE_ARM is not set | ||
| 556 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 557 | # CONFIG_IDEDMA_IVB is not set | ||
| 558 | # CONFIG_BLK_DEV_HD is not set | ||
| 559 | 769 | ||
| 560 | # | 770 | # |
| 561 | # SCSI device support | 771 | # SCSI device support |
| @@ -564,8 +774,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 564 | CONFIG_SCSI=y | 774 | CONFIG_SCSI=y |
| 565 | CONFIG_SCSI_DMA=y | 775 | CONFIG_SCSI_DMA=y |
| 566 | # CONFIG_SCSI_TGT is not set | 776 | # CONFIG_SCSI_TGT is not set |
| 567 | CONFIG_SCSI_NETLINK=y | 777 | # CONFIG_SCSI_NETLINK is not set |
| 568 | # CONFIG_SCSI_PROC_FS is not set | 778 | CONFIG_SCSI_PROC_FS=y |
| 569 | 779 | ||
| 570 | # | 780 | # |
| 571 | # SCSI support type (disk, tape, CD-ROM) | 781 | # SCSI support type (disk, tape, CD-ROM) |
| @@ -574,7 +784,7 @@ CONFIG_BLK_DEV_SD=y | |||
| 574 | # CONFIG_CHR_DEV_ST is not set | 784 | # CONFIG_CHR_DEV_ST is not set |
| 575 | # CONFIG_CHR_DEV_OSST is not set | 785 | # CONFIG_CHR_DEV_OSST is not set |
| 576 | CONFIG_BLK_DEV_SR=y | 786 | CONFIG_BLK_DEV_SR=y |
| 577 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 787 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 578 | CONFIG_CHR_DEV_SG=y | 788 | CONFIG_CHR_DEV_SG=y |
| 579 | # CONFIG_CHR_DEV_SCH is not set | 789 | # CONFIG_CHR_DEV_SCH is not set |
| 580 | 790 | ||
| @@ -582,7 +792,7 @@ CONFIG_CHR_DEV_SG=y | |||
| 582 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | 792 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs |
| 583 | # | 793 | # |
| 584 | # CONFIG_SCSI_MULTI_LUN is not set | 794 | # CONFIG_SCSI_MULTI_LUN is not set |
| 585 | # CONFIG_SCSI_CONSTANTS is not set | 795 | CONFIG_SCSI_CONSTANTS=y |
| 586 | # CONFIG_SCSI_LOGGING is not set | 796 | # CONFIG_SCSI_LOGGING is not set |
| 587 | # CONFIG_SCSI_SCAN_ASYNC is not set | 797 | # CONFIG_SCSI_SCAN_ASYNC is not set |
| 588 | CONFIG_SCSI_WAIT_SCAN=m | 798 | CONFIG_SCSI_WAIT_SCAN=m |
| @@ -591,81 +801,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 591 | # SCSI Transports | 801 | # SCSI Transports |
| 592 | # | 802 | # |
| 593 | CONFIG_SCSI_SPI_ATTRS=y | 803 | CONFIG_SCSI_SPI_ATTRS=y |
| 594 | CONFIG_SCSI_FC_ATTRS=y | 804 | # CONFIG_SCSI_FC_ATTRS is not set |
| 595 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 805 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 596 | # CONFIG_SCSI_SAS_ATTRS is not set | 806 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 597 | # CONFIG_SCSI_SAS_LIBSAS is not set | 807 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 598 | 808 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 599 | # | 809 | # CONFIG_SCSI_LOWLEVEL is not set |
| 600 | # SCSI low-level drivers | 810 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 601 | # | ||
| 602 | # CONFIG_ISCSI_TCP is not set | ||
| 603 | CONFIG_BLK_DEV_3W_XXXX_RAID=y | ||
| 604 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 605 | # CONFIG_SCSI_ACARD is not set | ||
| 606 | # CONFIG_SCSI_AACRAID is not set | ||
| 607 | CONFIG_SCSI_AIC7XXX=y | ||
| 608 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 | ||
| 609 | CONFIG_AIC7XXX_RESET_DELAY_MS=5000 | ||
| 610 | CONFIG_AIC7XXX_DEBUG_ENABLE=y | ||
| 611 | CONFIG_AIC7XXX_DEBUG_MASK=0 | ||
| 612 | CONFIG_AIC7XXX_REG_PRETTY_PRINT=y | ||
| 613 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 614 | CONFIG_SCSI_AIC79XX=y | ||
| 615 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
| 616 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
| 617 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
| 618 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
| 619 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
| 620 | # CONFIG_SCSI_AIC94XX is not set | ||
| 621 | # CONFIG_SCSI_DPT_I2O is not set | ||
| 622 | # CONFIG_SCSI_ADVANSYS is not set | ||
| 623 | # CONFIG_SCSI_ARCMSR is not set | ||
| 624 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 625 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 626 | # CONFIG_MEGARAID_SAS is not set | ||
| 627 | # CONFIG_SCSI_HPTIOP is not set | ||
| 628 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 629 | # CONFIG_SCSI_DMX3191D is not set | ||
| 630 | # CONFIG_SCSI_EATA is not set | ||
| 631 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 632 | # CONFIG_SCSI_GDTH is not set | ||
| 633 | # CONFIG_SCSI_IPS is not set | ||
| 634 | # CONFIG_SCSI_INITIO is not set | ||
| 635 | # CONFIG_SCSI_INIA100 is not set | ||
| 636 | # CONFIG_SCSI_STEX is not set | ||
| 637 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 638 | # CONFIG_SCSI_IPR is not set | ||
| 639 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 640 | # CONFIG_SCSI_QLA_FC is not set | ||
| 641 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 642 | # CONFIG_SCSI_LPFC is not set | ||
| 643 | # CONFIG_SCSI_DC395x is not set | ||
| 644 | # CONFIG_SCSI_DC390T is not set | ||
| 645 | # CONFIG_SCSI_NSP32 is not set | ||
| 646 | # CONFIG_SCSI_DEBUG is not set | ||
| 647 | # CONFIG_SCSI_SRP is not set | ||
| 648 | CONFIG_ATA=y | 811 | CONFIG_ATA=y |
| 649 | # CONFIG_ATA_NONSTANDARD is not set | 812 | # CONFIG_ATA_NONSTANDARD is not set |
| 650 | CONFIG_ATA_ACPI=y | 813 | CONFIG_ATA_ACPI=y |
| 814 | CONFIG_SATA_PMP=y | ||
| 651 | CONFIG_SATA_AHCI=y | 815 | CONFIG_SATA_AHCI=y |
| 652 | CONFIG_SATA_SVW=y | 816 | # CONFIG_SATA_SIL24 is not set |
| 817 | CONFIG_ATA_SFF=y | ||
| 818 | # CONFIG_SATA_SVW is not set | ||
| 653 | CONFIG_ATA_PIIX=y | 819 | CONFIG_ATA_PIIX=y |
| 654 | # CONFIG_SATA_MV is not set | 820 | # CONFIG_SATA_MV is not set |
| 655 | CONFIG_SATA_NV=y | 821 | # CONFIG_SATA_NV is not set |
| 656 | # CONFIG_PDC_ADMA is not set | 822 | # CONFIG_PDC_ADMA is not set |
| 657 | # CONFIG_SATA_QSTOR is not set | 823 | # CONFIG_SATA_QSTOR is not set |
| 658 | # CONFIG_SATA_PROMISE is not set | 824 | # CONFIG_SATA_PROMISE is not set |
| 659 | # CONFIG_SATA_SX4 is not set | 825 | # CONFIG_SATA_SX4 is not set |
| 660 | CONFIG_SATA_SIL=y | 826 | # CONFIG_SATA_SIL is not set |
| 661 | # CONFIG_SATA_SIL24 is not set | ||
| 662 | # CONFIG_SATA_SIS is not set | 827 | # CONFIG_SATA_SIS is not set |
| 663 | # CONFIG_SATA_ULI is not set | 828 | # CONFIG_SATA_ULI is not set |
| 664 | CONFIG_SATA_VIA=y | 829 | # CONFIG_SATA_VIA is not set |
| 665 | # CONFIG_SATA_VITESSE is not set | 830 | # CONFIG_SATA_VITESSE is not set |
| 666 | # CONFIG_SATA_INIC162X is not set | 831 | # CONFIG_SATA_INIC162X is not set |
| 832 | # CONFIG_PATA_ACPI is not set | ||
| 667 | # CONFIG_PATA_ALI is not set | 833 | # CONFIG_PATA_ALI is not set |
| 668 | # CONFIG_PATA_AMD is not set | 834 | CONFIG_PATA_AMD=y |
| 669 | # CONFIG_PATA_ARTOP is not set | 835 | # CONFIG_PATA_ARTOP is not set |
| 670 | # CONFIG_PATA_ATIIXP is not set | 836 | # CONFIG_PATA_ATIIXP is not set |
| 671 | # CONFIG_PATA_CMD640_PCI is not set | 837 | # CONFIG_PATA_CMD640_PCI is not set |
| @@ -673,6 +839,7 @@ CONFIG_SATA_VIA=y | |||
| 673 | # CONFIG_PATA_CS5520 is not set | 839 | # CONFIG_PATA_CS5520 is not set |
| 674 | # CONFIG_PATA_CS5530 is not set | 840 | # CONFIG_PATA_CS5530 is not set |
| 675 | # CONFIG_PATA_CS5535 is not set | 841 | # CONFIG_PATA_CS5535 is not set |
| 842 | # CONFIG_PATA_CS5536 is not set | ||
| 676 | # CONFIG_PATA_CYPRESS is not set | 843 | # CONFIG_PATA_CYPRESS is not set |
| 677 | # CONFIG_PATA_EFAR is not set | 844 | # CONFIG_PATA_EFAR is not set |
| 678 | # CONFIG_ATA_GENERIC is not set | 845 | # CONFIG_ATA_GENERIC is not set |
| @@ -686,11 +853,14 @@ CONFIG_SATA_VIA=y | |||
| 686 | # CONFIG_PATA_TRIFLEX is not set | 853 | # CONFIG_PATA_TRIFLEX is not set |
| 687 | # CONFIG_PATA_MARVELL is not set | 854 | # CONFIG_PATA_MARVELL is not set |
| 688 | # CONFIG_PATA_MPIIX is not set | 855 | # CONFIG_PATA_MPIIX is not set |
| 689 | # CONFIG_PATA_OLDPIIX is not set | 856 | CONFIG_PATA_OLDPIIX=y |
| 690 | # CONFIG_PATA_NETCELL is not set | 857 | # CONFIG_PATA_NETCELL is not set |
| 858 | # CONFIG_PATA_NINJA32 is not set | ||
| 691 | # CONFIG_PATA_NS87410 is not set | 859 | # CONFIG_PATA_NS87410 is not set |
| 860 | # CONFIG_PATA_NS87415 is not set | ||
| 692 | # CONFIG_PATA_OPTI is not set | 861 | # CONFIG_PATA_OPTI is not set |
| 693 | # CONFIG_PATA_OPTIDMA is not set | 862 | # CONFIG_PATA_OPTIDMA is not set |
| 863 | # CONFIG_PATA_PCMCIA is not set | ||
| 694 | # CONFIG_PATA_PDC_OLD is not set | 864 | # CONFIG_PATA_PDC_OLD is not set |
| 695 | # CONFIG_PATA_RADISYS is not set | 865 | # CONFIG_PATA_RADISYS is not set |
| 696 | # CONFIG_PATA_RZ1000 is not set | 866 | # CONFIG_PATA_RZ1000 is not set |
| @@ -702,65 +872,42 @@ CONFIG_SATA_VIA=y | |||
| 702 | # CONFIG_PATA_VIA is not set | 872 | # CONFIG_PATA_VIA is not set |
| 703 | # CONFIG_PATA_WINBOND is not set | 873 | # CONFIG_PATA_WINBOND is not set |
| 704 | CONFIG_MD=y | 874 | CONFIG_MD=y |
| 705 | # CONFIG_BLK_DEV_MD is not set | 875 | CONFIG_BLK_DEV_MD=y |
| 876 | # CONFIG_MD_LINEAR is not set | ||
| 877 | # CONFIG_MD_RAID0 is not set | ||
| 878 | # CONFIG_MD_RAID1 is not set | ||
| 879 | # CONFIG_MD_RAID10 is not set | ||
| 880 | # CONFIG_MD_RAID456 is not set | ||
| 881 | # CONFIG_MD_MULTIPATH is not set | ||
| 882 | # CONFIG_MD_FAULTY is not set | ||
| 706 | CONFIG_BLK_DEV_DM=y | 883 | CONFIG_BLK_DEV_DM=y |
| 707 | # CONFIG_DM_DEBUG is not set | 884 | # CONFIG_DM_DEBUG is not set |
| 708 | # CONFIG_DM_CRYPT is not set | 885 | # CONFIG_DM_CRYPT is not set |
| 709 | # CONFIG_DM_SNAPSHOT is not set | 886 | # CONFIG_DM_SNAPSHOT is not set |
| 710 | # CONFIG_DM_MIRROR is not set | 887 | CONFIG_DM_MIRROR=y |
| 711 | # CONFIG_DM_ZERO is not set | 888 | CONFIG_DM_ZERO=y |
| 712 | # CONFIG_DM_MULTIPATH is not set | 889 | # CONFIG_DM_MULTIPATH is not set |
| 713 | # CONFIG_DM_DELAY is not set | 890 | # CONFIG_DM_DELAY is not set |
| 714 | 891 | # CONFIG_DM_UEVENT is not set | |
| 715 | # | 892 | # CONFIG_FUSION is not set |
| 716 | # Fusion MPT device support | ||
| 717 | # | ||
| 718 | CONFIG_FUSION=y | ||
| 719 | CONFIG_FUSION_SPI=y | ||
| 720 | # CONFIG_FUSION_FC is not set | ||
| 721 | # CONFIG_FUSION_SAS is not set | ||
| 722 | CONFIG_FUSION_MAX_SGE=128 | ||
| 723 | # CONFIG_FUSION_CTL is not set | ||
| 724 | 893 | ||
| 725 | # | 894 | # |
| 726 | # IEEE 1394 (FireWire) support | 895 | # IEEE 1394 (FireWire) support |
| 727 | # | 896 | # |
| 728 | # CONFIG_FIREWIRE is not set | 897 | # CONFIG_FIREWIRE is not set |
| 729 | CONFIG_IEEE1394=y | 898 | # CONFIG_IEEE1394 is not set |
| 730 | |||
| 731 | # | ||
| 732 | # Subsystem Options | ||
| 733 | # | ||
| 734 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 735 | |||
| 736 | # | ||
| 737 | # Controllers | ||
| 738 | # | ||
| 739 | |||
| 740 | # | ||
| 741 | # Texas Instruments PCILynx requires I2C | ||
| 742 | # | ||
| 743 | CONFIG_IEEE1394_OHCI1394=y | ||
| 744 | |||
| 745 | # | ||
| 746 | # Protocols | ||
| 747 | # | ||
| 748 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
| 749 | # CONFIG_IEEE1394_SBP2 is not set | ||
| 750 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
| 751 | # CONFIG_IEEE1394_ETH1394 is not set | ||
| 752 | # CONFIG_IEEE1394_DV1394 is not set | ||
| 753 | CONFIG_IEEE1394_RAWIO=y | ||
| 754 | # CONFIG_I2O is not set | 899 | # CONFIG_I2O is not set |
| 755 | CONFIG_MACINTOSH_DRIVERS=y | 900 | CONFIG_MACINTOSH_DRIVERS=y |
| 756 | # CONFIG_MAC_EMUMOUSEBTN is not set | 901 | CONFIG_MAC_EMUMOUSEBTN=y |
| 757 | CONFIG_NETDEVICES=y | 902 | CONFIG_NETDEVICES=y |
| 758 | CONFIG_NETDEVICES_MULTIQUEUE=y | 903 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| 904 | # CONFIG_IFB is not set | ||
| 759 | # CONFIG_DUMMY is not set | 905 | # CONFIG_DUMMY is not set |
| 760 | # CONFIG_BONDING is not set | 906 | # CONFIG_BONDING is not set |
| 761 | # CONFIG_MACVLAN is not set | 907 | # CONFIG_MACVLAN is not set |
| 762 | # CONFIG_EQUALIZER is not set | 908 | # CONFIG_EQUALIZER is not set |
| 763 | # CONFIG_TUN is not set | 909 | # CONFIG_TUN is not set |
| 910 | # CONFIG_VETH is not set | ||
| 764 | # CONFIG_NET_SB1000 is not set | 911 | # CONFIG_NET_SB1000 is not set |
| 765 | # CONFIG_ARCNET is not set | 912 | # CONFIG_ARCNET is not set |
| 766 | # CONFIG_PHYLIB is not set | 913 | # CONFIG_PHYLIB is not set |
| @@ -770,38 +917,40 @@ CONFIG_MII=y | |||
| 770 | # CONFIG_SUNGEM is not set | 917 | # CONFIG_SUNGEM is not set |
| 771 | # CONFIG_CASSINI is not set | 918 | # CONFIG_CASSINI is not set |
| 772 | CONFIG_NET_VENDOR_3COM=y | 919 | CONFIG_NET_VENDOR_3COM=y |
| 773 | CONFIG_VORTEX=y | 920 | # CONFIG_VORTEX is not set |
| 774 | # CONFIG_TYPHOON is not set | 921 | # CONFIG_TYPHOON is not set |
| 775 | CONFIG_NET_TULIP=y | 922 | CONFIG_NET_TULIP=y |
| 776 | # CONFIG_DE2104X is not set | 923 | # CONFIG_DE2104X is not set |
| 777 | CONFIG_TULIP=y | 924 | # CONFIG_TULIP is not set |
| 778 | # CONFIG_TULIP_MWI is not set | ||
| 779 | # CONFIG_TULIP_MMIO is not set | ||
| 780 | # CONFIG_TULIP_NAPI is not set | ||
| 781 | # CONFIG_DE4X5 is not set | 925 | # CONFIG_DE4X5 is not set |
| 782 | # CONFIG_WINBOND_840 is not set | 926 | # CONFIG_WINBOND_840 is not set |
| 783 | # CONFIG_DM9102 is not set | 927 | # CONFIG_DM9102 is not set |
| 784 | # CONFIG_ULI526X is not set | 928 | # CONFIG_ULI526X is not set |
| 929 | # CONFIG_PCMCIA_XIRCOM is not set | ||
| 785 | # CONFIG_HP100 is not set | 930 | # CONFIG_HP100 is not set |
| 931 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 932 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 933 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 934 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 786 | CONFIG_NET_PCI=y | 935 | CONFIG_NET_PCI=y |
| 787 | # CONFIG_PCNET32 is not set | 936 | # CONFIG_PCNET32 is not set |
| 788 | # CONFIG_AMD8111_ETH is not set | 937 | # CONFIG_AMD8111_ETH is not set |
| 789 | # CONFIG_ADAPTEC_STARFIRE is not set | 938 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 790 | CONFIG_B44=y | 939 | # CONFIG_B44 is not set |
| 791 | CONFIG_FORCEDETH=y | 940 | CONFIG_FORCEDETH=y |
| 792 | # CONFIG_FORCEDETH_NAPI is not set | 941 | # CONFIG_FORCEDETH_NAPI is not set |
| 793 | # CONFIG_DGRS is not set | ||
| 794 | # CONFIG_EEPRO100 is not set | 942 | # CONFIG_EEPRO100 is not set |
| 795 | CONFIG_E100=y | 943 | CONFIG_E100=y |
| 796 | # CONFIG_FEALNX is not set | 944 | # CONFIG_FEALNX is not set |
| 797 | # CONFIG_NATSEMI is not set | 945 | # CONFIG_NATSEMI is not set |
| 798 | # CONFIG_NE2K_PCI is not set | 946 | # CONFIG_NE2K_PCI is not set |
| 799 | CONFIG_8139CP=y | 947 | # CONFIG_8139CP is not set |
| 800 | CONFIG_8139TOO=y | 948 | CONFIG_8139TOO=y |
| 801 | # CONFIG_8139TOO_PIO is not set | 949 | CONFIG_8139TOO_PIO=y |
| 802 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 950 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 803 | # CONFIG_8139TOO_8129 is not set | 951 | # CONFIG_8139TOO_8129 is not set |
| 804 | # CONFIG_8139_OLD_RX_RESET is not set | 952 | # CONFIG_8139_OLD_RX_RESET is not set |
| 953 | # CONFIG_R6040 is not set | ||
| 805 | # CONFIG_SIS900 is not set | 954 | # CONFIG_SIS900 is not set |
| 806 | # CONFIG_EPIC100 is not set | 955 | # CONFIG_EPIC100 is not set |
| 807 | # CONFIG_SUNDANCE is not set | 956 | # CONFIG_SUNDANCE is not set |
| @@ -814,34 +963,75 @@ CONFIG_NETDEV_1000=y | |||
| 814 | CONFIG_E1000=y | 963 | CONFIG_E1000=y |
| 815 | # CONFIG_E1000_NAPI is not set | 964 | # CONFIG_E1000_NAPI is not set |
| 816 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 965 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 966 | # CONFIG_E1000E is not set | ||
| 967 | # CONFIG_E1000E_ENABLED is not set | ||
| 968 | # CONFIG_IP1000 is not set | ||
| 969 | # CONFIG_IGB is not set | ||
| 817 | # CONFIG_NS83820 is not set | 970 | # CONFIG_NS83820 is not set |
| 818 | # CONFIG_HAMACHI is not set | 971 | # CONFIG_HAMACHI is not set |
| 819 | # CONFIG_YELLOWFIN is not set | 972 | # CONFIG_YELLOWFIN is not set |
| 820 | CONFIG_R8169=y | 973 | # CONFIG_R8169 is not set |
| 821 | # CONFIG_R8169_NAPI is not set | ||
| 822 | # CONFIG_SIS190 is not set | 974 | # CONFIG_SIS190 is not set |
| 823 | # CONFIG_SKGE is not set | 975 | # CONFIG_SKGE is not set |
| 824 | CONFIG_SKY2=y | 976 | CONFIG_SKY2=y |
| 977 | # CONFIG_SKY2_DEBUG is not set | ||
| 825 | # CONFIG_VIA_VELOCITY is not set | 978 | # CONFIG_VIA_VELOCITY is not set |
| 826 | CONFIG_TIGON3=y | 979 | CONFIG_TIGON3=y |
| 827 | CONFIG_BNX2=y | 980 | # CONFIG_BNX2 is not set |
| 828 | # CONFIG_QLA3XXX is not set | 981 | # CONFIG_QLA3XXX is not set |
| 829 | # CONFIG_ATL1 is not set | 982 | # CONFIG_ATL1 is not set |
| 830 | CONFIG_NETDEV_10000=y | 983 | CONFIG_NETDEV_10000=y |
| 831 | # CONFIG_CHELSIO_T1 is not set | 984 | # CONFIG_CHELSIO_T1 is not set |
| 832 | # CONFIG_CHELSIO_T3 is not set | 985 | # CONFIG_CHELSIO_T3 is not set |
| 986 | # CONFIG_IXGBE is not set | ||
| 833 | # CONFIG_IXGB is not set | 987 | # CONFIG_IXGB is not set |
| 834 | # CONFIG_S2IO is not set | 988 | # CONFIG_S2IO is not set |
| 835 | # CONFIG_MYRI10GE is not set | 989 | # CONFIG_MYRI10GE is not set |
| 836 | # CONFIG_NETXEN_NIC is not set | 990 | # CONFIG_NETXEN_NIC is not set |
| 991 | # CONFIG_NIU is not set | ||
| 837 | # CONFIG_MLX4_CORE is not set | 992 | # CONFIG_MLX4_CORE is not set |
| 838 | # CONFIG_TR is not set | 993 | # CONFIG_TEHUTI is not set |
| 994 | # CONFIG_BNX2X is not set | ||
| 995 | # CONFIG_SFC is not set | ||
| 996 | CONFIG_TR=y | ||
| 997 | # CONFIG_IBMOL is not set | ||
| 998 | # CONFIG_IBMLS is not set | ||
| 999 | # CONFIG_3C359 is not set | ||
| 1000 | # CONFIG_TMS380TR is not set | ||
| 839 | 1001 | ||
| 840 | # | 1002 | # |
| 841 | # Wireless LAN | 1003 | # Wireless LAN |
| 842 | # | 1004 | # |
| 843 | # CONFIG_WLAN_PRE80211 is not set | 1005 | # CONFIG_WLAN_PRE80211 is not set |
| 844 | # CONFIG_WLAN_80211 is not set | 1006 | CONFIG_WLAN_80211=y |
| 1007 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 1008 | # CONFIG_IPW2100 is not set | ||
| 1009 | # CONFIG_IPW2200 is not set | ||
| 1010 | # CONFIG_LIBERTAS is not set | ||
| 1011 | # CONFIG_AIRO is not set | ||
| 1012 | # CONFIG_HERMES is not set | ||
| 1013 | # CONFIG_ATMEL is not set | ||
| 1014 | # CONFIG_AIRO_CS is not set | ||
| 1015 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 1016 | # CONFIG_PRISM54 is not set | ||
| 1017 | # CONFIG_USB_ZD1201 is not set | ||
| 1018 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 1019 | # CONFIG_RTL8180 is not set | ||
| 1020 | # CONFIG_RTL8187 is not set | ||
| 1021 | # CONFIG_ADM8211 is not set | ||
| 1022 | # CONFIG_P54_COMMON is not set | ||
| 1023 | CONFIG_ATH5K=y | ||
| 1024 | # CONFIG_ATH5K_DEBUG is not set | ||
| 1025 | # CONFIG_IWLWIFI is not set | ||
| 1026 | # CONFIG_IWLCORE is not set | ||
| 1027 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1028 | # CONFIG_IWL4965 is not set | ||
| 1029 | # CONFIG_IWL3945 is not set | ||
| 1030 | # CONFIG_HOSTAP is not set | ||
| 1031 | # CONFIG_B43 is not set | ||
| 1032 | # CONFIG_B43LEGACY is not set | ||
| 1033 | # CONFIG_ZD1211RW is not set | ||
| 1034 | # CONFIG_RT2X00 is not set | ||
| 845 | 1035 | ||
| 846 | # | 1036 | # |
| 847 | # USB Network Adapters | 1037 | # USB Network Adapters |
| @@ -850,16 +1040,27 @@ CONFIG_NETDEV_10000=y | |||
| 850 | # CONFIG_USB_KAWETH is not set | 1040 | # CONFIG_USB_KAWETH is not set |
| 851 | # CONFIG_USB_PEGASUS is not set | 1041 | # CONFIG_USB_PEGASUS is not set |
| 852 | # CONFIG_USB_RTL8150 is not set | 1042 | # CONFIG_USB_RTL8150 is not set |
| 853 | # CONFIG_USB_USBNET_MII is not set | ||
| 854 | # CONFIG_USB_USBNET is not set | 1043 | # CONFIG_USB_USBNET is not set |
| 1044 | CONFIG_NET_PCMCIA=y | ||
| 1045 | # CONFIG_PCMCIA_3C589 is not set | ||
| 1046 | # CONFIG_PCMCIA_3C574 is not set | ||
| 1047 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 1048 | # CONFIG_PCMCIA_PCNET is not set | ||
| 1049 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 1050 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 1051 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 1052 | # CONFIG_PCMCIA_AXNET is not set | ||
| 1053 | # CONFIG_PCMCIA_IBMTR is not set | ||
| 855 | # CONFIG_WAN is not set | 1054 | # CONFIG_WAN is not set |
| 856 | # CONFIG_FDDI is not set | 1055 | CONFIG_FDDI=y |
| 1056 | # CONFIG_DEFXX is not set | ||
| 1057 | # CONFIG_SKFP is not set | ||
| 857 | # CONFIG_HIPPI is not set | 1058 | # CONFIG_HIPPI is not set |
| 858 | # CONFIG_PPP is not set | 1059 | # CONFIG_PPP is not set |
| 859 | # CONFIG_SLIP is not set | 1060 | # CONFIG_SLIP is not set |
| 860 | # CONFIG_NET_FC is not set | 1061 | # CONFIG_NET_FC is not set |
| 861 | # CONFIG_SHAPER is not set | ||
| 862 | CONFIG_NETCONSOLE=y | 1062 | CONFIG_NETCONSOLE=y |
| 1063 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
| 863 | CONFIG_NETPOLL=y | 1064 | CONFIG_NETPOLL=y |
| 864 | # CONFIG_NETPOLL_TRAP is not set | 1065 | # CONFIG_NETPOLL_TRAP is not set |
| 865 | CONFIG_NET_POLL_CONTROLLER=y | 1066 | CONFIG_NET_POLL_CONTROLLER=y |
| @@ -870,18 +1071,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
| 870 | # Input device support | 1071 | # Input device support |
| 871 | # | 1072 | # |
| 872 | CONFIG_INPUT=y | 1073 | CONFIG_INPUT=y |
| 873 | # CONFIG_INPUT_FF_MEMLESS is not set | 1074 | CONFIG_INPUT_FF_MEMLESS=y |
| 874 | # CONFIG_INPUT_POLLDEV is not set | 1075 | CONFIG_INPUT_POLLDEV=y |
| 875 | 1076 | ||
| 876 | # | 1077 | # |
| 877 | # Userland interfaces | 1078 | # Userland interfaces |
| 878 | # | 1079 | # |
| 879 | CONFIG_INPUT_MOUSEDEV=y | 1080 | CONFIG_INPUT_MOUSEDEV=y |
| 880 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1081 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
| 881 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1082 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 882 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1083 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 883 | # CONFIG_INPUT_JOYDEV is not set | 1084 | # CONFIG_INPUT_JOYDEV is not set |
| 884 | # CONFIG_INPUT_TSDEV is not set | ||
| 885 | CONFIG_INPUT_EVDEV=y | 1085 | CONFIG_INPUT_EVDEV=y |
| 886 | # CONFIG_INPUT_EVBUG is not set | 1086 | # CONFIG_INPUT_EVBUG is not set |
| 887 | 1087 | ||
| @@ -906,17 +1106,63 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 906 | # CONFIG_MOUSE_SERIAL is not set | 1106 | # CONFIG_MOUSE_SERIAL is not set |
| 907 | # CONFIG_MOUSE_APPLETOUCH is not set | 1107 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 908 | # CONFIG_MOUSE_VSXXXAA is not set | 1108 | # CONFIG_MOUSE_VSXXXAA is not set |
| 909 | # CONFIG_INPUT_JOYSTICK is not set | 1109 | CONFIG_INPUT_JOYSTICK=y |
| 910 | # CONFIG_INPUT_TABLET is not set | 1110 | # CONFIG_JOYSTICK_ANALOG is not set |
| 911 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1111 | # CONFIG_JOYSTICK_A3D is not set |
| 912 | # CONFIG_INPUT_MISC is not set | 1112 | # CONFIG_JOYSTICK_ADI is not set |
| 1113 | # CONFIG_JOYSTICK_COBRA is not set | ||
| 1114 | # CONFIG_JOYSTICK_GF2K is not set | ||
| 1115 | # CONFIG_JOYSTICK_GRIP is not set | ||
| 1116 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
| 1117 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
| 1118 | # CONFIG_JOYSTICK_INTERACT is not set | ||
| 1119 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
| 1120 | # CONFIG_JOYSTICK_TMDC is not set | ||
| 1121 | # CONFIG_JOYSTICK_IFORCE is not set | ||
| 1122 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
| 1123 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
| 1124 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
| 1125 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
| 1126 | # CONFIG_JOYSTICK_STINGER is not set | ||
| 1127 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
| 1128 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
| 1129 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
| 1130 | # CONFIG_JOYSTICK_XPAD is not set | ||
| 1131 | CONFIG_INPUT_TABLET=y | ||
| 1132 | # CONFIG_TABLET_USB_ACECAD is not set | ||
| 1133 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
| 1134 | # CONFIG_TABLET_USB_GTCO is not set | ||
| 1135 | # CONFIG_TABLET_USB_KBTAB is not set | ||
| 1136 | # CONFIG_TABLET_USB_WACOM is not set | ||
| 1137 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 1138 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 1139 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 1140 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 1141 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 1142 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 1143 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 1144 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 1145 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 1146 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 1147 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 1148 | CONFIG_INPUT_MISC=y | ||
| 1149 | # CONFIG_INPUT_PCSPKR is not set | ||
| 1150 | # CONFIG_INPUT_APANEL is not set | ||
| 1151 | # CONFIG_INPUT_WISTRON_BTNS is not set | ||
| 1152 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
| 1153 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
| 1154 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
| 1155 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
| 1156 | # CONFIG_INPUT_POWERMATE is not set | ||
| 1157 | # CONFIG_INPUT_YEALINK is not set | ||
| 1158 | # CONFIG_INPUT_UINPUT is not set | ||
| 913 | 1159 | ||
| 914 | # | 1160 | # |
| 915 | # Hardware I/O ports | 1161 | # Hardware I/O ports |
| 916 | # | 1162 | # |
| 917 | CONFIG_SERIO=y | 1163 | CONFIG_SERIO=y |
| 918 | CONFIG_SERIO_I8042=y | 1164 | CONFIG_SERIO_I8042=y |
| 919 | # CONFIG_SERIO_SERPORT is not set | 1165 | CONFIG_SERIO_SERPORT=y |
| 920 | # CONFIG_SERIO_CT82C710 is not set | 1166 | # CONFIG_SERIO_CT82C710 is not set |
| 921 | # CONFIG_SERIO_PCIPS2 is not set | 1167 | # CONFIG_SERIO_PCIPS2 is not set |
| 922 | CONFIG_SERIO_LIBPS2=y | 1168 | CONFIG_SERIO_LIBPS2=y |
| @@ -929,8 +1175,26 @@ CONFIG_SERIO_LIBPS2=y | |||
| 929 | CONFIG_VT=y | 1175 | CONFIG_VT=y |
| 930 | CONFIG_VT_CONSOLE=y | 1176 | CONFIG_VT_CONSOLE=y |
| 931 | CONFIG_HW_CONSOLE=y | 1177 | CONFIG_HW_CONSOLE=y |
| 932 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1178 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 933 | # CONFIG_SERIAL_NONSTANDARD is not set | 1179 | CONFIG_DEVKMEM=y |
| 1180 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 1181 | # CONFIG_COMPUTONE is not set | ||
| 1182 | # CONFIG_ROCKETPORT is not set | ||
| 1183 | # CONFIG_CYCLADES is not set | ||
| 1184 | # CONFIG_DIGIEPCA is not set | ||
| 1185 | # CONFIG_MOXA_INTELLIO is not set | ||
| 1186 | # CONFIG_MOXA_SMARTIO is not set | ||
| 1187 | # CONFIG_ISI is not set | ||
| 1188 | # CONFIG_SYNCLINK is not set | ||
| 1189 | # CONFIG_SYNCLINKMP is not set | ||
| 1190 | # CONFIG_SYNCLINK_GT is not set | ||
| 1191 | # CONFIG_N_HDLC is not set | ||
| 1192 | # CONFIG_RISCOM8 is not set | ||
| 1193 | # CONFIG_SPECIALIX is not set | ||
| 1194 | # CONFIG_SX is not set | ||
| 1195 | # CONFIG_RIO is not set | ||
| 1196 | # CONFIG_STALDRV is not set | ||
| 1197 | # CONFIG_NOZOMI is not set | ||
| 934 | 1198 | ||
| 935 | # | 1199 | # |
| 936 | # Serial drivers | 1200 | # Serial drivers |
| @@ -940,9 +1204,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
| 940 | CONFIG_FIX_EARLYCON_MEM=y | 1204 | CONFIG_FIX_EARLYCON_MEM=y |
| 941 | CONFIG_SERIAL_8250_PCI=y | 1205 | CONFIG_SERIAL_8250_PCI=y |
| 942 | CONFIG_SERIAL_8250_PNP=y | 1206 | CONFIG_SERIAL_8250_PNP=y |
| 943 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1207 | # CONFIG_SERIAL_8250_CS is not set |
| 1208 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 944 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1209 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 945 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1210 | CONFIG_SERIAL_8250_EXTENDED=y |
| 1211 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 1212 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 1213 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 1214 | CONFIG_SERIAL_8250_RSA=y | ||
| 946 | 1215 | ||
| 947 | # | 1216 | # |
| 948 | # Non-8250 serial port support | 1217 | # Non-8250 serial port support |
| @@ -951,89 +1220,275 @@ CONFIG_SERIAL_CORE=y | |||
| 951 | CONFIG_SERIAL_CORE_CONSOLE=y | 1220 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 952 | # CONFIG_SERIAL_JSM is not set | 1221 | # CONFIG_SERIAL_JSM is not set |
| 953 | CONFIG_UNIX98_PTYS=y | 1222 | CONFIG_UNIX98_PTYS=y |
| 954 | CONFIG_LEGACY_PTYS=y | 1223 | # CONFIG_LEGACY_PTYS is not set |
| 955 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 956 | # CONFIG_IPMI_HANDLER is not set | 1224 | # CONFIG_IPMI_HANDLER is not set |
| 957 | # CONFIG_WATCHDOG is not set | ||
| 958 | CONFIG_HW_RANDOM=y | 1225 | CONFIG_HW_RANDOM=y |
| 959 | CONFIG_HW_RANDOM_INTEL=y | 1226 | # CONFIG_HW_RANDOM_INTEL is not set |
| 960 | CONFIG_HW_RANDOM_AMD=y | 1227 | # CONFIG_HW_RANDOM_AMD is not set |
| 961 | CONFIG_HW_RANDOM_GEODE=y | 1228 | CONFIG_HW_RANDOM_GEODE=y |
| 962 | CONFIG_HW_RANDOM_VIA=y | 1229 | CONFIG_HW_RANDOM_VIA=y |
| 963 | # CONFIG_NVRAM is not set | 1230 | CONFIG_NVRAM=y |
| 964 | CONFIG_RTC=y | ||
| 965 | # CONFIG_R3964 is not set | 1231 | # CONFIG_R3964 is not set |
| 966 | # CONFIG_APPLICOM is not set | 1232 | # CONFIG_APPLICOM is not set |
| 967 | # CONFIG_SONYPI is not set | 1233 | # CONFIG_SONYPI is not set |
| 968 | CONFIG_AGP=y | 1234 | |
| 969 | # CONFIG_AGP_ALI is not set | 1235 | # |
| 970 | # CONFIG_AGP_ATI is not set | 1236 | # PCMCIA character devices |
| 971 | # CONFIG_AGP_AMD is not set | 1237 | # |
| 972 | CONFIG_AGP_AMD64=y | 1238 | # CONFIG_SYNCLINK_CS is not set |
| 973 | CONFIG_AGP_INTEL=y | 1239 | # CONFIG_CARDMAN_4000 is not set |
| 974 | # CONFIG_AGP_NVIDIA is not set | 1240 | # CONFIG_CARDMAN_4040 is not set |
| 975 | # CONFIG_AGP_SIS is not set | 1241 | # CONFIG_IPWIRELESS is not set |
| 976 | # CONFIG_AGP_SWORKS is not set | ||
| 977 | # CONFIG_AGP_VIA is not set | ||
| 978 | # CONFIG_AGP_EFFICEON is not set | ||
| 979 | # CONFIG_DRM is not set | ||
| 980 | # CONFIG_MWAVE is not set | 1242 | # CONFIG_MWAVE is not set |
| 981 | # CONFIG_PC8736x_GPIO is not set | 1243 | # CONFIG_PC8736x_GPIO is not set |
| 982 | # CONFIG_NSC_GPIO is not set | 1244 | # CONFIG_NSC_GPIO is not set |
| 983 | # CONFIG_CS5535_GPIO is not set | 1245 | # CONFIG_CS5535_GPIO is not set |
| 984 | CONFIG_RAW_DRIVER=y | 1246 | # CONFIG_RAW_DRIVER is not set |
| 985 | CONFIG_MAX_RAW_DEVS=256 | ||
| 986 | CONFIG_HPET=y | 1247 | CONFIG_HPET=y |
| 987 | # CONFIG_HPET_RTC_IRQ is not set | 1248 | # CONFIG_HPET_RTC_IRQ is not set |
| 988 | CONFIG_HPET_MMAP=y | 1249 | # CONFIG_HPET_MMAP is not set |
| 989 | # CONFIG_HANGCHECK_TIMER is not set | 1250 | # CONFIG_HANGCHECK_TIMER is not set |
| 990 | # CONFIG_TCG_TPM is not set | 1251 | # CONFIG_TCG_TPM is not set |
| 991 | # CONFIG_TELCLOCK is not set | 1252 | # CONFIG_TELCLOCK is not set |
| 992 | CONFIG_DEVPORT=y | 1253 | CONFIG_DEVPORT=y |
| 993 | # CONFIG_I2C is not set | 1254 | CONFIG_I2C=y |
| 994 | 1255 | CONFIG_I2C_BOARDINFO=y | |
| 995 | # | 1256 | # CONFIG_I2C_CHARDEV is not set |
| 996 | # SPI support | 1257 | |
| 997 | # | 1258 | # |
| 1259 | # I2C Hardware Bus support | ||
| 1260 | # | ||
| 1261 | # CONFIG_I2C_ALI1535 is not set | ||
| 1262 | # CONFIG_I2C_ALI1563 is not set | ||
| 1263 | # CONFIG_I2C_ALI15X3 is not set | ||
| 1264 | # CONFIG_I2C_AMD756 is not set | ||
| 1265 | # CONFIG_I2C_AMD8111 is not set | ||
| 1266 | CONFIG_I2C_I801=y | ||
| 1267 | # CONFIG_I2C_I810 is not set | ||
| 1268 | # CONFIG_I2C_PIIX4 is not set | ||
| 1269 | # CONFIG_I2C_NFORCE2 is not set | ||
| 1270 | # CONFIG_I2C_OCORES is not set | ||
| 1271 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1272 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1273 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1274 | # CONFIG_I2C_SIMTEC is not set | ||
| 1275 | # CONFIG_SCx200_ACB is not set | ||
| 1276 | # CONFIG_I2C_SIS5595 is not set | ||
| 1277 | # CONFIG_I2C_SIS630 is not set | ||
| 1278 | # CONFIG_I2C_SIS96X is not set | ||
| 1279 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1280 | # CONFIG_I2C_STUB is not set | ||
| 1281 | # CONFIG_I2C_TINY_USB is not set | ||
| 1282 | # CONFIG_I2C_VIA is not set | ||
| 1283 | # CONFIG_I2C_VIAPRO is not set | ||
| 1284 | # CONFIG_I2C_VOODOO3 is not set | ||
| 1285 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1286 | |||
| 1287 | # | ||
| 1288 | # Miscellaneous I2C Chip support | ||
| 1289 | # | ||
| 1290 | # CONFIG_DS1682 is not set | ||
| 1291 | # CONFIG_SENSORS_EEPROM is not set | ||
| 1292 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 1293 | # CONFIG_PCF8575 is not set | ||
| 1294 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1295 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 1296 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1297 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 1298 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 1299 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 1300 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 998 | # CONFIG_SPI is not set | 1301 | # CONFIG_SPI is not set |
| 999 | # CONFIG_SPI_MASTER is not set | ||
| 1000 | # CONFIG_W1 is not set | 1302 | # CONFIG_W1 is not set |
| 1001 | # CONFIG_POWER_SUPPLY is not set | 1303 | CONFIG_POWER_SUPPLY=y |
| 1304 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 1305 | # CONFIG_PDA_POWER is not set | ||
| 1306 | # CONFIG_BATTERY_DS2760 is not set | ||
| 1002 | # CONFIG_HWMON is not set | 1307 | # CONFIG_HWMON is not set |
| 1308 | CONFIG_THERMAL=y | ||
| 1309 | CONFIG_WATCHDOG=y | ||
| 1310 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 1311 | |||
| 1312 | # | ||
| 1313 | # Watchdog Device Drivers | ||
| 1314 | # | ||
| 1315 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 1316 | # CONFIG_ACQUIRE_WDT is not set | ||
| 1317 | # CONFIG_ADVANTECH_WDT is not set | ||
| 1318 | # CONFIG_ALIM1535_WDT is not set | ||
| 1319 | # CONFIG_ALIM7101_WDT is not set | ||
| 1320 | # CONFIG_SC520_WDT is not set | ||
| 1321 | # CONFIG_EUROTECH_WDT is not set | ||
| 1322 | # CONFIG_IB700_WDT is not set | ||
| 1323 | # CONFIG_IBMASR is not set | ||
| 1324 | # CONFIG_WAFER_WDT is not set | ||
| 1325 | # CONFIG_I6300ESB_WDT is not set | ||
| 1326 | # CONFIG_ITCO_WDT is not set | ||
| 1327 | # CONFIG_IT8712F_WDT is not set | ||
| 1328 | # CONFIG_HP_WATCHDOG is not set | ||
| 1329 | # CONFIG_SC1200_WDT is not set | ||
| 1330 | # CONFIG_PC87413_WDT is not set | ||
| 1331 | # CONFIG_60XX_WDT is not set | ||
| 1332 | # CONFIG_SBC8360_WDT is not set | ||
| 1333 | # CONFIG_SBC7240_WDT is not set | ||
| 1334 | # CONFIG_CPU5_WDT is not set | ||
| 1335 | # CONFIG_SMSC37B787_WDT is not set | ||
| 1336 | # CONFIG_W83627HF_WDT is not set | ||
| 1337 | # CONFIG_W83697HF_WDT is not set | ||
| 1338 | # CONFIG_W83877F_WDT is not set | ||
| 1339 | # CONFIG_W83977F_WDT is not set | ||
| 1340 | # CONFIG_MACHZ_WDT is not set | ||
| 1341 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
| 1342 | |||
| 1343 | # | ||
| 1344 | # PCI-based Watchdog Cards | ||
| 1345 | # | ||
| 1346 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 1347 | # CONFIG_WDTPCI is not set | ||
| 1348 | |||
| 1349 | # | ||
| 1350 | # USB-based Watchdog Cards | ||
| 1351 | # | ||
| 1352 | # CONFIG_USBPCWATCHDOG is not set | ||
| 1353 | |||
| 1354 | # | ||
| 1355 | # Sonics Silicon Backplane | ||
| 1356 | # | ||
| 1357 | CONFIG_SSB_POSSIBLE=y | ||
| 1358 | # CONFIG_SSB is not set | ||
| 1003 | 1359 | ||
| 1004 | # | 1360 | # |
| 1005 | # Multifunction device drivers | 1361 | # Multifunction device drivers |
| 1006 | # | 1362 | # |
| 1007 | # CONFIG_MFD_SM501 is not set | 1363 | # CONFIG_MFD_SM501 is not set |
| 1364 | # CONFIG_HTC_PASIC3 is not set | ||
| 1008 | 1365 | ||
| 1009 | # | 1366 | # |
| 1010 | # Multimedia devices | 1367 | # Multimedia devices |
| 1011 | # | 1368 | # |
| 1369 | |||
| 1370 | # | ||
| 1371 | # Multimedia core support | ||
| 1372 | # | ||
| 1012 | # CONFIG_VIDEO_DEV is not set | 1373 | # CONFIG_VIDEO_DEV is not set |
| 1013 | # CONFIG_DVB_CORE is not set | 1374 | # CONFIG_DVB_CORE is not set |
| 1375 | |||
| 1376 | # | ||
| 1377 | # Multimedia drivers | ||
| 1378 | # | ||
| 1014 | CONFIG_DAB=y | 1379 | CONFIG_DAB=y |
| 1015 | # CONFIG_USB_DABUSB is not set | 1380 | # CONFIG_USB_DABUSB is not set |
| 1016 | 1381 | ||
| 1017 | # | 1382 | # |
| 1018 | # Graphics support | 1383 | # Graphics support |
| 1019 | # | 1384 | # |
| 1020 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1385 | CONFIG_AGP=y |
| 1386 | # CONFIG_AGP_ALI is not set | ||
| 1387 | # CONFIG_AGP_ATI is not set | ||
| 1388 | # CONFIG_AGP_AMD is not set | ||
| 1389 | CONFIG_AGP_AMD64=y | ||
| 1390 | CONFIG_AGP_INTEL=y | ||
| 1391 | # CONFIG_AGP_NVIDIA is not set | ||
| 1392 | # CONFIG_AGP_SIS is not set | ||
| 1393 | # CONFIG_AGP_SWORKS is not set | ||
| 1394 | # CONFIG_AGP_VIA is not set | ||
| 1395 | # CONFIG_AGP_EFFICEON is not set | ||
| 1396 | CONFIG_DRM=y | ||
| 1397 | # CONFIG_DRM_TDFX is not set | ||
| 1398 | # CONFIG_DRM_R128 is not set | ||
| 1399 | # CONFIG_DRM_RADEON is not set | ||
| 1400 | # CONFIG_DRM_I810 is not set | ||
| 1401 | # CONFIG_DRM_I830 is not set | ||
| 1402 | CONFIG_DRM_I915=y | ||
| 1403 | # CONFIG_DRM_MGA is not set | ||
| 1404 | # CONFIG_DRM_SIS is not set | ||
| 1405 | # CONFIG_DRM_VIA is not set | ||
| 1406 | # CONFIG_DRM_SAVAGE is not set | ||
| 1407 | # CONFIG_VGASTATE is not set | ||
| 1408 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1409 | CONFIG_FB=y | ||
| 1410 | # CONFIG_FIRMWARE_EDID is not set | ||
| 1411 | # CONFIG_FB_DDC is not set | ||
| 1412 | CONFIG_FB_CFB_FILLRECT=y | ||
| 1413 | CONFIG_FB_CFB_COPYAREA=y | ||
| 1414 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 1415 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1416 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1417 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1418 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1419 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1420 | # CONFIG_FB_SYS_FOPS is not set | ||
| 1421 | CONFIG_FB_DEFERRED_IO=y | ||
| 1422 | # CONFIG_FB_SVGALIB is not set | ||
| 1423 | # CONFIG_FB_MACMODES is not set | ||
| 1424 | # CONFIG_FB_BACKLIGHT is not set | ||
| 1425 | CONFIG_FB_MODE_HELPERS=y | ||
| 1426 | CONFIG_FB_TILEBLITTING=y | ||
| 1427 | |||
| 1428 | # | ||
| 1429 | # Frame buffer hardware drivers | ||
| 1430 | # | ||
| 1431 | # CONFIG_FB_CIRRUS is not set | ||
| 1432 | # CONFIG_FB_PM2 is not set | ||
| 1433 | # CONFIG_FB_CYBER2000 is not set | ||
| 1434 | # CONFIG_FB_ARC is not set | ||
| 1435 | # CONFIG_FB_ASILIANT is not set | ||
| 1436 | # CONFIG_FB_IMSTT is not set | ||
| 1437 | # CONFIG_FB_VGA16 is not set | ||
| 1438 | # CONFIG_FB_UVESA is not set | ||
| 1439 | # CONFIG_FB_VESA is not set | ||
| 1440 | CONFIG_FB_EFI=y | ||
| 1441 | # CONFIG_FB_IMAC is not set | ||
| 1442 | # CONFIG_FB_N411 is not set | ||
| 1443 | # CONFIG_FB_HGA is not set | ||
| 1444 | # CONFIG_FB_S1D13XXX is not set | ||
| 1445 | # CONFIG_FB_NVIDIA is not set | ||
| 1446 | # CONFIG_FB_RIVA is not set | ||
| 1447 | # CONFIG_FB_I810 is not set | ||
| 1448 | # CONFIG_FB_LE80578 is not set | ||
| 1449 | # CONFIG_FB_INTEL is not set | ||
| 1450 | # CONFIG_FB_MATROX is not set | ||
| 1451 | # CONFIG_FB_RADEON is not set | ||
| 1452 | # CONFIG_FB_ATY128 is not set | ||
| 1453 | # CONFIG_FB_ATY is not set | ||
| 1454 | # CONFIG_FB_S3 is not set | ||
| 1455 | # CONFIG_FB_SAVAGE is not set | ||
| 1456 | # CONFIG_FB_SIS is not set | ||
| 1457 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1458 | # CONFIG_FB_KYRO is not set | ||
| 1459 | # CONFIG_FB_3DFX is not set | ||
| 1460 | # CONFIG_FB_VOODOO1 is not set | ||
| 1461 | # CONFIG_FB_VT8623 is not set | ||
| 1462 | # CONFIG_FB_CYBLA is not set | ||
| 1463 | # CONFIG_FB_TRIDENT is not set | ||
| 1464 | # CONFIG_FB_ARK is not set | ||
| 1465 | # CONFIG_FB_PM3 is not set | ||
| 1466 | # CONFIG_FB_GEODE is not set | ||
| 1467 | # CONFIG_FB_VIRTUAL is not set | ||
| 1468 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1469 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
| 1470 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1471 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1472 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
| 1021 | 1473 | ||
| 1022 | # | 1474 | # |
| 1023 | # Display device support | 1475 | # Display device support |
| 1024 | # | 1476 | # |
| 1025 | # CONFIG_DISPLAY_SUPPORT is not set | 1477 | # CONFIG_DISPLAY_SUPPORT is not set |
| 1026 | # CONFIG_VGASTATE is not set | ||
| 1027 | # CONFIG_FB is not set | ||
| 1028 | 1478 | ||
| 1029 | # | 1479 | # |
| 1030 | # Console display driver support | 1480 | # Console display driver support |
| 1031 | # | 1481 | # |
| 1032 | CONFIG_VGA_CONSOLE=y | 1482 | CONFIG_VGA_CONSOLE=y |
| 1033 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1483 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
| 1034 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128 | 1484 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
| 1035 | CONFIG_VIDEO_SELECT=y | 1485 | CONFIG_VIDEO_SELECT=y |
| 1036 | CONFIG_DUMMY_CONSOLE=y | 1486 | CONFIG_DUMMY_CONSOLE=y |
| 1487 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 1488 | CONFIG_LOGO=y | ||
| 1489 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 1490 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 1491 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 1037 | 1492 | ||
| 1038 | # | 1493 | # |
| 1039 | # Sound | 1494 | # Sound |
| @@ -1043,33 +1498,167 @@ CONFIG_SOUND=y | |||
| 1043 | # | 1498 | # |
| 1044 | # Advanced Linux Sound Architecture | 1499 | # Advanced Linux Sound Architecture |
| 1045 | # | 1500 | # |
| 1046 | # CONFIG_SND is not set | 1501 | CONFIG_SND=y |
| 1502 | CONFIG_SND_TIMER=y | ||
| 1503 | CONFIG_SND_PCM=y | ||
| 1504 | CONFIG_SND_HWDEP=y | ||
| 1505 | CONFIG_SND_SEQUENCER=y | ||
| 1506 | CONFIG_SND_SEQ_DUMMY=y | ||
| 1507 | CONFIG_SND_OSSEMUL=y | ||
| 1508 | CONFIG_SND_MIXER_OSS=y | ||
| 1509 | CONFIG_SND_PCM_OSS=y | ||
| 1510 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1511 | CONFIG_SND_SEQUENCER_OSS=y | ||
| 1512 | CONFIG_SND_DYNAMIC_MINORS=y | ||
| 1513 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1514 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1515 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1516 | # CONFIG_SND_DEBUG is not set | ||
| 1517 | CONFIG_SND_VMASTER=y | ||
| 1518 | |||
| 1519 | # | ||
| 1520 | # Generic devices | ||
| 1521 | # | ||
| 1522 | # CONFIG_SND_PCSP is not set | ||
| 1523 | # CONFIG_SND_DUMMY is not set | ||
| 1524 | # CONFIG_SND_VIRMIDI is not set | ||
| 1525 | # CONFIG_SND_MTPAV is not set | ||
| 1526 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1527 | # CONFIG_SND_MPU401 is not set | ||
| 1528 | |||
| 1529 | # | ||
| 1530 | # PCI devices | ||
| 1531 | # | ||
| 1532 | # CONFIG_SND_AD1889 is not set | ||
| 1533 | # CONFIG_SND_ALS300 is not set | ||
| 1534 | # CONFIG_SND_ALS4000 is not set | ||
| 1535 | # CONFIG_SND_ALI5451 is not set | ||
| 1536 | # CONFIG_SND_ATIIXP is not set | ||
| 1537 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1538 | # CONFIG_SND_AU8810 is not set | ||
| 1539 | # CONFIG_SND_AU8820 is not set | ||
| 1540 | # CONFIG_SND_AU8830 is not set | ||
| 1541 | # CONFIG_SND_AW2 is not set | ||
| 1542 | # CONFIG_SND_AZT3328 is not set | ||
| 1543 | # CONFIG_SND_BT87X is not set | ||
| 1544 | # CONFIG_SND_CA0106 is not set | ||
| 1545 | # CONFIG_SND_CMIPCI is not set | ||
| 1546 | # CONFIG_SND_OXYGEN is not set | ||
| 1547 | # CONFIG_SND_CS4281 is not set | ||
| 1548 | # CONFIG_SND_CS46XX is not set | ||
| 1549 | # CONFIG_SND_CS5530 is not set | ||
| 1550 | # CONFIG_SND_CS5535AUDIO is not set | ||
| 1551 | # CONFIG_SND_DARLA20 is not set | ||
| 1552 | # CONFIG_SND_GINA20 is not set | ||
| 1553 | # CONFIG_SND_LAYLA20 is not set | ||
| 1554 | # CONFIG_SND_DARLA24 is not set | ||
| 1555 | # CONFIG_SND_GINA24 is not set | ||
| 1556 | # CONFIG_SND_LAYLA24 is not set | ||
| 1557 | # CONFIG_SND_MONA is not set | ||
| 1558 | # CONFIG_SND_MIA is not set | ||
| 1559 | # CONFIG_SND_ECHO3G is not set | ||
| 1560 | # CONFIG_SND_INDIGO is not set | ||
| 1561 | # CONFIG_SND_INDIGOIO is not set | ||
| 1562 | # CONFIG_SND_INDIGODJ is not set | ||
| 1563 | # CONFIG_SND_EMU10K1 is not set | ||
| 1564 | # CONFIG_SND_EMU10K1X is not set | ||
| 1565 | # CONFIG_SND_ENS1370 is not set | ||
| 1566 | # CONFIG_SND_ENS1371 is not set | ||
| 1567 | # CONFIG_SND_ES1938 is not set | ||
| 1568 | # CONFIG_SND_ES1968 is not set | ||
| 1569 | # CONFIG_SND_FM801 is not set | ||
| 1570 | CONFIG_SND_HDA_INTEL=y | ||
| 1571 | CONFIG_SND_HDA_HWDEP=y | ||
| 1572 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
| 1573 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
| 1574 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
| 1575 | CONFIG_SND_HDA_CODEC_VIA=y | ||
| 1576 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
| 1577 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
| 1578 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
| 1579 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
| 1580 | CONFIG_SND_HDA_GENERIC=y | ||
| 1581 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
| 1582 | # CONFIG_SND_HDSP is not set | ||
| 1583 | # CONFIG_SND_HDSPM is not set | ||
| 1584 | # CONFIG_SND_HIFIER is not set | ||
| 1585 | # CONFIG_SND_ICE1712 is not set | ||
| 1586 | # CONFIG_SND_ICE1724 is not set | ||
| 1587 | # CONFIG_SND_INTEL8X0 is not set | ||
| 1588 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1589 | # CONFIG_SND_KORG1212 is not set | ||
| 1590 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1591 | # CONFIG_SND_MIXART is not set | ||
| 1592 | # CONFIG_SND_NM256 is not set | ||
| 1593 | # CONFIG_SND_PCXHR is not set | ||
| 1594 | # CONFIG_SND_RIPTIDE is not set | ||
| 1595 | # CONFIG_SND_RME32 is not set | ||
| 1596 | # CONFIG_SND_RME96 is not set | ||
| 1597 | # CONFIG_SND_RME9652 is not set | ||
| 1598 | # CONFIG_SND_SIS7019 is not set | ||
| 1599 | # CONFIG_SND_SONICVIBES is not set | ||
| 1600 | # CONFIG_SND_TRIDENT is not set | ||
| 1601 | # CONFIG_SND_VIA82XX is not set | ||
| 1602 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1603 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1604 | # CONFIG_SND_VX222 is not set | ||
| 1605 | # CONFIG_SND_YMFPCI is not set | ||
| 1606 | |||
| 1607 | # | ||
| 1608 | # USB devices | ||
| 1609 | # | ||
| 1610 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1611 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1612 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1613 | |||
| 1614 | # | ||
| 1615 | # PCMCIA devices | ||
| 1616 | # | ||
| 1617 | # CONFIG_SND_VXPOCKET is not set | ||
| 1618 | # CONFIG_SND_PDAUDIOCF is not set | ||
| 1619 | |||
| 1620 | # | ||
| 1621 | # System on Chip audio support | ||
| 1622 | # | ||
| 1623 | # CONFIG_SND_SOC is not set | ||
| 1624 | |||
| 1625 | # | ||
| 1626 | # ALSA SoC audio for Freescale SOCs | ||
| 1627 | # | ||
| 1628 | |||
| 1629 | # | ||
| 1630 | # SoC Audio for the Texas Instruments OMAP | ||
| 1631 | # | ||
| 1047 | 1632 | ||
| 1048 | # | 1633 | # |
| 1049 | # Open Sound System | 1634 | # Open Sound System |
| 1050 | # | 1635 | # |
| 1051 | CONFIG_SOUND_PRIME=y | 1636 | # CONFIG_SOUND_PRIME is not set |
| 1052 | # CONFIG_SOUND_TRIDENT is not set | ||
| 1053 | # CONFIG_SOUND_MSNDCLAS is not set | ||
| 1054 | # CONFIG_SOUND_MSNDPIN is not set | ||
| 1055 | # CONFIG_SOUND_OSS is not set | ||
| 1056 | CONFIG_HID_SUPPORT=y | 1637 | CONFIG_HID_SUPPORT=y |
| 1057 | CONFIG_HID=y | 1638 | CONFIG_HID=y |
| 1058 | # CONFIG_HID_DEBUG is not set | 1639 | CONFIG_HID_DEBUG=y |
| 1640 | CONFIG_HIDRAW=y | ||
| 1059 | 1641 | ||
| 1060 | # | 1642 | # |
| 1061 | # USB Input Devices | 1643 | # USB Input Devices |
| 1062 | # | 1644 | # |
| 1063 | CONFIG_USB_HID=y | 1645 | CONFIG_USB_HID=y |
| 1064 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1646 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 1065 | # CONFIG_HID_FF is not set | 1647 | CONFIG_HID_FF=y |
| 1066 | # CONFIG_USB_HIDDEV is not set | 1648 | CONFIG_HID_PID=y |
| 1649 | CONFIG_LOGITECH_FF=y | ||
| 1650 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1651 | CONFIG_PANTHERLORD_FF=y | ||
| 1652 | CONFIG_THRUSTMASTER_FF=y | ||
| 1653 | CONFIG_ZEROPLUS_FF=y | ||
| 1654 | CONFIG_USB_HIDDEV=y | ||
| 1067 | CONFIG_USB_SUPPORT=y | 1655 | CONFIG_USB_SUPPORT=y |
| 1068 | CONFIG_USB_ARCH_HAS_HCD=y | 1656 | CONFIG_USB_ARCH_HAS_HCD=y |
| 1069 | CONFIG_USB_ARCH_HAS_OHCI=y | 1657 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 1070 | CONFIG_USB_ARCH_HAS_EHCI=y | 1658 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 1071 | CONFIG_USB=y | 1659 | CONFIG_USB=y |
| 1072 | # CONFIG_USB_DEBUG is not set | 1660 | CONFIG_USB_DEBUG=y |
| 1661 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 1073 | 1662 | ||
| 1074 | # | 1663 | # |
| 1075 | # Miscellaneous USB options | 1664 | # Miscellaneous USB options |
| @@ -1077,18 +1666,18 @@ CONFIG_USB=y | |||
| 1077 | CONFIG_USB_DEVICEFS=y | 1666 | CONFIG_USB_DEVICEFS=y |
| 1078 | # CONFIG_USB_DEVICE_CLASS is not set | 1667 | # CONFIG_USB_DEVICE_CLASS is not set |
| 1079 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1668 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 1080 | # CONFIG_USB_SUSPEND is not set | 1669 | CONFIG_USB_SUSPEND=y |
| 1081 | # CONFIG_USB_PERSIST is not set | ||
| 1082 | # CONFIG_USB_OTG is not set | 1670 | # CONFIG_USB_OTG is not set |
| 1083 | 1671 | ||
| 1084 | # | 1672 | # |
| 1085 | # USB Host Controller Drivers | 1673 | # USB Host Controller Drivers |
| 1086 | # | 1674 | # |
| 1675 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1087 | CONFIG_USB_EHCI_HCD=y | 1676 | CONFIG_USB_EHCI_HCD=y |
| 1088 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1089 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1677 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1090 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1678 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1091 | # CONFIG_USB_ISP116X_HCD is not set | 1679 | # CONFIG_USB_ISP116X_HCD is not set |
| 1680 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1092 | CONFIG_USB_OHCI_HCD=y | 1681 | CONFIG_USB_OHCI_HCD=y |
| 1093 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1682 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1094 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1683 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -1121,8 +1710,10 @@ CONFIG_USB_STORAGE=y | |||
| 1121 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1710 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1122 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1711 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1123 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1712 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1713 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1124 | # CONFIG_USB_STORAGE_KARMA is not set | 1714 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1125 | # CONFIG_USB_LIBUSUAL is not set | 1715 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1716 | CONFIG_USB_LIBUSUAL=y | ||
| 1126 | 1717 | ||
| 1127 | # | 1718 | # |
| 1128 | # USB Imaging devices | 1719 | # USB Imaging devices |
| @@ -1134,10 +1725,6 @@ CONFIG_USB_MON=y | |||
| 1134 | # | 1725 | # |
| 1135 | # USB port drivers | 1726 | # USB port drivers |
| 1136 | # | 1727 | # |
| 1137 | |||
| 1138 | # | ||
| 1139 | # USB Serial Converter support | ||
| 1140 | # | ||
| 1141 | # CONFIG_USB_SERIAL is not set | 1728 | # CONFIG_USB_SERIAL is not set |
| 1142 | 1729 | ||
| 1143 | # | 1730 | # |
| @@ -1163,90 +1750,125 @@ CONFIG_USB_MON=y | |||
| 1163 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1750 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1164 | # CONFIG_USB_IOWARRIOR is not set | 1751 | # CONFIG_USB_IOWARRIOR is not set |
| 1165 | # CONFIG_USB_TEST is not set | 1752 | # CONFIG_USB_TEST is not set |
| 1753 | # CONFIG_USB_GADGET is not set | ||
| 1754 | # CONFIG_MMC is not set | ||
| 1755 | # CONFIG_MEMSTICK is not set | ||
| 1756 | CONFIG_NEW_LEDS=y | ||
| 1757 | CONFIG_LEDS_CLASS=y | ||
| 1166 | 1758 | ||
| 1167 | # | 1759 | # |
| 1168 | # USB DSL modem support | 1760 | # LED drivers |
| 1169 | # | 1761 | # |
| 1762 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
| 1170 | 1763 | ||
| 1171 | # | 1764 | # |
| 1172 | # USB Gadget Support | 1765 | # LED Triggers |
| 1173 | # | 1766 | # |
| 1174 | # CONFIG_USB_GADGET is not set | 1767 | CONFIG_LEDS_TRIGGERS=y |
| 1175 | # CONFIG_MMC is not set | 1768 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1769 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 1770 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1771 | # CONFIG_ACCESSIBILITY is not set | ||
| 1772 | # CONFIG_INFINIBAND is not set | ||
| 1773 | CONFIG_EDAC=y | ||
| 1176 | 1774 | ||
| 1177 | # | 1775 | # |
| 1178 | # LED devices | 1776 | # Reporting subsystems |
| 1179 | # | 1777 | # |
| 1180 | # CONFIG_NEW_LEDS is not set | 1778 | # CONFIG_EDAC_DEBUG is not set |
| 1779 | # CONFIG_EDAC_MM_EDAC is not set | ||
| 1780 | CONFIG_RTC_LIB=y | ||
| 1781 | CONFIG_RTC_CLASS=y | ||
| 1782 | # CONFIG_RTC_HCTOSYS is not set | ||
| 1783 | # CONFIG_RTC_DEBUG is not set | ||
| 1181 | 1784 | ||
| 1182 | # | 1785 | # |
| 1183 | # LED drivers | 1786 | # RTC interfaces |
| 1184 | # | 1787 | # |
| 1788 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1789 | CONFIG_RTC_INTF_PROC=y | ||
| 1790 | CONFIG_RTC_INTF_DEV=y | ||
| 1791 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1792 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1185 | 1793 | ||
| 1186 | # | 1794 | # |
| 1187 | # LED Triggers | 1795 | # I2C RTC drivers |
| 1188 | # | 1796 | # |
| 1189 | # CONFIG_INFINIBAND is not set | 1797 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1190 | # CONFIG_EDAC is not set | 1798 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1799 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1800 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1801 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1802 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1803 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1804 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1805 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1806 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1807 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1191 | 1808 | ||
| 1192 | # | 1809 | # |
| 1193 | # Real Time Clock | 1810 | # SPI RTC drivers |
| 1194 | # | 1811 | # |
| 1195 | # CONFIG_RTC_CLASS is not set | ||
| 1196 | 1812 | ||
| 1197 | # | 1813 | # |
| 1198 | # DMA Engine support | 1814 | # Platform RTC drivers |
| 1199 | # | 1815 | # |
| 1200 | # CONFIG_DMA_ENGINE is not set | 1816 | CONFIG_RTC_DRV_CMOS=y |
| 1817 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1818 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1819 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1820 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1821 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1822 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1823 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1201 | 1824 | ||
| 1202 | # | 1825 | # |
| 1203 | # DMA Clients | 1826 | # on-CPU RTC drivers |
| 1204 | # | 1827 | # |
| 1828 | CONFIG_DMADEVICES=y | ||
| 1205 | 1829 | ||
| 1206 | # | 1830 | # |
| 1207 | # DMA Devices | 1831 | # DMA Devices |
| 1208 | # | 1832 | # |
| 1209 | CONFIG_VIRTUALIZATION=y | 1833 | # CONFIG_INTEL_IOATDMA is not set |
| 1210 | # CONFIG_KVM is not set | 1834 | # CONFIG_UIO is not set |
| 1211 | 1835 | ||
| 1212 | # | 1836 | # |
| 1213 | # Userspace I/O | 1837 | # Firmware Drivers |
| 1214 | # | 1838 | # |
| 1215 | # CONFIG_UIO is not set | 1839 | # CONFIG_EDD is not set |
| 1840 | CONFIG_EFI_VARS=y | ||
| 1841 | # CONFIG_DELL_RBU is not set | ||
| 1842 | # CONFIG_DCDBAS is not set | ||
| 1843 | CONFIG_DMIID=y | ||
| 1844 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
| 1216 | 1845 | ||
| 1217 | # | 1846 | # |
| 1218 | # File systems | 1847 | # File systems |
| 1219 | # | 1848 | # |
| 1220 | CONFIG_EXT2_FS=y | 1849 | # CONFIG_EXT2_FS is not set |
| 1221 | CONFIG_EXT2_FS_XATTR=y | ||
| 1222 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 1223 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 1224 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1225 | CONFIG_EXT3_FS=y | 1850 | CONFIG_EXT3_FS=y |
| 1226 | CONFIG_EXT3_FS_XATTR=y | 1851 | CONFIG_EXT3_FS_XATTR=y |
| 1227 | CONFIG_EXT3_FS_POSIX_ACL=y | 1852 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1228 | # CONFIG_EXT3_FS_SECURITY is not set | 1853 | CONFIG_EXT3_FS_SECURITY=y |
| 1229 | # CONFIG_EXT4DEV_FS is not set | 1854 | # CONFIG_EXT4DEV_FS is not set |
| 1230 | CONFIG_JBD=y | 1855 | CONFIG_JBD=y |
| 1231 | # CONFIG_JBD_DEBUG is not set | 1856 | # CONFIG_JBD_DEBUG is not set |
| 1232 | CONFIG_FS_MBCACHE=y | 1857 | CONFIG_FS_MBCACHE=y |
| 1233 | CONFIG_REISERFS_FS=y | 1858 | # CONFIG_REISERFS_FS is not set |
| 1234 | # CONFIG_REISERFS_CHECK is not set | ||
| 1235 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 1236 | CONFIG_REISERFS_FS_XATTR=y | ||
| 1237 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 1238 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
| 1239 | # CONFIG_JFS_FS is not set | 1859 | # CONFIG_JFS_FS is not set |
| 1240 | CONFIG_FS_POSIX_ACL=y | 1860 | CONFIG_FS_POSIX_ACL=y |
| 1241 | # CONFIG_XFS_FS is not set | 1861 | # CONFIG_XFS_FS is not set |
| 1242 | # CONFIG_GFS2_FS is not set | ||
| 1243 | # CONFIG_OCFS2_FS is not set | 1862 | # CONFIG_OCFS2_FS is not set |
| 1244 | # CONFIG_MINIX_FS is not set | 1863 | CONFIG_DNOTIFY=y |
| 1245 | # CONFIG_ROMFS_FS is not set | ||
| 1246 | CONFIG_INOTIFY=y | 1864 | CONFIG_INOTIFY=y |
| 1247 | CONFIG_INOTIFY_USER=y | 1865 | CONFIG_INOTIFY_USER=y |
| 1248 | # CONFIG_QUOTA is not set | 1866 | CONFIG_QUOTA=y |
| 1249 | CONFIG_DNOTIFY=y | 1867 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 1868 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 1869 | # CONFIG_QFMT_V1 is not set | ||
| 1870 | CONFIG_QFMT_V2=y | ||
| 1871 | CONFIG_QUOTACTL=y | ||
| 1250 | # CONFIG_AUTOFS_FS is not set | 1872 | # CONFIG_AUTOFS_FS is not set |
| 1251 | CONFIG_AUTOFS4_FS=y | 1873 | CONFIG_AUTOFS4_FS=y |
| 1252 | # CONFIG_FUSE_FS is not set | 1874 | # CONFIG_FUSE_FS is not set |
| @@ -1256,8 +1878,8 @@ CONFIG_GENERIC_ACL=y | |||
| 1256 | # CD-ROM/DVD Filesystems | 1878 | # CD-ROM/DVD Filesystems |
| 1257 | # | 1879 | # |
| 1258 | CONFIG_ISO9660_FS=y | 1880 | CONFIG_ISO9660_FS=y |
| 1259 | # CONFIG_JOLIET is not set | 1881 | CONFIG_JOLIET=y |
| 1260 | # CONFIG_ZISOFS is not set | 1882 | CONFIG_ZISOFS=y |
| 1261 | # CONFIG_UDF_FS is not set | 1883 | # CONFIG_UDF_FS is not set |
| 1262 | 1884 | ||
| 1263 | # | 1885 | # |
| @@ -1275,13 +1897,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1275 | # | 1897 | # |
| 1276 | CONFIG_PROC_FS=y | 1898 | CONFIG_PROC_FS=y |
| 1277 | CONFIG_PROC_KCORE=y | 1899 | CONFIG_PROC_KCORE=y |
| 1900 | CONFIG_PROC_VMCORE=y | ||
| 1278 | CONFIG_PROC_SYSCTL=y | 1901 | CONFIG_PROC_SYSCTL=y |
| 1279 | CONFIG_SYSFS=y | 1902 | CONFIG_SYSFS=y |
| 1280 | CONFIG_TMPFS=y | 1903 | CONFIG_TMPFS=y |
| 1281 | CONFIG_TMPFS_POSIX_ACL=y | 1904 | CONFIG_TMPFS_POSIX_ACL=y |
| 1282 | CONFIG_HUGETLBFS=y | 1905 | CONFIG_HUGETLBFS=y |
| 1283 | CONFIG_HUGETLB_PAGE=y | 1906 | CONFIG_HUGETLB_PAGE=y |
| 1284 | CONFIG_RAMFS=y | ||
| 1285 | # CONFIG_CONFIGFS_FS is not set | 1907 | # CONFIG_CONFIGFS_FS is not set |
| 1286 | 1908 | ||
| 1287 | # | 1909 | # |
| @@ -1289,6 +1911,7 @@ CONFIG_RAMFS=y | |||
| 1289 | # | 1911 | # |
| 1290 | # CONFIG_ADFS_FS is not set | 1912 | # CONFIG_ADFS_FS is not set |
| 1291 | # CONFIG_AFFS_FS is not set | 1913 | # CONFIG_AFFS_FS is not set |
| 1914 | # CONFIG_ECRYPT_FS is not set | ||
| 1292 | # CONFIG_HFS_FS is not set | 1915 | # CONFIG_HFS_FS is not set |
| 1293 | # CONFIG_HFSPLUS_FS is not set | 1916 | # CONFIG_HFSPLUS_FS is not set |
| 1294 | # CONFIG_BEFS_FS is not set | 1917 | # CONFIG_BEFS_FS is not set |
| @@ -1296,33 +1919,15 @@ CONFIG_RAMFS=y | |||
| 1296 | # CONFIG_EFS_FS is not set | 1919 | # CONFIG_EFS_FS is not set |
| 1297 | # CONFIG_CRAMFS is not set | 1920 | # CONFIG_CRAMFS is not set |
| 1298 | # CONFIG_VXFS_FS is not set | 1921 | # CONFIG_VXFS_FS is not set |
| 1922 | # CONFIG_MINIX_FS is not set | ||
| 1299 | # CONFIG_HPFS_FS is not set | 1923 | # CONFIG_HPFS_FS is not set |
| 1300 | # CONFIG_QNX4FS_FS is not set | 1924 | # CONFIG_QNX4FS_FS is not set |
| 1925 | # CONFIG_ROMFS_FS is not set | ||
| 1301 | # CONFIG_SYSV_FS is not set | 1926 | # CONFIG_SYSV_FS is not set |
| 1302 | # CONFIG_UFS_FS is not set | 1927 | # CONFIG_UFS_FS is not set |
| 1303 | 1928 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1304 | # | 1929 | # CONFIG_NFS_FS is not set |
| 1305 | # Network File Systems | 1930 | # CONFIG_NFSD is not set |
| 1306 | # | ||
| 1307 | CONFIG_NFS_FS=y | ||
| 1308 | CONFIG_NFS_V3=y | ||
| 1309 | # CONFIG_NFS_V3_ACL is not set | ||
| 1310 | # CONFIG_NFS_V4 is not set | ||
| 1311 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1312 | CONFIG_NFSD=y | ||
| 1313 | CONFIG_NFSD_V3=y | ||
| 1314 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1315 | # CONFIG_NFSD_V4 is not set | ||
| 1316 | CONFIG_NFSD_TCP=y | ||
| 1317 | CONFIG_ROOT_NFS=y | ||
| 1318 | CONFIG_LOCKD=y | ||
| 1319 | CONFIG_LOCKD_V4=y | ||
| 1320 | CONFIG_EXPORTFS=y | ||
| 1321 | CONFIG_NFS_COMMON=y | ||
| 1322 | CONFIG_SUNRPC=y | ||
| 1323 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1324 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1325 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1326 | # CONFIG_SMB_FS is not set | 1931 | # CONFIG_SMB_FS is not set |
| 1327 | # CONFIG_CIFS is not set | 1932 | # CONFIG_CIFS is not set |
| 1328 | # CONFIG_NCP_FS is not set | 1933 | # CONFIG_NCP_FS is not set |
| @@ -1332,14 +1937,26 @@ CONFIG_SUNRPC=y | |||
| 1332 | # | 1937 | # |
| 1333 | # Partition Types | 1938 | # Partition Types |
| 1334 | # | 1939 | # |
| 1335 | # CONFIG_PARTITION_ADVANCED is not set | 1940 | CONFIG_PARTITION_ADVANCED=y |
| 1941 | # CONFIG_ACORN_PARTITION is not set | ||
| 1942 | CONFIG_OSF_PARTITION=y | ||
| 1943 | CONFIG_AMIGA_PARTITION=y | ||
| 1944 | # CONFIG_ATARI_PARTITION is not set | ||
| 1945 | CONFIG_MAC_PARTITION=y | ||
| 1336 | CONFIG_MSDOS_PARTITION=y | 1946 | CONFIG_MSDOS_PARTITION=y |
| 1337 | 1947 | CONFIG_BSD_DISKLABEL=y | |
| 1338 | # | 1948 | CONFIG_MINIX_SUBPARTITION=y |
| 1339 | # Native Language Support | 1949 | CONFIG_SOLARIS_X86_PARTITION=y |
| 1340 | # | 1950 | CONFIG_UNIXWARE_DISKLABEL=y |
| 1951 | # CONFIG_LDM_PARTITION is not set | ||
| 1952 | CONFIG_SGI_PARTITION=y | ||
| 1953 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1954 | CONFIG_SUN_PARTITION=y | ||
| 1955 | CONFIG_KARMA_PARTITION=y | ||
| 1956 | CONFIG_EFI_PARTITION=y | ||
| 1957 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1341 | CONFIG_NLS=y | 1958 | CONFIG_NLS=y |
| 1342 | CONFIG_NLS_DEFAULT="iso8859-1" | 1959 | CONFIG_NLS_DEFAULT="utf8" |
| 1343 | CONFIG_NLS_CODEPAGE_437=y | 1960 | CONFIG_NLS_CODEPAGE_437=y |
| 1344 | # CONFIG_NLS_CODEPAGE_737 is not set | 1961 | # CONFIG_NLS_CODEPAGE_737 is not set |
| 1345 | # CONFIG_NLS_CODEPAGE_775 is not set | 1962 | # CONFIG_NLS_CODEPAGE_775 is not set |
| @@ -1374,37 +1991,33 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1374 | # CONFIG_NLS_ISO8859_9 is not set | 1991 | # CONFIG_NLS_ISO8859_9 is not set |
| 1375 | # CONFIG_NLS_ISO8859_13 is not set | 1992 | # CONFIG_NLS_ISO8859_13 is not set |
| 1376 | # CONFIG_NLS_ISO8859_14 is not set | 1993 | # CONFIG_NLS_ISO8859_14 is not set |
| 1377 | CONFIG_NLS_ISO8859_15=y | 1994 | # CONFIG_NLS_ISO8859_15 is not set |
| 1378 | # CONFIG_NLS_KOI8_R is not set | 1995 | # CONFIG_NLS_KOI8_R is not set |
| 1379 | # CONFIG_NLS_KOI8_U is not set | 1996 | # CONFIG_NLS_KOI8_U is not set |
| 1380 | CONFIG_NLS_UTF8=y | 1997 | CONFIG_NLS_UTF8=y |
| 1381 | |||
| 1382 | # | ||
| 1383 | # Distributed Lock Manager | ||
| 1384 | # | ||
| 1385 | # CONFIG_DLM is not set | 1998 | # CONFIG_DLM is not set |
| 1386 | CONFIG_INSTRUMENTATION=y | ||
| 1387 | CONFIG_PROFILING=y | ||
| 1388 | CONFIG_OPROFILE=y | ||
| 1389 | CONFIG_KPROBES=y | ||
| 1390 | 1999 | ||
| 1391 | # | 2000 | # |
| 1392 | # Kernel hacking | 2001 | # Kernel hacking |
| 1393 | # | 2002 | # |
| 1394 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2003 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1395 | # CONFIG_PRINTK_TIME is not set | 2004 | # CONFIG_PRINTK_TIME is not set |
| 2005 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1396 | # CONFIG_ENABLE_MUST_CHECK is not set | 2006 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 2007 | CONFIG_FRAME_WARN=2048 | ||
| 1397 | CONFIG_MAGIC_SYSRQ=y | 2008 | CONFIG_MAGIC_SYSRQ=y |
| 1398 | CONFIG_UNUSED_SYMBOLS=y | 2009 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1399 | # CONFIG_DEBUG_FS is not set | 2010 | CONFIG_DEBUG_FS=y |
| 1400 | # CONFIG_HEADERS_CHECK is not set | 2011 | # CONFIG_HEADERS_CHECK is not set |
| 1401 | CONFIG_DEBUG_KERNEL=y | 2012 | CONFIG_DEBUG_KERNEL=y |
| 1402 | # CONFIG_DEBUG_SHIRQ is not set | 2013 | # CONFIG_DEBUG_SHIRQ is not set |
| 1403 | CONFIG_DETECT_SOFTLOCKUP=y | 2014 | # CONFIG_DETECT_SOFTLOCKUP is not set |
| 1404 | # CONFIG_SCHED_DEBUG is not set | 2015 | # CONFIG_SCHED_DEBUG is not set |
| 1405 | # CONFIG_SCHEDSTATS is not set | 2016 | CONFIG_SCHEDSTATS=y |
| 1406 | CONFIG_TIMER_STATS=y | 2017 | CONFIG_TIMER_STATS=y |
| 2018 | # CONFIG_DEBUG_OBJECTS is not set | ||
| 1407 | # CONFIG_SLUB_DEBUG_ON is not set | 2019 | # CONFIG_SLUB_DEBUG_ON is not set |
| 2020 | # CONFIG_SLUB_STATS is not set | ||
| 1408 | # CONFIG_DEBUG_RT_MUTEXES is not set | 2021 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1409 | # CONFIG_RT_MUTEX_TESTER is not set | 2022 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1410 | # CONFIG_DEBUG_SPINLOCK is not set | 2023 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1419,48 +2032,174 @@ CONFIG_TIMER_STATS=y | |||
| 1419 | CONFIG_DEBUG_BUGVERBOSE=y | 2032 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1420 | # CONFIG_DEBUG_INFO is not set | 2033 | # CONFIG_DEBUG_INFO is not set |
| 1421 | # CONFIG_DEBUG_VM is not set | 2034 | # CONFIG_DEBUG_VM is not set |
| 2035 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1422 | # CONFIG_DEBUG_LIST is not set | 2036 | # CONFIG_DEBUG_LIST is not set |
| 1423 | # CONFIG_FRAME_POINTER is not set | 2037 | # CONFIG_DEBUG_SG is not set |
| 1424 | CONFIG_OPTIMIZE_INLINING=y | 2038 | CONFIG_FRAME_POINTER=y |
| 2039 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1425 | # CONFIG_RCU_TORTURE_TEST is not set | 2040 | # CONFIG_RCU_TORTURE_TEST is not set |
| 2041 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 2042 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1426 | # CONFIG_LKDTM is not set | 2043 | # CONFIG_LKDTM is not set |
| 1427 | # CONFIG_FAULT_INJECTION is not set | 2044 | # CONFIG_FAULT_INJECTION is not set |
| 2045 | # CONFIG_LATENCYTOP is not set | ||
| 2046 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | ||
| 2047 | # CONFIG_SAMPLES is not set | ||
| 2048 | # CONFIG_KGDB is not set | ||
| 2049 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 2050 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
| 1428 | CONFIG_EARLY_PRINTK=y | 2051 | CONFIG_EARLY_PRINTK=y |
| 1429 | CONFIG_DEBUG_STACKOVERFLOW=y | 2052 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1430 | # CONFIG_DEBUG_STACK_USAGE is not set | 2053 | CONFIG_DEBUG_STACK_USAGE=y |
| 1431 | # CONFIG_DEBUG_RODATA is not set | 2054 | # CONFIG_DEBUG_PAGEALLOC is not set |
| 2055 | # CONFIG_X86_PTDUMP is not set | ||
| 2056 | CONFIG_DEBUG_RODATA=y | ||
| 2057 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
| 2058 | CONFIG_DEBUG_NX_TEST=m | ||
| 1432 | # CONFIG_4KSTACKS is not set | 2059 | # CONFIG_4KSTACKS is not set |
| 1433 | CONFIG_X86_FIND_SMP_CONFIG=y | 2060 | CONFIG_X86_FIND_SMP_CONFIG=y |
| 1434 | CONFIG_X86_MPPARSE=y | 2061 | CONFIG_X86_MPPARSE=y |
| 1435 | CONFIG_DOUBLEFAULT=y | 2062 | CONFIG_DOUBLEFAULT=y |
| 2063 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
| 2064 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
| 2065 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
| 2066 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
| 2067 | CONFIG_IO_DELAY_0X80=y | ||
| 2068 | # CONFIG_IO_DELAY_0XED is not set | ||
| 2069 | # CONFIG_IO_DELAY_UDELAY is not set | ||
| 2070 | # CONFIG_IO_DELAY_NONE is not set | ||
| 2071 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
| 2072 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
| 2073 | # CONFIG_CPA_DEBUG is not set | ||
| 1436 | 2074 | ||
| 1437 | # | 2075 | # |
| 1438 | # Security options | 2076 | # Security options |
| 1439 | # | 2077 | # |
| 1440 | # CONFIG_KEYS is not set | 2078 | CONFIG_KEYS=y |
| 1441 | # CONFIG_SECURITY is not set | 2079 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1442 | # CONFIG_CRYPTO is not set | 2080 | CONFIG_SECURITY=y |
| 2081 | CONFIG_SECURITY_NETWORK=y | ||
| 2082 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
| 2083 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2084 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 2085 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 2086 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
| 2087 | CONFIG_SECURITY_SELINUX=y | ||
| 2088 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
| 2089 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
| 2090 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
| 2091 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
| 2092 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
| 2093 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
| 2094 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
| 2095 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
| 2096 | # CONFIG_SECURITY_SMACK is not set | ||
| 2097 | CONFIG_CRYPTO=y | ||
| 2098 | |||
| 2099 | # | ||
| 2100 | # Crypto core or helper | ||
| 2101 | # | ||
| 2102 | CONFIG_CRYPTO_ALGAPI=y | ||
| 2103 | CONFIG_CRYPTO_AEAD=y | ||
| 2104 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 2105 | CONFIG_CRYPTO_HASH=y | ||
| 2106 | CONFIG_CRYPTO_MANAGER=y | ||
| 2107 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 2108 | # CONFIG_CRYPTO_NULL is not set | ||
| 2109 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 2110 | CONFIG_CRYPTO_AUTHENC=y | ||
| 2111 | # CONFIG_CRYPTO_TEST is not set | ||
| 2112 | |||
| 2113 | # | ||
| 2114 | # Authenticated Encryption with Associated Data | ||
| 2115 | # | ||
| 2116 | # CONFIG_CRYPTO_CCM is not set | ||
| 2117 | # CONFIG_CRYPTO_GCM is not set | ||
| 2118 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 2119 | |||
| 2120 | # | ||
| 2121 | # Block modes | ||
| 2122 | # | ||
| 2123 | CONFIG_CRYPTO_CBC=y | ||
| 2124 | # CONFIG_CRYPTO_CTR is not set | ||
| 2125 | # CONFIG_CRYPTO_CTS is not set | ||
| 2126 | CONFIG_CRYPTO_ECB=y | ||
| 2127 | # CONFIG_CRYPTO_LRW is not set | ||
| 2128 | # CONFIG_CRYPTO_PCBC is not set | ||
| 2129 | # CONFIG_CRYPTO_XTS is not set | ||
| 2130 | |||
| 2131 | # | ||
| 2132 | # Hash modes | ||
| 2133 | # | ||
| 2134 | CONFIG_CRYPTO_HMAC=y | ||
| 2135 | # CONFIG_CRYPTO_XCBC is not set | ||
| 2136 | |||
| 2137 | # | ||
| 2138 | # Digest | ||
| 2139 | # | ||
| 2140 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 2141 | # CONFIG_CRYPTO_MD4 is not set | ||
| 2142 | CONFIG_CRYPTO_MD5=y | ||
| 2143 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 2144 | CONFIG_CRYPTO_SHA1=y | ||
| 2145 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 2146 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 2147 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 2148 | # CONFIG_CRYPTO_WP512 is not set | ||
| 2149 | |||
| 2150 | # | ||
| 2151 | # Ciphers | ||
| 2152 | # | ||
| 2153 | CONFIG_CRYPTO_AES=y | ||
| 2154 | # CONFIG_CRYPTO_AES_586 is not set | ||
| 2155 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 2156 | CONFIG_CRYPTO_ARC4=y | ||
| 2157 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 2158 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 2159 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 2160 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 2161 | CONFIG_CRYPTO_DES=y | ||
| 2162 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 2163 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 2164 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 2165 | # CONFIG_CRYPTO_SALSA20_586 is not set | ||
| 2166 | # CONFIG_CRYPTO_SEED is not set | ||
| 2167 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 2168 | # CONFIG_CRYPTO_TEA is not set | ||
| 2169 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 2170 | # CONFIG_CRYPTO_TWOFISH_586 is not set | ||
| 2171 | |||
| 2172 | # | ||
| 2173 | # Compression | ||
| 2174 | # | ||
| 2175 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 2176 | # CONFIG_CRYPTO_LZO is not set | ||
| 2177 | CONFIG_CRYPTO_HW=y | ||
| 2178 | # CONFIG_CRYPTO_DEV_PADLOCK is not set | ||
| 2179 | # CONFIG_CRYPTO_DEV_GEODE is not set | ||
| 2180 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 2181 | CONFIG_HAVE_KVM=y | ||
| 2182 | CONFIG_VIRTUALIZATION=y | ||
| 2183 | # CONFIG_KVM is not set | ||
| 2184 | # CONFIG_LGUEST is not set | ||
| 2185 | # CONFIG_VIRTIO_PCI is not set | ||
| 2186 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1443 | 2187 | ||
| 1444 | # | 2188 | # |
| 1445 | # Library routines | 2189 | # Library routines |
| 1446 | # | 2190 | # |
| 1447 | CONFIG_BITREVERSE=y | 2191 | CONFIG_BITREVERSE=y |
| 2192 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
| 2193 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 1448 | # CONFIG_CRC_CCITT is not set | 2194 | # CONFIG_CRC_CCITT is not set |
| 1449 | # CONFIG_CRC16 is not set | 2195 | # CONFIG_CRC16 is not set |
| 1450 | # CONFIG_CRC_ITU_T is not set | 2196 | # CONFIG_CRC_ITU_T is not set |
| 1451 | CONFIG_CRC32=y | 2197 | CONFIG_CRC32=y |
| 1452 | # CONFIG_CRC7 is not set | 2198 | # CONFIG_CRC7 is not set |
| 1453 | # CONFIG_LIBCRC32C is not set | 2199 | # CONFIG_LIBCRC32C is not set |
| 2200 | CONFIG_AUDIT_GENERIC=y | ||
| 1454 | CONFIG_ZLIB_INFLATE=y | 2201 | CONFIG_ZLIB_INFLATE=y |
| 1455 | CONFIG_PLIST=y | 2202 | CONFIG_PLIST=y |
| 1456 | CONFIG_HAS_IOMEM=y | 2203 | CONFIG_HAS_IOMEM=y |
| 1457 | CONFIG_HAS_IOPORT=y | 2204 | CONFIG_HAS_IOPORT=y |
| 1458 | CONFIG_HAS_DMA=y | 2205 | CONFIG_HAS_DMA=y |
| 1459 | CONFIG_GENERIC_HARDIRQS=y | ||
| 1460 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 1461 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 1462 | CONFIG_X86_SMP=y | ||
| 1463 | CONFIG_X86_HT=y | ||
| 1464 | CONFIG_X86_BIOS_REBOOT=y | ||
| 1465 | CONFIG_X86_TRAMPOLINE=y | ||
| 1466 | CONFIG_KTIME_SCALAR=y | ||
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 2d6f5b2809d2..ae5124e064d4 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
| @@ -1,64 +1,103 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Linux kernel version: 2.6.22-git14 | 3 | # Linux kernel version: 2.6.26-rc1 |
| 4 | # Fri Jul 20 09:53:15 2007 | 4 | # Sun May 4 19:59:57 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_X86_64=y | ||
| 7 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
| 7 | # CONFIG_X86_32 is not set | ||
| 8 | CONFIG_X86_64=y | ||
| 8 | CONFIG_X86=y | 9 | CONFIG_X86=y |
| 10 | CONFIG_DEFCONFIG_LIST="arch/x86/configs/x86_64_defconfig" | ||
| 11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
| 9 | CONFIG_GENERIC_TIME=y | 12 | CONFIG_GENERIC_TIME=y |
| 10 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 11 | CONFIG_GENERIC_CMOS_UPDATE=y | 13 | CONFIG_GENERIC_CMOS_UPDATE=y |
| 12 | CONFIG_ZONE_DMA32=y | 14 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
| 15 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
| 16 | CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y | ||
| 13 | CONFIG_LOCKDEP_SUPPORT=y | 17 | CONFIG_LOCKDEP_SUPPORT=y |
| 14 | CONFIG_STACKTRACE_SUPPORT=y | 18 | CONFIG_STACKTRACE_SUPPORT=y |
| 15 | CONFIG_SEMAPHORE_SLEEPERS=y | 19 | CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
| 20 | CONFIG_FAST_CMPXCHG_LOCAL=y | ||
| 16 | CONFIG_MMU=y | 21 | CONFIG_MMU=y |
| 17 | CONFIG_ZONE_DMA=y | 22 | CONFIG_ZONE_DMA=y |
| 18 | CONFIG_QUICKLIST=y | ||
| 19 | CONFIG_NR_QUICK=2 | ||
| 20 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 21 | CONFIG_GENERIC_HWEIGHT=y | ||
| 22 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 23 | CONFIG_X86_CMPXCHG=y | ||
| 24 | CONFIG_EARLY_PRINTK=y | ||
| 25 | CONFIG_GENERIC_ISA_DMA=y | 23 | CONFIG_GENERIC_ISA_DMA=y |
| 26 | CONFIG_GENERIC_IOMAP=y | 24 | CONFIG_GENERIC_IOMAP=y |
| 27 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 28 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 29 | CONFIG_DMI=y | ||
| 30 | CONFIG_AUDIT_ARCH=y | ||
| 31 | CONFIG_GENERIC_BUG=y | 25 | CONFIG_GENERIC_BUG=y |
| 26 | CONFIG_GENERIC_HWEIGHT=y | ||
| 27 | # CONFIG_GENERIC_GPIO is not set | ||
| 28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
| 29 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
| 30 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
| 32 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
| 33 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
| 34 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
| 34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
| 35 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
| 36 | CONFIG_ARCH_HAS_CPU_RELAX=y | ||
| 37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | ||
| 38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | ||
| 39 | CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y | ||
| 40 | CONFIG_ARCH_HIBERNATION_POSSIBLE=y | ||
| 41 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | ||
| 42 | CONFIG_ZONE_DMA32=y | ||
| 43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
| 44 | CONFIG_AUDIT_ARCH=y | ||
| 45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
| 46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | ||
| 47 | CONFIG_GENERIC_HARDIRQS=y | ||
| 48 | CONFIG_GENERIC_IRQ_PROBE=y | ||
| 49 | CONFIG_GENERIC_PENDING_IRQ=y | ||
| 50 | CONFIG_X86_SMP=y | ||
| 51 | CONFIG_X86_64_SMP=y | ||
| 52 | CONFIG_X86_HT=y | ||
| 53 | CONFIG_X86_BIOS_REBOOT=y | ||
| 54 | CONFIG_X86_TRAMPOLINE=y | ||
| 55 | # CONFIG_KTIME_SCALAR is not set | ||
| 35 | 56 | ||
| 36 | # | 57 | # |
| 37 | # Code maturity level options | 58 | # General setup |
| 38 | # | 59 | # |
| 39 | CONFIG_EXPERIMENTAL=y | 60 | CONFIG_EXPERIMENTAL=y |
| 40 | CONFIG_LOCK_KERNEL=y | 61 | CONFIG_LOCK_KERNEL=y |
| 41 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 62 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
| 42 | |||
| 43 | # | ||
| 44 | # General setup | ||
| 45 | # | ||
| 46 | CONFIG_LOCALVERSION="" | 63 | CONFIG_LOCALVERSION="" |
| 47 | CONFIG_LOCALVERSION_AUTO=y | 64 | # CONFIG_LOCALVERSION_AUTO is not set |
| 48 | CONFIG_SWAP=y | 65 | CONFIG_SWAP=y |
| 49 | CONFIG_SYSVIPC=y | 66 | CONFIG_SYSVIPC=y |
| 50 | CONFIG_SYSVIPC_SYSCTL=y | 67 | CONFIG_SYSVIPC_SYSCTL=y |
| 51 | CONFIG_POSIX_MQUEUE=y | 68 | CONFIG_POSIX_MQUEUE=y |
| 52 | # CONFIG_BSD_PROCESS_ACCT is not set | 69 | CONFIG_BSD_PROCESS_ACCT=y |
| 53 | # CONFIG_TASKSTATS is not set | 70 | # CONFIG_BSD_PROCESS_ACCT_V3 is not set |
| 54 | # CONFIG_USER_NS is not set | 71 | CONFIG_TASKSTATS=y |
| 55 | # CONFIG_AUDIT is not set | 72 | CONFIG_TASK_DELAY_ACCT=y |
| 56 | CONFIG_IKCONFIG=y | 73 | CONFIG_TASK_XACCT=y |
| 57 | CONFIG_IKCONFIG_PROC=y | 74 | CONFIG_TASK_IO_ACCOUNTING=y |
| 58 | CONFIG_LOG_BUF_SHIFT=18 | 75 | CONFIG_AUDIT=y |
| 59 | # CONFIG_CPUSETS is not set | 76 | CONFIG_AUDITSYSCALL=y |
| 60 | CONFIG_SYSFS_DEPRECATED=y | 77 | CONFIG_AUDIT_TREE=y |
| 78 | # CONFIG_IKCONFIG is not set | ||
| 79 | CONFIG_LOG_BUF_SHIFT=17 | ||
| 80 | CONFIG_CGROUPS=y | ||
| 81 | # CONFIG_CGROUP_DEBUG is not set | ||
| 82 | CONFIG_CGROUP_NS=y | ||
| 83 | # CONFIG_CGROUP_DEVICE is not set | ||
| 84 | CONFIG_CPUSETS=y | ||
| 85 | CONFIG_GROUP_SCHED=y | ||
| 86 | CONFIG_FAIR_GROUP_SCHED=y | ||
| 87 | # CONFIG_RT_GROUP_SCHED is not set | ||
| 88 | # CONFIG_USER_SCHED is not set | ||
| 89 | CONFIG_CGROUP_SCHED=y | ||
| 90 | CONFIG_CGROUP_CPUACCT=y | ||
| 91 | CONFIG_RESOURCE_COUNTERS=y | ||
| 92 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | ||
| 93 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | ||
| 94 | CONFIG_PROC_PID_CPUSET=y | ||
| 61 | CONFIG_RELAY=y | 95 | CONFIG_RELAY=y |
| 96 | CONFIG_NAMESPACES=y | ||
| 97 | CONFIG_UTS_NS=y | ||
| 98 | CONFIG_IPC_NS=y | ||
| 99 | CONFIG_USER_NS=y | ||
| 100 | CONFIG_PID_NS=y | ||
| 62 | CONFIG_BLK_DEV_INITRD=y | 101 | CONFIG_BLK_DEV_INITRD=y |
| 63 | CONFIG_INITRAMFS_SOURCE="" | 102 | CONFIG_INITRAMFS_SOURCE="" |
| 64 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 103 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| @@ -66,13 +105,15 @@ CONFIG_SYSCTL=y | |||
| 66 | # CONFIG_EMBEDDED is not set | 105 | # CONFIG_EMBEDDED is not set |
| 67 | CONFIG_UID16=y | 106 | CONFIG_UID16=y |
| 68 | CONFIG_SYSCTL_SYSCALL=y | 107 | CONFIG_SYSCTL_SYSCALL=y |
| 108 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
| 69 | CONFIG_KALLSYMS=y | 109 | CONFIG_KALLSYMS=y |
| 70 | CONFIG_KALLSYMS_ALL=y | 110 | CONFIG_KALLSYMS_ALL=y |
| 71 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 111 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 72 | CONFIG_HOTPLUG=y | 112 | CONFIG_HOTPLUG=y |
| 73 | CONFIG_PRINTK=y | 113 | CONFIG_PRINTK=y |
| 74 | CONFIG_BUG=y | 114 | CONFIG_BUG=y |
| 75 | CONFIG_ELF_CORE=y | 115 | CONFIG_ELF_CORE=y |
| 116 | # CONFIG_COMPAT_BRK is not set | ||
| 76 | CONFIG_BASE_FULL=y | 117 | CONFIG_BASE_FULL=y |
| 77 | CONFIG_FUTEX=y | 118 | CONFIG_FUTEX=y |
| 78 | CONFIG_ANON_INODES=y | 119 | CONFIG_ANON_INODES=y |
| @@ -82,9 +123,21 @@ CONFIG_TIMERFD=y | |||
| 82 | CONFIG_EVENTFD=y | 123 | CONFIG_EVENTFD=y |
| 83 | CONFIG_SHMEM=y | 124 | CONFIG_SHMEM=y |
| 84 | CONFIG_VM_EVENT_COUNTERS=y | 125 | CONFIG_VM_EVENT_COUNTERS=y |
| 85 | CONFIG_SLAB=y | 126 | CONFIG_SLUB_DEBUG=y |
| 86 | # CONFIG_SLUB is not set | 127 | # CONFIG_SLAB is not set |
| 128 | CONFIG_SLUB=y | ||
| 87 | # CONFIG_SLOB is not set | 129 | # CONFIG_SLOB is not set |
| 130 | CONFIG_PROFILING=y | ||
| 131 | CONFIG_MARKERS=y | ||
| 132 | # CONFIG_OPROFILE is not set | ||
| 133 | CONFIG_HAVE_OPROFILE=y | ||
| 134 | CONFIG_KPROBES=y | ||
| 135 | CONFIG_KRETPROBES=y | ||
| 136 | CONFIG_HAVE_KPROBES=y | ||
| 137 | CONFIG_HAVE_KRETPROBES=y | ||
| 138 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
| 139 | CONFIG_PROC_PAGE_MONITOR=y | ||
| 140 | CONFIG_SLABINFO=y | ||
| 88 | CONFIG_RT_MUTEXES=y | 141 | CONFIG_RT_MUTEXES=y |
| 89 | # CONFIG_TINY_SHMEM is not set | 142 | # CONFIG_TINY_SHMEM is not set |
| 90 | CONFIG_BASE_SMALL=0 | 143 | CONFIG_BASE_SMALL=0 |
| @@ -96,14 +149,15 @@ CONFIG_MODULE_FORCE_UNLOAD=y | |||
| 96 | # CONFIG_KMOD is not set | 149 | # CONFIG_KMOD is not set |
| 97 | CONFIG_STOP_MACHINE=y | 150 | CONFIG_STOP_MACHINE=y |
| 98 | CONFIG_BLOCK=y | 151 | CONFIG_BLOCK=y |
| 99 | # CONFIG_BLK_DEV_IO_TRACE is not set | 152 | CONFIG_BLK_DEV_IO_TRACE=y |
| 100 | # CONFIG_BLK_DEV_BSG is not set | 153 | CONFIG_BLK_DEV_BSG=y |
| 154 | CONFIG_BLOCK_COMPAT=y | ||
| 101 | 155 | ||
| 102 | # | 156 | # |
| 103 | # IO Schedulers | 157 | # IO Schedulers |
| 104 | # | 158 | # |
| 105 | CONFIG_IOSCHED_NOOP=y | 159 | CONFIG_IOSCHED_NOOP=y |
| 106 | # CONFIG_IOSCHED_AS is not set | 160 | CONFIG_IOSCHED_AS=y |
| 107 | CONFIG_IOSCHED_DEADLINE=y | 161 | CONFIG_IOSCHED_DEADLINE=y |
| 108 | CONFIG_IOSCHED_CFQ=y | 162 | CONFIG_IOSCHED_CFQ=y |
| 109 | # CONFIG_DEFAULT_AS is not set | 163 | # CONFIG_DEFAULT_AS is not set |
| @@ -111,107 +165,177 @@ CONFIG_IOSCHED_CFQ=y | |||
| 111 | CONFIG_DEFAULT_CFQ=y | 165 | CONFIG_DEFAULT_CFQ=y |
| 112 | # CONFIG_DEFAULT_NOOP is not set | 166 | # CONFIG_DEFAULT_NOOP is not set |
| 113 | CONFIG_DEFAULT_IOSCHED="cfq" | 167 | CONFIG_DEFAULT_IOSCHED="cfq" |
| 168 | CONFIG_CLASSIC_RCU=y | ||
| 114 | 169 | ||
| 115 | # | 170 | # |
| 116 | # Processor type and features | 171 | # Processor type and features |
| 117 | # | 172 | # |
| 173 | CONFIG_TICK_ONESHOT=y | ||
| 174 | CONFIG_NO_HZ=y | ||
| 175 | CONFIG_HIGH_RES_TIMERS=y | ||
| 176 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
| 177 | CONFIG_SMP=y | ||
| 118 | CONFIG_X86_PC=y | 178 | CONFIG_X86_PC=y |
| 179 | # CONFIG_X86_ELAN is not set | ||
| 180 | # CONFIG_X86_VOYAGER is not set | ||
| 181 | # CONFIG_X86_NUMAQ is not set | ||
| 182 | # CONFIG_X86_SUMMIT is not set | ||
| 183 | # CONFIG_X86_BIGSMP is not set | ||
| 184 | # CONFIG_X86_VISWS is not set | ||
| 185 | # CONFIG_X86_GENERICARCH is not set | ||
| 186 | # CONFIG_X86_ES7000 is not set | ||
| 187 | # CONFIG_X86_RDC321X is not set | ||
| 119 | # CONFIG_X86_VSMP is not set | 188 | # CONFIG_X86_VSMP is not set |
| 189 | # CONFIG_PARAVIRT_GUEST is not set | ||
| 190 | CONFIG_MEMTEST_BOOTPARAM=y | ||
| 191 | CONFIG_MEMTEST_BOOTPARAM_VALUE=0 | ||
| 192 | # CONFIG_M386 is not set | ||
| 193 | # CONFIG_M486 is not set | ||
| 194 | # CONFIG_M586 is not set | ||
| 195 | # CONFIG_M586TSC is not set | ||
| 196 | # CONFIG_M586MMX is not set | ||
| 197 | # CONFIG_M686 is not set | ||
| 198 | # CONFIG_MPENTIUMII is not set | ||
| 199 | # CONFIG_MPENTIUMIII is not set | ||
| 200 | # CONFIG_MPENTIUMM is not set | ||
| 201 | # CONFIG_MPENTIUM4 is not set | ||
| 202 | # CONFIG_MK6 is not set | ||
| 203 | # CONFIG_MK7 is not set | ||
| 120 | # CONFIG_MK8 is not set | 204 | # CONFIG_MK8 is not set |
| 205 | # CONFIG_MCRUSOE is not set | ||
| 206 | # CONFIG_MEFFICEON is not set | ||
| 207 | # CONFIG_MWINCHIPC6 is not set | ||
| 208 | # CONFIG_MWINCHIP2 is not set | ||
| 209 | # CONFIG_MWINCHIP3D is not set | ||
| 210 | # CONFIG_MGEODEGX1 is not set | ||
| 211 | # CONFIG_MGEODE_LX is not set | ||
| 212 | # CONFIG_MCYRIXIII is not set | ||
| 213 | # CONFIG_MVIAC3_2 is not set | ||
| 214 | # CONFIG_MVIAC7 is not set | ||
| 121 | # CONFIG_MPSC is not set | 215 | # CONFIG_MPSC is not set |
| 122 | # CONFIG_MCORE2 is not set | 216 | CONFIG_MCORE2=y |
| 123 | CONFIG_GENERIC_CPU=y | 217 | # CONFIG_GENERIC_CPU is not set |
| 124 | CONFIG_X86_L1_CACHE_BYTES=128 | 218 | CONFIG_X86_CPU=y |
| 125 | CONFIG_X86_L1_CACHE_SHIFT=7 | 219 | CONFIG_X86_L1_CACHE_BYTES=64 |
| 126 | CONFIG_X86_INTERNODE_CACHE_BYTES=128 | 220 | CONFIG_X86_INTERNODE_CACHE_BYTES=64 |
| 127 | CONFIG_X86_TSC=y | 221 | CONFIG_X86_CMPXCHG=y |
| 222 | CONFIG_X86_L1_CACHE_SHIFT=6 | ||
| 128 | CONFIG_X86_GOOD_APIC=y | 223 | CONFIG_X86_GOOD_APIC=y |
| 129 | # CONFIG_MICROCODE is not set | 224 | CONFIG_X86_INTEL_USERCOPY=y |
| 130 | CONFIG_X86_MSR=y | 225 | CONFIG_X86_USE_PPRO_CHECKSUM=y |
| 131 | CONFIG_X86_CPUID=y | 226 | CONFIG_X86_P6_NOP=y |
| 132 | CONFIG_X86_HT=y | 227 | CONFIG_X86_TSC=y |
| 133 | CONFIG_X86_IO_APIC=y | 228 | CONFIG_X86_CMOV=y |
| 134 | CONFIG_X86_LOCAL_APIC=y | 229 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
| 135 | CONFIG_MTRR=y | 230 | CONFIG_X86_DEBUGCTLMSR=y |
| 136 | CONFIG_SMP=y | 231 | CONFIG_HPET_TIMER=y |
| 137 | CONFIG_SCHED_SMT=y | 232 | CONFIG_HPET_EMULATE_RTC=y |
| 233 | CONFIG_DMI=y | ||
| 234 | CONFIG_GART_IOMMU=y | ||
| 235 | CONFIG_CALGARY_IOMMU=y | ||
| 236 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | ||
| 237 | CONFIG_SWIOTLB=y | ||
| 238 | CONFIG_IOMMU_HELPER=y | ||
| 239 | CONFIG_NR_CPUS=4 | ||
| 240 | # CONFIG_SCHED_SMT is not set | ||
| 138 | CONFIG_SCHED_MC=y | 241 | CONFIG_SCHED_MC=y |
| 139 | # CONFIG_PREEMPT_NONE is not set | 242 | # CONFIG_PREEMPT_NONE is not set |
| 140 | CONFIG_PREEMPT_VOLUNTARY=y | 243 | CONFIG_PREEMPT_VOLUNTARY=y |
| 141 | # CONFIG_PREEMPT is not set | 244 | # CONFIG_PREEMPT is not set |
| 142 | CONFIG_PREEMPT_BKL=y | 245 | CONFIG_X86_LOCAL_APIC=y |
| 246 | CONFIG_X86_IO_APIC=y | ||
| 247 | # CONFIG_X86_MCE is not set | ||
| 248 | # CONFIG_I8K is not set | ||
| 249 | # CONFIG_MICROCODE is not set | ||
| 250 | CONFIG_X86_MSR=y | ||
| 251 | CONFIG_X86_CPUID=y | ||
| 143 | CONFIG_NUMA=y | 252 | CONFIG_NUMA=y |
| 144 | CONFIG_K8_NUMA=y | 253 | CONFIG_K8_NUMA=y |
| 145 | CONFIG_NODES_SHIFT=6 | ||
| 146 | CONFIG_X86_64_ACPI_NUMA=y | 254 | CONFIG_X86_64_ACPI_NUMA=y |
| 147 | CONFIG_NUMA_EMU=y | 255 | CONFIG_NODES_SPAN_OTHER_NODES=y |
| 256 | # CONFIG_NUMA_EMU is not set | ||
| 257 | CONFIG_NODES_SHIFT=6 | ||
| 258 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
| 259 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
| 260 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
| 261 | CONFIG_SELECT_MEMORY_MODEL=y | ||
| 262 | # CONFIG_FLATMEM_MANUAL is not set | ||
| 263 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
| 264 | CONFIG_SPARSEMEM_MANUAL=y | ||
| 265 | CONFIG_SPARSEMEM=y | ||
| 148 | CONFIG_NEED_MULTIPLE_NODES=y | 266 | CONFIG_NEED_MULTIPLE_NODES=y |
| 267 | CONFIG_HAVE_MEMORY_PRESENT=y | ||
| 149 | # CONFIG_SPARSEMEM_STATIC is not set | 268 | # CONFIG_SPARSEMEM_STATIC is not set |
| 269 | CONFIG_SPARSEMEM_EXTREME=y | ||
| 270 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | ||
| 271 | CONFIG_SPARSEMEM_VMEMMAP=y | ||
| 272 | |||
| 273 | # | ||
| 274 | # Memory hotplug is currently incompatible with Software Suspend | ||
| 275 | # | ||
| 276 | CONFIG_PAGEFLAGS_EXTENDED=y | ||
| 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 277 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
| 151 | CONFIG_MIGRATION=y | 278 | CONFIG_MIGRATION=y |
| 152 | CONFIG_RESOURCES_64BIT=y | 279 | CONFIG_RESOURCES_64BIT=y |
| 153 | CONFIG_ZONE_DMA_FLAG=1 | 280 | CONFIG_ZONE_DMA_FLAG=1 |
| 154 | CONFIG_BOUNCE=y | 281 | CONFIG_BOUNCE=y |
| 155 | CONFIG_VIRT_TO_BUS=y | 282 | CONFIG_VIRT_TO_BUS=y |
| 156 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 283 | CONFIG_MTRR=y |
| 157 | CONFIG_OUT_OF_LINE_PFN_TO_PAGE=y | 284 | # CONFIG_X86_PAT is not set |
| 158 | CONFIG_NR_CPUS=32 | 285 | CONFIG_EFI=y |
| 159 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
| 160 | CONFIG_HOTPLUG_CPU=y | ||
| 161 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 162 | CONFIG_HPET_TIMER=y | ||
| 163 | CONFIG_HPET_EMULATE_RTC=y | ||
| 164 | CONFIG_GART_IOMMU=y | ||
| 165 | # CONFIG_CALGARY_IOMMU is not set | ||
| 166 | CONFIG_SWIOTLB=y | ||
| 167 | CONFIG_X86_MCE=y | ||
| 168 | CONFIG_X86_MCE_INTEL=y | ||
| 169 | CONFIG_X86_MCE_AMD=y | ||
| 170 | # CONFIG_KEXEC is not set | ||
| 171 | # CONFIG_CRASH_DUMP is not set | ||
| 172 | # CONFIG_RELOCATABLE is not set | ||
| 173 | CONFIG_PHYSICAL_START=0x200000 | ||
| 174 | CONFIG_SECCOMP=y | 286 | CONFIG_SECCOMP=y |
| 175 | # CONFIG_CC_STACKPROTECTOR is not set | ||
| 176 | # CONFIG_HZ_100 is not set | 287 | # CONFIG_HZ_100 is not set |
| 177 | CONFIG_HZ_250=y | 288 | # CONFIG_HZ_250 is not set |
| 178 | # CONFIG_HZ_300 is not set | 289 | # CONFIG_HZ_300 is not set |
| 179 | # CONFIG_HZ_1000 is not set | 290 | CONFIG_HZ_1000=y |
| 180 | CONFIG_HZ=250 | 291 | CONFIG_HZ=1000 |
| 181 | CONFIG_K8_NB=y | 292 | CONFIG_SCHED_HRTICK=y |
| 182 | CONFIG_GENERIC_HARDIRQS=y | 293 | CONFIG_KEXEC=y |
| 183 | CONFIG_GENERIC_IRQ_PROBE=y | 294 | CONFIG_CRASH_DUMP=y |
| 184 | CONFIG_ISA_DMA_API=y | 295 | CONFIG_PHYSICAL_START=0x1000000 |
| 185 | CONFIG_GENERIC_PENDING_IRQ=y | 296 | CONFIG_RELOCATABLE=y |
| 297 | CONFIG_PHYSICAL_ALIGN=0x200000 | ||
| 298 | CONFIG_HOTPLUG_CPU=y | ||
| 299 | # CONFIG_COMPAT_VDSO is not set | ||
| 300 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | ||
| 301 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
| 186 | 302 | ||
| 187 | # | 303 | # |
| 188 | # Power management options | 304 | # Power management options |
| 189 | # | 305 | # |
| 306 | CONFIG_ARCH_HIBERNATION_HEADER=y | ||
| 190 | CONFIG_PM=y | 307 | CONFIG_PM=y |
| 191 | # CONFIG_PM_LEGACY is not set | 308 | CONFIG_PM_DEBUG=y |
| 192 | # CONFIG_PM_DEBUG is not set | 309 | # CONFIG_PM_VERBOSE is not set |
| 310 | CONFIG_CAN_PM_TRACE=y | ||
| 311 | CONFIG_PM_TRACE=y | ||
| 312 | CONFIG_PM_TRACE_RTC=y | ||
| 313 | CONFIG_PM_SLEEP_SMP=y | ||
| 314 | CONFIG_PM_SLEEP=y | ||
| 315 | CONFIG_SUSPEND=y | ||
| 316 | CONFIG_SUSPEND_FREEZER=y | ||
| 193 | CONFIG_HIBERNATION=y | 317 | CONFIG_HIBERNATION=y |
| 194 | CONFIG_PM_STD_PARTITION="" | 318 | CONFIG_PM_STD_PARTITION="" |
| 195 | |||
| 196 | # | ||
| 197 | # ACPI (Advanced Configuration and Power Interface) Support | ||
| 198 | # | ||
| 199 | CONFIG_ACPI=y | 319 | CONFIG_ACPI=y |
| 200 | CONFIG_ACPI_SLEEP=y | 320 | CONFIG_ACPI_SLEEP=y |
| 201 | CONFIG_ACPI_SLEEP_PROC_FS=y | ||
| 202 | CONFIG_ACPI_SLEEP_PROC_SLEEP=y | ||
| 203 | CONFIG_ACPI_PROCFS=y | 321 | CONFIG_ACPI_PROCFS=y |
| 322 | CONFIG_ACPI_PROCFS_POWER=y | ||
| 323 | CONFIG_ACPI_SYSFS_POWER=y | ||
| 324 | CONFIG_ACPI_PROC_EVENT=y | ||
| 204 | CONFIG_ACPI_AC=y | 325 | CONFIG_ACPI_AC=y |
| 205 | CONFIG_ACPI_BATTERY=y | 326 | CONFIG_ACPI_BATTERY=y |
| 206 | CONFIG_ACPI_BUTTON=y | 327 | CONFIG_ACPI_BUTTON=y |
| 207 | CONFIG_ACPI_FAN=y | 328 | CONFIG_ACPI_FAN=y |
| 208 | # CONFIG_ACPI_DOCK is not set | 329 | CONFIG_ACPI_DOCK=y |
| 330 | # CONFIG_ACPI_BAY is not set | ||
| 209 | CONFIG_ACPI_PROCESSOR=y | 331 | CONFIG_ACPI_PROCESSOR=y |
| 210 | CONFIG_ACPI_HOTPLUG_CPU=y | 332 | CONFIG_ACPI_HOTPLUG_CPU=y |
| 211 | CONFIG_ACPI_THERMAL=y | 333 | CONFIG_ACPI_THERMAL=y |
| 212 | CONFIG_ACPI_NUMA=y | 334 | CONFIG_ACPI_NUMA=y |
| 335 | # CONFIG_ACPI_WMI is not set | ||
| 213 | # CONFIG_ACPI_ASUS is not set | 336 | # CONFIG_ACPI_ASUS is not set |
| 214 | # CONFIG_ACPI_TOSHIBA is not set | 337 | # CONFIG_ACPI_TOSHIBA is not set |
| 338 | # CONFIG_ACPI_CUSTOM_DSDT is not set | ||
| 215 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 339 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
| 216 | # CONFIG_ACPI_DEBUG is not set | 340 | # CONFIG_ACPI_DEBUG is not set |
| 217 | CONFIG_ACPI_EC=y | 341 | CONFIG_ACPI_EC=y |
| @@ -227,29 +351,34 @@ CONFIG_ACPI_CONTAINER=y | |||
| 227 | CONFIG_CPU_FREQ=y | 351 | CONFIG_CPU_FREQ=y |
| 228 | CONFIG_CPU_FREQ_TABLE=y | 352 | CONFIG_CPU_FREQ_TABLE=y |
| 229 | CONFIG_CPU_FREQ_DEBUG=y | 353 | CONFIG_CPU_FREQ_DEBUG=y |
| 230 | CONFIG_CPU_FREQ_STAT=y | 354 | # CONFIG_CPU_FREQ_STAT is not set |
| 231 | # CONFIG_CPU_FREQ_STAT_DETAILS is not set | 355 | # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set |
| 232 | CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | 356 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set |
| 233 | # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | 357 | CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y |
| 358 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | ||
| 359 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | ||
| 234 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | 360 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y |
| 235 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set | 361 | # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set |
| 236 | CONFIG_CPU_FREQ_GOV_USERSPACE=y | 362 | CONFIG_CPU_FREQ_GOV_USERSPACE=y |
| 237 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y | 363 | CONFIG_CPU_FREQ_GOV_ONDEMAND=y |
| 238 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | 364 | # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set |
| 239 | 365 | ||
| 240 | # | 366 | # |
| 241 | # CPUFreq processor drivers | 367 | # CPUFreq processor drivers |
| 242 | # | 368 | # |
| 243 | CONFIG_X86_POWERNOW_K8=y | ||
| 244 | CONFIG_X86_POWERNOW_K8_ACPI=y | ||
| 245 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
| 246 | CONFIG_X86_ACPI_CPUFREQ=y | 369 | CONFIG_X86_ACPI_CPUFREQ=y |
| 370 | # CONFIG_X86_POWERNOW_K8 is not set | ||
| 371 | # CONFIG_X86_SPEEDSTEP_CENTRINO is not set | ||
| 372 | # CONFIG_X86_P4_CLOCKMOD is not set | ||
| 247 | 373 | ||
| 248 | # | 374 | # |
| 249 | # shared options | 375 | # shared options |
| 250 | # | 376 | # |
| 251 | CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | 377 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set |
| 252 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 378 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
| 379 | CONFIG_CPU_IDLE=y | ||
| 380 | CONFIG_CPU_IDLE_GOV_LADDER=y | ||
| 381 | CONFIG_CPU_IDLE_GOV_MENU=y | ||
| 253 | 382 | ||
| 254 | # | 383 | # |
| 255 | # Bus options (PCI etc.) | 384 | # Bus options (PCI etc.) |
| @@ -257,27 +386,56 @@ CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y | |||
| 257 | CONFIG_PCI=y | 386 | CONFIG_PCI=y |
| 258 | CONFIG_PCI_DIRECT=y | 387 | CONFIG_PCI_DIRECT=y |
| 259 | CONFIG_PCI_MMCONFIG=y | 388 | CONFIG_PCI_MMCONFIG=y |
| 389 | CONFIG_PCI_DOMAINS=y | ||
| 390 | CONFIG_DMAR=y | ||
| 391 | CONFIG_DMAR_GFX_WA=y | ||
| 392 | CONFIG_DMAR_FLOPPY_WA=y | ||
| 260 | CONFIG_PCIEPORTBUS=y | 393 | CONFIG_PCIEPORTBUS=y |
| 394 | # CONFIG_HOTPLUG_PCI_PCIE is not set | ||
| 261 | CONFIG_PCIEAER=y | 395 | CONFIG_PCIEAER=y |
| 396 | # CONFIG_PCIEASPM is not set | ||
| 262 | CONFIG_ARCH_SUPPORTS_MSI=y | 397 | CONFIG_ARCH_SUPPORTS_MSI=y |
| 263 | CONFIG_PCI_MSI=y | 398 | CONFIG_PCI_MSI=y |
| 399 | # CONFIG_PCI_LEGACY is not set | ||
| 264 | # CONFIG_PCI_DEBUG is not set | 400 | # CONFIG_PCI_DEBUG is not set |
| 265 | # CONFIG_HT_IRQ is not set | 401 | CONFIG_HT_IRQ=y |
| 266 | 402 | CONFIG_ISA_DMA_API=y | |
| 267 | # | 403 | CONFIG_K8_NB=y |
| 268 | # PCCARD (PCMCIA/CardBus) support | 404 | CONFIG_PCCARD=y |
| 269 | # | 405 | # CONFIG_PCMCIA_DEBUG is not set |
| 270 | # CONFIG_PCCARD is not set | 406 | CONFIG_PCMCIA=y |
| 271 | # CONFIG_HOTPLUG_PCI is not set | 407 | CONFIG_PCMCIA_LOAD_CIS=y |
| 408 | CONFIG_PCMCIA_IOCTL=y | ||
| 409 | CONFIG_CARDBUS=y | ||
| 410 | |||
| 411 | # | ||
| 412 | # PC-card bridges | ||
| 413 | # | ||
| 414 | CONFIG_YENTA=y | ||
| 415 | CONFIG_YENTA_O2=y | ||
| 416 | CONFIG_YENTA_RICOH=y | ||
| 417 | CONFIG_YENTA_TI=y | ||
| 418 | CONFIG_YENTA_ENE_TUNE=y | ||
| 419 | CONFIG_YENTA_TOSHIBA=y | ||
| 420 | # CONFIG_PD6729 is not set | ||
| 421 | # CONFIG_I82092 is not set | ||
| 422 | CONFIG_PCCARD_NONSTATIC=y | ||
| 423 | CONFIG_HOTPLUG_PCI=y | ||
| 424 | # CONFIG_HOTPLUG_PCI_FAKE is not set | ||
| 425 | # CONFIG_HOTPLUG_PCI_ACPI is not set | ||
| 426 | # CONFIG_HOTPLUG_PCI_CPCI is not set | ||
| 427 | # CONFIG_HOTPLUG_PCI_SHPC is not set | ||
| 272 | 428 | ||
| 273 | # | 429 | # |
| 274 | # Executable file formats / Emulations | 430 | # Executable file formats / Emulations |
| 275 | # | 431 | # |
| 276 | CONFIG_BINFMT_ELF=y | 432 | CONFIG_BINFMT_ELF=y |
| 277 | # CONFIG_BINFMT_MISC is not set | 433 | CONFIG_COMPAT_BINFMT_ELF=y |
| 434 | CONFIG_BINFMT_MISC=y | ||
| 278 | CONFIG_IA32_EMULATION=y | 435 | CONFIG_IA32_EMULATION=y |
| 279 | CONFIG_IA32_AOUT=y | 436 | # CONFIG_IA32_AOUT is not set |
| 280 | CONFIG_COMPAT=y | 437 | CONFIG_COMPAT=y |
| 438 | CONFIG_COMPAT_FOR_U64_ALIGNMENT=y | ||
| 281 | CONFIG_SYSVIPC_COMPAT=y | 439 | CONFIG_SYSVIPC_COMPAT=y |
| 282 | 440 | ||
| 283 | # | 441 | # |
| @@ -289,22 +447,31 @@ CONFIG_NET=y | |||
| 289 | # Networking options | 447 | # Networking options |
| 290 | # | 448 | # |
| 291 | CONFIG_PACKET=y | 449 | CONFIG_PACKET=y |
| 292 | # CONFIG_PACKET_MMAP is not set | 450 | CONFIG_PACKET_MMAP=y |
| 293 | CONFIG_UNIX=y | 451 | CONFIG_UNIX=y |
| 452 | CONFIG_XFRM=y | ||
| 453 | CONFIG_XFRM_USER=y | ||
| 454 | # CONFIG_XFRM_SUB_POLICY is not set | ||
| 455 | # CONFIG_XFRM_MIGRATE is not set | ||
| 456 | # CONFIG_XFRM_STATISTICS is not set | ||
| 294 | # CONFIG_NET_KEY is not set | 457 | # CONFIG_NET_KEY is not set |
| 295 | CONFIG_INET=y | 458 | CONFIG_INET=y |
| 296 | CONFIG_IP_MULTICAST=y | 459 | CONFIG_IP_MULTICAST=y |
| 297 | # CONFIG_IP_ADVANCED_ROUTER is not set | 460 | CONFIG_IP_ADVANCED_ROUTER=y |
| 461 | CONFIG_ASK_IP_FIB_HASH=y | ||
| 462 | # CONFIG_IP_FIB_TRIE is not set | ||
| 298 | CONFIG_IP_FIB_HASH=y | 463 | CONFIG_IP_FIB_HASH=y |
| 299 | CONFIG_IP_PNP=y | 464 | CONFIG_IP_MULTIPLE_TABLES=y |
| 300 | CONFIG_IP_PNP_DHCP=y | 465 | CONFIG_IP_ROUTE_MULTIPATH=y |
| 301 | # CONFIG_IP_PNP_BOOTP is not set | 466 | CONFIG_IP_ROUTE_VERBOSE=y |
| 302 | # CONFIG_IP_PNP_RARP is not set | 467 | # CONFIG_IP_PNP is not set |
| 303 | # CONFIG_NET_IPIP is not set | 468 | # CONFIG_NET_IPIP is not set |
| 304 | # CONFIG_NET_IPGRE is not set | 469 | # CONFIG_NET_IPGRE is not set |
| 305 | # CONFIG_IP_MROUTE is not set | 470 | CONFIG_IP_MROUTE=y |
| 471 | CONFIG_IP_PIMSM_V1=y | ||
| 472 | CONFIG_IP_PIMSM_V2=y | ||
| 306 | # CONFIG_ARPD is not set | 473 | # CONFIG_ARPD is not set |
| 307 | # CONFIG_SYN_COOKIES is not set | 474 | CONFIG_SYN_COOKIES=y |
| 308 | # CONFIG_INET_AH is not set | 475 | # CONFIG_INET_AH is not set |
| 309 | # CONFIG_INET_ESP is not set | 476 | # CONFIG_INET_ESP is not set |
| 310 | # CONFIG_INET_IPCOMP is not set | 477 | # CONFIG_INET_IPCOMP is not set |
| @@ -313,31 +480,109 @@ CONFIG_INET_TUNNEL=y | |||
| 313 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | 480 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
| 314 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | 481 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
| 315 | # CONFIG_INET_XFRM_MODE_BEET is not set | 482 | # CONFIG_INET_XFRM_MODE_BEET is not set |
| 316 | CONFIG_INET_DIAG=y | 483 | CONFIG_INET_LRO=y |
| 317 | CONFIG_INET_TCP_DIAG=y | 484 | # CONFIG_INET_DIAG is not set |
| 318 | # CONFIG_TCP_CONG_ADVANCED is not set | 485 | CONFIG_TCP_CONG_ADVANCED=y |
| 486 | # CONFIG_TCP_CONG_BIC is not set | ||
| 319 | CONFIG_TCP_CONG_CUBIC=y | 487 | CONFIG_TCP_CONG_CUBIC=y |
| 488 | # CONFIG_TCP_CONG_WESTWOOD is not set | ||
| 489 | # CONFIG_TCP_CONG_HTCP is not set | ||
| 490 | # CONFIG_TCP_CONG_HSTCP is not set | ||
| 491 | # CONFIG_TCP_CONG_HYBLA is not set | ||
| 492 | # CONFIG_TCP_CONG_VEGAS is not set | ||
| 493 | # CONFIG_TCP_CONG_SCALABLE is not set | ||
| 494 | # CONFIG_TCP_CONG_LP is not set | ||
| 495 | # CONFIG_TCP_CONG_VENO is not set | ||
| 496 | # CONFIG_TCP_CONG_YEAH is not set | ||
| 497 | # CONFIG_TCP_CONG_ILLINOIS is not set | ||
| 498 | # CONFIG_DEFAULT_BIC is not set | ||
| 499 | CONFIG_DEFAULT_CUBIC=y | ||
| 500 | # CONFIG_DEFAULT_HTCP is not set | ||
| 501 | # CONFIG_DEFAULT_VEGAS is not set | ||
| 502 | # CONFIG_DEFAULT_WESTWOOD is not set | ||
| 503 | # CONFIG_DEFAULT_RENO is not set | ||
| 320 | CONFIG_DEFAULT_TCP_CONG="cubic" | 504 | CONFIG_DEFAULT_TCP_CONG="cubic" |
| 321 | # CONFIG_TCP_MD5SIG is not set | 505 | CONFIG_TCP_MD5SIG=y |
| 506 | # CONFIG_IP_VS is not set | ||
| 322 | CONFIG_IPV6=y | 507 | CONFIG_IPV6=y |
| 323 | # CONFIG_IPV6_PRIVACY is not set | 508 | # CONFIG_IPV6_PRIVACY is not set |
| 324 | # CONFIG_IPV6_ROUTER_PREF is not set | 509 | # CONFIG_IPV6_ROUTER_PREF is not set |
| 325 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set | 510 | # CONFIG_IPV6_OPTIMISTIC_DAD is not set |
| 326 | # CONFIG_INET6_AH is not set | 511 | CONFIG_INET6_AH=y |
| 327 | # CONFIG_INET6_ESP is not set | 512 | CONFIG_INET6_ESP=y |
| 328 | # CONFIG_INET6_IPCOMP is not set | 513 | # CONFIG_INET6_IPCOMP is not set |
| 329 | # CONFIG_IPV6_MIP6 is not set | 514 | # CONFIG_IPV6_MIP6 is not set |
| 330 | # CONFIG_INET6_XFRM_TUNNEL is not set | 515 | # CONFIG_INET6_XFRM_TUNNEL is not set |
| 331 | # CONFIG_INET6_TUNNEL is not set | 516 | # CONFIG_INET6_TUNNEL is not set |
| 332 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set | 517 | CONFIG_INET6_XFRM_MODE_TRANSPORT=y |
| 333 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | 518 | CONFIG_INET6_XFRM_MODE_TUNNEL=y |
| 334 | # CONFIG_INET6_XFRM_MODE_BEET is not set | 519 | CONFIG_INET6_XFRM_MODE_BEET=y |
| 335 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set | 520 | # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set |
| 336 | CONFIG_IPV6_SIT=y | 521 | CONFIG_IPV6_SIT=y |
| 522 | CONFIG_IPV6_NDISC_NODETYPE=y | ||
| 337 | # CONFIG_IPV6_TUNNEL is not set | 523 | # CONFIG_IPV6_TUNNEL is not set |
| 338 | # CONFIG_IPV6_MULTIPLE_TABLES is not set | 524 | # CONFIG_IPV6_MULTIPLE_TABLES is not set |
| 339 | # CONFIG_NETWORK_SECMARK is not set | 525 | # CONFIG_IPV6_MROUTE is not set |
| 340 | # CONFIG_NETFILTER is not set | 526 | CONFIG_NETLABEL=y |
| 527 | CONFIG_NETWORK_SECMARK=y | ||
| 528 | CONFIG_NETFILTER=y | ||
| 529 | # CONFIG_NETFILTER_DEBUG is not set | ||
| 530 | # CONFIG_NETFILTER_ADVANCED is not set | ||
| 531 | |||
| 532 | # | ||
| 533 | # Core Netfilter Configuration | ||
| 534 | # | ||
| 535 | CONFIG_NETFILTER_NETLINK=y | ||
| 536 | CONFIG_NETFILTER_NETLINK_LOG=y | ||
| 537 | CONFIG_NF_CONNTRACK=y | ||
| 538 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
| 539 | CONFIG_NF_CONNTRACK_FTP=y | ||
| 540 | CONFIG_NF_CONNTRACK_IRC=y | ||
| 541 | CONFIG_NF_CONNTRACK_SIP=y | ||
| 542 | CONFIG_NF_CT_NETLINK=y | ||
| 543 | CONFIG_NETFILTER_XTABLES=y | ||
| 544 | CONFIG_NETFILTER_XT_TARGET_MARK=y | ||
| 545 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | ||
| 546 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | ||
| 547 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
| 548 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | ||
| 549 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | ||
| 550 | CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
| 551 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | ||
| 552 | CONFIG_NETFILTER_XT_MATCH_STATE=y | ||
| 553 | |||
| 554 | # | ||
| 555 | # IP: Netfilter Configuration | ||
| 556 | # | ||
| 557 | CONFIG_NF_CONNTRACK_IPV4=y | ||
| 558 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
| 559 | CONFIG_IP_NF_IPTABLES=y | ||
| 560 | CONFIG_IP_NF_FILTER=y | ||
| 561 | CONFIG_IP_NF_TARGET_REJECT=y | ||
| 562 | CONFIG_IP_NF_TARGET_LOG=y | ||
| 563 | CONFIG_IP_NF_TARGET_ULOG=y | ||
| 564 | CONFIG_NF_NAT=y | ||
| 565 | CONFIG_NF_NAT_NEEDED=y | ||
| 566 | CONFIG_IP_NF_TARGET_MASQUERADE=y | ||
| 567 | CONFIG_NF_NAT_FTP=y | ||
| 568 | CONFIG_NF_NAT_IRC=y | ||
| 569 | # CONFIG_NF_NAT_TFTP is not set | ||
| 570 | # CONFIG_NF_NAT_AMANDA is not set | ||
| 571 | # CONFIG_NF_NAT_PPTP is not set | ||
| 572 | # CONFIG_NF_NAT_H323 is not set | ||
| 573 | CONFIG_NF_NAT_SIP=y | ||
| 574 | CONFIG_IP_NF_MANGLE=y | ||
| 575 | |||
| 576 | # | ||
| 577 | # IPv6: Netfilter Configuration | ||
| 578 | # | ||
| 579 | CONFIG_NF_CONNTRACK_IPV6=y | ||
| 580 | CONFIG_IP6_NF_IPTABLES=y | ||
| 581 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | ||
| 582 | CONFIG_IP6_NF_FILTER=y | ||
| 583 | CONFIG_IP6_NF_TARGET_LOG=y | ||
| 584 | CONFIG_IP6_NF_TARGET_REJECT=y | ||
| 585 | CONFIG_IP6_NF_MANGLE=y | ||
| 341 | # CONFIG_IP_DCCP is not set | 586 | # CONFIG_IP_DCCP is not set |
| 342 | # CONFIG_IP_SCTP is not set | 587 | # CONFIG_IP_SCTP is not set |
| 343 | # CONFIG_TIPC is not set | 588 | # CONFIG_TIPC is not set |
| @@ -345,6 +590,7 @@ CONFIG_IPV6_SIT=y | |||
| 345 | # CONFIG_BRIDGE is not set | 590 | # CONFIG_BRIDGE is not set |
| 346 | # CONFIG_VLAN_8021Q is not set | 591 | # CONFIG_VLAN_8021Q is not set |
| 347 | # CONFIG_DECNET is not set | 592 | # CONFIG_DECNET is not set |
| 593 | CONFIG_LLC=y | ||
| 348 | # CONFIG_LLC2 is not set | 594 | # CONFIG_LLC2 is not set |
| 349 | # CONFIG_IPX is not set | 595 | # CONFIG_IPX is not set |
| 350 | # CONFIG_ATALK is not set | 596 | # CONFIG_ATALK is not set |
| @@ -352,28 +598,99 @@ CONFIG_IPV6_SIT=y | |||
| 352 | # CONFIG_LAPB is not set | 598 | # CONFIG_LAPB is not set |
| 353 | # CONFIG_ECONET is not set | 599 | # CONFIG_ECONET is not set |
| 354 | # CONFIG_WAN_ROUTER is not set | 600 | # CONFIG_WAN_ROUTER is not set |
| 355 | 601 | CONFIG_NET_SCHED=y | |
| 356 | # | 602 | |
| 357 | # QoS and/or fair queueing | 603 | # |
| 358 | # | 604 | # Queueing/Scheduling |
| 359 | # CONFIG_NET_SCHED is not set | 605 | # |
| 606 | # CONFIG_NET_SCH_CBQ is not set | ||
| 607 | # CONFIG_NET_SCH_HTB is not set | ||
| 608 | # CONFIG_NET_SCH_HFSC is not set | ||
| 609 | # CONFIG_NET_SCH_PRIO is not set | ||
| 610 | # CONFIG_NET_SCH_RR is not set | ||
| 611 | # CONFIG_NET_SCH_RED is not set | ||
| 612 | # CONFIG_NET_SCH_SFQ is not set | ||
| 613 | # CONFIG_NET_SCH_TEQL is not set | ||
| 614 | # CONFIG_NET_SCH_TBF is not set | ||
| 615 | # CONFIG_NET_SCH_GRED is not set | ||
| 616 | # CONFIG_NET_SCH_DSMARK is not set | ||
| 617 | # CONFIG_NET_SCH_NETEM is not set | ||
| 618 | # CONFIG_NET_SCH_INGRESS is not set | ||
| 619 | |||
| 620 | # | ||
| 621 | # Classification | ||
| 622 | # | ||
| 623 | CONFIG_NET_CLS=y | ||
| 624 | # CONFIG_NET_CLS_BASIC is not set | ||
| 625 | # CONFIG_NET_CLS_TCINDEX is not set | ||
| 626 | # CONFIG_NET_CLS_ROUTE4 is not set | ||
| 627 | # CONFIG_NET_CLS_FW is not set | ||
| 628 | # CONFIG_NET_CLS_U32 is not set | ||
| 629 | # CONFIG_NET_CLS_RSVP is not set | ||
| 630 | # CONFIG_NET_CLS_RSVP6 is not set | ||
| 631 | # CONFIG_NET_CLS_FLOW is not set | ||
| 632 | CONFIG_NET_EMATCH=y | ||
| 633 | CONFIG_NET_EMATCH_STACK=32 | ||
| 634 | # CONFIG_NET_EMATCH_CMP is not set | ||
| 635 | # CONFIG_NET_EMATCH_NBYTE is not set | ||
| 636 | # CONFIG_NET_EMATCH_U32 is not set | ||
| 637 | # CONFIG_NET_EMATCH_META is not set | ||
| 638 | # CONFIG_NET_EMATCH_TEXT is not set | ||
| 639 | CONFIG_NET_CLS_ACT=y | ||
| 640 | # CONFIG_NET_ACT_POLICE is not set | ||
| 641 | # CONFIG_NET_ACT_GACT is not set | ||
| 642 | # CONFIG_NET_ACT_MIRRED is not set | ||
| 643 | # CONFIG_NET_ACT_IPT is not set | ||
| 644 | # CONFIG_NET_ACT_NAT is not set | ||
| 645 | # CONFIG_NET_ACT_PEDIT is not set | ||
| 646 | # CONFIG_NET_ACT_SIMP is not set | ||
| 647 | CONFIG_NET_SCH_FIFO=y | ||
| 360 | 648 | ||
| 361 | # | 649 | # |
| 362 | # Network testing | 650 | # Network testing |
| 363 | # | 651 | # |
| 364 | # CONFIG_NET_PKTGEN is not set | 652 | # CONFIG_NET_PKTGEN is not set |
| 365 | # CONFIG_NET_TCPPROBE is not set | 653 | # CONFIG_NET_TCPPROBE is not set |
| 366 | # CONFIG_HAMRADIO is not set | 654 | CONFIG_HAMRADIO=y |
| 655 | |||
| 656 | # | ||
| 657 | # Packet Radio protocols | ||
| 658 | # | ||
| 659 | # CONFIG_AX25 is not set | ||
| 660 | # CONFIG_CAN is not set | ||
| 367 | # CONFIG_IRDA is not set | 661 | # CONFIG_IRDA is not set |
| 368 | # CONFIG_BT is not set | 662 | # CONFIG_BT is not set |
| 369 | # CONFIG_AF_RXRPC is not set | 663 | # CONFIG_AF_RXRPC is not set |
| 664 | CONFIG_FIB_RULES=y | ||
| 370 | 665 | ||
| 371 | # | 666 | # |
| 372 | # Wireless | 667 | # Wireless |
| 373 | # | 668 | # |
| 374 | # CONFIG_CFG80211 is not set | 669 | CONFIG_CFG80211=y |
| 375 | # CONFIG_WIRELESS_EXT is not set | 670 | CONFIG_NL80211=y |
| 376 | # CONFIG_MAC80211 is not set | 671 | CONFIG_WIRELESS_EXT=y |
| 672 | CONFIG_MAC80211=y | ||
| 673 | |||
| 674 | # | ||
| 675 | # Rate control algorithm selection | ||
| 676 | # | ||
| 677 | CONFIG_MAC80211_RC_DEFAULT_PID=y | ||
| 678 | # CONFIG_MAC80211_RC_DEFAULT_NONE is not set | ||
| 679 | |||
| 680 | # | ||
| 681 | # Selecting 'y' for an algorithm will | ||
| 682 | # | ||
| 683 | |||
| 684 | # | ||
| 685 | # build the algorithm into mac80211. | ||
| 686 | # | ||
| 687 | CONFIG_MAC80211_RC_DEFAULT="pid" | ||
| 688 | CONFIG_MAC80211_RC_PID=y | ||
| 689 | # CONFIG_MAC80211_MESH is not set | ||
| 690 | CONFIG_MAC80211_LEDS=y | ||
| 691 | # CONFIG_MAC80211_DEBUGFS is not set | ||
| 692 | # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set | ||
| 693 | # CONFIG_MAC80211_DEBUG is not set | ||
| 377 | # CONFIG_IEEE80211 is not set | 694 | # CONFIG_IEEE80211 is not set |
| 378 | # CONFIG_RFKILL is not set | 695 | # CONFIG_RFKILL is not set |
| 379 | # CONFIG_NET_9P is not set | 696 | # CONFIG_NET_9P is not set |
| @@ -385,13 +702,15 @@ CONFIG_IPV6_SIT=y | |||
| 385 | # | 702 | # |
| 386 | # Generic Driver Options | 703 | # Generic Driver Options |
| 387 | # | 704 | # |
| 705 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| 388 | CONFIG_STANDALONE=y | 706 | CONFIG_STANDALONE=y |
| 389 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 707 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
| 390 | CONFIG_FW_LOADER=y | 708 | CONFIG_FW_LOADER=y |
| 391 | # CONFIG_DEBUG_DRIVER is not set | 709 | # CONFIG_DEBUG_DRIVER is not set |
| 392 | # CONFIG_DEBUG_DEVRES is not set | 710 | CONFIG_DEBUG_DEVRES=y |
| 393 | # CONFIG_SYS_HYPERVISOR is not set | 711 | # CONFIG_SYS_HYPERVISOR is not set |
| 394 | # CONFIG_CONNECTOR is not set | 712 | CONFIG_CONNECTOR=y |
| 713 | CONFIG_PROC_EVENTS=y | ||
| 395 | # CONFIG_MTD is not set | 714 | # CONFIG_MTD is not set |
| 396 | # CONFIG_PARPORT is not set | 715 | # CONFIG_PARPORT is not set |
| 397 | CONFIG_PNP=y | 716 | CONFIG_PNP=y |
| @@ -402,7 +721,7 @@ CONFIG_PNP=y | |||
| 402 | # | 721 | # |
| 403 | CONFIG_PNPACPI=y | 722 | CONFIG_PNPACPI=y |
| 404 | CONFIG_BLK_DEV=y | 723 | CONFIG_BLK_DEV=y |
| 405 | CONFIG_BLK_DEV_FD=y | 724 | # CONFIG_BLK_DEV_FD is not set |
| 406 | # CONFIG_BLK_CPQ_DA is not set | 725 | # CONFIG_BLK_CPQ_DA is not set |
| 407 | # CONFIG_BLK_CPQ_CISS_DA is not set | 726 | # CONFIG_BLK_CPQ_CISS_DA is not set |
| 408 | # CONFIG_BLK_DEV_DAC960 is not set | 727 | # CONFIG_BLK_DEV_DAC960 is not set |
| @@ -415,8 +734,8 @@ CONFIG_BLK_DEV_LOOP=y | |||
| 415 | # CONFIG_BLK_DEV_UB is not set | 734 | # CONFIG_BLK_DEV_UB is not set |
| 416 | CONFIG_BLK_DEV_RAM=y | 735 | CONFIG_BLK_DEV_RAM=y |
| 417 | CONFIG_BLK_DEV_RAM_COUNT=16 | 736 | CONFIG_BLK_DEV_RAM_COUNT=16 |
| 418 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 737 | CONFIG_BLK_DEV_RAM_SIZE=16384 |
| 419 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 738 | # CONFIG_BLK_DEV_XIP is not set |
| 420 | # CONFIG_CDROM_PKTCDVD is not set | 739 | # CONFIG_CDROM_PKTCDVD is not set |
| 421 | # CONFIG_ATA_OVER_ETH is not set | 740 | # CONFIG_ATA_OVER_ETH is not set |
| 422 | CONFIG_MISC_DEVICES=y | 741 | CONFIG_MISC_DEVICES=y |
| @@ -425,72 +744,16 @@ CONFIG_MISC_DEVICES=y | |||
| 425 | # CONFIG_EEPROM_93CX6 is not set | 744 | # CONFIG_EEPROM_93CX6 is not set |
| 426 | # CONFIG_SGI_IOC4 is not set | 745 | # CONFIG_SGI_IOC4 is not set |
| 427 | # CONFIG_TIFM_CORE is not set | 746 | # CONFIG_TIFM_CORE is not set |
| 747 | # CONFIG_ACER_WMI is not set | ||
| 748 | # CONFIG_ASUS_LAPTOP is not set | ||
| 749 | # CONFIG_FUJITSU_LAPTOP is not set | ||
| 750 | # CONFIG_MSI_LAPTOP is not set | ||
| 428 | # CONFIG_SONY_LAPTOP is not set | 751 | # CONFIG_SONY_LAPTOP is not set |
| 429 | # CONFIG_THINKPAD_ACPI is not set | 752 | # CONFIG_THINKPAD_ACPI is not set |
| 430 | CONFIG_IDE=y | 753 | # CONFIG_INTEL_MENLOW is not set |
| 431 | CONFIG_BLK_DEV_IDE=y | 754 | # CONFIG_ENCLOSURE_SERVICES is not set |
| 432 | 755 | CONFIG_HAVE_IDE=y | |
| 433 | # | 756 | # CONFIG_IDE is not set |
| 434 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
| 435 | # | ||
| 436 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
| 437 | # CONFIG_BLK_DEV_HD_IDE is not set | ||
| 438 | CONFIG_BLK_DEV_IDEDISK=y | ||
| 439 | CONFIG_IDEDISK_MULTI_MODE=y | ||
| 440 | CONFIG_BLK_DEV_IDECD=y | ||
| 441 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
| 442 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
| 443 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
| 444 | CONFIG_BLK_DEV_IDEACPI=y | ||
| 445 | # CONFIG_IDE_TASK_IOCTL is not set | ||
| 446 | CONFIG_IDE_PROC_FS=y | ||
| 447 | |||
| 448 | # | ||
| 449 | # IDE chipset support/bugfixes | ||
| 450 | # | ||
| 451 | CONFIG_IDE_GENERIC=y | ||
| 452 | # CONFIG_BLK_DEV_CMD640 is not set | ||
| 453 | # CONFIG_BLK_DEV_IDEPNP is not set | ||
| 454 | CONFIG_BLK_DEV_IDEPCI=y | ||
| 455 | # CONFIG_IDEPCI_SHARE_IRQ is not set | ||
| 456 | CONFIG_IDEPCI_PCIBUS_ORDER=y | ||
| 457 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
| 458 | # CONFIG_BLK_DEV_GENERIC is not set | ||
| 459 | # CONFIG_BLK_DEV_OPTI621 is not set | ||
| 460 | # CONFIG_BLK_DEV_RZ1000 is not set | ||
| 461 | CONFIG_BLK_DEV_IDEDMA_PCI=y | ||
| 462 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
| 463 | # CONFIG_IDEDMA_ONLYDISK is not set | ||
| 464 | # CONFIG_BLK_DEV_AEC62XX is not set | ||
| 465 | # CONFIG_BLK_DEV_ALI15X3 is not set | ||
| 466 | CONFIG_BLK_DEV_AMD74XX=y | ||
| 467 | CONFIG_BLK_DEV_ATIIXP=y | ||
| 468 | # CONFIG_BLK_DEV_CMD64X is not set | ||
| 469 | # CONFIG_BLK_DEV_TRIFLEX is not set | ||
| 470 | # CONFIG_BLK_DEV_CY82C693 is not set | ||
| 471 | # CONFIG_BLK_DEV_CS5520 is not set | ||
| 472 | # CONFIG_BLK_DEV_CS5530 is not set | ||
| 473 | # CONFIG_BLK_DEV_HPT34X is not set | ||
| 474 | # CONFIG_BLK_DEV_HPT366 is not set | ||
| 475 | # CONFIG_BLK_DEV_JMICRON is not set | ||
| 476 | # CONFIG_BLK_DEV_SC1200 is not set | ||
| 477 | CONFIG_BLK_DEV_PIIX=y | ||
| 478 | # CONFIG_BLK_DEV_IT8213 is not set | ||
| 479 | # CONFIG_BLK_DEV_IT821X is not set | ||
| 480 | # CONFIG_BLK_DEV_NS87415 is not set | ||
| 481 | # CONFIG_BLK_DEV_PDC202XX_OLD is not set | ||
| 482 | CONFIG_BLK_DEV_PDC202XX_NEW=y | ||
| 483 | # CONFIG_BLK_DEV_SVWKS is not set | ||
| 484 | # CONFIG_BLK_DEV_SIIMAGE is not set | ||
| 485 | # CONFIG_BLK_DEV_SIS5513 is not set | ||
| 486 | # CONFIG_BLK_DEV_SLC90E66 is not set | ||
| 487 | # CONFIG_BLK_DEV_TRM290 is not set | ||
| 488 | # CONFIG_BLK_DEV_VIA82CXXX is not set | ||
| 489 | # CONFIG_BLK_DEV_TC86C001 is not set | ||
| 490 | # CONFIG_IDE_ARM is not set | ||
| 491 | CONFIG_BLK_DEV_IDEDMA=y | ||
| 492 | # CONFIG_IDEDMA_IVB is not set | ||
| 493 | # CONFIG_BLK_DEV_HD is not set | ||
| 494 | 757 | ||
| 495 | # | 758 | # |
| 496 | # SCSI device support | 759 | # SCSI device support |
| @@ -499,8 +762,8 @@ CONFIG_BLK_DEV_IDEDMA=y | |||
| 499 | CONFIG_SCSI=y | 762 | CONFIG_SCSI=y |
| 500 | CONFIG_SCSI_DMA=y | 763 | CONFIG_SCSI_DMA=y |
| 501 | # CONFIG_SCSI_TGT is not set | 764 | # CONFIG_SCSI_TGT is not set |
| 502 | CONFIG_SCSI_NETLINK=y | 765 | # CONFIG_SCSI_NETLINK is not set |
| 503 | # CONFIG_SCSI_PROC_FS is not set | 766 | CONFIG_SCSI_PROC_FS=y |
| 504 | 767 | ||
| 505 | # | 768 | # |
| 506 | # SCSI support type (disk, tape, CD-ROM) | 769 | # SCSI support type (disk, tape, CD-ROM) |
| @@ -509,7 +772,7 @@ CONFIG_BLK_DEV_SD=y | |||
| 509 | # CONFIG_CHR_DEV_ST is not set | 772 | # CONFIG_CHR_DEV_ST is not set |
| 510 | # CONFIG_CHR_DEV_OSST is not set | 773 | # CONFIG_CHR_DEV_OSST is not set |
| 511 | CONFIG_BLK_DEV_SR=y | 774 | CONFIG_BLK_DEV_SR=y |
| 512 | # CONFIG_BLK_DEV_SR_VENDOR is not set | 775 | CONFIG_BLK_DEV_SR_VENDOR=y |
| 513 | CONFIG_CHR_DEV_SG=y | 776 | CONFIG_CHR_DEV_SG=y |
| 514 | # CONFIG_CHR_DEV_SCH is not set | 777 | # CONFIG_CHR_DEV_SCH is not set |
| 515 | 778 | ||
| @@ -526,73 +789,37 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
| 526 | # SCSI Transports | 789 | # SCSI Transports |
| 527 | # | 790 | # |
| 528 | CONFIG_SCSI_SPI_ATTRS=y | 791 | CONFIG_SCSI_SPI_ATTRS=y |
| 529 | CONFIG_SCSI_FC_ATTRS=y | 792 | # CONFIG_SCSI_FC_ATTRS is not set |
| 530 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 793 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
| 531 | CONFIG_SCSI_SAS_ATTRS=y | 794 | # CONFIG_SCSI_SAS_ATTRS is not set |
| 532 | # CONFIG_SCSI_SAS_LIBSAS is not set | 795 | # CONFIG_SCSI_SAS_LIBSAS is not set |
| 533 | 796 | # CONFIG_SCSI_SRP_ATTRS is not set | |
| 534 | # | 797 | # CONFIG_SCSI_LOWLEVEL is not set |
| 535 | # SCSI low-level drivers | 798 | # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set |
| 536 | # | ||
| 537 | # CONFIG_ISCSI_TCP is not set | ||
| 538 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
| 539 | # CONFIG_SCSI_3W_9XXX is not set | ||
| 540 | # CONFIG_SCSI_ACARD is not set | ||
| 541 | # CONFIG_SCSI_AACRAID is not set | ||
| 542 | # CONFIG_SCSI_AIC7XXX is not set | ||
| 543 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
| 544 | CONFIG_SCSI_AIC79XX=y | ||
| 545 | CONFIG_AIC79XX_CMDS_PER_DEVICE=32 | ||
| 546 | CONFIG_AIC79XX_RESET_DELAY_MS=4000 | ||
| 547 | # CONFIG_AIC79XX_DEBUG_ENABLE is not set | ||
| 548 | CONFIG_AIC79XX_DEBUG_MASK=0 | ||
| 549 | # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set | ||
| 550 | # CONFIG_SCSI_AIC94XX is not set | ||
| 551 | # CONFIG_SCSI_ARCMSR is not set | ||
| 552 | # CONFIG_MEGARAID_NEWGEN is not set | ||
| 553 | # CONFIG_MEGARAID_LEGACY is not set | ||
| 554 | # CONFIG_MEGARAID_SAS is not set | ||
| 555 | # CONFIG_SCSI_HPTIOP is not set | ||
| 556 | # CONFIG_SCSI_BUSLOGIC is not set | ||
| 557 | # CONFIG_SCSI_DMX3191D is not set | ||
| 558 | # CONFIG_SCSI_EATA is not set | ||
| 559 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
| 560 | # CONFIG_SCSI_GDTH is not set | ||
| 561 | # CONFIG_SCSI_IPS is not set | ||
| 562 | # CONFIG_SCSI_INITIO is not set | ||
| 563 | # CONFIG_SCSI_INIA100 is not set | ||
| 564 | # CONFIG_SCSI_STEX is not set | ||
| 565 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
| 566 | # CONFIG_SCSI_IPR is not set | ||
| 567 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
| 568 | # CONFIG_SCSI_QLA_FC is not set | ||
| 569 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
| 570 | # CONFIG_SCSI_LPFC is not set | ||
| 571 | # CONFIG_SCSI_DC395x is not set | ||
| 572 | # CONFIG_SCSI_DC390T is not set | ||
| 573 | # CONFIG_SCSI_DEBUG is not set | ||
| 574 | # CONFIG_SCSI_SRP is not set | ||
| 575 | CONFIG_ATA=y | 799 | CONFIG_ATA=y |
| 576 | # CONFIG_ATA_NONSTANDARD is not set | 800 | # CONFIG_ATA_NONSTANDARD is not set |
| 577 | CONFIG_ATA_ACPI=y | 801 | CONFIG_ATA_ACPI=y |
| 802 | CONFIG_SATA_PMP=y | ||
| 578 | CONFIG_SATA_AHCI=y | 803 | CONFIG_SATA_AHCI=y |
| 579 | CONFIG_SATA_SVW=y | 804 | # CONFIG_SATA_SIL24 is not set |
| 805 | CONFIG_ATA_SFF=y | ||
| 806 | # CONFIG_SATA_SVW is not set | ||
| 580 | CONFIG_ATA_PIIX=y | 807 | CONFIG_ATA_PIIX=y |
| 581 | # CONFIG_SATA_MV is not set | 808 | # CONFIG_SATA_MV is not set |
| 582 | CONFIG_SATA_NV=y | 809 | # CONFIG_SATA_NV is not set |
| 583 | # CONFIG_PDC_ADMA is not set | 810 | # CONFIG_PDC_ADMA is not set |
| 584 | # CONFIG_SATA_QSTOR is not set | 811 | # CONFIG_SATA_QSTOR is not set |
| 585 | # CONFIG_SATA_PROMISE is not set | 812 | # CONFIG_SATA_PROMISE is not set |
| 586 | # CONFIG_SATA_SX4 is not set | 813 | # CONFIG_SATA_SX4 is not set |
| 587 | CONFIG_SATA_SIL=y | 814 | # CONFIG_SATA_SIL is not set |
| 588 | # CONFIG_SATA_SIL24 is not set | ||
| 589 | # CONFIG_SATA_SIS is not set | 815 | # CONFIG_SATA_SIS is not set |
| 590 | # CONFIG_SATA_ULI is not set | 816 | # CONFIG_SATA_ULI is not set |
| 591 | CONFIG_SATA_VIA=y | 817 | # CONFIG_SATA_VIA is not set |
| 592 | # CONFIG_SATA_VITESSE is not set | 818 | # CONFIG_SATA_VITESSE is not set |
| 593 | # CONFIG_SATA_INIC162X is not set | 819 | # CONFIG_SATA_INIC162X is not set |
| 820 | # CONFIG_PATA_ACPI is not set | ||
| 594 | # CONFIG_PATA_ALI is not set | 821 | # CONFIG_PATA_ALI is not set |
| 595 | # CONFIG_PATA_AMD is not set | 822 | CONFIG_PATA_AMD=y |
| 596 | # CONFIG_PATA_ARTOP is not set | 823 | # CONFIG_PATA_ARTOP is not set |
| 597 | # CONFIG_PATA_ATIIXP is not set | 824 | # CONFIG_PATA_ATIIXP is not set |
| 598 | # CONFIG_PATA_CMD640_PCI is not set | 825 | # CONFIG_PATA_CMD640_PCI is not set |
| @@ -612,11 +839,14 @@ CONFIG_SATA_VIA=y | |||
| 612 | # CONFIG_PATA_TRIFLEX is not set | 839 | # CONFIG_PATA_TRIFLEX is not set |
| 613 | # CONFIG_PATA_MARVELL is not set | 840 | # CONFIG_PATA_MARVELL is not set |
| 614 | # CONFIG_PATA_MPIIX is not set | 841 | # CONFIG_PATA_MPIIX is not set |
| 615 | # CONFIG_PATA_OLDPIIX is not set | 842 | CONFIG_PATA_OLDPIIX=y |
| 616 | # CONFIG_PATA_NETCELL is not set | 843 | # CONFIG_PATA_NETCELL is not set |
| 844 | # CONFIG_PATA_NINJA32 is not set | ||
| 617 | # CONFIG_PATA_NS87410 is not set | 845 | # CONFIG_PATA_NS87410 is not set |
| 846 | # CONFIG_PATA_NS87415 is not set | ||
| 618 | # CONFIG_PATA_OPTI is not set | 847 | # CONFIG_PATA_OPTI is not set |
| 619 | # CONFIG_PATA_OPTIDMA is not set | 848 | # CONFIG_PATA_OPTIDMA is not set |
| 849 | # CONFIG_PATA_PCMCIA is not set | ||
| 620 | # CONFIG_PATA_PDC_OLD is not set | 850 | # CONFIG_PATA_PDC_OLD is not set |
| 621 | # CONFIG_PATA_RADISYS is not set | 851 | # CONFIG_PATA_RADISYS is not set |
| 622 | # CONFIG_PATA_RZ1000 is not set | 852 | # CONFIG_PATA_RZ1000 is not set |
| @@ -628,65 +858,42 @@ CONFIG_SATA_VIA=y | |||
| 628 | # CONFIG_PATA_VIA is not set | 858 | # CONFIG_PATA_VIA is not set |
| 629 | # CONFIG_PATA_WINBOND is not set | 859 | # CONFIG_PATA_WINBOND is not set |
| 630 | CONFIG_MD=y | 860 | CONFIG_MD=y |
| 631 | # CONFIG_BLK_DEV_MD is not set | 861 | CONFIG_BLK_DEV_MD=y |
| 862 | # CONFIG_MD_LINEAR is not set | ||
| 863 | # CONFIG_MD_RAID0 is not set | ||
| 864 | # CONFIG_MD_RAID1 is not set | ||
| 865 | # CONFIG_MD_RAID10 is not set | ||
| 866 | # CONFIG_MD_RAID456 is not set | ||
| 867 | # CONFIG_MD_MULTIPATH is not set | ||
| 868 | # CONFIG_MD_FAULTY is not set | ||
| 632 | CONFIG_BLK_DEV_DM=y | 869 | CONFIG_BLK_DEV_DM=y |
| 633 | # CONFIG_DM_DEBUG is not set | 870 | # CONFIG_DM_DEBUG is not set |
| 634 | # CONFIG_DM_CRYPT is not set | 871 | # CONFIG_DM_CRYPT is not set |
| 635 | # CONFIG_DM_SNAPSHOT is not set | 872 | # CONFIG_DM_SNAPSHOT is not set |
| 636 | # CONFIG_DM_MIRROR is not set | 873 | CONFIG_DM_MIRROR=y |
| 637 | # CONFIG_DM_ZERO is not set | 874 | CONFIG_DM_ZERO=y |
| 638 | # CONFIG_DM_MULTIPATH is not set | 875 | # CONFIG_DM_MULTIPATH is not set |
| 639 | # CONFIG_DM_DELAY is not set | 876 | # CONFIG_DM_DELAY is not set |
| 640 | 877 | # CONFIG_DM_UEVENT is not set | |
| 641 | # | 878 | # CONFIG_FUSION is not set |
| 642 | # Fusion MPT device support | ||
| 643 | # | ||
| 644 | CONFIG_FUSION=y | ||
| 645 | CONFIG_FUSION_SPI=y | ||
| 646 | # CONFIG_FUSION_FC is not set | ||
| 647 | # CONFIG_FUSION_SAS is not set | ||
| 648 | CONFIG_FUSION_MAX_SGE=128 | ||
| 649 | # CONFIG_FUSION_CTL is not set | ||
| 650 | 879 | ||
| 651 | # | 880 | # |
| 652 | # IEEE 1394 (FireWire) support | 881 | # IEEE 1394 (FireWire) support |
| 653 | # | 882 | # |
| 654 | # CONFIG_FIREWIRE is not set | 883 | # CONFIG_FIREWIRE is not set |
| 655 | CONFIG_IEEE1394=y | 884 | # CONFIG_IEEE1394 is not set |
| 656 | |||
| 657 | # | ||
| 658 | # Subsystem Options | ||
| 659 | # | ||
| 660 | # CONFIG_IEEE1394_VERBOSEDEBUG is not set | ||
| 661 | |||
| 662 | # | ||
| 663 | # Controllers | ||
| 664 | # | ||
| 665 | |||
| 666 | # | ||
| 667 | # Texas Instruments PCILynx requires I2C | ||
| 668 | # | ||
| 669 | CONFIG_IEEE1394_OHCI1394=y | ||
| 670 | |||
| 671 | # | ||
| 672 | # Protocols | ||
| 673 | # | ||
| 674 | # CONFIG_IEEE1394_VIDEO1394 is not set | ||
| 675 | # CONFIG_IEEE1394_SBP2 is not set | ||
| 676 | # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set | ||
| 677 | # CONFIG_IEEE1394_ETH1394 is not set | ||
| 678 | # CONFIG_IEEE1394_DV1394 is not set | ||
| 679 | CONFIG_IEEE1394_RAWIO=y | ||
| 680 | # CONFIG_I2O is not set | 885 | # CONFIG_I2O is not set |
| 681 | CONFIG_MACINTOSH_DRIVERS=y | 886 | CONFIG_MACINTOSH_DRIVERS=y |
| 682 | # CONFIG_MAC_EMUMOUSEBTN is not set | 887 | CONFIG_MAC_EMUMOUSEBTN=y |
| 683 | CONFIG_NETDEVICES=y | 888 | CONFIG_NETDEVICES=y |
| 684 | CONFIG_NETDEVICES_MULTIQUEUE=y | 889 | # CONFIG_NETDEVICES_MULTIQUEUE is not set |
| 890 | # CONFIG_IFB is not set | ||
| 685 | # CONFIG_DUMMY is not set | 891 | # CONFIG_DUMMY is not set |
| 686 | # CONFIG_BONDING is not set | 892 | # CONFIG_BONDING is not set |
| 687 | # CONFIG_MACVLAN is not set | 893 | # CONFIG_MACVLAN is not set |
| 688 | # CONFIG_EQUALIZER is not set | 894 | # CONFIG_EQUALIZER is not set |
| 689 | CONFIG_TUN=y | 895 | # CONFIG_TUN is not set |
| 896 | # CONFIG_VETH is not set | ||
| 690 | # CONFIG_NET_SB1000 is not set | 897 | # CONFIG_NET_SB1000 is not set |
| 691 | # CONFIG_ARCNET is not set | 898 | # CONFIG_ARCNET is not set |
| 692 | # CONFIG_PHYLIB is not set | 899 | # CONFIG_PHYLIB is not set |
| @@ -696,39 +903,40 @@ CONFIG_MII=y | |||
| 696 | # CONFIG_SUNGEM is not set | 903 | # CONFIG_SUNGEM is not set |
| 697 | # CONFIG_CASSINI is not set | 904 | # CONFIG_CASSINI is not set |
| 698 | CONFIG_NET_VENDOR_3COM=y | 905 | CONFIG_NET_VENDOR_3COM=y |
| 699 | CONFIG_VORTEX=y | 906 | # CONFIG_VORTEX is not set |
| 700 | # CONFIG_TYPHOON is not set | 907 | # CONFIG_TYPHOON is not set |
| 701 | CONFIG_NET_TULIP=y | 908 | CONFIG_NET_TULIP=y |
| 702 | # CONFIG_DE2104X is not set | 909 | # CONFIG_DE2104X is not set |
| 703 | CONFIG_TULIP=y | 910 | # CONFIG_TULIP is not set |
| 704 | # CONFIG_TULIP_MWI is not set | ||
| 705 | # CONFIG_TULIP_MMIO is not set | ||
| 706 | # CONFIG_TULIP_NAPI is not set | ||
| 707 | # CONFIG_DE4X5 is not set | 911 | # CONFIG_DE4X5 is not set |
| 708 | # CONFIG_WINBOND_840 is not set | 912 | # CONFIG_WINBOND_840 is not set |
| 709 | # CONFIG_DM9102 is not set | 913 | # CONFIG_DM9102 is not set |
| 710 | # CONFIG_ULI526X is not set | 914 | # CONFIG_ULI526X is not set |
| 915 | # CONFIG_PCMCIA_XIRCOM is not set | ||
| 711 | # CONFIG_HP100 is not set | 916 | # CONFIG_HP100 is not set |
| 917 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
| 918 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
| 919 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
| 920 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
| 712 | CONFIG_NET_PCI=y | 921 | CONFIG_NET_PCI=y |
| 713 | # CONFIG_PCNET32 is not set | 922 | # CONFIG_PCNET32 is not set |
| 714 | CONFIG_AMD8111_ETH=y | 923 | # CONFIG_AMD8111_ETH is not set |
| 715 | # CONFIG_AMD8111E_NAPI is not set | ||
| 716 | # CONFIG_ADAPTEC_STARFIRE is not set | 924 | # CONFIG_ADAPTEC_STARFIRE is not set |
| 717 | CONFIG_B44=y | 925 | # CONFIG_B44 is not set |
| 718 | CONFIG_FORCEDETH=y | 926 | CONFIG_FORCEDETH=y |
| 719 | # CONFIG_FORCEDETH_NAPI is not set | 927 | # CONFIG_FORCEDETH_NAPI is not set |
| 720 | # CONFIG_DGRS is not set | ||
| 721 | # CONFIG_EEPRO100 is not set | 928 | # CONFIG_EEPRO100 is not set |
| 722 | CONFIG_E100=y | 929 | CONFIG_E100=y |
| 723 | # CONFIG_FEALNX is not set | 930 | # CONFIG_FEALNX is not set |
| 724 | # CONFIG_NATSEMI is not set | 931 | # CONFIG_NATSEMI is not set |
| 725 | # CONFIG_NE2K_PCI is not set | 932 | # CONFIG_NE2K_PCI is not set |
| 726 | CONFIG_8139CP=y | 933 | # CONFIG_8139CP is not set |
| 727 | CONFIG_8139TOO=y | 934 | CONFIG_8139TOO=y |
| 728 | # CONFIG_8139TOO_PIO is not set | 935 | CONFIG_8139TOO_PIO=y |
| 729 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 936 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
| 730 | # CONFIG_8139TOO_8129 is not set | 937 | # CONFIG_8139TOO_8129 is not set |
| 731 | # CONFIG_8139_OLD_RX_RESET is not set | 938 | # CONFIG_8139_OLD_RX_RESET is not set |
| 939 | # CONFIG_R6040 is not set | ||
| 732 | # CONFIG_SIS900 is not set | 940 | # CONFIG_SIS900 is not set |
| 733 | # CONFIG_EPIC100 is not set | 941 | # CONFIG_EPIC100 is not set |
| 734 | # CONFIG_SUNDANCE is not set | 942 | # CONFIG_SUNDANCE is not set |
| @@ -740,34 +948,74 @@ CONFIG_NETDEV_1000=y | |||
| 740 | CONFIG_E1000=y | 948 | CONFIG_E1000=y |
| 741 | # CONFIG_E1000_NAPI is not set | 949 | # CONFIG_E1000_NAPI is not set |
| 742 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | 950 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set |
| 951 | # CONFIG_E1000E is not set | ||
| 952 | # CONFIG_E1000E_ENABLED is not set | ||
| 953 | # CONFIG_IP1000 is not set | ||
| 954 | # CONFIG_IGB is not set | ||
| 743 | # CONFIG_NS83820 is not set | 955 | # CONFIG_NS83820 is not set |
| 744 | # CONFIG_HAMACHI is not set | 956 | # CONFIG_HAMACHI is not set |
| 745 | # CONFIG_YELLOWFIN is not set | 957 | # CONFIG_YELLOWFIN is not set |
| 746 | # CONFIG_R8169 is not set | 958 | # CONFIG_R8169 is not set |
| 747 | # CONFIG_SIS190 is not set | 959 | # CONFIG_SIS190 is not set |
| 748 | # CONFIG_SKGE is not set | 960 | # CONFIG_SKGE is not set |
| 749 | # CONFIG_SKY2 is not set | 961 | CONFIG_SKY2=y |
| 962 | # CONFIG_SKY2_DEBUG is not set | ||
| 750 | # CONFIG_VIA_VELOCITY is not set | 963 | # CONFIG_VIA_VELOCITY is not set |
| 751 | CONFIG_TIGON3=y | 964 | CONFIG_TIGON3=y |
| 752 | CONFIG_BNX2=y | 965 | # CONFIG_BNX2 is not set |
| 753 | # CONFIG_QLA3XXX is not set | 966 | # CONFIG_QLA3XXX is not set |
| 754 | # CONFIG_ATL1 is not set | 967 | # CONFIG_ATL1 is not set |
| 755 | CONFIG_NETDEV_10000=y | 968 | CONFIG_NETDEV_10000=y |
| 756 | # CONFIG_CHELSIO_T1 is not set | 969 | # CONFIG_CHELSIO_T1 is not set |
| 757 | # CONFIG_CHELSIO_T3 is not set | 970 | # CONFIG_CHELSIO_T3 is not set |
| 971 | # CONFIG_IXGBE is not set | ||
| 758 | # CONFIG_IXGB is not set | 972 | # CONFIG_IXGB is not set |
| 759 | CONFIG_S2IO=m | 973 | # CONFIG_S2IO is not set |
| 760 | # CONFIG_S2IO_NAPI is not set | ||
| 761 | # CONFIG_MYRI10GE is not set | 974 | # CONFIG_MYRI10GE is not set |
| 762 | # CONFIG_NETXEN_NIC is not set | 975 | # CONFIG_NETXEN_NIC is not set |
| 976 | # CONFIG_NIU is not set | ||
| 763 | # CONFIG_MLX4_CORE is not set | 977 | # CONFIG_MLX4_CORE is not set |
| 764 | # CONFIG_TR is not set | 978 | # CONFIG_TEHUTI is not set |
| 979 | # CONFIG_BNX2X is not set | ||
| 980 | # CONFIG_SFC is not set | ||
| 981 | CONFIG_TR=y | ||
| 982 | # CONFIG_IBMOL is not set | ||
| 983 | # CONFIG_3C359 is not set | ||
| 984 | # CONFIG_TMS380TR is not set | ||
| 765 | 985 | ||
| 766 | # | 986 | # |
| 767 | # Wireless LAN | 987 | # Wireless LAN |
| 768 | # | 988 | # |
| 769 | # CONFIG_WLAN_PRE80211 is not set | 989 | # CONFIG_WLAN_PRE80211 is not set |
| 770 | # CONFIG_WLAN_80211 is not set | 990 | CONFIG_WLAN_80211=y |
| 991 | # CONFIG_PCMCIA_RAYCS is not set | ||
| 992 | # CONFIG_IPW2100 is not set | ||
| 993 | # CONFIG_IPW2200 is not set | ||
| 994 | # CONFIG_LIBERTAS is not set | ||
| 995 | # CONFIG_AIRO is not set | ||
| 996 | # CONFIG_HERMES is not set | ||
| 997 | # CONFIG_ATMEL is not set | ||
| 998 | # CONFIG_AIRO_CS is not set | ||
| 999 | # CONFIG_PCMCIA_WL3501 is not set | ||
| 1000 | # CONFIG_PRISM54 is not set | ||
| 1001 | # CONFIG_USB_ZD1201 is not set | ||
| 1002 | # CONFIG_USB_NET_RNDIS_WLAN is not set | ||
| 1003 | # CONFIG_RTL8180 is not set | ||
| 1004 | # CONFIG_RTL8187 is not set | ||
| 1005 | # CONFIG_ADM8211 is not set | ||
| 1006 | # CONFIG_P54_COMMON is not set | ||
| 1007 | CONFIG_ATH5K=y | ||
| 1008 | # CONFIG_ATH5K_DEBUG is not set | ||
| 1009 | # CONFIG_IWLWIFI is not set | ||
| 1010 | # CONFIG_IWLCORE is not set | ||
| 1011 | # CONFIG_IWLWIFI_LEDS is not set | ||
| 1012 | # CONFIG_IWL4965 is not set | ||
| 1013 | # CONFIG_IWL3945 is not set | ||
| 1014 | # CONFIG_HOSTAP is not set | ||
| 1015 | # CONFIG_B43 is not set | ||
| 1016 | # CONFIG_B43LEGACY is not set | ||
| 1017 | # CONFIG_ZD1211RW is not set | ||
| 1018 | # CONFIG_RT2X00 is not set | ||
| 771 | 1019 | ||
| 772 | # | 1020 | # |
| 773 | # USB Network Adapters | 1021 | # USB Network Adapters |
| @@ -776,16 +1024,26 @@ CONFIG_S2IO=m | |||
| 776 | # CONFIG_USB_KAWETH is not set | 1024 | # CONFIG_USB_KAWETH is not set |
| 777 | # CONFIG_USB_PEGASUS is not set | 1025 | # CONFIG_USB_PEGASUS is not set |
| 778 | # CONFIG_USB_RTL8150 is not set | 1026 | # CONFIG_USB_RTL8150 is not set |
| 779 | # CONFIG_USB_USBNET_MII is not set | ||
| 780 | # CONFIG_USB_USBNET is not set | 1027 | # CONFIG_USB_USBNET is not set |
| 1028 | CONFIG_NET_PCMCIA=y | ||
| 1029 | # CONFIG_PCMCIA_3C589 is not set | ||
| 1030 | # CONFIG_PCMCIA_3C574 is not set | ||
| 1031 | # CONFIG_PCMCIA_FMVJ18X is not set | ||
| 1032 | # CONFIG_PCMCIA_PCNET is not set | ||
| 1033 | # CONFIG_PCMCIA_NMCLAN is not set | ||
| 1034 | # CONFIG_PCMCIA_SMC91C92 is not set | ||
| 1035 | # CONFIG_PCMCIA_XIRC2PS is not set | ||
| 1036 | # CONFIG_PCMCIA_AXNET is not set | ||
| 781 | # CONFIG_WAN is not set | 1037 | # CONFIG_WAN is not set |
| 782 | # CONFIG_FDDI is not set | 1038 | CONFIG_FDDI=y |
| 1039 | # CONFIG_DEFXX is not set | ||
| 1040 | # CONFIG_SKFP is not set | ||
| 783 | # CONFIG_HIPPI is not set | 1041 | # CONFIG_HIPPI is not set |
| 784 | # CONFIG_PPP is not set | 1042 | # CONFIG_PPP is not set |
| 785 | # CONFIG_SLIP is not set | 1043 | # CONFIG_SLIP is not set |
| 786 | # CONFIG_NET_FC is not set | 1044 | # CONFIG_NET_FC is not set |
| 787 | # CONFIG_SHAPER is not set | ||
| 788 | CONFIG_NETCONSOLE=y | 1045 | CONFIG_NETCONSOLE=y |
| 1046 | # CONFIG_NETCONSOLE_DYNAMIC is not set | ||
| 789 | CONFIG_NETPOLL=y | 1047 | CONFIG_NETPOLL=y |
| 790 | # CONFIG_NETPOLL_TRAP is not set | 1048 | # CONFIG_NETPOLL_TRAP is not set |
| 791 | CONFIG_NET_POLL_CONTROLLER=y | 1049 | CONFIG_NET_POLL_CONTROLLER=y |
| @@ -796,18 +1054,17 @@ CONFIG_NET_POLL_CONTROLLER=y | |||
| 796 | # Input device support | 1054 | # Input device support |
| 797 | # | 1055 | # |
| 798 | CONFIG_INPUT=y | 1056 | CONFIG_INPUT=y |
| 799 | # CONFIG_INPUT_FF_MEMLESS is not set | 1057 | CONFIG_INPUT_FF_MEMLESS=y |
| 800 | # CONFIG_INPUT_POLLDEV is not set | 1058 | CONFIG_INPUT_POLLDEV=y |
| 801 | 1059 | ||
| 802 | # | 1060 | # |
| 803 | # Userland interfaces | 1061 | # Userland interfaces |
| 804 | # | 1062 | # |
| 805 | CONFIG_INPUT_MOUSEDEV=y | 1063 | CONFIG_INPUT_MOUSEDEV=y |
| 806 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | 1064 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
| 807 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | 1065 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 |
| 808 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | 1066 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 |
| 809 | # CONFIG_INPUT_JOYDEV is not set | 1067 | # CONFIG_INPUT_JOYDEV is not set |
| 810 | # CONFIG_INPUT_TSDEV is not set | ||
| 811 | CONFIG_INPUT_EVDEV=y | 1068 | CONFIG_INPUT_EVDEV=y |
| 812 | # CONFIG_INPUT_EVBUG is not set | 1069 | # CONFIG_INPUT_EVBUG is not set |
| 813 | 1070 | ||
| @@ -832,17 +1089,62 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y | |||
| 832 | # CONFIG_MOUSE_SERIAL is not set | 1089 | # CONFIG_MOUSE_SERIAL is not set |
| 833 | # CONFIG_MOUSE_APPLETOUCH is not set | 1090 | # CONFIG_MOUSE_APPLETOUCH is not set |
| 834 | # CONFIG_MOUSE_VSXXXAA is not set | 1091 | # CONFIG_MOUSE_VSXXXAA is not set |
| 835 | # CONFIG_INPUT_JOYSTICK is not set | 1092 | CONFIG_INPUT_JOYSTICK=y |
| 836 | # CONFIG_INPUT_TABLET is not set | 1093 | # CONFIG_JOYSTICK_ANALOG is not set |
| 837 | # CONFIG_INPUT_TOUCHSCREEN is not set | 1094 | # CONFIG_JOYSTICK_A3D is not set |
| 838 | # CONFIG_INPUT_MISC is not set | 1095 | # CONFIG_JOYSTICK_ADI is not set |
| 1096 | # CONFIG_JOYSTICK_COBRA is not set | ||
| 1097 | # CONFIG_JOYSTICK_GF2K is not set | ||
| 1098 | # CONFIG_JOYSTICK_GRIP is not set | ||
| 1099 | # CONFIG_JOYSTICK_GRIP_MP is not set | ||
| 1100 | # CONFIG_JOYSTICK_GUILLEMOT is not set | ||
| 1101 | # CONFIG_JOYSTICK_INTERACT is not set | ||
| 1102 | # CONFIG_JOYSTICK_SIDEWINDER is not set | ||
| 1103 | # CONFIG_JOYSTICK_TMDC is not set | ||
| 1104 | # CONFIG_JOYSTICK_IFORCE is not set | ||
| 1105 | # CONFIG_JOYSTICK_WARRIOR is not set | ||
| 1106 | # CONFIG_JOYSTICK_MAGELLAN is not set | ||
| 1107 | # CONFIG_JOYSTICK_SPACEORB is not set | ||
| 1108 | # CONFIG_JOYSTICK_SPACEBALL is not set | ||
| 1109 | # CONFIG_JOYSTICK_STINGER is not set | ||
| 1110 | # CONFIG_JOYSTICK_TWIDJOY is not set | ||
| 1111 | # CONFIG_JOYSTICK_ZHENHUA is not set | ||
| 1112 | # CONFIG_JOYSTICK_JOYDUMP is not set | ||
| 1113 | # CONFIG_JOYSTICK_XPAD is not set | ||
| 1114 | CONFIG_INPUT_TABLET=y | ||
| 1115 | # CONFIG_TABLET_USB_ACECAD is not set | ||
| 1116 | # CONFIG_TABLET_USB_AIPTEK is not set | ||
| 1117 | # CONFIG_TABLET_USB_GTCO is not set | ||
| 1118 | # CONFIG_TABLET_USB_KBTAB is not set | ||
| 1119 | # CONFIG_TABLET_USB_WACOM is not set | ||
| 1120 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 1121 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | ||
| 1122 | # CONFIG_TOUCHSCREEN_GUNZE is not set | ||
| 1123 | # CONFIG_TOUCHSCREEN_ELO is not set | ||
| 1124 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | ||
| 1125 | # CONFIG_TOUCHSCREEN_MK712 is not set | ||
| 1126 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | ||
| 1127 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | ||
| 1128 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | ||
| 1129 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
| 1130 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | ||
| 1131 | CONFIG_INPUT_MISC=y | ||
| 1132 | # CONFIG_INPUT_PCSPKR is not set | ||
| 1133 | # CONFIG_INPUT_APANEL is not set | ||
| 1134 | # CONFIG_INPUT_ATLAS_BTNS is not set | ||
| 1135 | # CONFIG_INPUT_ATI_REMOTE is not set | ||
| 1136 | # CONFIG_INPUT_ATI_REMOTE2 is not set | ||
| 1137 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | ||
| 1138 | # CONFIG_INPUT_POWERMATE is not set | ||
| 1139 | # CONFIG_INPUT_YEALINK is not set | ||
| 1140 | # CONFIG_INPUT_UINPUT is not set | ||
| 839 | 1141 | ||
| 840 | # | 1142 | # |
| 841 | # Hardware I/O ports | 1143 | # Hardware I/O ports |
| 842 | # | 1144 | # |
| 843 | CONFIG_SERIO=y | 1145 | CONFIG_SERIO=y |
| 844 | CONFIG_SERIO_I8042=y | 1146 | CONFIG_SERIO_I8042=y |
| 845 | # CONFIG_SERIO_SERPORT is not set | 1147 | CONFIG_SERIO_SERPORT=y |
| 846 | # CONFIG_SERIO_CT82C710 is not set | 1148 | # CONFIG_SERIO_CT82C710 is not set |
| 847 | # CONFIG_SERIO_PCIPS2 is not set | 1149 | # CONFIG_SERIO_PCIPS2 is not set |
| 848 | CONFIG_SERIO_LIBPS2=y | 1150 | CONFIG_SERIO_LIBPS2=y |
| @@ -855,8 +1157,26 @@ CONFIG_SERIO_LIBPS2=y | |||
| 855 | CONFIG_VT=y | 1157 | CONFIG_VT=y |
| 856 | CONFIG_VT_CONSOLE=y | 1158 | CONFIG_VT_CONSOLE=y |
| 857 | CONFIG_HW_CONSOLE=y | 1159 | CONFIG_HW_CONSOLE=y |
| 858 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 1160 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 859 | # CONFIG_SERIAL_NONSTANDARD is not set | 1161 | CONFIG_DEVKMEM=y |
| 1162 | CONFIG_SERIAL_NONSTANDARD=y | ||
| 1163 | # CONFIG_COMPUTONE is not set | ||
| 1164 | # CONFIG_ROCKETPORT is not set | ||
| 1165 | # CONFIG_CYCLADES is not set | ||
| 1166 | # CONFIG_DIGIEPCA is not set | ||
| 1167 | # CONFIG_MOXA_INTELLIO is not set | ||
| 1168 | # CONFIG_MOXA_SMARTIO is not set | ||
| 1169 | # CONFIG_ISI is not set | ||
| 1170 | # CONFIG_SYNCLINK is not set | ||
| 1171 | # CONFIG_SYNCLINKMP is not set | ||
| 1172 | # CONFIG_SYNCLINK_GT is not set | ||
| 1173 | # CONFIG_N_HDLC is not set | ||
| 1174 | # CONFIG_RISCOM8 is not set | ||
| 1175 | # CONFIG_SPECIALIX is not set | ||
| 1176 | # CONFIG_SX is not set | ||
| 1177 | # CONFIG_RIO is not set | ||
| 1178 | # CONFIG_STALDRV is not set | ||
| 1179 | # CONFIG_NOZOMI is not set | ||
| 860 | 1180 | ||
| 861 | # | 1181 | # |
| 862 | # Serial drivers | 1182 | # Serial drivers |
| @@ -866,9 +1186,14 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
| 866 | CONFIG_FIX_EARLYCON_MEM=y | 1186 | CONFIG_FIX_EARLYCON_MEM=y |
| 867 | CONFIG_SERIAL_8250_PCI=y | 1187 | CONFIG_SERIAL_8250_PCI=y |
| 868 | CONFIG_SERIAL_8250_PNP=y | 1188 | CONFIG_SERIAL_8250_PNP=y |
| 869 | CONFIG_SERIAL_8250_NR_UARTS=4 | 1189 | # CONFIG_SERIAL_8250_CS is not set |
| 1190 | CONFIG_SERIAL_8250_NR_UARTS=32 | ||
| 870 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | 1191 | CONFIG_SERIAL_8250_RUNTIME_UARTS=4 |
| 871 | # CONFIG_SERIAL_8250_EXTENDED is not set | 1192 | CONFIG_SERIAL_8250_EXTENDED=y |
| 1193 | CONFIG_SERIAL_8250_MANY_PORTS=y | ||
| 1194 | CONFIG_SERIAL_8250_SHARE_IRQ=y | ||
| 1195 | CONFIG_SERIAL_8250_DETECT_IRQ=y | ||
| 1196 | CONFIG_SERIAL_8250_RSA=y | ||
| 872 | 1197 | ||
| 873 | # | 1198 | # |
| 874 | # Non-8250 serial port support | 1199 | # Non-8250 serial port support |
| @@ -877,78 +1202,260 @@ CONFIG_SERIAL_CORE=y | |||
| 877 | CONFIG_SERIAL_CORE_CONSOLE=y | 1202 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 878 | # CONFIG_SERIAL_JSM is not set | 1203 | # CONFIG_SERIAL_JSM is not set |
| 879 | CONFIG_UNIX98_PTYS=y | 1204 | CONFIG_UNIX98_PTYS=y |
| 880 | CONFIG_LEGACY_PTYS=y | 1205 | # CONFIG_LEGACY_PTYS is not set |
| 881 | CONFIG_LEGACY_PTY_COUNT=256 | ||
| 882 | # CONFIG_IPMI_HANDLER is not set | 1206 | # CONFIG_IPMI_HANDLER is not set |
| 883 | # CONFIG_WATCHDOG is not set | ||
| 884 | CONFIG_HW_RANDOM=y | 1207 | CONFIG_HW_RANDOM=y |
| 885 | CONFIG_HW_RANDOM_INTEL=y | 1208 | # CONFIG_HW_RANDOM_INTEL is not set |
| 886 | CONFIG_HW_RANDOM_AMD=y | 1209 | # CONFIG_HW_RANDOM_AMD is not set |
| 887 | # CONFIG_NVRAM is not set | 1210 | CONFIG_NVRAM=y |
| 888 | CONFIG_RTC=y | ||
| 889 | # CONFIG_R3964 is not set | 1211 | # CONFIG_R3964 is not set |
| 890 | # CONFIG_APPLICOM is not set | 1212 | # CONFIG_APPLICOM is not set |
| 891 | CONFIG_AGP=y | 1213 | |
| 892 | CONFIG_AGP_AMD64=y | 1214 | # |
| 893 | CONFIG_AGP_INTEL=y | 1215 | # PCMCIA character devices |
| 894 | # CONFIG_AGP_SIS is not set | 1216 | # |
| 895 | # CONFIG_AGP_VIA is not set | 1217 | # CONFIG_SYNCLINK_CS is not set |
| 896 | # CONFIG_DRM is not set | 1218 | # CONFIG_CARDMAN_4000 is not set |
| 1219 | # CONFIG_CARDMAN_4040 is not set | ||
| 1220 | # CONFIG_IPWIRELESS is not set | ||
| 897 | # CONFIG_MWAVE is not set | 1221 | # CONFIG_MWAVE is not set |
| 898 | # CONFIG_PC8736x_GPIO is not set | 1222 | # CONFIG_PC8736x_GPIO is not set |
| 899 | CONFIG_RAW_DRIVER=y | 1223 | # CONFIG_RAW_DRIVER is not set |
| 900 | CONFIG_MAX_RAW_DEVS=256 | ||
| 901 | CONFIG_HPET=y | 1224 | CONFIG_HPET=y |
| 902 | # CONFIG_HPET_RTC_IRQ is not set | 1225 | # CONFIG_HPET_RTC_IRQ is not set |
| 903 | CONFIG_HPET_MMAP=y | 1226 | # CONFIG_HPET_MMAP is not set |
| 904 | # CONFIG_HANGCHECK_TIMER is not set | 1227 | # CONFIG_HANGCHECK_TIMER is not set |
| 905 | # CONFIG_TCG_TPM is not set | 1228 | # CONFIG_TCG_TPM is not set |
| 906 | # CONFIG_TELCLOCK is not set | 1229 | # CONFIG_TELCLOCK is not set |
| 907 | CONFIG_DEVPORT=y | 1230 | CONFIG_DEVPORT=y |
| 908 | # CONFIG_I2C is not set | 1231 | CONFIG_I2C=y |
| 909 | 1232 | CONFIG_I2C_BOARDINFO=y | |
| 910 | # | 1233 | # CONFIG_I2C_CHARDEV is not set |
| 911 | # SPI support | 1234 | |
| 912 | # | 1235 | # |
| 1236 | # I2C Hardware Bus support | ||
| 1237 | # | ||
| 1238 | # CONFIG_I2C_ALI1535 is not set | ||
| 1239 | # CONFIG_I2C_ALI1563 is not set | ||
| 1240 | # CONFIG_I2C_ALI15X3 is not set | ||
| 1241 | # CONFIG_I2C_AMD756 is not set | ||
| 1242 | # CONFIG_I2C_AMD8111 is not set | ||
| 1243 | CONFIG_I2C_I801=y | ||
| 1244 | # CONFIG_I2C_I810 is not set | ||
| 1245 | # CONFIG_I2C_PIIX4 is not set | ||
| 1246 | # CONFIG_I2C_NFORCE2 is not set | ||
| 1247 | # CONFIG_I2C_OCORES is not set | ||
| 1248 | # CONFIG_I2C_PARPORT_LIGHT is not set | ||
| 1249 | # CONFIG_I2C_PROSAVAGE is not set | ||
| 1250 | # CONFIG_I2C_SAVAGE4 is not set | ||
| 1251 | # CONFIG_I2C_SIMTEC is not set | ||
| 1252 | # CONFIG_I2C_SIS5595 is not set | ||
| 1253 | # CONFIG_I2C_SIS630 is not set | ||
| 1254 | # CONFIG_I2C_SIS96X is not set | ||
| 1255 | # CONFIG_I2C_TAOS_EVM is not set | ||
| 1256 | # CONFIG_I2C_STUB is not set | ||
| 1257 | # CONFIG_I2C_TINY_USB is not set | ||
| 1258 | # CONFIG_I2C_VIA is not set | ||
| 1259 | # CONFIG_I2C_VIAPRO is not set | ||
| 1260 | # CONFIG_I2C_VOODOO3 is not set | ||
| 1261 | # CONFIG_I2C_PCA_PLATFORM is not set | ||
| 1262 | |||
| 1263 | # | ||
| 1264 | # Miscellaneous I2C Chip support | ||
| 1265 | # | ||
| 1266 | # CONFIG_DS1682 is not set | ||
| 1267 | # CONFIG_SENSORS_EEPROM is not set | ||
| 1268 | # CONFIG_SENSORS_PCF8574 is not set | ||
| 1269 | # CONFIG_PCF8575 is not set | ||
| 1270 | # CONFIG_SENSORS_PCF8591 is not set | ||
| 1271 | # CONFIG_SENSORS_MAX6875 is not set | ||
| 1272 | # CONFIG_SENSORS_TSL2550 is not set | ||
| 1273 | # CONFIG_I2C_DEBUG_CORE is not set | ||
| 1274 | # CONFIG_I2C_DEBUG_ALGO is not set | ||
| 1275 | # CONFIG_I2C_DEBUG_BUS is not set | ||
| 1276 | # CONFIG_I2C_DEBUG_CHIP is not set | ||
| 913 | # CONFIG_SPI is not set | 1277 | # CONFIG_SPI is not set |
| 914 | # CONFIG_SPI_MASTER is not set | ||
| 915 | # CONFIG_W1 is not set | 1278 | # CONFIG_W1 is not set |
| 916 | # CONFIG_POWER_SUPPLY is not set | 1279 | CONFIG_POWER_SUPPLY=y |
| 1280 | # CONFIG_POWER_SUPPLY_DEBUG is not set | ||
| 1281 | # CONFIG_PDA_POWER is not set | ||
| 1282 | # CONFIG_BATTERY_DS2760 is not set | ||
| 917 | # CONFIG_HWMON is not set | 1283 | # CONFIG_HWMON is not set |
| 1284 | CONFIG_THERMAL=y | ||
| 1285 | CONFIG_WATCHDOG=y | ||
| 1286 | # CONFIG_WATCHDOG_NOWAYOUT is not set | ||
| 1287 | |||
| 1288 | # | ||
| 1289 | # Watchdog Device Drivers | ||
| 1290 | # | ||
| 1291 | # CONFIG_SOFT_WATCHDOG is not set | ||
| 1292 | # CONFIG_ACQUIRE_WDT is not set | ||
| 1293 | # CONFIG_ADVANTECH_WDT is not set | ||
| 1294 | # CONFIG_ALIM1535_WDT is not set | ||
| 1295 | # CONFIG_ALIM7101_WDT is not set | ||
| 1296 | # CONFIG_SC520_WDT is not set | ||
| 1297 | # CONFIG_EUROTECH_WDT is not set | ||
| 1298 | # CONFIG_IB700_WDT is not set | ||
| 1299 | # CONFIG_IBMASR is not set | ||
| 1300 | # CONFIG_WAFER_WDT is not set | ||
| 1301 | # CONFIG_I6300ESB_WDT is not set | ||
| 1302 | # CONFIG_ITCO_WDT is not set | ||
| 1303 | # CONFIG_IT8712F_WDT is not set | ||
| 1304 | # CONFIG_HP_WATCHDOG is not set | ||
| 1305 | # CONFIG_SC1200_WDT is not set | ||
| 1306 | # CONFIG_PC87413_WDT is not set | ||
| 1307 | # CONFIG_60XX_WDT is not set | ||
| 1308 | # CONFIG_SBC8360_WDT is not set | ||
| 1309 | # CONFIG_CPU5_WDT is not set | ||
| 1310 | # CONFIG_SMSC37B787_WDT is not set | ||
| 1311 | # CONFIG_W83627HF_WDT is not set | ||
| 1312 | # CONFIG_W83697HF_WDT is not set | ||
| 1313 | # CONFIG_W83877F_WDT is not set | ||
| 1314 | # CONFIG_W83977F_WDT is not set | ||
| 1315 | # CONFIG_MACHZ_WDT is not set | ||
| 1316 | # CONFIG_SBC_EPX_C3_WATCHDOG is not set | ||
| 1317 | |||
| 1318 | # | ||
| 1319 | # PCI-based Watchdog Cards | ||
| 1320 | # | ||
| 1321 | # CONFIG_PCIPCWATCHDOG is not set | ||
| 1322 | # CONFIG_WDTPCI is not set | ||
| 1323 | |||
| 1324 | # | ||
| 1325 | # USB-based Watchdog Cards | ||
| 1326 | # | ||
| 1327 | # CONFIG_USBPCWATCHDOG is not set | ||
| 1328 | |||
| 1329 | # | ||
| 1330 | # Sonics Silicon Backplane | ||
| 1331 | # | ||
| 1332 | CONFIG_SSB_POSSIBLE=y | ||
| 1333 | # CONFIG_SSB is not set | ||
| 918 | 1334 | ||
| 919 | # | 1335 | # |
| 920 | # Multifunction device drivers | 1336 | # Multifunction device drivers |
| 921 | # | 1337 | # |
| 922 | # CONFIG_MFD_SM501 is not set | 1338 | # CONFIG_MFD_SM501 is not set |
| 1339 | # CONFIG_HTC_PASIC3 is not set | ||
| 923 | 1340 | ||
| 924 | # | 1341 | # |
| 925 | # Multimedia devices | 1342 | # Multimedia devices |
| 926 | # | 1343 | # |
| 1344 | |||
| 1345 | # | ||
| 1346 | # Multimedia core support | ||
| 1347 | # | ||
| 927 | # CONFIG_VIDEO_DEV is not set | 1348 | # CONFIG_VIDEO_DEV is not set |
| 928 | # CONFIG_DVB_CORE is not set | 1349 | # CONFIG_DVB_CORE is not set |
| 1350 | |||
| 1351 | # | ||
| 1352 | # Multimedia drivers | ||
| 1353 | # | ||
| 929 | CONFIG_DAB=y | 1354 | CONFIG_DAB=y |
| 930 | # CONFIG_USB_DABUSB is not set | 1355 | # CONFIG_USB_DABUSB is not set |
| 931 | 1356 | ||
| 932 | # | 1357 | # |
| 933 | # Graphics support | 1358 | # Graphics support |
| 934 | # | 1359 | # |
| 935 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1360 | CONFIG_AGP=y |
| 1361 | CONFIG_AGP_AMD64=y | ||
| 1362 | CONFIG_AGP_INTEL=y | ||
| 1363 | # CONFIG_AGP_SIS is not set | ||
| 1364 | # CONFIG_AGP_VIA is not set | ||
| 1365 | CONFIG_DRM=y | ||
| 1366 | # CONFIG_DRM_TDFX is not set | ||
| 1367 | # CONFIG_DRM_R128 is not set | ||
| 1368 | # CONFIG_DRM_RADEON is not set | ||
| 1369 | # CONFIG_DRM_I810 is not set | ||
| 1370 | # CONFIG_DRM_I830 is not set | ||
| 1371 | CONFIG_DRM_I915=y | ||
| 1372 | # CONFIG_DRM_MGA is not set | ||
| 1373 | # CONFIG_DRM_SIS is not set | ||
| 1374 | # CONFIG_DRM_VIA is not set | ||
| 1375 | # CONFIG_DRM_SAVAGE is not set | ||
| 1376 | # CONFIG_VGASTATE is not set | ||
| 1377 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
| 1378 | CONFIG_FB=y | ||
| 1379 | # CONFIG_FIRMWARE_EDID is not set | ||
| 1380 | # CONFIG_FB_DDC is not set | ||
| 1381 | CONFIG_FB_CFB_FILLRECT=y | ||
| 1382 | CONFIG_FB_CFB_COPYAREA=y | ||
| 1383 | CONFIG_FB_CFB_IMAGEBLIT=y | ||
| 1384 | # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set | ||
| 1385 | # CONFIG_FB_SYS_FILLRECT is not set | ||
| 1386 | # CONFIG_FB_SYS_COPYAREA is not set | ||
| 1387 | # CONFIG_FB_SYS_IMAGEBLIT is not set | ||
| 1388 | # CONFIG_FB_FOREIGN_ENDIAN is not set | ||
| 1389 | # CONFIG_FB_SYS_FOPS is not set | ||
| 1390 | CONFIG_FB_DEFERRED_IO=y | ||
| 1391 | # CONFIG_FB_SVGALIB is not set | ||
| 1392 | # CONFIG_FB_MACMODES is not set | ||
| 1393 | # CONFIG_FB_BACKLIGHT is not set | ||
| 1394 | CONFIG_FB_MODE_HELPERS=y | ||
| 1395 | CONFIG_FB_TILEBLITTING=y | ||
| 1396 | |||
| 1397 | # | ||
| 1398 | # Frame buffer hardware drivers | ||
| 1399 | # | ||
| 1400 | # CONFIG_FB_CIRRUS is not set | ||
| 1401 | # CONFIG_FB_PM2 is not set | ||
| 1402 | # CONFIG_FB_CYBER2000 is not set | ||
| 1403 | # CONFIG_FB_ARC is not set | ||
| 1404 | # CONFIG_FB_ASILIANT is not set | ||
| 1405 | # CONFIG_FB_IMSTT is not set | ||
| 1406 | # CONFIG_FB_VGA16 is not set | ||
| 1407 | # CONFIG_FB_UVESA is not set | ||
| 1408 | # CONFIG_FB_VESA is not set | ||
| 1409 | CONFIG_FB_EFI=y | ||
| 1410 | # CONFIG_FB_IMAC is not set | ||
| 1411 | # CONFIG_FB_N411 is not set | ||
| 1412 | # CONFIG_FB_HGA is not set | ||
| 1413 | # CONFIG_FB_S1D13XXX is not set | ||
| 1414 | # CONFIG_FB_NVIDIA is not set | ||
| 1415 | # CONFIG_FB_RIVA is not set | ||
| 1416 | # CONFIG_FB_LE80578 is not set | ||
| 1417 | # CONFIG_FB_INTEL is not set | ||
| 1418 | # CONFIG_FB_MATROX is not set | ||
| 1419 | # CONFIG_FB_RADEON is not set | ||
| 1420 | # CONFIG_FB_ATY128 is not set | ||
| 1421 | # CONFIG_FB_ATY is not set | ||
| 1422 | # CONFIG_FB_S3 is not set | ||
| 1423 | # CONFIG_FB_SAVAGE is not set | ||
| 1424 | # CONFIG_FB_SIS is not set | ||
| 1425 | # CONFIG_FB_NEOMAGIC is not set | ||
| 1426 | # CONFIG_FB_KYRO is not set | ||
| 1427 | # CONFIG_FB_3DFX is not set | ||
| 1428 | # CONFIG_FB_VOODOO1 is not set | ||
| 1429 | # CONFIG_FB_VT8623 is not set | ||
| 1430 | # CONFIG_FB_TRIDENT is not set | ||
| 1431 | # CONFIG_FB_ARK is not set | ||
| 1432 | # CONFIG_FB_PM3 is not set | ||
| 1433 | # CONFIG_FB_GEODE is not set | ||
| 1434 | # CONFIG_FB_VIRTUAL is not set | ||
| 1435 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| 1436 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
| 1437 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| 1438 | # CONFIG_BACKLIGHT_CORGI is not set | ||
| 1439 | # CONFIG_BACKLIGHT_PROGEAR is not set | ||
| 936 | 1440 | ||
| 937 | # | 1441 | # |
| 938 | # Display device support | 1442 | # Display device support |
| 939 | # | 1443 | # |
| 940 | # CONFIG_DISPLAY_SUPPORT is not set | 1444 | # CONFIG_DISPLAY_SUPPORT is not set |
| 941 | # CONFIG_VGASTATE is not set | ||
| 942 | # CONFIG_FB is not set | ||
| 943 | 1445 | ||
| 944 | # | 1446 | # |
| 945 | # Console display driver support | 1447 | # Console display driver support |
| 946 | # | 1448 | # |
| 947 | CONFIG_VGA_CONSOLE=y | 1449 | CONFIG_VGA_CONSOLE=y |
| 948 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1450 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
| 949 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256 | 1451 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
| 950 | CONFIG_VIDEO_SELECT=y | 1452 | CONFIG_VIDEO_SELECT=y |
| 951 | CONFIG_DUMMY_CONSOLE=y | 1453 | CONFIG_DUMMY_CONSOLE=y |
| 1454 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | ||
| 1455 | CONFIG_LOGO=y | ||
| 1456 | # CONFIG_LOGO_LINUX_MONO is not set | ||
| 1457 | # CONFIG_LOGO_LINUX_VGA16 is not set | ||
| 1458 | CONFIG_LOGO_LINUX_CLUT224=y | ||
| 952 | 1459 | ||
| 953 | # | 1460 | # |
| 954 | # Sound | 1461 | # Sound |
| @@ -958,33 +1465,165 @@ CONFIG_SOUND=y | |||
| 958 | # | 1465 | # |
| 959 | # Advanced Linux Sound Architecture | 1466 | # Advanced Linux Sound Architecture |
| 960 | # | 1467 | # |
| 961 | # CONFIG_SND is not set | 1468 | CONFIG_SND=y |
| 1469 | CONFIG_SND_TIMER=y | ||
| 1470 | CONFIG_SND_PCM=y | ||
| 1471 | CONFIG_SND_HWDEP=y | ||
| 1472 | CONFIG_SND_SEQUENCER=y | ||
| 1473 | CONFIG_SND_SEQ_DUMMY=y | ||
| 1474 | CONFIG_SND_OSSEMUL=y | ||
| 1475 | CONFIG_SND_MIXER_OSS=y | ||
| 1476 | CONFIG_SND_PCM_OSS=y | ||
| 1477 | CONFIG_SND_PCM_OSS_PLUGINS=y | ||
| 1478 | CONFIG_SND_SEQUENCER_OSS=y | ||
| 1479 | CONFIG_SND_DYNAMIC_MINORS=y | ||
| 1480 | CONFIG_SND_SUPPORT_OLD_API=y | ||
| 1481 | CONFIG_SND_VERBOSE_PROCFS=y | ||
| 1482 | # CONFIG_SND_VERBOSE_PRINTK is not set | ||
| 1483 | # CONFIG_SND_DEBUG is not set | ||
| 1484 | CONFIG_SND_VMASTER=y | ||
| 1485 | |||
| 1486 | # | ||
| 1487 | # Generic devices | ||
| 1488 | # | ||
| 1489 | # CONFIG_SND_PCSP is not set | ||
| 1490 | # CONFIG_SND_DUMMY is not set | ||
| 1491 | # CONFIG_SND_VIRMIDI is not set | ||
| 1492 | # CONFIG_SND_MTPAV is not set | ||
| 1493 | # CONFIG_SND_SERIAL_U16550 is not set | ||
| 1494 | # CONFIG_SND_MPU401 is not set | ||
| 1495 | |||
| 1496 | # | ||
| 1497 | # PCI devices | ||
| 1498 | # | ||
| 1499 | # CONFIG_SND_AD1889 is not set | ||
| 1500 | # CONFIG_SND_ALS300 is not set | ||
| 1501 | # CONFIG_SND_ALS4000 is not set | ||
| 1502 | # CONFIG_SND_ALI5451 is not set | ||
| 1503 | # CONFIG_SND_ATIIXP is not set | ||
| 1504 | # CONFIG_SND_ATIIXP_MODEM is not set | ||
| 1505 | # CONFIG_SND_AU8810 is not set | ||
| 1506 | # CONFIG_SND_AU8820 is not set | ||
| 1507 | # CONFIG_SND_AU8830 is not set | ||
| 1508 | # CONFIG_SND_AW2 is not set | ||
| 1509 | # CONFIG_SND_AZT3328 is not set | ||
| 1510 | # CONFIG_SND_BT87X is not set | ||
| 1511 | # CONFIG_SND_CA0106 is not set | ||
| 1512 | # CONFIG_SND_CMIPCI is not set | ||
| 1513 | # CONFIG_SND_OXYGEN is not set | ||
| 1514 | # CONFIG_SND_CS4281 is not set | ||
| 1515 | # CONFIG_SND_CS46XX is not set | ||
| 1516 | # CONFIG_SND_CS5530 is not set | ||
| 1517 | # CONFIG_SND_DARLA20 is not set | ||
| 1518 | # CONFIG_SND_GINA20 is not set | ||
| 1519 | # CONFIG_SND_LAYLA20 is not set | ||
| 1520 | # CONFIG_SND_DARLA24 is not set | ||
| 1521 | # CONFIG_SND_GINA24 is not set | ||
| 1522 | # CONFIG_SND_LAYLA24 is not set | ||
| 1523 | # CONFIG_SND_MONA is not set | ||
| 1524 | # CONFIG_SND_MIA is not set | ||
| 1525 | # CONFIG_SND_ECHO3G is not set | ||
| 1526 | # CONFIG_SND_INDIGO is not set | ||
| 1527 | # CONFIG_SND_INDIGOIO is not set | ||
| 1528 | # CONFIG_SND_INDIGODJ is not set | ||
| 1529 | # CONFIG_SND_EMU10K1 is not set | ||
| 1530 | # CONFIG_SND_EMU10K1X is not set | ||
| 1531 | # CONFIG_SND_ENS1370 is not set | ||
| 1532 | # CONFIG_SND_ENS1371 is not set | ||
| 1533 | # CONFIG_SND_ES1938 is not set | ||
| 1534 | # CONFIG_SND_ES1968 is not set | ||
| 1535 | # CONFIG_SND_FM801 is not set | ||
| 1536 | CONFIG_SND_HDA_INTEL=y | ||
| 1537 | CONFIG_SND_HDA_HWDEP=y | ||
| 1538 | CONFIG_SND_HDA_CODEC_REALTEK=y | ||
| 1539 | CONFIG_SND_HDA_CODEC_ANALOG=y | ||
| 1540 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | ||
| 1541 | CONFIG_SND_HDA_CODEC_VIA=y | ||
| 1542 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | ||
| 1543 | CONFIG_SND_HDA_CODEC_CONEXANT=y | ||
| 1544 | CONFIG_SND_HDA_CODEC_CMEDIA=y | ||
| 1545 | CONFIG_SND_HDA_CODEC_SI3054=y | ||
| 1546 | CONFIG_SND_HDA_GENERIC=y | ||
| 1547 | # CONFIG_SND_HDA_POWER_SAVE is not set | ||
| 1548 | # CONFIG_SND_HDSP is not set | ||
| 1549 | # CONFIG_SND_HDSPM is not set | ||
| 1550 | # CONFIG_SND_HIFIER is not set | ||
| 1551 | # CONFIG_SND_ICE1712 is not set | ||
| 1552 | # CONFIG_SND_ICE1724 is not set | ||
| 1553 | # CONFIG_SND_INTEL8X0 is not set | ||
| 1554 | # CONFIG_SND_INTEL8X0M is not set | ||
| 1555 | # CONFIG_SND_KORG1212 is not set | ||
| 1556 | # CONFIG_SND_MAESTRO3 is not set | ||
| 1557 | # CONFIG_SND_MIXART is not set | ||
| 1558 | # CONFIG_SND_NM256 is not set | ||
| 1559 | # CONFIG_SND_PCXHR is not set | ||
| 1560 | # CONFIG_SND_RIPTIDE is not set | ||
| 1561 | # CONFIG_SND_RME32 is not set | ||
| 1562 | # CONFIG_SND_RME96 is not set | ||
| 1563 | # CONFIG_SND_RME9652 is not set | ||
| 1564 | # CONFIG_SND_SONICVIBES is not set | ||
| 1565 | # CONFIG_SND_TRIDENT is not set | ||
| 1566 | # CONFIG_SND_VIA82XX is not set | ||
| 1567 | # CONFIG_SND_VIA82XX_MODEM is not set | ||
| 1568 | # CONFIG_SND_VIRTUOSO is not set | ||
| 1569 | # CONFIG_SND_VX222 is not set | ||
| 1570 | # CONFIG_SND_YMFPCI is not set | ||
| 1571 | |||
| 1572 | # | ||
| 1573 | # USB devices | ||
| 1574 | # | ||
| 1575 | # CONFIG_SND_USB_AUDIO is not set | ||
| 1576 | # CONFIG_SND_USB_USX2Y is not set | ||
| 1577 | # CONFIG_SND_USB_CAIAQ is not set | ||
| 1578 | |||
| 1579 | # | ||
| 1580 | # PCMCIA devices | ||
| 1581 | # | ||
| 1582 | # CONFIG_SND_VXPOCKET is not set | ||
| 1583 | # CONFIG_SND_PDAUDIOCF is not set | ||
| 1584 | |||
| 1585 | # | ||
| 1586 | # System on Chip audio support | ||
| 1587 | # | ||
| 1588 | # CONFIG_SND_SOC is not set | ||
| 1589 | |||
| 1590 | # | ||
| 1591 | # ALSA SoC audio for Freescale SOCs | ||
| 1592 | # | ||
| 1593 | |||
| 1594 | # | ||
| 1595 | # SoC Audio for the Texas Instruments OMAP | ||
| 1596 | # | ||
| 962 | 1597 | ||
| 963 | # | 1598 | # |
| 964 | # Open Sound System | 1599 | # Open Sound System |
| 965 | # | 1600 | # |
| 966 | CONFIG_SOUND_PRIME=y | 1601 | # CONFIG_SOUND_PRIME is not set |
| 967 | # CONFIG_SOUND_TRIDENT is not set | ||
| 968 | # CONFIG_SOUND_MSNDCLAS is not set | ||
| 969 | # CONFIG_SOUND_MSNDPIN is not set | ||
| 970 | # CONFIG_SOUND_OSS is not set | ||
| 971 | CONFIG_HID_SUPPORT=y | 1602 | CONFIG_HID_SUPPORT=y |
| 972 | CONFIG_HID=y | 1603 | CONFIG_HID=y |
| 973 | # CONFIG_HID_DEBUG is not set | 1604 | CONFIG_HID_DEBUG=y |
| 1605 | CONFIG_HIDRAW=y | ||
| 974 | 1606 | ||
| 975 | # | 1607 | # |
| 976 | # USB Input Devices | 1608 | # USB Input Devices |
| 977 | # | 1609 | # |
| 978 | CONFIG_USB_HID=y | 1610 | CONFIG_USB_HID=y |
| 979 | # CONFIG_USB_HIDINPUT_POWERBOOK is not set | 1611 | CONFIG_USB_HIDINPUT_POWERBOOK=y |
| 980 | # CONFIG_HID_FF is not set | 1612 | CONFIG_HID_FF=y |
| 981 | # CONFIG_USB_HIDDEV is not set | 1613 | CONFIG_HID_PID=y |
| 1614 | CONFIG_LOGITECH_FF=y | ||
| 1615 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | ||
| 1616 | CONFIG_PANTHERLORD_FF=y | ||
| 1617 | CONFIG_THRUSTMASTER_FF=y | ||
| 1618 | CONFIG_ZEROPLUS_FF=y | ||
| 1619 | CONFIG_USB_HIDDEV=y | ||
| 982 | CONFIG_USB_SUPPORT=y | 1620 | CONFIG_USB_SUPPORT=y |
| 983 | CONFIG_USB_ARCH_HAS_HCD=y | 1621 | CONFIG_USB_ARCH_HAS_HCD=y |
| 984 | CONFIG_USB_ARCH_HAS_OHCI=y | 1622 | CONFIG_USB_ARCH_HAS_OHCI=y |
| 985 | CONFIG_USB_ARCH_HAS_EHCI=y | 1623 | CONFIG_USB_ARCH_HAS_EHCI=y |
| 986 | CONFIG_USB=y | 1624 | CONFIG_USB=y |
| 987 | # CONFIG_USB_DEBUG is not set | 1625 | CONFIG_USB_DEBUG=y |
| 1626 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| 988 | 1627 | ||
| 989 | # | 1628 | # |
| 990 | # Miscellaneous USB options | 1629 | # Miscellaneous USB options |
| @@ -992,18 +1631,18 @@ CONFIG_USB=y | |||
| 992 | CONFIG_USB_DEVICEFS=y | 1631 | CONFIG_USB_DEVICEFS=y |
| 993 | # CONFIG_USB_DEVICE_CLASS is not set | 1632 | # CONFIG_USB_DEVICE_CLASS is not set |
| 994 | # CONFIG_USB_DYNAMIC_MINORS is not set | 1633 | # CONFIG_USB_DYNAMIC_MINORS is not set |
| 995 | # CONFIG_USB_SUSPEND is not set | 1634 | CONFIG_USB_SUSPEND=y |
| 996 | # CONFIG_USB_PERSIST is not set | ||
| 997 | # CONFIG_USB_OTG is not set | 1635 | # CONFIG_USB_OTG is not set |
| 998 | 1636 | ||
| 999 | # | 1637 | # |
| 1000 | # USB Host Controller Drivers | 1638 | # USB Host Controller Drivers |
| 1001 | # | 1639 | # |
| 1640 | # CONFIG_USB_C67X00_HCD is not set | ||
| 1002 | CONFIG_USB_EHCI_HCD=y | 1641 | CONFIG_USB_EHCI_HCD=y |
| 1003 | # CONFIG_USB_EHCI_SPLIT_ISO is not set | ||
| 1004 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1642 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
| 1005 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1643 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
| 1006 | # CONFIG_USB_ISP116X_HCD is not set | 1644 | # CONFIG_USB_ISP116X_HCD is not set |
| 1645 | # CONFIG_USB_ISP1760_HCD is not set | ||
| 1007 | CONFIG_USB_OHCI_HCD=y | 1646 | CONFIG_USB_OHCI_HCD=y |
| 1008 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set | 1647 | # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set |
| 1009 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set | 1648 | # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set |
| @@ -1036,8 +1675,10 @@ CONFIG_USB_STORAGE=y | |||
| 1036 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1675 | # CONFIG_USB_STORAGE_SDDR55 is not set |
| 1037 | # CONFIG_USB_STORAGE_JUMPSHOT is not set | 1676 | # CONFIG_USB_STORAGE_JUMPSHOT is not set |
| 1038 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1677 | # CONFIG_USB_STORAGE_ALAUDA is not set |
| 1678 | # CONFIG_USB_STORAGE_ONETOUCH is not set | ||
| 1039 | # CONFIG_USB_STORAGE_KARMA is not set | 1679 | # CONFIG_USB_STORAGE_KARMA is not set |
| 1040 | # CONFIG_USB_LIBUSUAL is not set | 1680 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
| 1681 | CONFIG_USB_LIBUSUAL=y | ||
| 1041 | 1682 | ||
| 1042 | # | 1683 | # |
| 1043 | # USB Imaging devices | 1684 | # USB Imaging devices |
| @@ -1049,10 +1690,6 @@ CONFIG_USB_MON=y | |||
| 1049 | # | 1690 | # |
| 1050 | # USB port drivers | 1691 | # USB port drivers |
| 1051 | # | 1692 | # |
| 1052 | |||
| 1053 | # | ||
| 1054 | # USB Serial Converter support | ||
| 1055 | # | ||
| 1056 | # CONFIG_USB_SERIAL is not set | 1693 | # CONFIG_USB_SERIAL is not set |
| 1057 | 1694 | ||
| 1058 | # | 1695 | # |
| @@ -1078,98 +1715,126 @@ CONFIG_USB_MON=y | |||
| 1078 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1715 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1079 | # CONFIG_USB_IOWARRIOR is not set | 1716 | # CONFIG_USB_IOWARRIOR is not set |
| 1080 | # CONFIG_USB_TEST is not set | 1717 | # CONFIG_USB_TEST is not set |
| 1718 | # CONFIG_USB_GADGET is not set | ||
| 1719 | # CONFIG_MMC is not set | ||
| 1720 | # CONFIG_MEMSTICK is not set | ||
| 1721 | CONFIG_NEW_LEDS=y | ||
| 1722 | CONFIG_LEDS_CLASS=y | ||
| 1081 | 1723 | ||
| 1082 | # | 1724 | # |
| 1083 | # USB DSL modem support | 1725 | # LED drivers |
| 1084 | # | 1726 | # |
| 1727 | # CONFIG_LEDS_CLEVO_MAIL is not set | ||
| 1085 | 1728 | ||
| 1086 | # | 1729 | # |
| 1087 | # USB Gadget Support | 1730 | # LED Triggers |
| 1088 | # | 1731 | # |
| 1089 | # CONFIG_USB_GADGET is not set | 1732 | CONFIG_LEDS_TRIGGERS=y |
| 1090 | # CONFIG_MMC is not set | 1733 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
| 1734 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | ||
| 1735 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | ||
| 1736 | # CONFIG_ACCESSIBILITY is not set | ||
| 1737 | # CONFIG_INFINIBAND is not set | ||
| 1738 | CONFIG_EDAC=y | ||
| 1091 | 1739 | ||
| 1092 | # | 1740 | # |
| 1093 | # LED devices | 1741 | # Reporting subsystems |
| 1094 | # | 1742 | # |
| 1095 | # CONFIG_NEW_LEDS is not set | 1743 | # CONFIG_EDAC_DEBUG is not set |
| 1744 | # CONFIG_EDAC_MM_EDAC is not set | ||
| 1745 | CONFIG_RTC_LIB=y | ||
| 1746 | CONFIG_RTC_CLASS=y | ||
| 1747 | # CONFIG_RTC_HCTOSYS is not set | ||
| 1748 | # CONFIG_RTC_DEBUG is not set | ||
| 1096 | 1749 | ||
| 1097 | # | 1750 | # |
| 1098 | # LED drivers | 1751 | # RTC interfaces |
| 1099 | # | 1752 | # |
| 1753 | CONFIG_RTC_INTF_SYSFS=y | ||
| 1754 | CONFIG_RTC_INTF_PROC=y | ||
| 1755 | CONFIG_RTC_INTF_DEV=y | ||
| 1756 | # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set | ||
| 1757 | # CONFIG_RTC_DRV_TEST is not set | ||
| 1100 | 1758 | ||
| 1101 | # | 1759 | # |
| 1102 | # LED Triggers | 1760 | # I2C RTC drivers |
| 1103 | # | 1761 | # |
| 1104 | # CONFIG_INFINIBAND is not set | 1762 | # CONFIG_RTC_DRV_DS1307 is not set |
| 1105 | # CONFIG_EDAC is not set | 1763 | # CONFIG_RTC_DRV_DS1374 is not set |
| 1764 | # CONFIG_RTC_DRV_DS1672 is not set | ||
| 1765 | # CONFIG_RTC_DRV_MAX6900 is not set | ||
| 1766 | # CONFIG_RTC_DRV_RS5C372 is not set | ||
| 1767 | # CONFIG_RTC_DRV_ISL1208 is not set | ||
| 1768 | # CONFIG_RTC_DRV_X1205 is not set | ||
| 1769 | # CONFIG_RTC_DRV_PCF8563 is not set | ||
| 1770 | # CONFIG_RTC_DRV_PCF8583 is not set | ||
| 1771 | # CONFIG_RTC_DRV_M41T80 is not set | ||
| 1772 | # CONFIG_RTC_DRV_S35390A is not set | ||
| 1106 | 1773 | ||
| 1107 | # | 1774 | # |
| 1108 | # Real Time Clock | 1775 | # SPI RTC drivers |
| 1109 | # | 1776 | # |
| 1110 | # CONFIG_RTC_CLASS is not set | ||
| 1111 | 1777 | ||
| 1112 | # | 1778 | # |
| 1113 | # DMA Engine support | 1779 | # Platform RTC drivers |
| 1114 | # | 1780 | # |
| 1115 | # CONFIG_DMA_ENGINE is not set | 1781 | CONFIG_RTC_DRV_CMOS=y |
| 1782 | # CONFIG_RTC_DRV_DS1511 is not set | ||
| 1783 | # CONFIG_RTC_DRV_DS1553 is not set | ||
| 1784 | # CONFIG_RTC_DRV_DS1742 is not set | ||
| 1785 | # CONFIG_RTC_DRV_STK17TA8 is not set | ||
| 1786 | # CONFIG_RTC_DRV_M48T86 is not set | ||
| 1787 | # CONFIG_RTC_DRV_M48T59 is not set | ||
| 1788 | # CONFIG_RTC_DRV_V3020 is not set | ||
| 1116 | 1789 | ||
| 1117 | # | 1790 | # |
| 1118 | # DMA Clients | 1791 | # on-CPU RTC drivers |
| 1119 | # | 1792 | # |
| 1793 | CONFIG_DMADEVICES=y | ||
| 1120 | 1794 | ||
| 1121 | # | 1795 | # |
| 1122 | # DMA Devices | 1796 | # DMA Devices |
| 1123 | # | 1797 | # |
| 1124 | CONFIG_VIRTUALIZATION=y | 1798 | # CONFIG_INTEL_IOATDMA is not set |
| 1125 | # CONFIG_KVM is not set | ||
| 1126 | |||
| 1127 | # | ||
| 1128 | # Userspace I/O | ||
| 1129 | # | ||
| 1130 | # CONFIG_UIO is not set | 1799 | # CONFIG_UIO is not set |
| 1131 | 1800 | ||
| 1132 | # | 1801 | # |
| 1133 | # Firmware Drivers | 1802 | # Firmware Drivers |
| 1134 | # | 1803 | # |
| 1135 | # CONFIG_EDD is not set | 1804 | # CONFIG_EDD is not set |
| 1805 | CONFIG_EFI_VARS=y | ||
| 1136 | # CONFIG_DELL_RBU is not set | 1806 | # CONFIG_DELL_RBU is not set |
| 1137 | # CONFIG_DCDBAS is not set | 1807 | # CONFIG_DCDBAS is not set |
| 1138 | CONFIG_DMIID=y | 1808 | CONFIG_DMIID=y |
| 1809 | # CONFIG_ISCSI_IBFT_FIND is not set | ||
| 1139 | 1810 | ||
| 1140 | # | 1811 | # |
| 1141 | # File systems | 1812 | # File systems |
| 1142 | # | 1813 | # |
| 1143 | CONFIG_EXT2_FS=y | 1814 | # CONFIG_EXT2_FS is not set |
| 1144 | CONFIG_EXT2_FS_XATTR=y | ||
| 1145 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
| 1146 | # CONFIG_EXT2_FS_SECURITY is not set | ||
| 1147 | # CONFIG_EXT2_FS_XIP is not set | ||
| 1148 | CONFIG_EXT3_FS=y | 1815 | CONFIG_EXT3_FS=y |
| 1149 | CONFIG_EXT3_FS_XATTR=y | 1816 | CONFIG_EXT3_FS_XATTR=y |
| 1150 | CONFIG_EXT3_FS_POSIX_ACL=y | 1817 | CONFIG_EXT3_FS_POSIX_ACL=y |
| 1151 | # CONFIG_EXT3_FS_SECURITY is not set | 1818 | CONFIG_EXT3_FS_SECURITY=y |
| 1152 | # CONFIG_EXT4DEV_FS is not set | 1819 | # CONFIG_EXT4DEV_FS is not set |
| 1153 | CONFIG_JBD=y | 1820 | CONFIG_JBD=y |
| 1154 | # CONFIG_JBD_DEBUG is not set | 1821 | # CONFIG_JBD_DEBUG is not set |
| 1155 | CONFIG_FS_MBCACHE=y | 1822 | CONFIG_FS_MBCACHE=y |
| 1156 | CONFIG_REISERFS_FS=y | 1823 | # CONFIG_REISERFS_FS is not set |
| 1157 | # CONFIG_REISERFS_CHECK is not set | ||
| 1158 | # CONFIG_REISERFS_PROC_INFO is not set | ||
| 1159 | CONFIG_REISERFS_FS_XATTR=y | ||
| 1160 | CONFIG_REISERFS_FS_POSIX_ACL=y | ||
| 1161 | # CONFIG_REISERFS_FS_SECURITY is not set | ||
| 1162 | # CONFIG_JFS_FS is not set | 1824 | # CONFIG_JFS_FS is not set |
| 1163 | CONFIG_FS_POSIX_ACL=y | 1825 | CONFIG_FS_POSIX_ACL=y |
| 1164 | # CONFIG_XFS_FS is not set | 1826 | # CONFIG_XFS_FS is not set |
| 1165 | # CONFIG_GFS2_FS is not set | 1827 | # CONFIG_GFS2_FS is not set |
| 1166 | # CONFIG_OCFS2_FS is not set | 1828 | # CONFIG_OCFS2_FS is not set |
| 1167 | # CONFIG_MINIX_FS is not set | 1829 | CONFIG_DNOTIFY=y |
| 1168 | # CONFIG_ROMFS_FS is not set | ||
| 1169 | CONFIG_INOTIFY=y | 1830 | CONFIG_INOTIFY=y |
| 1170 | CONFIG_INOTIFY_USER=y | 1831 | CONFIG_INOTIFY_USER=y |
| 1171 | # CONFIG_QUOTA is not set | 1832 | CONFIG_QUOTA=y |
| 1172 | CONFIG_DNOTIFY=y | 1833 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
| 1834 | # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| 1835 | # CONFIG_QFMT_V1 is not set | ||
| 1836 | CONFIG_QFMT_V2=y | ||
| 1837 | CONFIG_QUOTACTL=y | ||
| 1173 | # CONFIG_AUTOFS_FS is not set | 1838 | # CONFIG_AUTOFS_FS is not set |
| 1174 | CONFIG_AUTOFS4_FS=y | 1839 | CONFIG_AUTOFS4_FS=y |
| 1175 | # CONFIG_FUSE_FS is not set | 1840 | # CONFIG_FUSE_FS is not set |
| @@ -1180,7 +1845,7 @@ CONFIG_GENERIC_ACL=y | |||
| 1180 | # | 1845 | # |
| 1181 | CONFIG_ISO9660_FS=y | 1846 | CONFIG_ISO9660_FS=y |
| 1182 | CONFIG_JOLIET=y | 1847 | CONFIG_JOLIET=y |
| 1183 | # CONFIG_ZISOFS is not set | 1848 | CONFIG_ZISOFS=y |
| 1184 | # CONFIG_UDF_FS is not set | 1849 | # CONFIG_UDF_FS is not set |
| 1185 | 1850 | ||
| 1186 | # | 1851 | # |
| @@ -1198,13 +1863,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
| 1198 | # | 1863 | # |
| 1199 | CONFIG_PROC_FS=y | 1864 | CONFIG_PROC_FS=y |
| 1200 | CONFIG_PROC_KCORE=y | 1865 | CONFIG_PROC_KCORE=y |
| 1866 | CONFIG_PROC_VMCORE=y | ||
| 1201 | CONFIG_PROC_SYSCTL=y | 1867 | CONFIG_PROC_SYSCTL=y |
| 1202 | CONFIG_SYSFS=y | 1868 | CONFIG_SYSFS=y |
| 1203 | CONFIG_TMPFS=y | 1869 | CONFIG_TMPFS=y |
| 1204 | CONFIG_TMPFS_POSIX_ACL=y | 1870 | CONFIG_TMPFS_POSIX_ACL=y |
| 1205 | CONFIG_HUGETLBFS=y | 1871 | CONFIG_HUGETLBFS=y |
| 1206 | CONFIG_HUGETLB_PAGE=y | 1872 | CONFIG_HUGETLB_PAGE=y |
| 1207 | CONFIG_RAMFS=y | ||
| 1208 | # CONFIG_CONFIGFS_FS is not set | 1873 | # CONFIG_CONFIGFS_FS is not set |
| 1209 | 1874 | ||
| 1210 | # | 1875 | # |
| @@ -1212,6 +1877,7 @@ CONFIG_RAMFS=y | |||
| 1212 | # | 1877 | # |
| 1213 | # CONFIG_ADFS_FS is not set | 1878 | # CONFIG_ADFS_FS is not set |
| 1214 | # CONFIG_AFFS_FS is not set | 1879 | # CONFIG_AFFS_FS is not set |
| 1880 | # CONFIG_ECRYPT_FS is not set | ||
| 1215 | # CONFIG_HFS_FS is not set | 1881 | # CONFIG_HFS_FS is not set |
| 1216 | # CONFIG_HFSPLUS_FS is not set | 1882 | # CONFIG_HFSPLUS_FS is not set |
| 1217 | # CONFIG_BEFS_FS is not set | 1883 | # CONFIG_BEFS_FS is not set |
| @@ -1219,33 +1885,15 @@ CONFIG_RAMFS=y | |||
| 1219 | # CONFIG_EFS_FS is not set | 1885 | # CONFIG_EFS_FS is not set |
| 1220 | # CONFIG_CRAMFS is not set | 1886 | # CONFIG_CRAMFS is not set |
| 1221 | # CONFIG_VXFS_FS is not set | 1887 | # CONFIG_VXFS_FS is not set |
| 1888 | # CONFIG_MINIX_FS is not set | ||
| 1222 | # CONFIG_HPFS_FS is not set | 1889 | # CONFIG_HPFS_FS is not set |
| 1223 | # CONFIG_QNX4FS_FS is not set | 1890 | # CONFIG_QNX4FS_FS is not set |
| 1891 | # CONFIG_ROMFS_FS is not set | ||
| 1224 | # CONFIG_SYSV_FS is not set | 1892 | # CONFIG_SYSV_FS is not set |
| 1225 | # CONFIG_UFS_FS is not set | 1893 | # CONFIG_UFS_FS is not set |
| 1226 | 1894 | CONFIG_NETWORK_FILESYSTEMS=y | |
| 1227 | # | 1895 | # CONFIG_NFS_FS is not set |
| 1228 | # Network File Systems | 1896 | # CONFIG_NFSD is not set |
| 1229 | # | ||
| 1230 | CONFIG_NFS_FS=y | ||
| 1231 | CONFIG_NFS_V3=y | ||
| 1232 | # CONFIG_NFS_V3_ACL is not set | ||
| 1233 | # CONFIG_NFS_V4 is not set | ||
| 1234 | # CONFIG_NFS_DIRECTIO is not set | ||
| 1235 | CONFIG_NFSD=y | ||
| 1236 | CONFIG_NFSD_V3=y | ||
| 1237 | # CONFIG_NFSD_V3_ACL is not set | ||
| 1238 | # CONFIG_NFSD_V4 is not set | ||
| 1239 | CONFIG_NFSD_TCP=y | ||
| 1240 | CONFIG_ROOT_NFS=y | ||
| 1241 | CONFIG_LOCKD=y | ||
| 1242 | CONFIG_LOCKD_V4=y | ||
| 1243 | CONFIG_EXPORTFS=y | ||
| 1244 | CONFIG_NFS_COMMON=y | ||
| 1245 | CONFIG_SUNRPC=y | ||
| 1246 | # CONFIG_SUNRPC_BIND34 is not set | ||
| 1247 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
| 1248 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
| 1249 | # CONFIG_SMB_FS is not set | 1897 | # CONFIG_SMB_FS is not set |
| 1250 | # CONFIG_CIFS is not set | 1898 | # CONFIG_CIFS is not set |
| 1251 | # CONFIG_NCP_FS is not set | 1899 | # CONFIG_NCP_FS is not set |
| @@ -1255,14 +1903,26 @@ CONFIG_SUNRPC=y | |||
| 1255 | # | 1903 | # |
| 1256 | # Partition Types | 1904 | # Partition Types |
| 1257 | # | 1905 | # |
| 1258 | # CONFIG_PARTITION_ADVANCED is not set | 1906 | CONFIG_PARTITION_ADVANCED=y |
| 1907 | # CONFIG_ACORN_PARTITION is not set | ||
| 1908 | CONFIG_OSF_PARTITION=y | ||
| 1909 | CONFIG_AMIGA_PARTITION=y | ||
| 1910 | # CONFIG_ATARI_PARTITION is not set | ||
| 1911 | CONFIG_MAC_PARTITION=y | ||
| 1259 | CONFIG_MSDOS_PARTITION=y | 1912 | CONFIG_MSDOS_PARTITION=y |
| 1260 | 1913 | CONFIG_BSD_DISKLABEL=y | |
| 1261 | # | 1914 | CONFIG_MINIX_SUBPARTITION=y |
| 1262 | # Native Language Support | 1915 | CONFIG_SOLARIS_X86_PARTITION=y |
| 1263 | # | 1916 | CONFIG_UNIXWARE_DISKLABEL=y |
| 1917 | # CONFIG_LDM_PARTITION is not set | ||
| 1918 | CONFIG_SGI_PARTITION=y | ||
| 1919 | # CONFIG_ULTRIX_PARTITION is not set | ||
| 1920 | CONFIG_SUN_PARTITION=y | ||
| 1921 | CONFIG_KARMA_PARTITION=y | ||
| 1922 | CONFIG_EFI_PARTITION=y | ||
| 1923 | # CONFIG_SYSV68_PARTITION is not set | ||
| 1264 | CONFIG_NLS=y | 1924 | CONFIG_NLS=y |
| 1265 | CONFIG_NLS_DEFAULT="iso8859-1" | 1925 | CONFIG_NLS_DEFAULT="utf8" |
| 1266 | CONFIG_NLS_CODEPAGE_437=y | 1926 | CONFIG_NLS_CODEPAGE_437=y |
| 1267 | # CONFIG_NLS_CODEPAGE_737 is not set | 1927 | # CONFIG_NLS_CODEPAGE_737 is not set |
| 1268 | # CONFIG_NLS_CODEPAGE_775 is not set | 1928 | # CONFIG_NLS_CODEPAGE_775 is not set |
| @@ -1297,40 +1957,33 @@ CONFIG_NLS_ISO8859_1=y | |||
| 1297 | # CONFIG_NLS_ISO8859_9 is not set | 1957 | # CONFIG_NLS_ISO8859_9 is not set |
| 1298 | # CONFIG_NLS_ISO8859_13 is not set | 1958 | # CONFIG_NLS_ISO8859_13 is not set |
| 1299 | # CONFIG_NLS_ISO8859_14 is not set | 1959 | # CONFIG_NLS_ISO8859_14 is not set |
| 1300 | CONFIG_NLS_ISO8859_15=y | 1960 | # CONFIG_NLS_ISO8859_15 is not set |
| 1301 | # CONFIG_NLS_KOI8_R is not set | 1961 | # CONFIG_NLS_KOI8_R is not set |
| 1302 | # CONFIG_NLS_KOI8_U is not set | 1962 | # CONFIG_NLS_KOI8_U is not set |
| 1303 | CONFIG_NLS_UTF8=y | 1963 | CONFIG_NLS_UTF8=y |
| 1304 | |||
| 1305 | # | ||
| 1306 | # Distributed Lock Manager | ||
| 1307 | # | ||
| 1308 | # CONFIG_DLM is not set | 1964 | # CONFIG_DLM is not set |
| 1309 | 1965 | ||
| 1310 | # | 1966 | # |
| 1311 | # Instrumentation Support | ||
| 1312 | # | ||
| 1313 | CONFIG_PROFILING=y | ||
| 1314 | CONFIG_OPROFILE=y | ||
| 1315 | CONFIG_KPROBES=y | ||
| 1316 | |||
| 1317 | # | ||
| 1318 | # Kernel hacking | 1967 | # Kernel hacking |
| 1319 | # | 1968 | # |
| 1320 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1969 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
| 1321 | # CONFIG_PRINTK_TIME is not set | 1970 | # CONFIG_PRINTK_TIME is not set |
| 1971 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
| 1322 | # CONFIG_ENABLE_MUST_CHECK is not set | 1972 | # CONFIG_ENABLE_MUST_CHECK is not set |
| 1973 | CONFIG_FRAME_WARN=2048 | ||
| 1323 | CONFIG_MAGIC_SYSRQ=y | 1974 | CONFIG_MAGIC_SYSRQ=y |
| 1324 | CONFIG_UNUSED_SYMBOLS=y | 1975 | # CONFIG_UNUSED_SYMBOLS is not set |
| 1325 | CONFIG_DEBUG_FS=y | 1976 | CONFIG_DEBUG_FS=y |
| 1326 | # CONFIG_HEADERS_CHECK is not set | 1977 | # CONFIG_HEADERS_CHECK is not set |
| 1327 | CONFIG_DEBUG_KERNEL=y | 1978 | CONFIG_DEBUG_KERNEL=y |
| 1328 | # CONFIG_DEBUG_SHIRQ is not set | 1979 | # CONFIG_DEBUG_SHIRQ is not set |
| 1329 | CONFIG_DETECT_SOFTLOCKUP=y | 1980 | # CONFIG_DETECT_SOFTLOCKUP is not set |
| 1330 | # CONFIG_SCHED_DEBUG is not set | 1981 | # CONFIG_SCHED_DEBUG is not set |
| 1331 | # CONFIG_SCHEDSTATS is not set | 1982 | CONFIG_SCHEDSTATS=y |
| 1332 | CONFIG_TIMER_STATS=y | 1983 | CONFIG_TIMER_STATS=y |
| 1333 | # CONFIG_DEBUG_SLAB is not set | 1984 | # CONFIG_DEBUG_OBJECTS is not set |
| 1985 | # CONFIG_SLUB_DEBUG_ON is not set | ||
| 1986 | # CONFIG_SLUB_STATS is not set | ||
| 1334 | # CONFIG_DEBUG_RT_MUTEXES is not set | 1987 | # CONFIG_DEBUG_RT_MUTEXES is not set |
| 1335 | # CONFIG_RT_MUTEX_TESTER is not set | 1988 | # CONFIG_RT_MUTEX_TESTER is not set |
| 1336 | # CONFIG_DEBUG_SPINLOCK is not set | 1989 | # CONFIG_DEBUG_SPINLOCK is not set |
| @@ -1344,28 +1997,162 @@ CONFIG_TIMER_STATS=y | |||
| 1344 | CONFIG_DEBUG_BUGVERBOSE=y | 1997 | CONFIG_DEBUG_BUGVERBOSE=y |
| 1345 | # CONFIG_DEBUG_INFO is not set | 1998 | # CONFIG_DEBUG_INFO is not set |
| 1346 | # CONFIG_DEBUG_VM is not set | 1999 | # CONFIG_DEBUG_VM is not set |
| 2000 | # CONFIG_DEBUG_WRITECOUNT is not set | ||
| 1347 | # CONFIG_DEBUG_LIST is not set | 2001 | # CONFIG_DEBUG_LIST is not set |
| 1348 | # CONFIG_FRAME_POINTER is not set | 2002 | # CONFIG_DEBUG_SG is not set |
| 1349 | CONFIG_OPTIMIZE_INLINING=y | 2003 | CONFIG_FRAME_POINTER=y |
| 2004 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
| 1350 | # CONFIG_RCU_TORTURE_TEST is not set | 2005 | # CONFIG_RCU_TORTURE_TEST is not set |
| 2006 | # CONFIG_KPROBES_SANITY_TEST is not set | ||
| 2007 | # CONFIG_BACKTRACE_SELF_TEST is not set | ||
| 1351 | # CONFIG_LKDTM is not set | 2008 | # CONFIG_LKDTM is not set |
| 1352 | # CONFIG_FAULT_INJECTION is not set | 2009 | # CONFIG_FAULT_INJECTION is not set |
| 1353 | # CONFIG_DEBUG_RODATA is not set | 2010 | # CONFIG_LATENCYTOP is not set |
| 1354 | # CONFIG_IOMMU_DEBUG is not set | 2011 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
| 2012 | # CONFIG_SAMPLES is not set | ||
| 2013 | # CONFIG_KGDB is not set | ||
| 2014 | CONFIG_HAVE_ARCH_KGDB=y | ||
| 2015 | # CONFIG_NONPROMISC_DEVMEM is not set | ||
| 2016 | CONFIG_EARLY_PRINTK=y | ||
| 1355 | CONFIG_DEBUG_STACKOVERFLOW=y | 2017 | CONFIG_DEBUG_STACKOVERFLOW=y |
| 1356 | # CONFIG_DEBUG_STACK_USAGE is not set | 2018 | CONFIG_DEBUG_STACK_USAGE=y |
| 2019 | # CONFIG_DEBUG_PAGEALLOC is not set | ||
| 2020 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||
| 2021 | # CONFIG_X86_PTDUMP is not set | ||
| 2022 | CONFIG_DEBUG_RODATA=y | ||
| 2023 | # CONFIG_DIRECT_GBPAGES is not set | ||
| 2024 | # CONFIG_DEBUG_RODATA_TEST is not set | ||
| 2025 | CONFIG_DEBUG_NX_TEST=m | ||
| 2026 | CONFIG_X86_MPPARSE=y | ||
| 2027 | # CONFIG_IOMMU_DEBUG is not set | ||
| 2028 | CONFIG_IO_DELAY_TYPE_0X80=0 | ||
| 2029 | CONFIG_IO_DELAY_TYPE_0XED=1 | ||
| 2030 | CONFIG_IO_DELAY_TYPE_UDELAY=2 | ||
| 2031 | CONFIG_IO_DELAY_TYPE_NONE=3 | ||
| 2032 | CONFIG_IO_DELAY_0X80=y | ||
| 2033 | # CONFIG_IO_DELAY_0XED is not set | ||
| 2034 | # CONFIG_IO_DELAY_UDELAY is not set | ||
| 2035 | # CONFIG_IO_DELAY_NONE is not set | ||
| 2036 | CONFIG_DEFAULT_IO_DELAY_TYPE=0 | ||
| 2037 | CONFIG_DEBUG_BOOT_PARAMS=y | ||
| 2038 | # CONFIG_CPA_DEBUG is not set | ||
| 1357 | 2039 | ||
| 1358 | # | 2040 | # |
| 1359 | # Security options | 2041 | # Security options |
| 1360 | # | 2042 | # |
| 1361 | # CONFIG_KEYS is not set | 2043 | CONFIG_KEYS=y |
| 1362 | # CONFIG_SECURITY is not set | 2044 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
| 1363 | # CONFIG_CRYPTO is not set | 2045 | CONFIG_SECURITY=y |
| 2046 | CONFIG_SECURITY_NETWORK=y | ||
| 2047 | # CONFIG_SECURITY_NETWORK_XFRM is not set | ||
| 2048 | CONFIG_SECURITY_CAPABILITIES=y | ||
| 2049 | CONFIG_SECURITY_FILE_CAPABILITIES=y | ||
| 2050 | # CONFIG_SECURITY_ROOTPLUG is not set | ||
| 2051 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | ||
| 2052 | CONFIG_SECURITY_SELINUX=y | ||
| 2053 | CONFIG_SECURITY_SELINUX_BOOTPARAM=y | ||
| 2054 | CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 | ||
| 2055 | CONFIG_SECURITY_SELINUX_DISABLE=y | ||
| 2056 | CONFIG_SECURITY_SELINUX_DEVELOP=y | ||
| 2057 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | ||
| 2058 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | ||
| 2059 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
| 2060 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | ||
| 2061 | # CONFIG_SECURITY_SMACK is not set | ||
| 2062 | CONFIG_CRYPTO=y | ||
| 2063 | |||
| 2064 | # | ||
| 2065 | # Crypto core or helper | ||
| 2066 | # | ||
| 2067 | CONFIG_CRYPTO_ALGAPI=y | ||
| 2068 | CONFIG_CRYPTO_AEAD=y | ||
| 2069 | CONFIG_CRYPTO_BLKCIPHER=y | ||
| 2070 | CONFIG_CRYPTO_HASH=y | ||
| 2071 | CONFIG_CRYPTO_MANAGER=y | ||
| 2072 | # CONFIG_CRYPTO_GF128MUL is not set | ||
| 2073 | # CONFIG_CRYPTO_NULL is not set | ||
| 2074 | # CONFIG_CRYPTO_CRYPTD is not set | ||
| 2075 | CONFIG_CRYPTO_AUTHENC=y | ||
| 2076 | # CONFIG_CRYPTO_TEST is not set | ||
| 2077 | |||
| 2078 | # | ||
| 2079 | # Authenticated Encryption with Associated Data | ||
| 2080 | # | ||
| 2081 | # CONFIG_CRYPTO_CCM is not set | ||
| 2082 | # CONFIG_CRYPTO_GCM is not set | ||
| 2083 | # CONFIG_CRYPTO_SEQIV is not set | ||
| 2084 | |||
| 2085 | # | ||
| 2086 | # Block modes | ||
| 2087 | # | ||
| 2088 | CONFIG_CRYPTO_CBC=y | ||
| 2089 | # CONFIG_CRYPTO_CTR is not set | ||
| 2090 | # CONFIG_CRYPTO_CTS is not set | ||
| 2091 | CONFIG_CRYPTO_ECB=y | ||
| 2092 | # CONFIG_CRYPTO_LRW is not set | ||
| 2093 | # CONFIG_CRYPTO_PCBC is not set | ||
| 2094 | # CONFIG_CRYPTO_XTS is not set | ||
| 2095 | |||
| 2096 | # | ||
| 2097 | # Hash modes | ||
| 2098 | # | ||
| 2099 | CONFIG_CRYPTO_HMAC=y | ||
| 2100 | # CONFIG_CRYPTO_XCBC is not set | ||
| 2101 | |||
| 2102 | # | ||
| 2103 | # Digest | ||
| 2104 | # | ||
| 2105 | # CONFIG_CRYPTO_CRC32C is not set | ||
| 2106 | # CONFIG_CRYPTO_MD4 is not set | ||
| 2107 | CONFIG_CRYPTO_MD5=y | ||
| 2108 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
| 2109 | CONFIG_CRYPTO_SHA1=y | ||
| 2110 | # CONFIG_CRYPTO_SHA256 is not set | ||
| 2111 | # CONFIG_CRYPTO_SHA512 is not set | ||
| 2112 | # CONFIG_CRYPTO_TGR192 is not set | ||
| 2113 | # CONFIG_CRYPTO_WP512 is not set | ||
| 2114 | |||
| 2115 | # | ||
| 2116 | # Ciphers | ||
| 2117 | # | ||
| 2118 | CONFIG_CRYPTO_AES=y | ||
| 2119 | # CONFIG_CRYPTO_AES_X86_64 is not set | ||
| 2120 | # CONFIG_CRYPTO_ANUBIS is not set | ||
| 2121 | CONFIG_CRYPTO_ARC4=y | ||
| 2122 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
| 2123 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
| 2124 | # CONFIG_CRYPTO_CAST5 is not set | ||
| 2125 | # CONFIG_CRYPTO_CAST6 is not set | ||
| 2126 | CONFIG_CRYPTO_DES=y | ||
| 2127 | # CONFIG_CRYPTO_FCRYPT is not set | ||
| 2128 | # CONFIG_CRYPTO_KHAZAD is not set | ||
| 2129 | # CONFIG_CRYPTO_SALSA20 is not set | ||
| 2130 | # CONFIG_CRYPTO_SALSA20_X86_64 is not set | ||
| 2131 | # CONFIG_CRYPTO_SEED is not set | ||
| 2132 | # CONFIG_CRYPTO_SERPENT is not set | ||
| 2133 | # CONFIG_CRYPTO_TEA is not set | ||
| 2134 | # CONFIG_CRYPTO_TWOFISH is not set | ||
| 2135 | # CONFIG_CRYPTO_TWOFISH_X86_64 is not set | ||
| 2136 | |||
| 2137 | # | ||
| 2138 | # Compression | ||
| 2139 | # | ||
| 2140 | # CONFIG_CRYPTO_DEFLATE is not set | ||
| 2141 | # CONFIG_CRYPTO_LZO is not set | ||
| 2142 | CONFIG_CRYPTO_HW=y | ||
| 2143 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | ||
| 2144 | CONFIG_HAVE_KVM=y | ||
| 2145 | CONFIG_VIRTUALIZATION=y | ||
| 2146 | # CONFIG_KVM is not set | ||
| 2147 | # CONFIG_VIRTIO_PCI is not set | ||
| 2148 | # CONFIG_VIRTIO_BALLOON is not set | ||
| 1364 | 2149 | ||
| 1365 | # | 2150 | # |
| 1366 | # Library routines | 2151 | # Library routines |
| 1367 | # | 2152 | # |
| 1368 | CONFIG_BITREVERSE=y | 2153 | CONFIG_BITREVERSE=y |
| 2154 | CONFIG_GENERIC_FIND_FIRST_BIT=y | ||
| 2155 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
| 1369 | # CONFIG_CRC_CCITT is not set | 2156 | # CONFIG_CRC_CCITT is not set |
| 1370 | # CONFIG_CRC16 is not set | 2157 | # CONFIG_CRC16 is not set |
| 1371 | # CONFIG_CRC_ITU_T is not set | 2158 | # CONFIG_CRC_ITU_T is not set |
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index b5e329da166c..3aefbce2de48 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -370,13 +370,11 @@ quiet_ni_syscall: | |||
| 370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi | 370 | PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi |
| 371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi | 371 | PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi |
| 372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx | 372 | PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx |
| 373 | PTREGSCALL stub32_sigsuspend, sys32_sigsuspend, %rcx | ||
| 374 | PTREGSCALL stub32_execve, sys32_execve, %rcx | 373 | PTREGSCALL stub32_execve, sys32_execve, %rcx |
| 375 | PTREGSCALL stub32_fork, sys_fork, %rdi | 374 | PTREGSCALL stub32_fork, sys_fork, %rdi |
| 376 | PTREGSCALL stub32_clone, sys32_clone, %rdx | 375 | PTREGSCALL stub32_clone, sys32_clone, %rdx |
| 377 | PTREGSCALL stub32_vfork, sys_vfork, %rdi | 376 | PTREGSCALL stub32_vfork, sys_vfork, %rdi |
| 378 | PTREGSCALL stub32_iopl, sys_iopl, %rsi | 377 | PTREGSCALL stub32_iopl, sys_iopl, %rsi |
| 379 | PTREGSCALL stub32_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
| 380 | 378 | ||
| 381 | ENTRY(ia32_ptregs_common) | 379 | ENTRY(ia32_ptregs_common) |
| 382 | popq %r11 | 380 | popq %r11 |
| @@ -476,7 +474,7 @@ ia32_sys_call_table: | |||
| 476 | .quad sys_ssetmask | 474 | .quad sys_ssetmask |
| 477 | .quad sys_setreuid16 /* 70 */ | 475 | .quad sys_setreuid16 /* 70 */ |
| 478 | .quad sys_setregid16 | 476 | .quad sys_setregid16 |
| 479 | .quad stub32_sigsuspend | 477 | .quad sys32_sigsuspend |
| 480 | .quad compat_sys_sigpending | 478 | .quad compat_sys_sigpending |
| 481 | .quad sys_sethostname | 479 | .quad sys_sethostname |
| 482 | .quad compat_sys_setrlimit /* 75 */ | 480 | .quad compat_sys_setrlimit /* 75 */ |
| @@ -583,7 +581,7 @@ ia32_sys_call_table: | |||
| 583 | .quad sys32_rt_sigpending | 581 | .quad sys32_rt_sigpending |
| 584 | .quad compat_sys_rt_sigtimedwait | 582 | .quad compat_sys_rt_sigtimedwait |
| 585 | .quad sys32_rt_sigqueueinfo | 583 | .quad sys32_rt_sigqueueinfo |
| 586 | .quad stub32_rt_sigsuspend | 584 | .quad sys_rt_sigsuspend |
| 587 | .quad sys32_pread /* 180 */ | 585 | .quad sys32_pread /* 180 */ |
| 588 | .quad sys32_pwrite | 586 | .quad sys32_pwrite |
| 589 | .quad sys_chown16 | 587 | .quad sys_chown16 |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 3a2a54c950ff..8a42b797cd6b 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -18,7 +18,7 @@ CFLAGS_tsc_64.o := $(nostackp) | |||
| 18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o | 18 | obj-y := process_$(BITS).o signal_$(BITS).o entry_$(BITS).o |
| 19 | obj-y += traps_$(BITS).o irq_$(BITS).o | 19 | obj-y += traps_$(BITS).o irq_$(BITS).o |
| 20 | obj-y += time_$(BITS).o ioport.o ldt.o | 20 | obj-y += time_$(BITS).o ioport.o ldt.o |
| 21 | obj-y += setup_$(BITS).o i8259_$(BITS).o setup.o | 21 | obj-y += setup_$(BITS).o i8259.o irqinit_$(BITS).o setup.o |
| 22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o | 22 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o |
| 23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o | 23 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |
| 24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o | 24 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o setup64.o |
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index 479926d9e004..e819362c7068 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c | |||
| @@ -35,6 +35,18 @@ int fallback_aper_force __initdata; | |||
| 35 | 35 | ||
| 36 | int fix_aperture __initdata = 1; | 36 | int fix_aperture __initdata = 1; |
| 37 | 37 | ||
| 38 | struct bus_dev_range { | ||
| 39 | int bus; | ||
| 40 | int dev_base; | ||
| 41 | int dev_limit; | ||
| 42 | }; | ||
| 43 | |||
| 44 | static struct bus_dev_range bus_dev_ranges[] __initdata = { | ||
| 45 | { 0x00, 0x18, 0x20}, | ||
| 46 | { 0xff, 0x00, 0x20}, | ||
| 47 | { 0xfe, 0x00, 0x20} | ||
| 48 | }; | ||
| 49 | |||
| 38 | static struct resource gart_resource = { | 50 | static struct resource gart_resource = { |
| 39 | .name = "GART", | 51 | .name = "GART", |
| 40 | .flags = IORESOURCE_MEM, | 52 | .flags = IORESOURCE_MEM, |
| @@ -55,8 +67,9 @@ static u32 __init allocate_aperture(void) | |||
| 55 | u32 aper_size; | 67 | u32 aper_size; |
| 56 | void *p; | 68 | void *p; |
| 57 | 69 | ||
| 58 | if (fallback_aper_order > 7) | 70 | /* aper_size should <= 1G */ |
| 59 | fallback_aper_order = 7; | 71 | if (fallback_aper_order > 5) |
| 72 | fallback_aper_order = 5; | ||
| 60 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; | 73 | aper_size = (32 * 1024 * 1024) << fallback_aper_order; |
| 61 | 74 | ||
| 62 | /* | 75 | /* |
| @@ -65,7 +78,20 @@ static u32 __init allocate_aperture(void) | |||
| 65 | * memory. Unfortunately we cannot move it up because that would | 78 | * memory. Unfortunately we cannot move it up because that would |
| 66 | * make the IOMMU useless. | 79 | * make the IOMMU useless. |
| 67 | */ | 80 | */ |
| 68 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 0); | 81 | /* |
| 82 | * using 512M as goal, in case kexec will load kernel_big | ||
| 83 | * that will do the on position decompress, and could overlap with | ||
| 84 | * that positon with gart that is used. | ||
| 85 | * sequende: | ||
| 86 | * kernel_small | ||
| 87 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
| 88 | * ==> kernel_small(gart area become e820_reserved) | ||
| 89 | * ==> kexec (with kdump trigger path or previous doesn't shutdown gart) | ||
| 90 | * ==> kerne_big (uncompressed size will be big than 64M or 128M) | ||
| 91 | * so don't use 512M below as gart iommu, leave the space for kernel | ||
| 92 | * code for safe | ||
| 93 | */ | ||
| 94 | p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20); | ||
| 69 | if (!p || __pa(p)+aper_size > 0xffffffff) { | 95 | if (!p || __pa(p)+aper_size > 0xffffffff) { |
| 70 | printk(KERN_ERR | 96 | printk(KERN_ERR |
| 71 | "Cannot allocate aperture memory hole (%p,%uK)\n", | 97 | "Cannot allocate aperture memory hole (%p,%uK)\n", |
| @@ -83,69 +109,53 @@ static u32 __init allocate_aperture(void) | |||
| 83 | return (u32)__pa(p); | 109 | return (u32)__pa(p); |
| 84 | } | 110 | } |
| 85 | 111 | ||
| 86 | static int __init aperture_valid(u64 aper_base, u32 aper_size) | ||
| 87 | { | ||
| 88 | if (!aper_base) | ||
| 89 | return 0; | ||
| 90 | |||
| 91 | if (aper_base + aper_size > 0x100000000UL) { | ||
| 92 | printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); | ||
| 93 | return 0; | ||
| 94 | } | ||
| 95 | if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { | ||
| 96 | printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); | ||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | if (aper_size < 64*1024*1024) { | ||
| 100 | printk(KERN_ERR "Aperture too small (%d MB)\n", aper_size>>20); | ||
| 101 | return 0; | ||
| 102 | } | ||
| 103 | |||
| 104 | return 1; | ||
| 105 | } | ||
| 106 | 112 | ||
| 107 | /* Find a PCI capability */ | 113 | /* Find a PCI capability */ |
| 108 | static __u32 __init find_cap(int num, int slot, int func, int cap) | 114 | static u32 __init find_cap(int bus, int slot, int func, int cap) |
| 109 | { | 115 | { |
| 110 | int bytes; | 116 | int bytes; |
| 111 | u8 pos; | 117 | u8 pos; |
| 112 | 118 | ||
| 113 | if (!(read_pci_config_16(num, slot, func, PCI_STATUS) & | 119 | if (!(read_pci_config_16(bus, slot, func, PCI_STATUS) & |
| 114 | PCI_STATUS_CAP_LIST)) | 120 | PCI_STATUS_CAP_LIST)) |
| 115 | return 0; | 121 | return 0; |
| 116 | 122 | ||
| 117 | pos = read_pci_config_byte(num, slot, func, PCI_CAPABILITY_LIST); | 123 | pos = read_pci_config_byte(bus, slot, func, PCI_CAPABILITY_LIST); |
| 118 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { | 124 | for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) { |
| 119 | u8 id; | 125 | u8 id; |
| 120 | 126 | ||
| 121 | pos &= ~3; | 127 | pos &= ~3; |
| 122 | id = read_pci_config_byte(num, slot, func, pos+PCI_CAP_LIST_ID); | 128 | id = read_pci_config_byte(bus, slot, func, pos+PCI_CAP_LIST_ID); |
| 123 | if (id == 0xff) | 129 | if (id == 0xff) |
| 124 | break; | 130 | break; |
| 125 | if (id == cap) | 131 | if (id == cap) |
| 126 | return pos; | 132 | return pos; |
| 127 | pos = read_pci_config_byte(num, slot, func, | 133 | pos = read_pci_config_byte(bus, slot, func, |
| 128 | pos+PCI_CAP_LIST_NEXT); | 134 | pos+PCI_CAP_LIST_NEXT); |
| 129 | } | 135 | } |
| 130 | return 0; | 136 | return 0; |
| 131 | } | 137 | } |
| 132 | 138 | ||
| 133 | /* Read a standard AGPv3 bridge header */ | 139 | /* Read a standard AGPv3 bridge header */ |
| 134 | static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | 140 | static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order) |
| 135 | { | 141 | { |
| 136 | u32 apsize; | 142 | u32 apsize; |
| 137 | u32 apsizereg; | 143 | u32 apsizereg; |
| 138 | int nbits; | 144 | int nbits; |
| 139 | u32 aper_low, aper_hi; | 145 | u32 aper_low, aper_hi; |
| 140 | u64 aper; | 146 | u64 aper; |
| 147 | u32 old_order; | ||
| 141 | 148 | ||
| 142 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", num, slot, func); | 149 | printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", bus, slot, func); |
| 143 | apsizereg = read_pci_config_16(num, slot, func, cap + 0x14); | 150 | apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14); |
| 144 | if (apsizereg == 0xffffffff) { | 151 | if (apsizereg == 0xffffffff) { |
| 145 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); | 152 | printk(KERN_ERR "APSIZE in AGP bridge unreadable\n"); |
| 146 | return 0; | 153 | return 0; |
| 147 | } | 154 | } |
| 148 | 155 | ||
| 156 | /* old_order could be the value from NB gart setting */ | ||
| 157 | old_order = *order; | ||
| 158 | |||
| 149 | apsize = apsizereg & 0xfff; | 159 | apsize = apsizereg & 0xfff; |
| 150 | /* Some BIOS use weird encodings not in the AGPv3 table. */ | 160 | /* Some BIOS use weird encodings not in the AGPv3 table. */ |
| 151 | if (apsize & 0xff) | 161 | if (apsize & 0xff) |
| @@ -155,14 +165,26 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
| 155 | if ((int)*order < 0) /* < 32MB */ | 165 | if ((int)*order < 0) /* < 32MB */ |
| 156 | *order = 0; | 166 | *order = 0; |
| 157 | 167 | ||
| 158 | aper_low = read_pci_config(num, slot, func, 0x10); | 168 | aper_low = read_pci_config(bus, slot, func, 0x10); |
| 159 | aper_hi = read_pci_config(num, slot, func, 0x14); | 169 | aper_hi = read_pci_config(bus, slot, func, 0x14); |
| 160 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | 170 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); |
| 161 | 171 | ||
| 172 | /* | ||
| 173 | * On some sick chips, APSIZE is 0. It means it wants 4G | ||
| 174 | * so let double check that order, and lets trust AMD NB settings: | ||
| 175 | */ | ||
| 176 | printk(KERN_INFO "Aperture from AGP @ %Lx old size %u MB\n", | ||
| 177 | aper, 32 << old_order); | ||
| 178 | if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) { | ||
| 179 | printk(KERN_INFO "Aperture size %u MB (APSIZE %x) is not right, using settings from NB\n", | ||
| 180 | 32 << *order, apsizereg); | ||
| 181 | *order = old_order; | ||
| 182 | } | ||
| 183 | |||
| 162 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", | 184 | printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", |
| 163 | aper, 32 << *order, apsizereg); | 185 | aper, 32 << *order, apsizereg); |
| 164 | 186 | ||
| 165 | if (!aperture_valid(aper, (32*1024*1024) << *order)) | 187 | if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20)) |
| 166 | return 0; | 188 | return 0; |
| 167 | return (u32)aper; | 189 | return (u32)aper; |
| 168 | } | 190 | } |
| @@ -180,17 +202,17 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order) | |||
| 180 | * the AGP bridges should be always an own bus on the HT hierarchy, | 202 | * the AGP bridges should be always an own bus on the HT hierarchy, |
| 181 | * but do it here for future safety. | 203 | * but do it here for future safety. |
| 182 | */ | 204 | */ |
| 183 | static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | 205 | static u32 __init search_agp_bridge(u32 *order, int *valid_agp) |
| 184 | { | 206 | { |
| 185 | int num, slot, func; | 207 | int bus, slot, func; |
| 186 | 208 | ||
| 187 | /* Poor man's PCI discovery */ | 209 | /* Poor man's PCI discovery */ |
| 188 | for (num = 0; num < 256; num++) { | 210 | for (bus = 0; bus < 256; bus++) { |
| 189 | for (slot = 0; slot < 32; slot++) { | 211 | for (slot = 0; slot < 32; slot++) { |
| 190 | for (func = 0; func < 8; func++) { | 212 | for (func = 0; func < 8; func++) { |
| 191 | u32 class, cap; | 213 | u32 class, cap; |
| 192 | u8 type; | 214 | u8 type; |
| 193 | class = read_pci_config(num, slot, func, | 215 | class = read_pci_config(bus, slot, func, |
| 194 | PCI_CLASS_REVISION); | 216 | PCI_CLASS_REVISION); |
| 195 | if (class == 0xffffffff) | 217 | if (class == 0xffffffff) |
| 196 | break; | 218 | break; |
| @@ -199,17 +221,17 @@ static __u32 __init search_agp_bridge(u32 *order, int *valid_agp) | |||
| 199 | case PCI_CLASS_BRIDGE_HOST: | 221 | case PCI_CLASS_BRIDGE_HOST: |
| 200 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ | 222 | case PCI_CLASS_BRIDGE_OTHER: /* needed? */ |
| 201 | /* AGP bridge? */ | 223 | /* AGP bridge? */ |
| 202 | cap = find_cap(num, slot, func, | 224 | cap = find_cap(bus, slot, func, |
| 203 | PCI_CAP_ID_AGP); | 225 | PCI_CAP_ID_AGP); |
| 204 | if (!cap) | 226 | if (!cap) |
| 205 | break; | 227 | break; |
| 206 | *valid_agp = 1; | 228 | *valid_agp = 1; |
| 207 | return read_agp(num, slot, func, cap, | 229 | return read_agp(bus, slot, func, cap, |
| 208 | order); | 230 | order); |
| 209 | } | 231 | } |
| 210 | 232 | ||
| 211 | /* No multi-function device? */ | 233 | /* No multi-function device? */ |
| 212 | type = read_pci_config_byte(num, slot, func, | 234 | type = read_pci_config_byte(bus, slot, func, |
| 213 | PCI_HEADER_TYPE); | 235 | PCI_HEADER_TYPE); |
| 214 | if (!(type & 0x80)) | 236 | if (!(type & 0x80)) |
| 215 | break; | 237 | break; |
| @@ -249,36 +271,50 @@ void __init early_gart_iommu_check(void) | |||
| 249 | * or BIOS forget to put that in reserved. | 271 | * or BIOS forget to put that in reserved. |
| 250 | * try to update e820 to make that region as reserved. | 272 | * try to update e820 to make that region as reserved. |
| 251 | */ | 273 | */ |
| 252 | int fix, num; | 274 | int i, fix, slot; |
| 253 | u32 ctl; | 275 | u32 ctl; |
| 254 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; | 276 | u32 aper_size = 0, aper_order = 0, last_aper_order = 0; |
| 255 | u64 aper_base = 0, last_aper_base = 0; | 277 | u64 aper_base = 0, last_aper_base = 0; |
| 256 | int aper_enabled = 0, last_aper_enabled = 0; | 278 | int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0; |
| 257 | 279 | ||
| 258 | if (!early_pci_allowed()) | 280 | if (!early_pci_allowed()) |
| 259 | return; | 281 | return; |
| 260 | 282 | ||
| 283 | /* This is mostly duplicate of iommu_hole_init */ | ||
| 261 | fix = 0; | 284 | fix = 0; |
| 262 | for (num = 24; num < 32; num++) { | 285 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 263 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 286 | int bus; |
| 264 | continue; | 287 | int dev_base, dev_limit; |
| 265 | 288 | ||
| 266 | ctl = read_pci_config(0, num, 3, 0x90); | 289 | bus = bus_dev_ranges[i].bus; |
| 267 | aper_enabled = ctl & 1; | 290 | dev_base = bus_dev_ranges[i].dev_base; |
| 268 | aper_order = (ctl >> 1) & 7; | 291 | dev_limit = bus_dev_ranges[i].dev_limit; |
| 269 | aper_size = (32 * 1024 * 1024) << aper_order; | 292 | |
| 270 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 293 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 271 | aper_base <<= 25; | 294 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 272 | 295 | continue; | |
| 273 | if ((last_aper_order && aper_order != last_aper_order) || | 296 | |
| 274 | (last_aper_base && aper_base != last_aper_base) || | 297 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
| 275 | (last_aper_enabled && aper_enabled != last_aper_enabled)) { | 298 | aper_enabled = ctl & AMD64_GARTEN; |
| 276 | fix = 1; | 299 | aper_order = (ctl >> 1) & 7; |
| 277 | break; | 300 | aper_size = (32 * 1024 * 1024) << aper_order; |
| 301 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; | ||
| 302 | aper_base <<= 25; | ||
| 303 | |||
| 304 | if (last_valid) { | ||
| 305 | if ((aper_order != last_aper_order) || | ||
| 306 | (aper_base != last_aper_base) || | ||
| 307 | (aper_enabled != last_aper_enabled)) { | ||
| 308 | fix = 1; | ||
| 309 | break; | ||
| 310 | } | ||
| 311 | } | ||
| 312 | |||
| 313 | last_aper_order = aper_order; | ||
| 314 | last_aper_base = aper_base; | ||
| 315 | last_aper_enabled = aper_enabled; | ||
| 316 | last_valid = 1; | ||
| 278 | } | 317 | } |
| 279 | last_aper_order = aper_order; | ||
| 280 | last_aper_base = aper_base; | ||
| 281 | last_aper_enabled = aper_enabled; | ||
| 282 | } | 318 | } |
| 283 | 319 | ||
| 284 | if (!fix && !aper_enabled) | 320 | if (!fix && !aper_enabled) |
| @@ -290,32 +326,46 @@ void __init early_gart_iommu_check(void) | |||
| 290 | if (gart_fix_e820 && !fix && aper_enabled) { | 326 | if (gart_fix_e820 && !fix && aper_enabled) { |
| 291 | if (e820_any_mapped(aper_base, aper_base + aper_size, | 327 | if (e820_any_mapped(aper_base, aper_base + aper_size, |
| 292 | E820_RAM)) { | 328 | E820_RAM)) { |
| 293 | /* reserved it, so we can resuse it in second kernel */ | 329 | /* reserve it, so we can reuse it in second kernel */ |
| 294 | printk(KERN_INFO "update e820 for GART\n"); | 330 | printk(KERN_INFO "update e820 for GART\n"); |
| 295 | add_memory_region(aper_base, aper_size, E820_RESERVED); | 331 | add_memory_region(aper_base, aper_size, E820_RESERVED); |
| 296 | update_e820(); | 332 | update_e820(); |
| 297 | } | 333 | } |
| 298 | return; | ||
| 299 | } | 334 | } |
| 300 | 335 | ||
| 336 | if (!fix) | ||
| 337 | return; | ||
| 338 | |||
| 301 | /* different nodes have different setting, disable them all at first*/ | 339 | /* different nodes have different setting, disable them all at first*/ |
| 302 | for (num = 24; num < 32; num++) { | 340 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 303 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 341 | int bus; |
| 304 | continue; | 342 | int dev_base, dev_limit; |
| 343 | |||
| 344 | bus = bus_dev_ranges[i].bus; | ||
| 345 | dev_base = bus_dev_ranges[i].dev_base; | ||
| 346 | dev_limit = bus_dev_ranges[i].dev_limit; | ||
| 347 | |||
| 348 | for (slot = dev_base; slot < dev_limit; slot++) { | ||
| 349 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) | ||
| 350 | continue; | ||
| 305 | 351 | ||
| 306 | ctl = read_pci_config(0, num, 3, 0x90); | 352 | ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); |
| 307 | ctl &= ~1; | 353 | ctl &= ~AMD64_GARTEN; |
| 308 | write_pci_config(0, num, 3, 0x90, ctl); | 354 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl); |
| 355 | } | ||
| 309 | } | 356 | } |
| 310 | 357 | ||
| 311 | } | 358 | } |
| 312 | 359 | ||
| 360 | static int __initdata printed_gart_size_msg; | ||
| 361 | |||
| 313 | void __init gart_iommu_hole_init(void) | 362 | void __init gart_iommu_hole_init(void) |
| 314 | { | 363 | { |
| 364 | u32 agp_aper_base = 0, agp_aper_order = 0; | ||
| 315 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; | 365 | u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0; |
| 316 | u64 aper_base, last_aper_base = 0; | 366 | u64 aper_base, last_aper_base = 0; |
| 317 | int fix, num, valid_agp = 0; | 367 | int fix, slot, valid_agp = 0; |
| 318 | int node; | 368 | int i, node; |
| 319 | 369 | ||
| 320 | if (gart_iommu_aperture_disabled || !fix_aperture || | 370 | if (gart_iommu_aperture_disabled || !fix_aperture || |
| 321 | !early_pci_allowed()) | 371 | !early_pci_allowed()) |
| @@ -323,38 +373,63 @@ void __init gart_iommu_hole_init(void) | |||
| 323 | 373 | ||
| 324 | printk(KERN_INFO "Checking aperture...\n"); | 374 | printk(KERN_INFO "Checking aperture...\n"); |
| 325 | 375 | ||
| 376 | if (!fallback_aper_force) | ||
| 377 | agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp); | ||
| 378 | |||
| 326 | fix = 0; | 379 | fix = 0; |
| 327 | node = 0; | 380 | node = 0; |
| 328 | for (num = 24; num < 32; num++) { | 381 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 329 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 382 | int bus; |
| 330 | continue; | 383 | int dev_base, dev_limit; |
| 331 | 384 | ||
| 332 | iommu_detected = 1; | 385 | bus = bus_dev_ranges[i].bus; |
| 333 | gart_iommu_aperture = 1; | 386 | dev_base = bus_dev_ranges[i].dev_base; |
| 334 | 387 | dev_limit = bus_dev_ranges[i].dev_limit; | |
| 335 | aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; | 388 | |
| 336 | aper_size = (32 * 1024 * 1024) << aper_order; | 389 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 337 | aper_base = read_pci_config(0, num, 3, 0x94) & 0x7fff; | 390 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 338 | aper_base <<= 25; | 391 | continue; |
| 339 | 392 | ||
| 340 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | 393 | iommu_detected = 1; |
| 341 | node, aper_base, aper_size >> 20); | 394 | gart_iommu_aperture = 1; |
| 342 | node++; | 395 | |
| 343 | 396 | aper_order = (read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL) >> 1) & 7; | |
| 344 | if (!aperture_valid(aper_base, aper_size)) { | 397 | aper_size = (32 * 1024 * 1024) << aper_order; |
| 345 | fix = 1; | 398 | aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; |
| 346 | break; | 399 | aper_base <<= 25; |
| 347 | } | 400 | |
| 401 | printk(KERN_INFO "Node %d: aperture @ %Lx size %u MB\n", | ||
| 402 | node, aper_base, aper_size >> 20); | ||
| 403 | node++; | ||
| 404 | |||
| 405 | if (!aperture_valid(aper_base, aper_size, 64<<20)) { | ||
| 406 | if (valid_agp && agp_aper_base && | ||
| 407 | agp_aper_base == aper_base && | ||
| 408 | agp_aper_order == aper_order) { | ||
| 409 | /* the same between two setting from NB and agp */ | ||
| 410 | if (!no_iommu && end_pfn > MAX_DMA32_PFN && !printed_gart_size_msg) { | ||
| 411 | printk(KERN_ERR "you are using iommu with agp, but GART size is less than 64M\n"); | ||
| 412 | printk(KERN_ERR "please increase GART size in your BIOS setup\n"); | ||
| 413 | printk(KERN_ERR "if BIOS doesn't have that option, contact your HW vendor!\n"); | ||
| 414 | printed_gart_size_msg = 1; | ||
| 415 | } | ||
| 416 | } else { | ||
| 417 | fix = 1; | ||
| 418 | goto out; | ||
| 419 | } | ||
| 420 | } | ||
| 348 | 421 | ||
| 349 | if ((last_aper_order && aper_order != last_aper_order) || | 422 | if ((last_aper_order && aper_order != last_aper_order) || |
| 350 | (last_aper_base && aper_base != last_aper_base)) { | 423 | (last_aper_base && aper_base != last_aper_base)) { |
| 351 | fix = 1; | 424 | fix = 1; |
| 352 | break; | 425 | goto out; |
| 426 | } | ||
| 427 | last_aper_order = aper_order; | ||
| 428 | last_aper_base = aper_base; | ||
| 353 | } | 429 | } |
| 354 | last_aper_order = aper_order; | ||
| 355 | last_aper_base = aper_base; | ||
| 356 | } | 430 | } |
| 357 | 431 | ||
| 432 | out: | ||
| 358 | if (!fix && !fallback_aper_force) { | 433 | if (!fix && !fallback_aper_force) { |
| 359 | if (last_aper_base) { | 434 | if (last_aper_base) { |
| 360 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; | 435 | unsigned long n = (32 * 1024 * 1024) << last_aper_order; |
| @@ -364,8 +439,10 @@ void __init gart_iommu_hole_init(void) | |||
| 364 | return; | 439 | return; |
| 365 | } | 440 | } |
| 366 | 441 | ||
| 367 | if (!fallback_aper_force) | 442 | if (!fallback_aper_force) { |
| 368 | aper_alloc = search_agp_bridge(&aper_order, &valid_agp); | 443 | aper_alloc = agp_aper_base; |
| 444 | aper_order = agp_aper_order; | ||
| 445 | } | ||
| 369 | 446 | ||
| 370 | if (aper_alloc) { | 447 | if (aper_alloc) { |
| 371 | /* Got the aperture from the AGP bridge */ | 448 | /* Got the aperture from the AGP bridge */ |
| @@ -401,16 +478,24 @@ void __init gart_iommu_hole_init(void) | |||
| 401 | } | 478 | } |
| 402 | 479 | ||
| 403 | /* Fix up the north bridges */ | 480 | /* Fix up the north bridges */ |
| 404 | for (num = 24; num < 32; num++) { | 481 | for (i = 0; i < ARRAY_SIZE(bus_dev_ranges); i++) { |
| 405 | if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00))) | 482 | int bus; |
| 406 | continue; | 483 | int dev_base, dev_limit; |
| 407 | 484 | ||
| 408 | /* | 485 | bus = bus_dev_ranges[i].bus; |
| 409 | * Don't enable translation yet. That is done later. | 486 | dev_base = bus_dev_ranges[i].dev_base; |
| 410 | * Assume this BIOS didn't initialise the GART so | 487 | dev_limit = bus_dev_ranges[i].dev_limit; |
| 411 | * just overwrite all previous bits | 488 | for (slot = dev_base; slot < dev_limit; slot++) { |
| 412 | */ | 489 | if (!early_is_k8_nb(read_pci_config(bus, slot, 3, 0x00))) |
| 413 | write_pci_config(0, num, 3, 0x90, aper_order<<1); | 490 | continue; |
| 414 | write_pci_config(0, num, 3, 0x94, aper_alloc>>25); | 491 | |
| 492 | /* Don't enable translation yet. That is done later. | ||
| 493 | Assume this BIOS didn't initialise the GART so | ||
| 494 | just overwrite all previous bits */ | ||
| 495 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, aper_order << 1); | ||
| 496 | write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25); | ||
| 497 | } | ||
| 415 | } | 498 | } |
| 499 | |||
| 500 | set_up_gart_resume(aper_order, aper_alloc); | ||
| 416 | } | 501 | } |
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index c44206e731d4..45d8da405ad9 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
| @@ -1153,9 +1153,6 @@ static int __init detect_init_APIC(void) | |||
| 1153 | if (l & MSR_IA32_APICBASE_ENABLE) | 1153 | if (l & MSR_IA32_APICBASE_ENABLE) |
| 1154 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; | 1154 | mp_lapic_addr = l & MSR_IA32_APICBASE_BASE; |
| 1155 | 1155 | ||
| 1156 | if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED) | ||
| 1157 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 1158 | |||
| 1159 | printk(KERN_INFO "Found and enabled local APIC!\n"); | 1156 | printk(KERN_INFO "Found and enabled local APIC!\n"); |
| 1160 | 1157 | ||
| 1161 | apic_pm_activate(); | 1158 | apic_pm_activate(); |
| @@ -1268,6 +1265,10 @@ int __init APIC_init_uniprocessor(void) | |||
| 1268 | 1265 | ||
| 1269 | setup_local_APIC(); | 1266 | setup_local_APIC(); |
| 1270 | 1267 | ||
| 1268 | #ifdef CONFIG_X86_IO_APIC | ||
| 1269 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
| 1270 | #endif | ||
| 1271 | localise_nmi_watchdog(); | ||
| 1271 | end_local_APIC_setup(); | 1272 | end_local_APIC_setup(); |
| 1272 | #ifdef CONFIG_X86_IO_APIC | 1273 | #ifdef CONFIG_X86_IO_APIC |
| 1273 | if (smp_found_config) | 1274 | if (smp_found_config) |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index a5cc8447cf4d..3ef7752aa8e5 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
| @@ -851,7 +851,7 @@ static int __init detect_init_APIC(void) | |||
| 851 | 851 | ||
| 852 | void __init early_init_lapic_mapping(void) | 852 | void __init early_init_lapic_mapping(void) |
| 853 | { | 853 | { |
| 854 | unsigned long apic_phys; | 854 | unsigned long phys_addr; |
| 855 | 855 | ||
| 856 | /* | 856 | /* |
| 857 | * If no local APIC can be found then go out | 857 | * If no local APIC can be found then go out |
| @@ -860,11 +860,11 @@ void __init early_init_lapic_mapping(void) | |||
| 860 | if (!smp_found_config) | 860 | if (!smp_found_config) |
| 861 | return; | 861 | return; |
| 862 | 862 | ||
| 863 | apic_phys = mp_lapic_addr; | 863 | phys_addr = mp_lapic_addr; |
| 864 | 864 | ||
| 865 | set_fixmap_nocache(FIX_APIC_BASE, apic_phys); | 865 | set_fixmap_nocache(FIX_APIC_BASE, phys_addr); |
| 866 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", | 866 | apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n", |
| 867 | APIC_BASE, apic_phys); | 867 | APIC_BASE, phys_addr); |
| 868 | 868 | ||
| 869 | /* | 869 | /* |
| 870 | * Fetch the APIC ID of the BSP in case we have a | 870 | * Fetch the APIC ID of the BSP in case we have a |
| @@ -930,6 +930,8 @@ int __init APIC_init_uniprocessor(void) | |||
| 930 | if (!skip_ioapic_setup && nr_ioapics) | 930 | if (!skip_ioapic_setup && nr_ioapics) |
| 931 | enable_IO_APIC(); | 931 | enable_IO_APIC(); |
| 932 | 932 | ||
| 933 | if (!smp_found_config || skip_ioapic_setup || !nr_ioapics) | ||
| 934 | localise_nmi_watchdog(); | ||
| 933 | end_local_APIC_setup(); | 935 | end_local_APIC_setup(); |
| 934 | 936 | ||
| 935 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) | 937 | if (smp_found_config && !skip_ioapic_setup && nr_ioapics) |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index bf9290e29013..00e6d1370954 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
| @@ -228,6 +228,7 @@ | |||
| 228 | #include <linux/suspend.h> | 228 | #include <linux/suspend.h> |
| 229 | #include <linux/kthread.h> | 229 | #include <linux/kthread.h> |
| 230 | #include <linux/jiffies.h> | 230 | #include <linux/jiffies.h> |
| 231 | #include <linux/smp_lock.h> | ||
| 231 | 232 | ||
| 232 | #include <asm/system.h> | 233 | #include <asm/system.h> |
| 233 | #include <asm/uaccess.h> | 234 | #include <asm/uaccess.h> |
| @@ -1149,7 +1150,7 @@ static void queue_event(apm_event_t event, struct apm_user *sender) | |||
| 1149 | as->event_tail = 0; | 1150 | as->event_tail = 0; |
| 1150 | } | 1151 | } |
| 1151 | as->events[as->event_head] = event; | 1152 | as->events[as->event_head] = event; |
| 1152 | if ((!as->suser) || (!as->writer)) | 1153 | if (!as->suser || !as->writer) |
| 1153 | continue; | 1154 | continue; |
| 1154 | switch (event) { | 1155 | switch (event) { |
| 1155 | case APM_SYS_SUSPEND: | 1156 | case APM_SYS_SUSPEND: |
| @@ -1396,7 +1397,7 @@ static void apm_mainloop(void) | |||
| 1396 | 1397 | ||
| 1397 | static int check_apm_user(struct apm_user *as, const char *func) | 1398 | static int check_apm_user(struct apm_user *as, const char *func) |
| 1398 | { | 1399 | { |
| 1399 | if ((as == NULL) || (as->magic != APM_BIOS_MAGIC)) { | 1400 | if (as == NULL || as->magic != APM_BIOS_MAGIC) { |
| 1400 | printk(KERN_ERR "apm: %s passed bad filp\n", func); | 1401 | printk(KERN_ERR "apm: %s passed bad filp\n", func); |
| 1401 | return 1; | 1402 | return 1; |
| 1402 | } | 1403 | } |
| @@ -1459,18 +1460,19 @@ static unsigned int do_poll(struct file *fp, poll_table *wait) | |||
| 1459 | return 0; | 1460 | return 0; |
| 1460 | } | 1461 | } |
| 1461 | 1462 | ||
| 1462 | static int do_ioctl(struct inode *inode, struct file *filp, | 1463 | static long do_ioctl(struct file *filp, u_int cmd, u_long arg) |
| 1463 | u_int cmd, u_long arg) | ||
| 1464 | { | 1464 | { |
| 1465 | struct apm_user *as; | 1465 | struct apm_user *as; |
| 1466 | int ret; | ||
| 1466 | 1467 | ||
| 1467 | as = filp->private_data; | 1468 | as = filp->private_data; |
| 1468 | if (check_apm_user(as, "ioctl")) | 1469 | if (check_apm_user(as, "ioctl")) |
| 1469 | return -EIO; | 1470 | return -EIO; |
| 1470 | if ((!as->suser) || (!as->writer)) | 1471 | if (!as->suser || !as->writer) |
| 1471 | return -EPERM; | 1472 | return -EPERM; |
| 1472 | switch (cmd) { | 1473 | switch (cmd) { |
| 1473 | case APM_IOC_STANDBY: | 1474 | case APM_IOC_STANDBY: |
| 1475 | lock_kernel(); | ||
| 1474 | if (as->standbys_read > 0) { | 1476 | if (as->standbys_read > 0) { |
| 1475 | as->standbys_read--; | 1477 | as->standbys_read--; |
| 1476 | as->standbys_pending--; | 1478 | as->standbys_pending--; |
| @@ -1479,8 +1481,10 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
| 1479 | queue_event(APM_USER_STANDBY, as); | 1481 | queue_event(APM_USER_STANDBY, as); |
| 1480 | if (standbys_pending <= 0) | 1482 | if (standbys_pending <= 0) |
| 1481 | standby(); | 1483 | standby(); |
| 1484 | unlock_kernel(); | ||
| 1482 | break; | 1485 | break; |
| 1483 | case APM_IOC_SUSPEND: | 1486 | case APM_IOC_SUSPEND: |
| 1487 | lock_kernel(); | ||
| 1484 | if (as->suspends_read > 0) { | 1488 | if (as->suspends_read > 0) { |
| 1485 | as->suspends_read--; | 1489 | as->suspends_read--; |
| 1486 | as->suspends_pending--; | 1490 | as->suspends_pending--; |
| @@ -1488,16 +1492,17 @@ static int do_ioctl(struct inode *inode, struct file *filp, | |||
| 1488 | } else | 1492 | } else |
| 1489 | queue_event(APM_USER_SUSPEND, as); | 1493 | queue_event(APM_USER_SUSPEND, as); |
| 1490 | if (suspends_pending <= 0) { | 1494 | if (suspends_pending <= 0) { |
| 1491 | return suspend(1); | 1495 | ret = suspend(1); |
| 1492 | } else { | 1496 | } else { |
| 1493 | as->suspend_wait = 1; | 1497 | as->suspend_wait = 1; |
| 1494 | wait_event_interruptible(apm_suspend_waitqueue, | 1498 | wait_event_interruptible(apm_suspend_waitqueue, |
| 1495 | as->suspend_wait == 0); | 1499 | as->suspend_wait == 0); |
| 1496 | return as->suspend_result; | 1500 | ret = as->suspend_result; |
| 1497 | } | 1501 | } |
| 1498 | break; | 1502 | unlock_kernel(); |
| 1503 | return ret; | ||
| 1499 | default: | 1504 | default: |
| 1500 | return -EINVAL; | 1505 | return -ENOTTY; |
| 1501 | } | 1506 | } |
| 1502 | return 0; | 1507 | return 0; |
| 1503 | } | 1508 | } |
| @@ -1860,7 +1865,7 @@ static const struct file_operations apm_bios_fops = { | |||
| 1860 | .owner = THIS_MODULE, | 1865 | .owner = THIS_MODULE, |
| 1861 | .read = do_read, | 1866 | .read = do_read, |
| 1862 | .poll = do_poll, | 1867 | .poll = do_poll, |
| 1863 | .ioctl = do_ioctl, | 1868 | .unlocked_ioctl = do_ioctl, |
| 1864 | .open = do_open, | 1869 | .open = do_open, |
| 1865 | .release = do_release, | 1870 | .release = do_release, |
| 1866 | }; | 1871 | }; |
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index c2e1ce33c7cb..84a8220a6072 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | |||
| 2 | /* | 1 | /* |
| 3 | * Routines to indentify additional cpu features that are scattered in | 2 | * Routines to indentify additional cpu features that are scattered in |
| 4 | * cpuid space. | 3 | * cpuid space. |
| 5 | */ | 4 | */ |
| 6 | |||
| 7 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
| 8 | 6 | ||
| 9 | #include <asm/pat.h> | 7 | #include <asm/pat.h> |
| @@ -53,19 +51,20 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) | |||
| 53 | #ifdef CONFIG_X86_PAT | 51 | #ifdef CONFIG_X86_PAT |
| 54 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) | 52 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) |
| 55 | { | 53 | { |
| 54 | if (!cpu_has_pat) | ||
| 55 | pat_disable("PAT not supported by CPU."); | ||
| 56 | |||
| 56 | switch (c->x86_vendor) { | 57 | switch (c->x86_vendor) { |
| 57 | case X86_VENDOR_AMD: | ||
| 58 | if (c->x86 >= 0xf && c->x86 <= 0x11) | ||
| 59 | return; | ||
| 60 | break; | ||
| 61 | case X86_VENDOR_INTEL: | 58 | case X86_VENDOR_INTEL: |
| 62 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) | 59 | if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15)) |
| 63 | return; | 60 | return; |
| 64 | break; | 61 | break; |
| 62 | case X86_VENDOR_AMD: | ||
| 63 | case X86_VENDOR_CENTAUR: | ||
| 64 | case X86_VENDOR_TRANSMETA: | ||
| 65 | return; | ||
| 65 | } | 66 | } |
| 66 | 67 | ||
| 67 | pat_disable(cpu_has_pat ? | 68 | pat_disable("PAT disabled. Not yet verified on this CPU type."); |
| 68 | "PAT disabled. Not yet verified on this CPU type." : | ||
| 69 | "PAT not supported by CPU."); | ||
| 70 | } | 69 | } |
| 71 | #endif | 70 | #endif |
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 170d2f5523b2..1b1c56bb338f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c | |||
| @@ -59,8 +59,12 @@ static void __init check_fpu(void) | |||
| 59 | return; | 59 | return; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* trap_init() enabled FXSR and company _before_ testing for FP problems here. */ | 62 | /* |
| 63 | /* Test for the divl bug.. */ | 63 | * trap_init() enabled FXSR and company _before_ testing for FP |
| 64 | * problems here. | ||
| 65 | * | ||
| 66 | * Test for the divl bug.. | ||
| 67 | */ | ||
| 64 | __asm__("fninit\n\t" | 68 | __asm__("fninit\n\t" |
| 65 | "fldl %1\n\t" | 69 | "fldl %1\n\t" |
| 66 | "fdivl %2\n\t" | 70 | "fdivl %2\n\t" |
| @@ -108,10 +112,15 @@ static void __init check_popad(void) | |||
| 108 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " | 112 | "movl $12345678,%%eax; movl $0,%%edi; pusha; popa; movl (%%edx,%%edi),%%ecx " |
| 109 | : "=&a" (res) | 113 | : "=&a" (res) |
| 110 | : "d" (inp) | 114 | : "d" (inp) |
| 111 | : "ecx", "edi" ); | 115 | : "ecx", "edi"); |
| 112 | /* If this fails, it means that any user program may lock the CPU hard. Too bad. */ | 116 | /* |
| 113 | if (res != 12345678) printk( "Buggy.\n" ); | 117 | * If this fails, it means that any user program may lock the |
| 114 | else printk( "OK.\n" ); | 118 | * CPU hard. Too bad. |
| 119 | */ | ||
| 120 | if (res != 12345678) | ||
| 121 | printk("Buggy.\n"); | ||
| 122 | else | ||
| 123 | printk("OK.\n"); | ||
| 115 | #endif | 124 | #endif |
| 116 | } | 125 | } |
| 117 | 126 | ||
| @@ -137,7 +146,8 @@ static void __init check_config(void) | |||
| 137 | * i486+ only features! (WP works in supervisor mode and the | 146 | * i486+ only features! (WP works in supervisor mode and the |
| 138 | * new "invlpg" and "bswap" instructions) | 147 | * new "invlpg" and "bswap" instructions) |
| 139 | */ | 148 | */ |
| 140 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || defined(CONFIG_X86_BSWAP) | 149 | #if defined(CONFIG_X86_WP_WORKS_OK) || defined(CONFIG_X86_INVLPG) || \ |
| 150 | defined(CONFIG_X86_BSWAP) | ||
| 141 | if (boot_cpu_data.x86 == 3) | 151 | if (boot_cpu_data.x86 == 3) |
| 142 | panic("Kernel requires i486+ for 'invlpg' and other features"); | 152 | panic("Kernel requires i486+ for 'invlpg' and other features"); |
| 143 | #endif | 153 | #endif |
| @@ -170,6 +180,7 @@ void __init check_bugs(void) | |||
| 170 | check_fpu(); | 180 | check_fpu(); |
| 171 | check_hlt(); | 181 | check_hlt(); |
| 172 | check_popad(); | 182 | check_popad(); |
| 173 | init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | 183 | init_utsname()->machine[1] = |
| 184 | '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); | ||
| 174 | alternative_instructions(); | 185 | alternative_instructions(); |
| 175 | } | 186 | } |
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c index f03e9153618e..965ea52767ac 100644 --- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c +++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | |||
| @@ -26,9 +26,10 @@ | |||
| 26 | #define NFORCE2_SAFE_DISTANCE 50 | 26 | #define NFORCE2_SAFE_DISTANCE 50 |
| 27 | 27 | ||
| 28 | /* Delay in ms between FSB changes */ | 28 | /* Delay in ms between FSB changes */ |
| 29 | //#define NFORCE2_DELAY 10 | 29 | /* #define NFORCE2_DELAY 10 */ |
| 30 | 30 | ||
| 31 | /* nforce2_chipset: | 31 | /* |
| 32 | * nforce2_chipset: | ||
| 32 | * FSB is changed using the chipset | 33 | * FSB is changed using the chipset |
| 33 | */ | 34 | */ |
| 34 | static struct pci_dev *nforce2_chipset_dev; | 35 | static struct pci_dev *nforce2_chipset_dev; |
| @@ -36,13 +37,13 @@ static struct pci_dev *nforce2_chipset_dev; | |||
| 36 | /* fid: | 37 | /* fid: |
| 37 | * multiplier * 10 | 38 | * multiplier * 10 |
| 38 | */ | 39 | */ |
| 39 | static int fid = 0; | 40 | static int fid; |
| 40 | 41 | ||
| 41 | /* min_fsb, max_fsb: | 42 | /* min_fsb, max_fsb: |
| 42 | * minimum and maximum FSB (= FSB at boot time) | 43 | * minimum and maximum FSB (= FSB at boot time) |
| 43 | */ | 44 | */ |
| 44 | static int min_fsb = 0; | 45 | static int min_fsb; |
| 45 | static int max_fsb = 0; | 46 | static int max_fsb; |
| 46 | 47 | ||
| 47 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); | 48 | MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); |
| 48 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); | 49 | MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver"); |
| @@ -53,7 +54,7 @@ module_param(min_fsb, int, 0444); | |||
| 53 | 54 | ||
| 54 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); | 55 | MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)"); |
| 55 | MODULE_PARM_DESC(min_fsb, | 56 | MODULE_PARM_DESC(min_fsb, |
| 56 | "Minimum FSB to use, if not defined: current FSB - 50"); | 57 | "Minimum FSB to use, if not defined: current FSB - 50"); |
| 57 | 58 | ||
| 58 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) | 59 | #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "cpufreq-nforce2", msg) |
| 59 | 60 | ||
| @@ -139,7 +140,7 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
| 139 | 140 | ||
| 140 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ | 141 | /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */ |
| 141 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, | 142 | nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, |
| 142 | 0x01EF,PCI_ANY_ID,PCI_ANY_ID,NULL); | 143 | 0x01EF, PCI_ANY_ID, PCI_ANY_ID, NULL); |
| 143 | if (!nforce2_sub5) | 144 | if (!nforce2_sub5) |
| 144 | return 0; | 145 | return 0; |
| 145 | 146 | ||
| @@ -147,13 +148,13 @@ static unsigned int nforce2_fsb_read(int bootfsb) | |||
| 147 | fsb /= 1000000; | 148 | fsb /= 1000000; |
| 148 | 149 | ||
| 149 | /* Check if PLL register is already set */ | 150 | /* Check if PLL register is already set */ |
| 150 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 151 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
| 151 | 152 | ||
| 152 | if(bootfsb || !temp) | 153 | if (bootfsb || !temp) |
| 153 | return fsb; | 154 | return fsb; |
| 154 | 155 | ||
| 155 | /* Use PLL register FSB value */ | 156 | /* Use PLL register FSB value */ |
| 156 | pci_read_config_dword(nforce2_chipset_dev,NFORCE2_PLLREG, &temp); | 157 | pci_read_config_dword(nforce2_chipset_dev, NFORCE2_PLLREG, &temp); |
| 157 | fsb = nforce2_calc_fsb(temp); | 158 | fsb = nforce2_calc_fsb(temp); |
| 158 | 159 | ||
| 159 | return fsb; | 160 | return fsb; |
| @@ -184,7 +185,7 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | /* First write? Then set actual value */ | 187 | /* First write? Then set actual value */ |
| 187 | pci_read_config_byte(nforce2_chipset_dev,NFORCE2_PLLENABLE, (u8 *)&temp); | 188 | pci_read_config_byte(nforce2_chipset_dev, NFORCE2_PLLENABLE, (u8 *)&temp); |
| 188 | if (!temp) { | 189 | if (!temp) { |
| 189 | pll = nforce2_calc_pll(tfsb); | 190 | pll = nforce2_calc_pll(tfsb); |
| 190 | 191 | ||
| @@ -210,7 +211,8 @@ static int nforce2_set_fsb(unsigned int fsb) | |||
| 210 | tfsb--; | 211 | tfsb--; |
| 211 | 212 | ||
| 212 | /* Calculate the PLL reg. value */ | 213 | /* Calculate the PLL reg. value */ |
| 213 | if ((pll = nforce2_calc_pll(tfsb)) == -1) | 214 | pll = nforce2_calc_pll(tfsb); |
| 215 | if (pll == -1) | ||
| 214 | return -EINVAL; | 216 | return -EINVAL; |
| 215 | 217 | ||
| 216 | nforce2_write_pll(pll); | 218 | nforce2_write_pll(pll); |
| @@ -249,7 +251,7 @@ static unsigned int nforce2_get(unsigned int cpu) | |||
| 249 | static int nforce2_target(struct cpufreq_policy *policy, | 251 | static int nforce2_target(struct cpufreq_policy *policy, |
| 250 | unsigned int target_freq, unsigned int relation) | 252 | unsigned int target_freq, unsigned int relation) |
| 251 | { | 253 | { |
| 252 | // unsigned long flags; | 254 | /* unsigned long flags; */ |
| 253 | struct cpufreq_freqs freqs; | 255 | struct cpufreq_freqs freqs; |
| 254 | unsigned int target_fsb; | 256 | unsigned int target_fsb; |
| 255 | 257 | ||
| @@ -271,17 +273,17 @@ static int nforce2_target(struct cpufreq_policy *policy, | |||
| 271 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); | 273 | cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); |
| 272 | 274 | ||
| 273 | /* Disable IRQs */ | 275 | /* Disable IRQs */ |
| 274 | //local_irq_save(flags); | 276 | /* local_irq_save(flags); */ |
| 275 | 277 | ||
| 276 | if (nforce2_set_fsb(target_fsb) < 0) | 278 | if (nforce2_set_fsb(target_fsb) < 0) |
| 277 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", | 279 | printk(KERN_ERR "cpufreq: Changing FSB to %d failed\n", |
| 278 | target_fsb); | 280 | target_fsb); |
| 279 | else | 281 | else |
| 280 | dprintk("Changed FSB successfully to %d\n", | 282 | dprintk("Changed FSB successfully to %d\n", |
| 281 | target_fsb); | 283 | target_fsb); |
| 282 | 284 | ||
| 283 | /* Enable IRQs */ | 285 | /* Enable IRQs */ |
| 284 | //local_irq_restore(flags); | 286 | /* local_irq_restore(flags); */ |
| 285 | 287 | ||
| 286 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); | 288 | cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); |
| 287 | 289 | ||
| @@ -302,8 +304,8 @@ static int nforce2_verify(struct cpufreq_policy *policy) | |||
| 302 | policy->max = (fsb_pol_max + 1) * fid * 100; | 304 | policy->max = (fsb_pol_max + 1) * fid * 100; |
| 303 | 305 | ||
| 304 | cpufreq_verify_within_limits(policy, | 306 | cpufreq_verify_within_limits(policy, |
| 305 | policy->cpuinfo.min_freq, | 307 | policy->cpuinfo.min_freq, |
| 306 | policy->cpuinfo.max_freq); | 308 | policy->cpuinfo.max_freq); |
| 307 | return 0; | 309 | return 0; |
| 308 | } | 310 | } |
| 309 | 311 | ||
| @@ -347,7 +349,7 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) | |||
| 347 | /* Set maximum FSB to FSB at boot time */ | 349 | /* Set maximum FSB to FSB at boot time */ |
| 348 | max_fsb = nforce2_fsb_read(1); | 350 | max_fsb = nforce2_fsb_read(1); |
| 349 | 351 | ||
| 350 | if(!max_fsb) | 352 | if (!max_fsb) |
| 351 | return -EIO; | 353 | return -EIO; |
| 352 | 354 | ||
| 353 | if (!min_fsb) | 355 | if (!min_fsb) |
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c index 26d615dcb149..2c8afafa18e8 100644 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c | |||
| @@ -62,6 +62,7 @@ static struct _cache_table cache_table[] __cpuinitdata = | |||
| 62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ | 62 | { 0x4b, LVL_3, 8192 }, /* 16-way set assoc, 64 byte line size */ |
| 63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ | 63 | { 0x4c, LVL_3, 12288 }, /* 12-way set assoc, 64 byte line size */ |
| 64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ | 64 | { 0x4d, LVL_3, 16384 }, /* 16-way set assoc, 64 byte line size */ |
| 65 | { 0x4e, LVL_2, 6144 }, /* 24-way set assoc, 64 byte line size */ | ||
| 65 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ | 66 | { 0x60, LVL_1_DATA, 16 }, /* 8-way set assoc, sectored cache, 64 byte line size */ |
| 66 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 67 | { 0x66, LVL_1_DATA, 8 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
| 67 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ | 68 | { 0x67, LVL_1_DATA, 16 }, /* 4-way set assoc, sectored cache, 64 byte line size */ |
diff --git a/arch/x86/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c index e633c9c2b764..f390c9f66351 100644 --- a/arch/x86/kernel/cpu/mcheck/k7.c +++ b/arch/x86/kernel/cpu/mcheck/k7.c | |||
| @@ -9,23 +9,23 @@ | |||
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/smp.h> | 10 | #include <linux/smp.h> |
| 11 | 11 | ||
| 12 | #include <asm/processor.h> | 12 | #include <asm/processor.h> |
| 13 | #include <asm/system.h> | 13 | #include <asm/system.h> |
| 14 | #include <asm/msr.h> | 14 | #include <asm/msr.h> |
| 15 | 15 | ||
| 16 | #include "mce.h" | 16 | #include "mce.h" |
| 17 | 17 | ||
| 18 | /* Machine Check Handler For AMD Athlon/Duron */ | 18 | /* Machine Check Handler For AMD Athlon/Duron */ |
| 19 | static void k7_machine_check(struct pt_regs * regs, long error_code) | 19 | static void k7_machine_check(struct pt_regs *regs, long error_code) |
| 20 | { | 20 | { |
| 21 | int recover=1; | 21 | int recover = 1; |
| 22 | u32 alow, ahigh, high, low; | 22 | u32 alow, ahigh, high, low; |
| 23 | u32 mcgstl, mcgsth; | 23 | u32 mcgstl, mcgsth; |
| 24 | int i; | 24 | int i; |
| 25 | 25 | ||
| 26 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 26 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 27 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 27 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
| 28 | recover=0; | 28 | recover = 0; |
| 29 | 29 | ||
| 30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 30 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
| 31 | smp_processor_id(), mcgsth, mcgstl); | 31 | smp_processor_id(), mcgsth, mcgstl); |
| @@ -60,12 +60,12 @@ static void k7_machine_check(struct pt_regs * regs, long error_code) | |||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | if (recover&2) | 62 | if (recover&2) |
| 63 | panic ("CPU context corrupt"); | 63 | panic("CPU context corrupt"); |
| 64 | if (recover&1) | 64 | if (recover&1) |
| 65 | panic ("Unable to continue"); | 65 | panic("Unable to continue"); |
| 66 | printk (KERN_EMERG "Attempting to continue.\n"); | 66 | printk(KERN_EMERG "Attempting to continue.\n"); |
| 67 | mcgstl &= ~(1<<2); | 67 | mcgstl &= ~(1<<2); |
| 68 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 68 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | 71 | ||
| @@ -81,25 +81,25 @@ void amd_mcheck_init(struct cpuinfo_x86 *c) | |||
| 81 | machine_check_vector = k7_machine_check; | 81 | machine_check_vector = k7_machine_check; |
| 82 | wmb(); | 82 | wmb(); |
| 83 | 83 | ||
| 84 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 84 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
| 85 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 85 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 86 | if (l & (1<<8)) /* Control register present ? */ | 86 | if (l & (1<<8)) /* Control register present ? */ |
| 87 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 87 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 88 | nr_mce_banks = l & 0xff; | 88 | nr_mce_banks = l & 0xff; |
| 89 | 89 | ||
| 90 | /* Clear status for MC index 0 separately, we don't touch CTL, | 90 | /* Clear status for MC index 0 separately, we don't touch CTL, |
| 91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ | 91 | * as some K7 Athlons cause spurious MCEs when its enabled. */ |
| 92 | if (boot_cpu_data.x86 == 6) { | 92 | if (boot_cpu_data.x86 == 6) { |
| 93 | wrmsr (MSR_IA32_MC0_STATUS, 0x0, 0x0); | 93 | wrmsr(MSR_IA32_MC0_STATUS, 0x0, 0x0); |
| 94 | i = 1; | 94 | i = 1; |
| 95 | } else | 95 | } else |
| 96 | i = 0; | 96 | i = 0; |
| 97 | for (; i<nr_mce_banks; i++) { | 97 | for (; i < nr_mce_banks; i++) { |
| 98 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 98 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
| 99 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 99 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | set_in_cr4 (X86_CR4_MCE); | 102 | set_in_cr4(X86_CR4_MCE); |
| 103 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 103 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
| 104 | smp_processor_id()); | 104 | smp_processor_id()); |
| 105 | } | 105 | } |
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index e07e8c068ae0..501ca1cea27d 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <asm/idle.h> | 31 | #include <asm/idle.h> |
| 32 | 32 | ||
| 33 | #define MISC_MCELOG_MINOR 227 | 33 | #define MISC_MCELOG_MINOR 227 |
| 34 | #define NR_BANKS 6 | 34 | #define NR_SYSFS_BANKS 6 |
| 35 | 35 | ||
| 36 | atomic_t mce_entry; | 36 | atomic_t mce_entry; |
| 37 | 37 | ||
| @@ -46,7 +46,7 @@ static int mce_dont_init; | |||
| 46 | */ | 46 | */ |
| 47 | static int tolerant = 1; | 47 | static int tolerant = 1; |
| 48 | static int banks; | 48 | static int banks; |
| 49 | static unsigned long bank[NR_BANKS] = { [0 ... NR_BANKS-1] = ~0UL }; | 49 | static unsigned long bank[NR_SYSFS_BANKS] = { [0 ... NR_SYSFS_BANKS-1] = ~0UL }; |
| 50 | static unsigned long notify_user; | 50 | static unsigned long notify_user; |
| 51 | static int rip_msr; | 51 | static int rip_msr; |
| 52 | static int mce_bootlog = -1; | 52 | static int mce_bootlog = -1; |
| @@ -209,7 +209,7 @@ void do_machine_check(struct pt_regs * regs, long error_code) | |||
| 209 | barrier(); | 209 | barrier(); |
| 210 | 210 | ||
| 211 | for (i = 0; i < banks; i++) { | 211 | for (i = 0; i < banks; i++) { |
| 212 | if (!bank[i]) | 212 | if (i < NR_SYSFS_BANKS && !bank[i]) |
| 213 | continue; | 213 | continue; |
| 214 | 214 | ||
| 215 | m.misc = 0; | 215 | m.misc = 0; |
| @@ -444,9 +444,10 @@ static void mce_init(void *dummy) | |||
| 444 | 444 | ||
| 445 | rdmsrl(MSR_IA32_MCG_CAP, cap); | 445 | rdmsrl(MSR_IA32_MCG_CAP, cap); |
| 446 | banks = cap & 0xff; | 446 | banks = cap & 0xff; |
| 447 | if (banks > NR_BANKS) { | 447 | if (banks > MCE_EXTENDED_BANK) { |
| 448 | printk(KERN_INFO "MCE: warning: using only %d banks\n", banks); | 448 | banks = MCE_EXTENDED_BANK; |
| 449 | banks = NR_BANKS; | 449 | printk(KERN_INFO "MCE: warning: using only %d banks\n", |
| 450 | MCE_EXTENDED_BANK); | ||
| 450 | } | 451 | } |
| 451 | /* Use accurate RIP reporting if available. */ | 452 | /* Use accurate RIP reporting if available. */ |
| 452 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) | 453 | if ((cap & (1<<9)) && ((cap >> 16) & 0xff) >= 9) |
| @@ -462,7 +463,11 @@ static void mce_init(void *dummy) | |||
| 462 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 463 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 463 | 464 | ||
| 464 | for (i = 0; i < banks; i++) { | 465 | for (i = 0; i < banks; i++) { |
| 465 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | 466 | if (i < NR_SYSFS_BANKS) |
| 467 | wrmsrl(MSR_IA32_MC0_CTL+4*i, bank[i]); | ||
| 468 | else | ||
| 469 | wrmsrl(MSR_IA32_MC0_CTL+4*i, ~0UL); | ||
| 470 | |||
| 466 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); | 471 | wrmsrl(MSR_IA32_MC0_STATUS+4*i, 0); |
| 467 | } | 472 | } |
| 468 | } | 473 | } |
| @@ -766,7 +771,10 @@ DEFINE_PER_CPU(struct sys_device, device_mce); | |||
| 766 | } \ | 771 | } \ |
| 767 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); | 772 | static SYSDEV_ATTR(name, 0644, show_ ## name, set_ ## name); |
| 768 | 773 | ||
| 769 | /* TBD should generate these dynamically based on number of available banks */ | 774 | /* |
| 775 | * TBD should generate these dynamically based on number of available banks. | ||
| 776 | * Have only 6 contol banks in /sysfs until then. | ||
| 777 | */ | ||
| 770 | ACCESSOR(bank0ctl,bank[0],mce_restart()) | 778 | ACCESSOR(bank0ctl,bank[0],mce_restart()) |
| 771 | ACCESSOR(bank1ctl,bank[1],mce_restart()) | 779 | ACCESSOR(bank1ctl,bank[1],mce_restart()) |
| 772 | ACCESSOR(bank2ctl,bank[2],mce_restart()) | 780 | ACCESSOR(bank2ctl,bank[2],mce_restart()) |
diff --git a/arch/x86/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c index cb03345554a5..eef001ad3bde 100644 --- a/arch/x86/kernel/cpu/mcheck/p4.c +++ b/arch/x86/kernel/cpu/mcheck/p4.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <linux/interrupt.h> | 8 | #include <linux/interrupt.h> |
| 9 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
| 10 | 10 | ||
| 11 | #include <asm/processor.h> | 11 | #include <asm/processor.h> |
| 12 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 13 | #include <asm/msr.h> | 13 | #include <asm/msr.h> |
| 14 | #include <asm/apic.h> | 14 | #include <asm/apic.h> |
| @@ -32,12 +32,12 @@ struct intel_mce_extended_msrs { | |||
| 32 | /* u32 *reserved[]; */ | 32 | /* u32 *reserved[]; */ |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | static int mce_num_extended_msrs = 0; | 35 | static int mce_num_extended_msrs; |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | #ifdef CONFIG_X86_MCE_P4THERMAL | 38 | #ifdef CONFIG_X86_MCE_P4THERMAL |
| 39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) | 39 | static void unexpected_thermal_interrupt(struct pt_regs *regs) |
| 40 | { | 40 | { |
| 41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", | 41 | printk(KERN_ERR "CPU%d: Unexpected LVT TMR interrupt!\n", |
| 42 | smp_processor_id()); | 42 | smp_processor_id()); |
| 43 | add_taint(TAINT_MACHINE_CHECK); | 43 | add_taint(TAINT_MACHINE_CHECK); |
| @@ -83,7 +83,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 83 | * be some SMM goo which handles it, so we can't even put a handler | 83 | * be some SMM goo which handles it, so we can't even put a handler |
| 84 | * since it might be delivered via SMI already -zwanem. | 84 | * since it might be delivered via SMI already -zwanem. |
| 85 | */ | 85 | */ |
| 86 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | 86 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
| 87 | h = apic_read(APIC_LVTTHMR); | 87 | h = apic_read(APIC_LVTTHMR); |
| 88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { | 88 | if ((l & (1<<3)) && (h & APIC_DM_SMI)) { |
| 89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", | 89 | printk(KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n", |
| @@ -91,7 +91,7 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 91 | return; /* -EBUSY */ | 91 | return; /* -EBUSY */ |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | /* check whether a vector already exists, temporarily masked? */ | 94 | /* check whether a vector already exists, temporarily masked? */ |
| 95 | if (h & APIC_VECTOR_MASK) { | 95 | if (h & APIC_VECTOR_MASK) { |
| 96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " | 96 | printk(KERN_DEBUG "CPU%d: Thermal LVT vector (%#x) already " |
| 97 | "installed\n", | 97 | "installed\n", |
| @@ -104,18 +104,18 @@ static void intel_init_thermal(struct cpuinfo_x86 *c) | |||
| 104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ | 104 | h |= (APIC_DM_FIXED | APIC_LVT_MASKED); /* we'll mask till we're ready */ |
| 105 | apic_write_around(APIC_LVTTHMR, h); | 105 | apic_write_around(APIC_LVTTHMR, h); |
| 106 | 106 | ||
| 107 | rdmsr (MSR_IA32_THERM_INTERRUPT, l, h); | 107 | rdmsr(MSR_IA32_THERM_INTERRUPT, l, h); |
| 108 | wrmsr (MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); | 108 | wrmsr(MSR_IA32_THERM_INTERRUPT, l | 0x03 , h); |
| 109 | 109 | ||
| 110 | /* ok we're good to go... */ | 110 | /* ok we're good to go... */ |
| 111 | vendor_thermal_interrupt = intel_thermal_interrupt; | 111 | vendor_thermal_interrupt = intel_thermal_interrupt; |
| 112 | |||
| 113 | rdmsr (MSR_IA32_MISC_ENABLE, l, h); | ||
| 114 | wrmsr (MSR_IA32_MISC_ENABLE, l | (1<<3), h); | ||
| 115 | 112 | ||
| 116 | l = apic_read (APIC_LVTTHMR); | 113 | rdmsr(MSR_IA32_MISC_ENABLE, l, h); |
| 117 | apic_write_around (APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | 114 | wrmsr(MSR_IA32_MISC_ENABLE, l | (1<<3), h); |
| 118 | printk (KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | 115 | |
| 116 | l = apic_read(APIC_LVTTHMR); | ||
| 117 | apic_write_around(APIC_LVTTHMR, l & ~APIC_LVT_MASKED); | ||
| 118 | printk(KERN_INFO "CPU%d: Thermal monitoring enabled\n", cpu); | ||
| 119 | 119 | ||
| 120 | /* enable thermal throttle processing */ | 120 | /* enable thermal throttle processing */ |
| 121 | atomic_set(&therm_throt_en, 1); | 121 | atomic_set(&therm_throt_en, 1); |
| @@ -129,28 +129,28 @@ static inline void intel_get_extended_msrs(struct intel_mce_extended_msrs *r) | |||
| 129 | { | 129 | { |
| 130 | u32 h; | 130 | u32 h; |
| 131 | 131 | ||
| 132 | rdmsr (MSR_IA32_MCG_EAX, r->eax, h); | 132 | rdmsr(MSR_IA32_MCG_EAX, r->eax, h); |
| 133 | rdmsr (MSR_IA32_MCG_EBX, r->ebx, h); | 133 | rdmsr(MSR_IA32_MCG_EBX, r->ebx, h); |
| 134 | rdmsr (MSR_IA32_MCG_ECX, r->ecx, h); | 134 | rdmsr(MSR_IA32_MCG_ECX, r->ecx, h); |
| 135 | rdmsr (MSR_IA32_MCG_EDX, r->edx, h); | 135 | rdmsr(MSR_IA32_MCG_EDX, r->edx, h); |
| 136 | rdmsr (MSR_IA32_MCG_ESI, r->esi, h); | 136 | rdmsr(MSR_IA32_MCG_ESI, r->esi, h); |
| 137 | rdmsr (MSR_IA32_MCG_EDI, r->edi, h); | 137 | rdmsr(MSR_IA32_MCG_EDI, r->edi, h); |
| 138 | rdmsr (MSR_IA32_MCG_EBP, r->ebp, h); | 138 | rdmsr(MSR_IA32_MCG_EBP, r->ebp, h); |
| 139 | rdmsr (MSR_IA32_MCG_ESP, r->esp, h); | 139 | rdmsr(MSR_IA32_MCG_ESP, r->esp, h); |
| 140 | rdmsr (MSR_IA32_MCG_EFLAGS, r->eflags, h); | 140 | rdmsr(MSR_IA32_MCG_EFLAGS, r->eflags, h); |
| 141 | rdmsr (MSR_IA32_MCG_EIP, r->eip, h); | 141 | rdmsr(MSR_IA32_MCG_EIP, r->eip, h); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | static void intel_machine_check(struct pt_regs * regs, long error_code) | 144 | static void intel_machine_check(struct pt_regs *regs, long error_code) |
| 145 | { | 145 | { |
| 146 | int recover=1; | 146 | int recover = 1; |
| 147 | u32 alow, ahigh, high, low; | 147 | u32 alow, ahigh, high, low; |
| 148 | u32 mcgstl, mcgsth; | 148 | u32 mcgstl, mcgsth; |
| 149 | int i; | 149 | int i; |
| 150 | 150 | ||
| 151 | rdmsr (MSR_IA32_MCG_STATUS, mcgstl, mcgsth); | 151 | rdmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 152 | if (mcgstl & (1<<0)) /* Recoverable ? */ | 152 | if (mcgstl & (1<<0)) /* Recoverable ? */ |
| 153 | recover=0; | 153 | recover = 0; |
| 154 | 154 | ||
| 155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", | 155 | printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n", |
| 156 | smp_processor_id(), mcgsth, mcgstl); | 156 | smp_processor_id(), mcgsth, mcgstl); |
| @@ -191,20 +191,20 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | if (recover & 2) | 193 | if (recover & 2) |
| 194 | panic ("CPU context corrupt"); | 194 | panic("CPU context corrupt"); |
| 195 | if (recover & 1) | 195 | if (recover & 1) |
| 196 | panic ("Unable to continue"); | 196 | panic("Unable to continue"); |
| 197 | 197 | ||
| 198 | printk(KERN_EMERG "Attempting to continue.\n"); | 198 | printk(KERN_EMERG "Attempting to continue.\n"); |
| 199 | /* | 199 | /* |
| 200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not | 200 | * Do not clear the MSR_IA32_MCi_STATUS if the error is not |
| 201 | * recoverable/continuable.This will allow BIOS to look at the MSRs | 201 | * recoverable/continuable.This will allow BIOS to look at the MSRs |
| 202 | * for errors if the OS could not log the error. | 202 | * for errors if the OS could not log the error. |
| 203 | */ | 203 | */ |
| 204 | for (i=0; i<nr_mce_banks; i++) { | 204 | for (i = 0; i < nr_mce_banks; i++) { |
| 205 | u32 msr; | 205 | u32 msr; |
| 206 | msr = MSR_IA32_MC0_STATUS+i*4; | 206 | msr = MSR_IA32_MC0_STATUS+i*4; |
| 207 | rdmsr (msr, low, high); | 207 | rdmsr(msr, low, high); |
| 208 | if (high&(1<<31)) { | 208 | if (high&(1<<31)) { |
| 209 | /* Clear it */ | 209 | /* Clear it */ |
| 210 | wrmsr(msr, 0UL, 0UL); | 210 | wrmsr(msr, 0UL, 0UL); |
| @@ -214,7 +214,7 @@ static void intel_machine_check(struct pt_regs * regs, long error_code) | |||
| 214 | } | 214 | } |
| 215 | } | 215 | } |
| 216 | mcgstl &= ~(1<<2); | 216 | mcgstl &= ~(1<<2); |
| 217 | wrmsr (MSR_IA32_MCG_STATUS,mcgstl, mcgsth); | 217 | wrmsr(MSR_IA32_MCG_STATUS, mcgstl, mcgsth); |
| 218 | } | 218 | } |
| 219 | 219 | ||
| 220 | 220 | ||
| @@ -222,30 +222,30 @@ void intel_p4_mcheck_init(struct cpuinfo_x86 *c) | |||
| 222 | { | 222 | { |
| 223 | u32 l, h; | 223 | u32 l, h; |
| 224 | int i; | 224 | int i; |
| 225 | 225 | ||
| 226 | machine_check_vector = intel_machine_check; | 226 | machine_check_vector = intel_machine_check; |
| 227 | wmb(); | 227 | wmb(); |
| 228 | 228 | ||
| 229 | printk (KERN_INFO "Intel machine check architecture supported.\n"); | 229 | printk(KERN_INFO "Intel machine check architecture supported.\n"); |
| 230 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 230 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 231 | if (l & (1<<8)) /* Control register present ? */ | 231 | if (l & (1<<8)) /* Control register present ? */ |
| 232 | wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); | 232 | wrmsr(MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff); |
| 233 | nr_mce_banks = l & 0xff; | 233 | nr_mce_banks = l & 0xff; |
| 234 | 234 | ||
| 235 | for (i=0; i<nr_mce_banks; i++) { | 235 | for (i = 0; i < nr_mce_banks; i++) { |
| 236 | wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); | 236 | wrmsr(MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff); |
| 237 | wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); | 237 | wrmsr(MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0); |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | set_in_cr4 (X86_CR4_MCE); | 240 | set_in_cr4(X86_CR4_MCE); |
| 241 | printk (KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", | 241 | printk(KERN_INFO "Intel machine check reporting enabled on CPU#%d.\n", |
| 242 | smp_processor_id()); | 242 | smp_processor_id()); |
| 243 | 243 | ||
| 244 | /* Check for P4/Xeon extended MCE MSRs */ | 244 | /* Check for P4/Xeon extended MCE MSRs */ |
| 245 | rdmsr (MSR_IA32_MCG_CAP, l, h); | 245 | rdmsr(MSR_IA32_MCG_CAP, l, h); |
| 246 | if (l & (1<<9)) {/* MCG_EXT_P */ | 246 | if (l & (1<<9)) {/* MCG_EXT_P */ |
| 247 | mce_num_extended_msrs = (l >> 16) & 0xff; | 247 | mce_num_extended_msrs = (l >> 16) & 0xff; |
| 248 | printk (KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" | 248 | printk(KERN_INFO "CPU%d: Intel P4/Xeon Extended MCE MSRs (%d)" |
| 249 | " available\n", | 249 | " available\n", |
| 250 | smp_processor_id(), mce_num_extended_msrs); | 250 | smp_processor_id(), mce_num_extended_msrs); |
| 251 | 251 | ||
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 9f51e1ea9e82..84fd9f2a28ff 100644 --- a/arch/x86/kernel/early-quirks.c +++ b/arch/x86/kernel/early-quirks.c | |||
| @@ -98,17 +98,6 @@ static void __init nvidia_bugs(int num, int slot, int func) | |||
| 98 | 98 | ||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | static void __init ati_bugs(int num, int slot, int func) | ||
| 102 | { | ||
| 103 | #ifdef CONFIG_X86_IO_APIC | ||
| 104 | if (timer_over_8254 == 1) { | ||
| 105 | timer_over_8254 = 0; | ||
| 106 | printk(KERN_INFO | ||
| 107 | "ATI board detected. Disabling timer routing over 8254.\n"); | ||
| 108 | } | ||
| 109 | #endif | ||
| 110 | } | ||
| 111 | |||
| 112 | #define QFLAG_APPLY_ONCE 0x1 | 101 | #define QFLAG_APPLY_ONCE 0x1 |
| 113 | #define QFLAG_APPLIED 0x2 | 102 | #define QFLAG_APPLIED 0x2 |
| 114 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) | 103 | #define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED) |
| @@ -126,8 +115,6 @@ static struct chipset early_qrk[] __initdata = { | |||
| 126 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, | 115 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, nvidia_bugs }, |
| 127 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, | 116 | { PCI_VENDOR_ID_VIA, PCI_ANY_ID, |
| 128 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, | 117 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, via_bugs }, |
| 129 | { PCI_VENDOR_ID_ATI, PCI_ANY_ID, | ||
| 130 | PCI_CLASS_BRIDGE_PCI, PCI_ANY_ID, QFLAG_APPLY_ONCE, ati_bugs }, | ||
| 131 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, | 118 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB, |
| 132 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, | 119 | PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, fix_hypertransport_config }, |
| 133 | {} | 120 | {} |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 556a8df522a7..5cf0aa993f4f 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -420,7 +420,6 @@ END(\label) | |||
| 420 | PTREGSCALL stub_clone, sys_clone, %r8 | 420 | PTREGSCALL stub_clone, sys_clone, %r8 |
| 421 | PTREGSCALL stub_fork, sys_fork, %rdi | 421 | PTREGSCALL stub_fork, sys_fork, %rdi |
| 422 | PTREGSCALL stub_vfork, sys_vfork, %rdi | 422 | PTREGSCALL stub_vfork, sys_vfork, %rdi |
| 423 | PTREGSCALL stub_rt_sigsuspend, sys_rt_sigsuspend, %rdx | ||
| 424 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx | 423 | PTREGSCALL stub_sigaltstack, sys_sigaltstack, %rdx |
| 425 | PTREGSCALL stub_iopl, sys_iopl, %rsi | 424 | PTREGSCALL stub_iopl, sys_iopl, %rsi |
| 426 | 425 | ||
| @@ -1120,10 +1119,6 @@ ENTRY(coprocessor_segment_overrun) | |||
| 1120 | zeroentry do_coprocessor_segment_overrun | 1119 | zeroentry do_coprocessor_segment_overrun |
| 1121 | END(coprocessor_segment_overrun) | 1120 | END(coprocessor_segment_overrun) |
| 1122 | 1121 | ||
| 1123 | ENTRY(reserved) | ||
| 1124 | zeroentry do_reserved | ||
| 1125 | END(reserved) | ||
| 1126 | |||
| 1127 | /* runs on exception stack */ | 1122 | /* runs on exception stack */ |
| 1128 | ENTRY(double_fault) | 1123 | ENTRY(double_fault) |
| 1129 | XCPT_FRAME | 1124 | XCPT_FRAME |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b817974ef942..263b9d14753e 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
| 19 | #include <asm/msr.h> | 19 | #include <asm/msr.h> |
| 20 | #include <asm/cache.h> | 20 | #include <asm/cache.h> |
| 21 | #include <asm/processor-flags.h> | ||
| 21 | 22 | ||
| 22 | #ifdef CONFIG_PARAVIRT | 23 | #ifdef CONFIG_PARAVIRT |
| 23 | #include <asm/asm-offsets.h> | 24 | #include <asm/asm-offsets.h> |
| @@ -154,9 +155,7 @@ ENTRY(secondary_startup_64) | |||
| 154 | */ | 155 | */ |
| 155 | 156 | ||
| 156 | /* Enable PAE mode and PGE */ | 157 | /* Enable PAE mode and PGE */ |
| 157 | xorq %rax, %rax | 158 | movl $(X86_CR4_PAE | X86_CR4_PGE), %eax |
| 158 | btsq $5, %rax | ||
| 159 | btsq $7, %rax | ||
| 160 | movq %rax, %cr4 | 159 | movq %rax, %cr4 |
| 161 | 160 | ||
| 162 | /* Setup early boot stage 4 level pagetables. */ | 161 | /* Setup early boot stage 4 level pagetables. */ |
| @@ -184,14 +183,10 @@ ENTRY(secondary_startup_64) | |||
| 184 | 1: wrmsr /* Make changes effective */ | 183 | 1: wrmsr /* Make changes effective */ |
| 185 | 184 | ||
| 186 | /* Setup cr0 */ | 185 | /* Setup cr0 */ |
| 187 | #define CR0_PM 1 /* protected mode */ | 186 | #define CR0_STATE (X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \ |
| 188 | #define CR0_MP (1<<1) | 187 | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \ |
| 189 | #define CR0_ET (1<<4) | 188 | X86_CR0_PG) |
| 190 | #define CR0_NE (1<<5) | 189 | movl $CR0_STATE, %eax |
| 191 | #define CR0_WP (1<<16) | ||
| 192 | #define CR0_AM (1<<18) | ||
| 193 | #define CR0_PAGING (1<<31) | ||
| 194 | movl $CR0_PM|CR0_MP|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PAGING,%eax | ||
| 195 | /* Make changes effective */ | 190 | /* Make changes effective */ |
| 196 | movq %rax, %cr0 | 191 | movq %rax, %cr0 |
| 197 | 192 | ||
| @@ -327,11 +322,11 @@ early_idt_ripmsg: | |||
| 327 | ENTRY(name) | 322 | ENTRY(name) |
| 328 | 323 | ||
| 329 | /* Automate the creation of 1 to 1 mapping pmd entries */ | 324 | /* Automate the creation of 1 to 1 mapping pmd entries */ |
| 330 | #define PMDS(START, PERM, COUNT) \ | 325 | #define PMDS(START, PERM, COUNT) \ |
| 331 | i = 0 ; \ | 326 | i = 0 ; \ |
| 332 | .rept (COUNT) ; \ | 327 | .rept (COUNT) ; \ |
| 333 | .quad (START) + (i << 21) + (PERM) ; \ | 328 | .quad (START) + (i << PMD_SHIFT) + (PERM) ; \ |
| 334 | i = i + 1 ; \ | 329 | i = i + 1 ; \ |
| 335 | .endr | 330 | .endr |
| 336 | 331 | ||
| 337 | /* | 332 | /* |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 9b5cfcdfc426..ea230ec69057 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | /* FSEC = 10^-15 | 18 | /* FSEC = 10^-15 |
| 19 | NSEC = 10^-9 */ | 19 | NSEC = 10^-9 */ |
| 20 | #define FSEC_PER_NSEC 1000000 | 20 | #define FSEC_PER_NSEC 1000000L |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| 23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists | 23 | * HPET address is set in acpi/boot.c, when an ACPI entry exists |
| @@ -206,20 +206,19 @@ static void hpet_enable_legacy_int(void) | |||
| 206 | 206 | ||
| 207 | static void hpet_legacy_clockevent_register(void) | 207 | static void hpet_legacy_clockevent_register(void) |
| 208 | { | 208 | { |
| 209 | uint64_t hpet_freq; | ||
| 210 | |||
| 211 | /* Start HPET legacy interrupts */ | 209 | /* Start HPET legacy interrupts */ |
| 212 | hpet_enable_legacy_int(); | 210 | hpet_enable_legacy_int(); |
| 213 | 211 | ||
| 214 | /* | 212 | /* |
| 215 | * The period is a femto seconds value. We need to calculate the | 213 | * The mult factor is defined as (include/linux/clockchips.h) |
| 216 | * scaled math multiplication factor for nanosecond to hpet tick | 214 | * mult/2^shift = cyc/ns (in contrast to ns/cyc in clocksource.h) |
| 217 | * conversion. | 215 | * hpet_period is in units of femtoseconds (per cycle), so |
| 216 | * mult/2^shift = cyc/ns = 10^6/hpet_period | ||
| 217 | * mult = (10^6 * 2^shift)/hpet_period | ||
| 218 | * mult = (FSEC_PER_NSEC << hpet_clockevent.shift)/hpet_period | ||
| 218 | */ | 219 | */ |
| 219 | hpet_freq = 1000000000000000ULL; | 220 | hpet_clockevent.mult = div_sc((unsigned long) FSEC_PER_NSEC, |
| 220 | do_div(hpet_freq, hpet_period); | 221 | hpet_period, hpet_clockevent.shift); |
| 221 | hpet_clockevent.mult = div_sc((unsigned long) hpet_freq, | ||
| 222 | NSEC_PER_SEC, hpet_clockevent.shift); | ||
| 223 | /* Calculate the min / max delta */ | 222 | /* Calculate the min / max delta */ |
| 224 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, | 223 | hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, |
| 225 | &hpet_clockevent); | 224 | &hpet_clockevent); |
| @@ -324,7 +323,7 @@ static struct clocksource clocksource_hpet = { | |||
| 324 | 323 | ||
| 325 | static int hpet_clocksource_register(void) | 324 | static int hpet_clocksource_register(void) |
| 326 | { | 325 | { |
| 327 | u64 tmp, start, now; | 326 | u64 start, now; |
| 328 | cycle_t t1; | 327 | cycle_t t1; |
| 329 | 328 | ||
| 330 | /* Start the counter */ | 329 | /* Start the counter */ |
| @@ -351,21 +350,15 @@ static int hpet_clocksource_register(void) | |||
| 351 | return -ENODEV; | 350 | return -ENODEV; |
| 352 | } | 351 | } |
| 353 | 352 | ||
| 354 | /* Initialize and register HPET clocksource | 353 | /* |
| 355 | * | 354 | * The definition of mult is (include/linux/clocksource.h) |
| 356 | * hpet period is in femto seconds per cycle | 355 | * mult/2^shift = ns/cyc and hpet_period is in units of fsec/cyc |
| 357 | * so we need to convert this to ns/cyc units | 356 | * so we first need to convert hpet_period to ns/cyc units: |
| 358 | * approximated by mult/2^shift | 357 | * mult/2^shift = ns/cyc = hpet_period/10^6 |
| 359 | * | 358 | * mult = (hpet_period * 2^shift)/10^6 |
| 360 | * fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift | 359 | * mult = (hpet_period << shift)/FSEC_PER_NSEC |
| 361 | * fsec/cyc * 1ns/1000000fsec * 2^shift = mult | ||
| 362 | * fsec/cyc * 2^shift * 1nsec/1000000fsec = mult | ||
| 363 | * (fsec/cyc << shift)/1000000 = mult | ||
| 364 | * (hpet_period << shift)/FSEC_PER_NSEC = mult | ||
| 365 | */ | 360 | */ |
| 366 | tmp = (u64)hpet_period << HPET_SHIFT; | 361 | clocksource_hpet.mult = div_sc(hpet_period, FSEC_PER_NSEC, HPET_SHIFT); |
| 367 | do_div(tmp, FSEC_PER_NSEC); | ||
| 368 | clocksource_hpet.mult = (u32)tmp; | ||
| 369 | 362 | ||
| 370 | clocksource_register(&clocksource_hpet); | 363 | clocksource_register(&clocksource_hpet); |
| 371 | 364 | ||
diff --git a/arch/x86/kernel/i8259_32.c b/arch/x86/kernel/i8259.c index fe631967d625..7a0fda8f01b5 100644 --- a/arch/x86/kernel/i8259_32.c +++ b/arch/x86/kernel/i8259.c | |||
| @@ -1,8 +1,10 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 2 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
| 3 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
| 4 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 7 | #include <linux/timex.h> | ||
| 6 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
| 7 | #include <linux/random.h> | 9 | #include <linux/random.h> |
| 8 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| @@ -10,10 +12,12 @@ | |||
| 10 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
| 11 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
| 12 | 14 | ||
| 15 | #include <asm/acpi.h> | ||
| 13 | #include <asm/atomic.h> | 16 | #include <asm/atomic.h> |
| 14 | #include <asm/system.h> | 17 | #include <asm/system.h> |
| 15 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 16 | #include <asm/timer.h> | 19 | #include <asm/timer.h> |
| 20 | #include <asm/hw_irq.h> | ||
| 17 | #include <asm/pgtable.h> | 21 | #include <asm/pgtable.h> |
| 18 | #include <asm/delay.h> | 22 | #include <asm/delay.h> |
| 19 | #include <asm/desc.h> | 23 | #include <asm/desc.h> |
| @@ -32,7 +36,7 @@ static int i8259A_auto_eoi; | |||
| 32 | DEFINE_SPINLOCK(i8259A_lock); | 36 | DEFINE_SPINLOCK(i8259A_lock); |
| 33 | static void mask_and_ack_8259A(unsigned int); | 37 | static void mask_and_ack_8259A(unsigned int); |
| 34 | 38 | ||
| 35 | static struct irq_chip i8259A_chip = { | 39 | struct irq_chip i8259A_chip = { |
| 36 | .name = "XT-PIC", | 40 | .name = "XT-PIC", |
| 37 | .mask = disable_8259A_irq, | 41 | .mask = disable_8259A_irq, |
| 38 | .disable = disable_8259A_irq, | 42 | .disable = disable_8259A_irq, |
| @@ -125,14 +129,14 @@ static inline int i8259A_irq_real(unsigned int irq) | |||
| 125 | int irqmask = 1<<irq; | 129 | int irqmask = 1<<irq; |
| 126 | 130 | ||
| 127 | if (irq < 8) { | 131 | if (irq < 8) { |
| 128 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | 132 | outb(0x0B, PIC_MASTER_CMD); /* ISR register */ |
| 129 | value = inb(PIC_MASTER_CMD) & irqmask; | 133 | value = inb(PIC_MASTER_CMD) & irqmask; |
| 130 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | 134 | outb(0x0A, PIC_MASTER_CMD); /* back to the IRR register */ |
| 131 | return value; | 135 | return value; |
| 132 | } | 136 | } |
| 133 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | 137 | outb(0x0B, PIC_SLAVE_CMD); /* ISR register */ |
| 134 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | 138 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); |
| 135 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | 139 | outb(0x0A, PIC_SLAVE_CMD); /* back to the IRR register */ |
| 136 | return value; | 140 | return value; |
| 137 | } | 141 | } |
| 138 | 142 | ||
| @@ -171,12 +175,14 @@ handle_real_irq: | |||
| 171 | if (irq & 8) { | 175 | if (irq & 8) { |
| 172 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | 176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ |
| 173 | outb(cached_slave_mask, PIC_SLAVE_IMR); | 177 | outb(cached_slave_mask, PIC_SLAVE_IMR); |
| 174 | outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ | 178 | /* 'Specific EOI' to slave */ |
| 175 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ | 179 | outb(0x60+(irq&7), PIC_SLAVE_CMD); |
| 180 | /* 'Specific EOI' to master-IRQ2 */ | ||
| 181 | outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); | ||
| 176 | } else { | 182 | } else { |
| 177 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | 183 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ |
| 178 | outb(cached_master_mask, PIC_MASTER_IMR); | 184 | outb(cached_master_mask, PIC_MASTER_IMR); |
| 179 | outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ | 185 | outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ |
| 180 | } | 186 | } |
| 181 | spin_unlock_irqrestore(&i8259A_lock, flags); | 187 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 182 | return; | 188 | return; |
| @@ -199,7 +205,8 @@ spurious_8259A_irq: | |||
| 199 | * lets ACK and report it. [once per IRQ] | 205 | * lets ACK and report it. [once per IRQ] |
| 200 | */ | 206 | */ |
| 201 | if (!(spurious_irq_mask & irqmask)) { | 207 | if (!(spurious_irq_mask & irqmask)) { |
| 202 | printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq); | 208 | printk(KERN_DEBUG |
| 209 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
| 203 | spurious_irq_mask |= irqmask; | 210 | spurious_irq_mask |= irqmask; |
| 204 | } | 211 | } |
| 205 | atomic_inc(&irq_err_count); | 212 | atomic_inc(&irq_err_count); |
| @@ -290,17 +297,34 @@ void init_8259A(int auto_eoi) | |||
| 290 | * outb_pic - this has to work on a wide range of PC hardware. | 297 | * outb_pic - this has to work on a wide range of PC hardware. |
| 291 | */ | 298 | */ |
| 292 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | 299 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ |
| 300 | #ifndef CONFIG_X86_64 | ||
| 293 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ | 301 | outb_pic(0x20 + 0, PIC_MASTER_IMR); /* ICW2: 8259A-1 IR0-7 mapped to 0x20-0x27 */ |
| 294 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ | 302 | outb_pic(1U << PIC_CASCADE_IR, PIC_MASTER_IMR); /* 8259A-1 (the master) has a slave on IR2 */ |
| 303 | #else /* CONFIG_X86_64 */ | ||
| 304 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
| 305 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
| 306 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
| 307 | outb_pic(0x04, PIC_MASTER_IMR); | ||
| 308 | #endif /* CONFIG_X86_64 */ | ||
| 295 | if (auto_eoi) /* master does Auto EOI */ | 309 | if (auto_eoi) /* master does Auto EOI */ |
| 296 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | 310 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); |
| 297 | else /* master expects normal EOI */ | 311 | else /* master expects normal EOI */ |
| 298 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | 312 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); |
| 299 | 313 | ||
| 300 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | 314 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ |
| 315 | #ifndef CONFIG_X86_64 | ||
| 301 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ | 316 | outb_pic(0x20 + 8, PIC_SLAVE_IMR); /* ICW2: 8259A-2 IR0-7 mapped to 0x28-0x2f */ |
| 302 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ | 317 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); /* 8259A-2 is a slave on master's IR2 */ |
| 303 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ | 318 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); /* (slave's support for AEOI in flat mode is to be investigated) */ |
| 319 | #else /* CONFIG_X86_64 */ | ||
| 320 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
| 321 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
| 322 | /* 8259A-2 is a slave on master's IR2 */ | ||
| 323 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
| 324 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
| 325 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
| 326 | |||
| 327 | #endif /* CONFIG_X86_64 */ | ||
| 304 | if (auto_eoi) | 328 | if (auto_eoi) |
| 305 | /* | 329 | /* |
| 306 | * In AEOI mode we just have to mask the interrupt | 330 | * In AEOI mode we just have to mask the interrupt |
| @@ -317,93 +341,3 @@ void init_8259A(int auto_eoi) | |||
| 317 | 341 | ||
| 318 | spin_unlock_irqrestore(&i8259A_lock, flags); | 342 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 319 | } | 343 | } |
| 320 | |||
| 321 | /* | ||
| 322 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
| 323 | * as the irq is unreliable, and exception 16 works correctly | ||
| 324 | * (ie as explained in the intel literature). On a 386, you | ||
| 325 | * can't use exception 16 due to bad IBM design, so we have to | ||
| 326 | * rely on the less exact irq13. | ||
| 327 | * | ||
| 328 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
| 329 | * leads to races. IBM designers who came up with it should | ||
| 330 | * be shot. | ||
| 331 | */ | ||
| 332 | |||
| 333 | |||
| 334 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
| 335 | { | ||
| 336 | extern void math_error(void __user *); | ||
| 337 | outb(0,0xF0); | ||
| 338 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
| 339 | return IRQ_NONE; | ||
| 340 | math_error((void __user *)get_irq_regs()->ip); | ||
| 341 | return IRQ_HANDLED; | ||
| 342 | } | ||
| 343 | |||
| 344 | /* | ||
| 345 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
| 346 | * so allow interrupt sharing. | ||
| 347 | */ | ||
| 348 | static struct irqaction fpu_irq = { | ||
| 349 | .handler = math_error_irq, | ||
| 350 | .mask = CPU_MASK_NONE, | ||
| 351 | .name = "fpu", | ||
| 352 | }; | ||
| 353 | |||
| 354 | void __init init_ISA_irqs (void) | ||
| 355 | { | ||
| 356 | int i; | ||
| 357 | |||
| 358 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 359 | init_bsp_APIC(); | ||
| 360 | #endif | ||
| 361 | init_8259A(0); | ||
| 362 | |||
| 363 | /* | ||
| 364 | * 16 old-style INTA-cycle interrupts: | ||
| 365 | */ | ||
| 366 | for (i = 0; i < 16; i++) { | ||
| 367 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 368 | handle_level_irq, "XT"); | ||
| 369 | } | ||
| 370 | } | ||
| 371 | |||
| 372 | /* Overridden in paravirt.c */ | ||
| 373 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 374 | |||
| 375 | void __init native_init_IRQ(void) | ||
| 376 | { | ||
| 377 | int i; | ||
| 378 | |||
| 379 | /* all the set up before the call gates are initialised */ | ||
| 380 | pre_intr_init_hook(); | ||
| 381 | |||
| 382 | /* | ||
| 383 | * Cover the whole vector space, no vector can escape | ||
| 384 | * us. (some of these will be overridden and become | ||
| 385 | * 'special' SMP interrupts) | ||
| 386 | */ | ||
| 387 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 388 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 389 | if (i >= NR_IRQS) | ||
| 390 | break; | ||
| 391 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
| 392 | if (!test_bit(vector, used_vectors)) | ||
| 393 | set_intr_gate(vector, interrupt[i]); | ||
| 394 | } | ||
| 395 | |||
| 396 | /* setup after call gates are initialised (usually add in | ||
| 397 | * the architecture specific gates) | ||
| 398 | */ | ||
| 399 | intr_init_hook(); | ||
| 400 | |||
| 401 | /* | ||
| 402 | * External FPU? Set up irq13 if so, for | ||
| 403 | * original braindamaged IBM FERR coupling. | ||
| 404 | */ | ||
| 405 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
| 406 | setup_irq(FPU_IRQ, &fpu_irq); | ||
| 407 | |||
| 408 | irq_ctx_init(smp_processor_id()); | ||
| 409 | } | ||
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c deleted file mode 100644 index fa57a1568508..000000000000 --- a/arch/x86/kernel/i8259_64.c +++ /dev/null | |||
| @@ -1,512 +0,0 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 2 | #include <linux/errno.h> | ||
| 3 | #include <linux/signal.h> | ||
| 4 | #include <linux/sched.h> | ||
| 5 | #include <linux/ioport.h> | ||
| 6 | #include <linux/interrupt.h> | ||
| 7 | #include <linux/timex.h> | ||
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/random.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/kernel_stat.h> | ||
| 12 | #include <linux/sysdev.h> | ||
| 13 | #include <linux/bitops.h> | ||
| 14 | |||
| 15 | #include <asm/acpi.h> | ||
| 16 | #include <asm/atomic.h> | ||
| 17 | #include <asm/system.h> | ||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/hw_irq.h> | ||
| 20 | #include <asm/pgtable.h> | ||
| 21 | #include <asm/delay.h> | ||
| 22 | #include <asm/desc.h> | ||
| 23 | #include <asm/apic.h> | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * Common place to define all x86 IRQ vectors | ||
| 28 | * | ||
| 29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
| 30 | * | ||
| 31 | * These macros create the low-level assembly IRQ routines that save | ||
| 32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
| 33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
| 34 | * interrupt-controller happy. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #define BI(x,y) \ | ||
| 38 | BUILD_IRQ(x##y) | ||
| 39 | |||
| 40 | #define BUILD_16_IRQS(x) \ | ||
| 41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
| 42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
| 43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
| 44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
| 45 | |||
| 46 | /* | ||
| 47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
| 48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* | ||
| 52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
| 53 | * are unused but an SMP system is supposed to have enough memory ... | ||
| 54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
| 55 | * across the spectrum, so we really want to be prepared to get all | ||
| 56 | * of these. Plus, more powerful systems might have more than 64 | ||
| 57 | * IO-APIC registers. | ||
| 58 | * | ||
| 59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
| 60 | */ | ||
| 61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
| 62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
| 63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
| 64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
| 65 | |||
| 66 | #undef BUILD_16_IRQS | ||
| 67 | #undef BI | ||
| 68 | |||
| 69 | |||
| 70 | #define IRQ(x,y) \ | ||
| 71 | IRQ##x##y##_interrupt | ||
| 72 | |||
| 73 | #define IRQLIST_16(x) \ | ||
| 74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
| 75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
| 76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
| 77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
| 78 | |||
| 79 | /* for the irq vectors */ | ||
| 80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
| 81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
| 82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
| 83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
| 84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
| 85 | }; | ||
| 86 | |||
| 87 | #undef IRQ | ||
| 88 | #undef IRQLIST_16 | ||
| 89 | |||
| 90 | /* | ||
| 91 | * This is the 'legacy' 8259A Programmable Interrupt Controller, | ||
| 92 | * present in the majority of PC/AT boxes. | ||
| 93 | * plus some generic x86 specific things if generic specifics makes | ||
| 94 | * any sense at all. | ||
| 95 | * this file should become arch/i386/kernel/irq.c when the old irq.c | ||
| 96 | * moves to arch independent land | ||
| 97 | */ | ||
| 98 | |||
| 99 | static int i8259A_auto_eoi; | ||
| 100 | DEFINE_SPINLOCK(i8259A_lock); | ||
| 101 | static void mask_and_ack_8259A(unsigned int); | ||
| 102 | |||
| 103 | static struct irq_chip i8259A_chip = { | ||
| 104 | .name = "XT-PIC", | ||
| 105 | .mask = disable_8259A_irq, | ||
| 106 | .disable = disable_8259A_irq, | ||
| 107 | .unmask = enable_8259A_irq, | ||
| 108 | .mask_ack = mask_and_ack_8259A, | ||
| 109 | }; | ||
| 110 | |||
| 111 | /* | ||
| 112 | * 8259A PIC functions to handle ISA devices: | ||
| 113 | */ | ||
| 114 | |||
| 115 | /* | ||
| 116 | * This contains the irq mask for both 8259A irq controllers, | ||
| 117 | */ | ||
| 118 | unsigned int cached_irq_mask = 0xffff; | ||
| 119 | |||
| 120 | /* | ||
| 121 | * Not all IRQs can be routed through the IO-APIC, eg. on certain (older) | ||
| 122 | * boards the timer interrupt is not really connected to any IO-APIC pin, | ||
| 123 | * it's fed to the master 8259A's IR0 line only. | ||
| 124 | * | ||
| 125 | * Any '1' bit in this mask means the IRQ is routed through the IO-APIC. | ||
| 126 | * this 'mixed mode' IRQ handling costs nothing because it's only used | ||
| 127 | * at IRQ setup time. | ||
| 128 | */ | ||
| 129 | unsigned long io_apic_irqs; | ||
| 130 | |||
| 131 | void disable_8259A_irq(unsigned int irq) | ||
| 132 | { | ||
| 133 | unsigned int mask = 1 << irq; | ||
| 134 | unsigned long flags; | ||
| 135 | |||
| 136 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 137 | cached_irq_mask |= mask; | ||
| 138 | if (irq & 8) | ||
| 139 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 140 | else | ||
| 141 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 142 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 143 | } | ||
| 144 | |||
| 145 | void enable_8259A_irq(unsigned int irq) | ||
| 146 | { | ||
| 147 | unsigned int mask = ~(1 << irq); | ||
| 148 | unsigned long flags; | ||
| 149 | |||
| 150 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 151 | cached_irq_mask &= mask; | ||
| 152 | if (irq & 8) | ||
| 153 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 154 | else | ||
| 155 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 156 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 157 | } | ||
| 158 | |||
| 159 | int i8259A_irq_pending(unsigned int irq) | ||
| 160 | { | ||
| 161 | unsigned int mask = 1<<irq; | ||
| 162 | unsigned long flags; | ||
| 163 | int ret; | ||
| 164 | |||
| 165 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 166 | if (irq < 8) | ||
| 167 | ret = inb(PIC_MASTER_CMD) & mask; | ||
| 168 | else | ||
| 169 | ret = inb(PIC_SLAVE_CMD) & (mask >> 8); | ||
| 170 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 171 | |||
| 172 | return ret; | ||
| 173 | } | ||
| 174 | |||
| 175 | void make_8259A_irq(unsigned int irq) | ||
| 176 | { | ||
| 177 | disable_irq_nosync(irq); | ||
| 178 | io_apic_irqs &= ~(1<<irq); | ||
| 179 | set_irq_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq, | ||
| 180 | "XT"); | ||
| 181 | enable_irq(irq); | ||
| 182 | } | ||
| 183 | |||
| 184 | /* | ||
| 185 | * This function assumes to be called rarely. Switching between | ||
| 186 | * 8259A registers is slow. | ||
| 187 | * This has to be protected by the irq controller spinlock | ||
| 188 | * before being called. | ||
| 189 | */ | ||
| 190 | static inline int i8259A_irq_real(unsigned int irq) | ||
| 191 | { | ||
| 192 | int value; | ||
| 193 | int irqmask = 1<<irq; | ||
| 194 | |||
| 195 | if (irq < 8) { | ||
| 196 | outb(0x0B,PIC_MASTER_CMD); /* ISR register */ | ||
| 197 | value = inb(PIC_MASTER_CMD) & irqmask; | ||
| 198 | outb(0x0A,PIC_MASTER_CMD); /* back to the IRR register */ | ||
| 199 | return value; | ||
| 200 | } | ||
| 201 | outb(0x0B,PIC_SLAVE_CMD); /* ISR register */ | ||
| 202 | value = inb(PIC_SLAVE_CMD) & (irqmask >> 8); | ||
| 203 | outb(0x0A,PIC_SLAVE_CMD); /* back to the IRR register */ | ||
| 204 | return value; | ||
| 205 | } | ||
| 206 | |||
| 207 | /* | ||
| 208 | * Careful! The 8259A is a fragile beast, it pretty | ||
| 209 | * much _has_ to be done exactly like this (mask it | ||
| 210 | * first, _then_ send the EOI, and the order of EOI | ||
| 211 | * to the two 8259s is important! | ||
| 212 | */ | ||
| 213 | static void mask_and_ack_8259A(unsigned int irq) | ||
| 214 | { | ||
| 215 | unsigned int irqmask = 1 << irq; | ||
| 216 | unsigned long flags; | ||
| 217 | |||
| 218 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 219 | /* | ||
| 220 | * Lightweight spurious IRQ detection. We do not want | ||
| 221 | * to overdo spurious IRQ handling - it's usually a sign | ||
| 222 | * of hardware problems, so we only do the checks we can | ||
| 223 | * do without slowing down good hardware unnecessarily. | ||
| 224 | * | ||
| 225 | * Note that IRQ7 and IRQ15 (the two spurious IRQs | ||
| 226 | * usually resulting from the 8259A-1|2 PICs) occur | ||
| 227 | * even if the IRQ is masked in the 8259A. Thus we | ||
| 228 | * can check spurious 8259A IRQs without doing the | ||
| 229 | * quite slow i8259A_irq_real() call for every IRQ. | ||
| 230 | * This does not cover 100% of spurious interrupts, | ||
| 231 | * but should be enough to warn the user that there | ||
| 232 | * is something bad going on ... | ||
| 233 | */ | ||
| 234 | if (cached_irq_mask & irqmask) | ||
| 235 | goto spurious_8259A_irq; | ||
| 236 | cached_irq_mask |= irqmask; | ||
| 237 | |||
| 238 | handle_real_irq: | ||
| 239 | if (irq & 8) { | ||
| 240 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | ||
| 241 | outb(cached_slave_mask, PIC_SLAVE_IMR); | ||
| 242 | /* 'Specific EOI' to slave */ | ||
| 243 | outb(0x60+(irq&7),PIC_SLAVE_CMD); | ||
| 244 | /* 'Specific EOI' to master-IRQ2 */ | ||
| 245 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); | ||
| 246 | } else { | ||
| 247 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | ||
| 248 | outb(cached_master_mask, PIC_MASTER_IMR); | ||
| 249 | /* 'Specific EOI' to master */ | ||
| 250 | outb(0x60+irq,PIC_MASTER_CMD); | ||
| 251 | } | ||
| 252 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 253 | return; | ||
| 254 | |||
| 255 | spurious_8259A_irq: | ||
| 256 | /* | ||
| 257 | * this is the slow path - should happen rarely. | ||
| 258 | */ | ||
| 259 | if (i8259A_irq_real(irq)) | ||
| 260 | /* | ||
| 261 | * oops, the IRQ _is_ in service according to the | ||
| 262 | * 8259A - not spurious, go handle it. | ||
| 263 | */ | ||
| 264 | goto handle_real_irq; | ||
| 265 | |||
| 266 | { | ||
| 267 | static int spurious_irq_mask; | ||
| 268 | /* | ||
| 269 | * At this point we can be sure the IRQ is spurious, | ||
| 270 | * lets ACK and report it. [once per IRQ] | ||
| 271 | */ | ||
| 272 | if (!(spurious_irq_mask & irqmask)) { | ||
| 273 | printk(KERN_DEBUG | ||
| 274 | "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
| 275 | spurious_irq_mask |= irqmask; | ||
| 276 | } | ||
| 277 | atomic_inc(&irq_err_count); | ||
| 278 | /* | ||
| 279 | * Theoretically we do not have to handle this IRQ, | ||
| 280 | * but in Linux this does not cause problems and is | ||
| 281 | * simpler for us. | ||
| 282 | */ | ||
| 283 | goto handle_real_irq; | ||
| 284 | } | ||
| 285 | } | ||
| 286 | |||
| 287 | static char irq_trigger[2]; | ||
| 288 | /** | ||
| 289 | * ELCR registers (0x4d0, 0x4d1) control edge/level of IRQ | ||
| 290 | */ | ||
| 291 | static void restore_ELCR(char *trigger) | ||
| 292 | { | ||
| 293 | outb(trigger[0], 0x4d0); | ||
| 294 | outb(trigger[1], 0x4d1); | ||
| 295 | } | ||
| 296 | |||
| 297 | static void save_ELCR(char *trigger) | ||
| 298 | { | ||
| 299 | /* IRQ 0,1,2,8,13 are marked as reserved */ | ||
| 300 | trigger[0] = inb(0x4d0) & 0xF8; | ||
| 301 | trigger[1] = inb(0x4d1) & 0xDE; | ||
| 302 | } | ||
| 303 | |||
| 304 | static int i8259A_resume(struct sys_device *dev) | ||
| 305 | { | ||
| 306 | init_8259A(i8259A_auto_eoi); | ||
| 307 | restore_ELCR(irq_trigger); | ||
| 308 | return 0; | ||
| 309 | } | ||
| 310 | |||
| 311 | static int i8259A_suspend(struct sys_device *dev, pm_message_t state) | ||
| 312 | { | ||
| 313 | save_ELCR(irq_trigger); | ||
| 314 | return 0; | ||
| 315 | } | ||
| 316 | |||
| 317 | static int i8259A_shutdown(struct sys_device *dev) | ||
| 318 | { | ||
| 319 | /* Put the i8259A into a quiescent state that | ||
| 320 | * the kernel initialization code can get it | ||
| 321 | * out of. | ||
| 322 | */ | ||
| 323 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
| 324 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */ | ||
| 325 | return 0; | ||
| 326 | } | ||
| 327 | |||
| 328 | static struct sysdev_class i8259_sysdev_class = { | ||
| 329 | .name = "i8259", | ||
| 330 | .suspend = i8259A_suspend, | ||
| 331 | .resume = i8259A_resume, | ||
| 332 | .shutdown = i8259A_shutdown, | ||
| 333 | }; | ||
| 334 | |||
| 335 | static struct sys_device device_i8259A = { | ||
| 336 | .id = 0, | ||
| 337 | .cls = &i8259_sysdev_class, | ||
| 338 | }; | ||
| 339 | |||
| 340 | static int __init i8259A_init_sysfs(void) | ||
| 341 | { | ||
| 342 | int error = sysdev_class_register(&i8259_sysdev_class); | ||
| 343 | if (!error) | ||
| 344 | error = sysdev_register(&device_i8259A); | ||
| 345 | return error; | ||
| 346 | } | ||
| 347 | |||
| 348 | device_initcall(i8259A_init_sysfs); | ||
| 349 | |||
| 350 | void init_8259A(int auto_eoi) | ||
| 351 | { | ||
| 352 | unsigned long flags; | ||
| 353 | |||
| 354 | i8259A_auto_eoi = auto_eoi; | ||
| 355 | |||
| 356 | spin_lock_irqsave(&i8259A_lock, flags); | ||
| 357 | |||
| 358 | outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */ | ||
| 359 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ | ||
| 360 | |||
| 361 | /* | ||
| 362 | * outb_pic - this has to work on a wide range of PC hardware. | ||
| 363 | */ | ||
| 364 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | ||
| 365 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | ||
| 366 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); | ||
| 367 | /* 8259A-1 (the master) has a slave on IR2 */ | ||
| 368 | outb_pic(0x04, PIC_MASTER_IMR); | ||
| 369 | if (auto_eoi) /* master does Auto EOI */ | ||
| 370 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | ||
| 371 | else /* master expects normal EOI */ | ||
| 372 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | ||
| 373 | |||
| 374 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | ||
| 375 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | ||
| 376 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); | ||
| 377 | /* 8259A-2 is a slave on master's IR2 */ | ||
| 378 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); | ||
| 379 | /* (slave's support for AEOI in flat mode is to be investigated) */ | ||
| 380 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | ||
| 381 | |||
| 382 | if (auto_eoi) | ||
| 383 | /* | ||
| 384 | * In AEOI mode we just have to mask the interrupt | ||
| 385 | * when acking. | ||
| 386 | */ | ||
| 387 | i8259A_chip.mask_ack = disable_8259A_irq; | ||
| 388 | else | ||
| 389 | i8259A_chip.mask_ack = mask_and_ack_8259A; | ||
| 390 | |||
| 391 | udelay(100); /* wait for 8259A to initialize */ | ||
| 392 | |||
| 393 | outb(cached_master_mask, PIC_MASTER_IMR); /* restore master IRQ mask */ | ||
| 394 | outb(cached_slave_mask, PIC_SLAVE_IMR); /* restore slave IRQ mask */ | ||
| 395 | |||
| 396 | spin_unlock_irqrestore(&i8259A_lock, flags); | ||
| 397 | } | ||
| 398 | |||
| 399 | |||
| 400 | |||
| 401 | |||
| 402 | /* | ||
| 403 | * IRQ2 is cascade interrupt to second interrupt controller | ||
| 404 | */ | ||
| 405 | |||
| 406 | static struct irqaction irq2 = { | ||
| 407 | .handler = no_action, | ||
| 408 | .mask = CPU_MASK_NONE, | ||
| 409 | .name = "cascade", | ||
| 410 | }; | ||
| 411 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
| 412 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
| 413 | [IRQ0_VECTOR] = 0, | ||
| 414 | [IRQ1_VECTOR] = 1, | ||
| 415 | [IRQ2_VECTOR] = 2, | ||
| 416 | [IRQ3_VECTOR] = 3, | ||
| 417 | [IRQ4_VECTOR] = 4, | ||
| 418 | [IRQ5_VECTOR] = 5, | ||
| 419 | [IRQ6_VECTOR] = 6, | ||
| 420 | [IRQ7_VECTOR] = 7, | ||
| 421 | [IRQ8_VECTOR] = 8, | ||
| 422 | [IRQ9_VECTOR] = 9, | ||
| 423 | [IRQ10_VECTOR] = 10, | ||
| 424 | [IRQ11_VECTOR] = 11, | ||
| 425 | [IRQ12_VECTOR] = 12, | ||
| 426 | [IRQ13_VECTOR] = 13, | ||
| 427 | [IRQ14_VECTOR] = 14, | ||
| 428 | [IRQ15_VECTOR] = 15, | ||
| 429 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
| 430 | }; | ||
| 431 | |||
| 432 | void __init init_ISA_irqs (void) | ||
| 433 | { | ||
| 434 | int i; | ||
| 435 | |||
| 436 | init_bsp_APIC(); | ||
| 437 | init_8259A(0); | ||
| 438 | |||
| 439 | for (i = 0; i < NR_IRQS; i++) { | ||
| 440 | irq_desc[i].status = IRQ_DISABLED; | ||
| 441 | irq_desc[i].action = NULL; | ||
| 442 | irq_desc[i].depth = 1; | ||
| 443 | |||
| 444 | if (i < 16) { | ||
| 445 | /* | ||
| 446 | * 16 old-style INTA-cycle interrupts: | ||
| 447 | */ | ||
| 448 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 449 | handle_level_irq, "XT"); | ||
| 450 | } else { | ||
| 451 | /* | ||
| 452 | * 'high' PCI IRQs filled in on demand | ||
| 453 | */ | ||
| 454 | irq_desc[i].chip = &no_irq_chip; | ||
| 455 | } | ||
| 456 | } | ||
| 457 | } | ||
| 458 | |||
| 459 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 460 | |||
| 461 | void __init native_init_IRQ(void) | ||
| 462 | { | ||
| 463 | int i; | ||
| 464 | |||
| 465 | init_ISA_irqs(); | ||
| 466 | /* | ||
| 467 | * Cover the whole vector space, no vector can escape | ||
| 468 | * us. (some of these will be overridden and become | ||
| 469 | * 'special' SMP interrupts) | ||
| 470 | */ | ||
| 471 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 472 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 473 | if (vector != IA32_SYSCALL_VECTOR) | ||
| 474 | set_intr_gate(vector, interrupt[i]); | ||
| 475 | } | ||
| 476 | |||
| 477 | #ifdef CONFIG_SMP | ||
| 478 | /* | ||
| 479 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
| 480 | * IPI, driven by wakeup. | ||
| 481 | */ | ||
| 482 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
| 483 | |||
| 484 | /* IPIs for invalidation */ | ||
| 485 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
| 486 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
| 487 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
| 488 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
| 489 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
| 490 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
| 491 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
| 492 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
| 493 | |||
| 494 | /* IPI for generic function call */ | ||
| 495 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
| 496 | |||
| 497 | /* Low priority IPI to cleanup after moving an irq */ | ||
| 498 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
| 499 | #endif | ||
| 500 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
| 501 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
| 502 | |||
| 503 | /* self generated IPI for local APIC timer */ | ||
| 504 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
| 505 | |||
| 506 | /* IPI vectors for APIC spurious and error interrupts */ | ||
| 507 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
| 508 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
| 509 | |||
| 510 | if (!acpi_ioapic) | ||
| 511 | setup_irq(2, &irq2); | ||
| 512 | } | ||
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c index 4dc8600d9d20..d4f9df2b022a 100644 --- a/arch/x86/kernel/io_apic_32.c +++ b/arch/x86/kernel/io_apic_32.c | |||
| @@ -58,7 +58,7 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | |||
| 58 | static DEFINE_SPINLOCK(ioapic_lock); | 58 | static DEFINE_SPINLOCK(ioapic_lock); |
| 59 | static DEFINE_SPINLOCK(vector_lock); | 59 | static DEFINE_SPINLOCK(vector_lock); |
| 60 | 60 | ||
| 61 | int timer_over_8254 __initdata = 1; | 61 | int timer_through_8259 __initdata; |
| 62 | 62 | ||
| 63 | /* | 63 | /* |
| 64 | * Is the SiS APIC rmw bug present ? | 64 | * Is the SiS APIC rmw bug present ? |
| @@ -239,7 +239,7 @@ static void __init replace_pin_at_irq(unsigned int irq, | |||
| 239 | } | 239 | } |
| 240 | } | 240 | } |
| 241 | 241 | ||
| 242 | static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsigned long disable) | 242 | static void __modify_IO_APIC_irq(unsigned int irq, unsigned long enable, unsigned long disable) |
| 243 | { | 243 | { |
| 244 | struct irq_pin_list *entry = irq_2_pin + irq; | 244 | struct irq_pin_list *entry = irq_2_pin + irq; |
| 245 | unsigned int pin, reg; | 245 | unsigned int pin, reg; |
| @@ -259,30 +259,32 @@ static void __modify_IO_APIC_irq (unsigned int irq, unsigned long enable, unsign | |||
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | /* mask = 1 */ | 261 | /* mask = 1 */ |
| 262 | static void __mask_IO_APIC_irq (unsigned int irq) | 262 | static void __mask_IO_APIC_irq(unsigned int irq) |
| 263 | { | 263 | { |
| 264 | __modify_IO_APIC_irq(irq, 0x00010000, 0); | 264 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, 0); |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | /* mask = 0 */ | 267 | /* mask = 0 */ |
| 268 | static void __unmask_IO_APIC_irq (unsigned int irq) | 268 | static void __unmask_IO_APIC_irq(unsigned int irq) |
| 269 | { | 269 | { |
| 270 | __modify_IO_APIC_irq(irq, 0, 0x00010000); | 270 | __modify_IO_APIC_irq(irq, 0, IO_APIC_REDIR_MASKED); |
| 271 | } | 271 | } |
| 272 | 272 | ||
| 273 | /* mask = 1, trigger = 0 */ | 273 | /* mask = 1, trigger = 0 */ |
| 274 | static void __mask_and_edge_IO_APIC_irq (unsigned int irq) | 274 | static void __mask_and_edge_IO_APIC_irq(unsigned int irq) |
| 275 | { | 275 | { |
| 276 | __modify_IO_APIC_irq(irq, 0x00010000, 0x00008000); | 276 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_MASKED, |
| 277 | IO_APIC_REDIR_LEVEL_TRIGGER); | ||
| 277 | } | 278 | } |
| 278 | 279 | ||
| 279 | /* mask = 0, trigger = 1 */ | 280 | /* mask = 0, trigger = 1 */ |
| 280 | static void __unmask_and_level_IO_APIC_irq (unsigned int irq) | 281 | static void __unmask_and_level_IO_APIC_irq(unsigned int irq) |
| 281 | { | 282 | { |
| 282 | __modify_IO_APIC_irq(irq, 0x00008000, 0x00010000); | 283 | __modify_IO_APIC_irq(irq, IO_APIC_REDIR_LEVEL_TRIGGER, |
| 284 | IO_APIC_REDIR_MASKED); | ||
| 283 | } | 285 | } |
| 284 | 286 | ||
| 285 | static void mask_IO_APIC_irq (unsigned int irq) | 287 | static void mask_IO_APIC_irq(unsigned int irq) |
| 286 | { | 288 | { |
| 287 | unsigned long flags; | 289 | unsigned long flags; |
| 288 | 290 | ||
| @@ -291,7 +293,7 @@ static void mask_IO_APIC_irq (unsigned int irq) | |||
| 291 | spin_unlock_irqrestore(&ioapic_lock, flags); | 293 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 292 | } | 294 | } |
| 293 | 295 | ||
| 294 | static void unmask_IO_APIC_irq (unsigned int irq) | 296 | static void unmask_IO_APIC_irq(unsigned int irq) |
| 295 | { | 297 | { |
| 296 | unsigned long flags; | 298 | unsigned long flags; |
| 297 | 299 | ||
| @@ -303,7 +305,7 @@ static void unmask_IO_APIC_irq (unsigned int irq) | |||
| 303 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | 305 | static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) |
| 304 | { | 306 | { |
| 305 | struct IO_APIC_route_entry entry; | 307 | struct IO_APIC_route_entry entry; |
| 306 | 308 | ||
| 307 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ | 309 | /* Check delivery_mode to be sure we're not clearing an SMI pin */ |
| 308 | entry = ioapic_read_entry(apic, pin); | 310 | entry = ioapic_read_entry(apic, pin); |
| 309 | if (entry.delivery_mode == dest_SMI) | 311 | if (entry.delivery_mode == dest_SMI) |
| @@ -315,7 +317,7 @@ static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin) | |||
| 315 | ioapic_mask_entry(apic, pin); | 317 | ioapic_mask_entry(apic, pin); |
| 316 | } | 318 | } |
| 317 | 319 | ||
| 318 | static void clear_IO_APIC (void) | 320 | static void clear_IO_APIC(void) |
| 319 | { | 321 | { |
| 320 | int apic, pin; | 322 | int apic, pin; |
| 321 | 323 | ||
| @@ -332,7 +334,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
| 332 | struct irq_pin_list *entry = irq_2_pin + irq; | 334 | struct irq_pin_list *entry = irq_2_pin + irq; |
| 333 | unsigned int apicid_value; | 335 | unsigned int apicid_value; |
| 334 | cpumask_t tmp; | 336 | cpumask_t tmp; |
| 335 | 337 | ||
| 336 | cpus_and(tmp, cpumask, cpu_online_map); | 338 | cpus_and(tmp, cpumask, cpu_online_map); |
| 337 | if (cpus_empty(tmp)) | 339 | if (cpus_empty(tmp)) |
| 338 | tmp = TARGET_CPUS; | 340 | tmp = TARGET_CPUS; |
| @@ -361,7 +363,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) | |||
| 361 | # include <linux/kernel_stat.h> /* kstat */ | 363 | # include <linux/kernel_stat.h> /* kstat */ |
| 362 | # include <linux/slab.h> /* kmalloc() */ | 364 | # include <linux/slab.h> /* kmalloc() */ |
| 363 | # include <linux/timer.h> | 365 | # include <linux/timer.h> |
| 364 | 366 | ||
| 365 | #define IRQBALANCE_CHECK_ARCH -999 | 367 | #define IRQBALANCE_CHECK_ARCH -999 |
| 366 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) | 368 | #define MAX_BALANCED_IRQ_INTERVAL (5*HZ) |
| 367 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) | 369 | #define MIN_BALANCED_IRQ_INTERVAL (HZ/2) |
| @@ -373,14 +375,14 @@ static int physical_balance __read_mostly; | |||
| 373 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; | 375 | static long balanced_irq_interval __read_mostly = MAX_BALANCED_IRQ_INTERVAL; |
| 374 | 376 | ||
| 375 | static struct irq_cpu_info { | 377 | static struct irq_cpu_info { |
| 376 | unsigned long * last_irq; | 378 | unsigned long *last_irq; |
| 377 | unsigned long * irq_delta; | 379 | unsigned long *irq_delta; |
| 378 | unsigned long irq; | 380 | unsigned long irq; |
| 379 | } irq_cpu_data[NR_CPUS]; | 381 | } irq_cpu_data[NR_CPUS]; |
| 380 | 382 | ||
| 381 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) | 383 | #define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq) |
| 382 | #define LAST_CPU_IRQ(cpu,irq) (irq_cpu_data[cpu].last_irq[irq]) | 384 | #define LAST_CPU_IRQ(cpu, irq) (irq_cpu_data[cpu].last_irq[irq]) |
| 383 | #define IRQ_DELTA(cpu,irq) (irq_cpu_data[cpu].irq_delta[irq]) | 385 | #define IRQ_DELTA(cpu, irq) (irq_cpu_data[cpu].irq_delta[irq]) |
| 384 | 386 | ||
| 385 | #define IDLE_ENOUGH(cpu,now) \ | 387 | #define IDLE_ENOUGH(cpu,now) \ |
| 386 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) | 388 | (idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1)) |
| @@ -419,8 +421,8 @@ inside: | |||
| 419 | if (cpu == -1) | 421 | if (cpu == -1) |
| 420 | cpu = NR_CPUS-1; | 422 | cpu = NR_CPUS-1; |
| 421 | } | 423 | } |
| 422 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu,allowed_mask) || | 424 | } while (!cpu_online(cpu) || !IRQ_ALLOWED(cpu, allowed_mask) || |
| 423 | (search_idle && !IDLE_ENOUGH(cpu,now))); | 425 | (search_idle && !IDLE_ENOUGH(cpu, now))); |
| 424 | 426 | ||
| 425 | return cpu; | 427 | return cpu; |
| 426 | } | 428 | } |
| @@ -430,15 +432,14 @@ static inline void balance_irq(int cpu, int irq) | |||
| 430 | unsigned long now = jiffies; | 432 | unsigned long now = jiffies; |
| 431 | cpumask_t allowed_mask; | 433 | cpumask_t allowed_mask; |
| 432 | unsigned int new_cpu; | 434 | unsigned int new_cpu; |
| 433 | 435 | ||
| 434 | if (irqbalance_disabled) | 436 | if (irqbalance_disabled) |
| 435 | return; | 437 | return; |
| 436 | 438 | ||
| 437 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); | 439 | cpus_and(allowed_mask, cpu_online_map, balance_irq_affinity[irq]); |
| 438 | new_cpu = move(cpu, allowed_mask, now, 1); | 440 | new_cpu = move(cpu, allowed_mask, now, 1); |
| 439 | if (cpu != new_cpu) { | 441 | if (cpu != new_cpu) |
| 440 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); | 442 | set_pending_irq(irq, cpumask_of_cpu(new_cpu)); |
| 441 | } | ||
| 442 | } | 443 | } |
| 443 | 444 | ||
| 444 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | 445 | static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) |
| @@ -450,14 +451,14 @@ static inline void rotate_irqs_among_cpus(unsigned long useful_load_threshold) | |||
| 450 | if (!irq_desc[j].action) | 451 | if (!irq_desc[j].action) |
| 451 | continue; | 452 | continue; |
| 452 | /* Is it a significant load ? */ | 453 | /* Is it a significant load ? */ |
| 453 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i),j) < | 454 | if (IRQ_DELTA(CPU_TO_PACKAGEINDEX(i), j) < |
| 454 | useful_load_threshold) | 455 | useful_load_threshold) |
| 455 | continue; | 456 | continue; |
| 456 | balance_irq(i, j); | 457 | balance_irq(i, j); |
| 457 | } | 458 | } |
| 458 | } | 459 | } |
| 459 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 460 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
| 460 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 461 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
| 461 | return; | 462 | return; |
| 462 | } | 463 | } |
| 463 | 464 | ||
| @@ -486,22 +487,22 @@ static void do_irq_balance(void) | |||
| 486 | /* Is this an active IRQ or balancing disabled ? */ | 487 | /* Is this an active IRQ or balancing disabled ? */ |
| 487 | if (!irq_desc[j].action || irq_balancing_disabled(j)) | 488 | if (!irq_desc[j].action || irq_balancing_disabled(j)) |
| 488 | continue; | 489 | continue; |
| 489 | if ( package_index == i ) | 490 | if (package_index == i) |
| 490 | IRQ_DELTA(package_index,j) = 0; | 491 | IRQ_DELTA(package_index, j) = 0; |
| 491 | /* Determine the total count per processor per IRQ */ | 492 | /* Determine the total count per processor per IRQ */ |
| 492 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; | 493 | value_now = (unsigned long) kstat_cpu(i).irqs[j]; |
| 493 | 494 | ||
| 494 | /* Determine the activity per processor per IRQ */ | 495 | /* Determine the activity per processor per IRQ */ |
| 495 | delta = value_now - LAST_CPU_IRQ(i,j); | 496 | delta = value_now - LAST_CPU_IRQ(i, j); |
| 496 | 497 | ||
| 497 | /* Update last_cpu_irq[][] for the next time */ | 498 | /* Update last_cpu_irq[][] for the next time */ |
| 498 | LAST_CPU_IRQ(i,j) = value_now; | 499 | LAST_CPU_IRQ(i, j) = value_now; |
| 499 | 500 | ||
| 500 | /* Ignore IRQs whose rate is less than the clock */ | 501 | /* Ignore IRQs whose rate is less than the clock */ |
| 501 | if (delta < useful_load_threshold) | 502 | if (delta < useful_load_threshold) |
| 502 | continue; | 503 | continue; |
| 503 | /* update the load for the processor or package total */ | 504 | /* update the load for the processor or package total */ |
| 504 | IRQ_DELTA(package_index,j) += delta; | 505 | IRQ_DELTA(package_index, j) += delta; |
| 505 | 506 | ||
| 506 | /* Keep track of the higher numbered sibling as well */ | 507 | /* Keep track of the higher numbered sibling as well */ |
| 507 | if (i != package_index) | 508 | if (i != package_index) |
| @@ -527,7 +528,8 @@ static void do_irq_balance(void) | |||
| 527 | max_cpu_irq = ULONG_MAX; | 528 | max_cpu_irq = ULONG_MAX; |
| 528 | 529 | ||
| 529 | tryanothercpu: | 530 | tryanothercpu: |
| 530 | /* Look for heaviest loaded processor. | 531 | /* |
| 532 | * Look for heaviest loaded processor. | ||
| 531 | * We may come back to get the next heaviest loaded processor. | 533 | * We may come back to get the next heaviest loaded processor. |
| 532 | * Skip processors with trivial loads. | 534 | * Skip processors with trivial loads. |
| 533 | */ | 535 | */ |
| @@ -536,7 +538,7 @@ tryanothercpu: | |||
| 536 | for_each_online_cpu(i) { | 538 | for_each_online_cpu(i) { |
| 537 | if (i != CPU_TO_PACKAGEINDEX(i)) | 539 | if (i != CPU_TO_PACKAGEINDEX(i)) |
| 538 | continue; | 540 | continue; |
| 539 | if (max_cpu_irq <= CPU_IRQ(i)) | 541 | if (max_cpu_irq <= CPU_IRQ(i)) |
| 540 | continue; | 542 | continue; |
| 541 | if (tmp_cpu_irq < CPU_IRQ(i)) { | 543 | if (tmp_cpu_irq < CPU_IRQ(i)) { |
| 542 | tmp_cpu_irq = CPU_IRQ(i); | 544 | tmp_cpu_irq = CPU_IRQ(i); |
| @@ -545,8 +547,9 @@ tryanothercpu: | |||
| 545 | } | 547 | } |
| 546 | 548 | ||
| 547 | if (tmp_loaded == -1) { | 549 | if (tmp_loaded == -1) { |
| 548 | /* In the case of small number of heavy interrupt sources, | 550 | /* |
| 549 | * loading some of the cpus too much. We use Ingo's original | 551 | * In the case of small number of heavy interrupt sources, |
| 552 | * loading some of the cpus too much. We use Ingo's original | ||
| 550 | * approach to rotate them around. | 553 | * approach to rotate them around. |
| 551 | */ | 554 | */ |
| 552 | if (!first_attempt && imbalance >= useful_load_threshold) { | 555 | if (!first_attempt && imbalance >= useful_load_threshold) { |
| @@ -555,13 +558,14 @@ tryanothercpu: | |||
| 555 | } | 558 | } |
| 556 | goto not_worth_the_effort; | 559 | goto not_worth_the_effort; |
| 557 | } | 560 | } |
| 558 | 561 | ||
| 559 | first_attempt = 0; /* heaviest search */ | 562 | first_attempt = 0; /* heaviest search */ |
| 560 | max_cpu_irq = tmp_cpu_irq; /* load */ | 563 | max_cpu_irq = tmp_cpu_irq; /* load */ |
| 561 | max_loaded = tmp_loaded; /* processor */ | 564 | max_loaded = tmp_loaded; /* processor */ |
| 562 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; | 565 | imbalance = (max_cpu_irq - min_cpu_irq) / 2; |
| 563 | 566 | ||
| 564 | /* if imbalance is less than approx 10% of max load, then | 567 | /* |
| 568 | * if imbalance is less than approx 10% of max load, then | ||
| 565 | * observe diminishing returns action. - quit | 569 | * observe diminishing returns action. - quit |
| 566 | */ | 570 | */ |
| 567 | if (imbalance < (max_cpu_irq >> 3)) | 571 | if (imbalance < (max_cpu_irq >> 3)) |
| @@ -577,26 +581,25 @@ tryanotherirq: | |||
| 577 | /* Is this an active IRQ? */ | 581 | /* Is this an active IRQ? */ |
| 578 | if (!irq_desc[j].action) | 582 | if (!irq_desc[j].action) |
| 579 | continue; | 583 | continue; |
| 580 | if (imbalance <= IRQ_DELTA(max_loaded,j)) | 584 | if (imbalance <= IRQ_DELTA(max_loaded, j)) |
| 581 | continue; | 585 | continue; |
| 582 | /* Try to find the IRQ that is closest to the imbalance | 586 | /* Try to find the IRQ that is closest to the imbalance |
| 583 | * without going over. | 587 | * without going over. |
| 584 | */ | 588 | */ |
| 585 | if (move_this_load < IRQ_DELTA(max_loaded,j)) { | 589 | if (move_this_load < IRQ_DELTA(max_loaded, j)) { |
| 586 | move_this_load = IRQ_DELTA(max_loaded,j); | 590 | move_this_load = IRQ_DELTA(max_loaded, j); |
| 587 | selected_irq = j; | 591 | selected_irq = j; |
| 588 | } | 592 | } |
| 589 | } | 593 | } |
| 590 | if (selected_irq == -1) { | 594 | if (selected_irq == -1) |
| 591 | goto tryanothercpu; | 595 | goto tryanothercpu; |
| 592 | } | ||
| 593 | 596 | ||
| 594 | imbalance = move_this_load; | 597 | imbalance = move_this_load; |
| 595 | 598 | ||
| 596 | /* For physical_balance case, we accumulated both load | 599 | /* For physical_balance case, we accumulated both load |
| 597 | * values in the one of the siblings cpu_irq[], | 600 | * values in the one of the siblings cpu_irq[], |
| 598 | * to use the same code for physical and logical processors | 601 | * to use the same code for physical and logical processors |
| 599 | * as much as possible. | 602 | * as much as possible. |
| 600 | * | 603 | * |
| 601 | * NOTE: the cpu_irq[] array holds the sum of the load for | 604 | * NOTE: the cpu_irq[] array holds the sum of the load for |
| 602 | * sibling A and sibling B in the slot for the lowest numbered | 605 | * sibling A and sibling B in the slot for the lowest numbered |
| @@ -625,11 +628,11 @@ tryanotherirq: | |||
| 625 | /* mark for change destination */ | 628 | /* mark for change destination */ |
| 626 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); | 629 | set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded)); |
| 627 | 630 | ||
| 628 | /* Since we made a change, come back sooner to | 631 | /* Since we made a change, come back sooner to |
| 629 | * check for more variation. | 632 | * check for more variation. |
| 630 | */ | 633 | */ |
| 631 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, | 634 | balanced_irq_interval = max((long)MIN_BALANCED_IRQ_INTERVAL, |
| 632 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); | 635 | balanced_irq_interval - BALANCED_IRQ_LESS_DELTA); |
| 633 | return; | 636 | return; |
| 634 | } | 637 | } |
| 635 | goto tryanotherirq; | 638 | goto tryanotherirq; |
| @@ -640,7 +643,7 @@ not_worth_the_effort: | |||
| 640 | * upward | 643 | * upward |
| 641 | */ | 644 | */ |
| 642 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, | 645 | balanced_irq_interval = min((long)MAX_BALANCED_IRQ_INTERVAL, |
| 643 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); | 646 | balanced_irq_interval + BALANCED_IRQ_MORE_DELTA); |
| 644 | return; | 647 | return; |
| 645 | } | 648 | } |
| 646 | 649 | ||
| @@ -679,13 +682,13 @@ static int __init balanced_irq_init(void) | |||
| 679 | cpumask_t tmp; | 682 | cpumask_t tmp; |
| 680 | 683 | ||
| 681 | cpus_shift_right(tmp, cpu_online_map, 2); | 684 | cpus_shift_right(tmp, cpu_online_map, 2); |
| 682 | c = &boot_cpu_data; | 685 | c = &boot_cpu_data; |
| 683 | /* When not overwritten by the command line ask subarchitecture. */ | 686 | /* When not overwritten by the command line ask subarchitecture. */ |
| 684 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) | 687 | if (irqbalance_disabled == IRQBALANCE_CHECK_ARCH) |
| 685 | irqbalance_disabled = NO_BALANCE_IRQ; | 688 | irqbalance_disabled = NO_BALANCE_IRQ; |
| 686 | if (irqbalance_disabled) | 689 | if (irqbalance_disabled) |
| 687 | return 0; | 690 | return 0; |
| 688 | 691 | ||
| 689 | /* disable irqbalance completely if there is only one processor online */ | 692 | /* disable irqbalance completely if there is only one processor online */ |
| 690 | if (num_online_cpus() < 2) { | 693 | if (num_online_cpus() < 2) { |
| 691 | irqbalance_disabled = 1; | 694 | irqbalance_disabled = 1; |
| @@ -699,16 +702,14 @@ static int __init balanced_irq_init(void) | |||
| 699 | physical_balance = 1; | 702 | physical_balance = 1; |
| 700 | 703 | ||
| 701 | for_each_online_cpu(i) { | 704 | for_each_online_cpu(i) { |
| 702 | irq_cpu_data[i].irq_delta = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 705 | irq_cpu_data[i].irq_delta = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
| 703 | irq_cpu_data[i].last_irq = kmalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); | 706 | irq_cpu_data[i].last_irq = kzalloc(sizeof(unsigned long) * NR_IRQS, GFP_KERNEL); |
| 704 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { | 707 | if (irq_cpu_data[i].irq_delta == NULL || irq_cpu_data[i].last_irq == NULL) { |
| 705 | printk(KERN_ERR "balanced_irq_init: out of memory"); | 708 | printk(KERN_ERR "balanced_irq_init: out of memory"); |
| 706 | goto failed; | 709 | goto failed; |
| 707 | } | 710 | } |
| 708 | memset(irq_cpu_data[i].irq_delta,0,sizeof(unsigned long) * NR_IRQS); | ||
| 709 | memset(irq_cpu_data[i].last_irq,0,sizeof(unsigned long) * NR_IRQS); | ||
| 710 | } | 711 | } |
| 711 | 712 | ||
| 712 | printk(KERN_INFO "Starting balanced_irq\n"); | 713 | printk(KERN_INFO "Starting balanced_irq\n"); |
| 713 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) | 714 | if (!IS_ERR(kthread_run(balanced_irq, NULL, "kirqd"))) |
| 714 | return 0; | 715 | return 0; |
| @@ -843,7 +844,7 @@ static int __init find_isa_irq_apic(int irq, int type) | |||
| 843 | } | 844 | } |
| 844 | if (i < mp_irq_entries) { | 845 | if (i < mp_irq_entries) { |
| 845 | int apic; | 846 | int apic; |
| 846 | for(apic = 0; apic < nr_ioapics; apic++) { | 847 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 847 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) | 848 | if (mp_ioapics[apic].mpc_apicid == mp_irqs[i].mpc_dstapic) |
| 848 | return apic; | 849 | return apic; |
| 849 | } | 850 | } |
| @@ -880,7 +881,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
| 880 | !mp_irqs[i].mpc_irqtype && | 881 | !mp_irqs[i].mpc_irqtype && |
| 881 | (bus == lbus) && | 882 | (bus == lbus) && |
| 882 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { | 883 | (slot == ((mp_irqs[i].mpc_srcbusirq >> 2) & 0x1f))) { |
| 883 | int irq = pin_2_irq(i,apic,mp_irqs[i].mpc_dstirq); | 884 | int irq = pin_2_irq(i, apic, mp_irqs[i].mpc_dstirq); |
| 884 | 885 | ||
| 885 | if (!(apic || IO_APIC_IRQ(irq))) | 886 | if (!(apic || IO_APIC_IRQ(irq))) |
| 886 | continue; | 887 | continue; |
| @@ -900,7 +901,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin) | |||
| 900 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); | 901 | EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); |
| 901 | 902 | ||
| 902 | /* | 903 | /* |
| 903 | * This function currently is only a helper for the i386 smp boot process where | 904 | * This function currently is only a helper for the i386 smp boot process where |
| 904 | * we need to reprogram the ioredtbls to cater for the cpus which have come online | 905 | * we need to reprogram the ioredtbls to cater for the cpus which have come online |
| 905 | * so mask in all cases should simply be TARGET_CPUS | 906 | * so mask in all cases should simply be TARGET_CPUS |
| 906 | */ | 907 | */ |
| @@ -975,37 +976,36 @@ static int MPBIOS_polarity(int idx) | |||
| 975 | /* | 976 | /* |
| 976 | * Determine IRQ line polarity (high active or low active): | 977 | * Determine IRQ line polarity (high active or low active): |
| 977 | */ | 978 | */ |
| 978 | switch (mp_irqs[idx].mpc_irqflag & 3) | 979 | switch (mp_irqs[idx].mpc_irqflag & 3) { |
| 980 | case 0: /* conforms, ie. bus-type dependent polarity */ | ||
| 979 | { | 981 | { |
| 980 | case 0: /* conforms, ie. bus-type dependent polarity */ | 982 | polarity = test_bit(bus, mp_bus_not_pci)? |
| 981 | { | 983 | default_ISA_polarity(idx): |
| 982 | polarity = test_bit(bus, mp_bus_not_pci)? | 984 | default_PCI_polarity(idx); |
| 983 | default_ISA_polarity(idx): | 985 | break; |
| 984 | default_PCI_polarity(idx); | 986 | } |
| 985 | break; | 987 | case 1: /* high active */ |
| 986 | } | 988 | { |
| 987 | case 1: /* high active */ | 989 | polarity = 0; |
| 988 | { | 990 | break; |
| 989 | polarity = 0; | 991 | } |
| 990 | break; | 992 | case 2: /* reserved */ |
| 991 | } | 993 | { |
| 992 | case 2: /* reserved */ | 994 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 993 | { | 995 | polarity = 1; |
| 994 | printk(KERN_WARNING "broken BIOS!!\n"); | 996 | break; |
| 995 | polarity = 1; | 997 | } |
| 996 | break; | 998 | case 3: /* low active */ |
| 997 | } | 999 | { |
| 998 | case 3: /* low active */ | 1000 | polarity = 1; |
| 999 | { | 1001 | break; |
| 1000 | polarity = 1; | 1002 | } |
| 1001 | break; | 1003 | default: /* invalid */ |
| 1002 | } | 1004 | { |
| 1003 | default: /* invalid */ | 1005 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 1004 | { | 1006 | polarity = 1; |
| 1005 | printk(KERN_WARNING "broken BIOS!!\n"); | 1007 | break; |
| 1006 | polarity = 1; | 1008 | } |
| 1007 | break; | ||
| 1008 | } | ||
| 1009 | } | 1009 | } |
| 1010 | return polarity; | 1010 | return polarity; |
| 1011 | } | 1011 | } |
| @@ -1018,69 +1018,67 @@ static int MPBIOS_trigger(int idx) | |||
| 1018 | /* | 1018 | /* |
| 1019 | * Determine IRQ trigger mode (edge or level sensitive): | 1019 | * Determine IRQ trigger mode (edge or level sensitive): |
| 1020 | */ | 1020 | */ |
| 1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) | 1021 | switch ((mp_irqs[idx].mpc_irqflag>>2) & 3) { |
| 1022 | case 0: /* conforms, ie. bus-type dependent */ | ||
| 1022 | { | 1023 | { |
| 1023 | case 0: /* conforms, ie. bus-type dependent */ | 1024 | trigger = test_bit(bus, mp_bus_not_pci)? |
| 1024 | { | 1025 | default_ISA_trigger(idx): |
| 1025 | trigger = test_bit(bus, mp_bus_not_pci)? | 1026 | default_PCI_trigger(idx); |
| 1026 | default_ISA_trigger(idx): | ||
| 1027 | default_PCI_trigger(idx); | ||
| 1028 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) | 1027 | #if defined(CONFIG_EISA) || defined(CONFIG_MCA) |
| 1029 | switch (mp_bus_id_to_type[bus]) | 1028 | switch (mp_bus_id_to_type[bus]) { |
| 1030 | { | 1029 | case MP_BUS_ISA: /* ISA pin */ |
| 1031 | case MP_BUS_ISA: /* ISA pin */ | 1030 | { |
| 1032 | { | 1031 | /* set before the switch */ |
| 1033 | /* set before the switch */ | ||
| 1034 | break; | ||
| 1035 | } | ||
| 1036 | case MP_BUS_EISA: /* EISA pin */ | ||
| 1037 | { | ||
| 1038 | trigger = default_EISA_trigger(idx); | ||
| 1039 | break; | ||
| 1040 | } | ||
| 1041 | case MP_BUS_PCI: /* PCI pin */ | ||
| 1042 | { | ||
| 1043 | /* set before the switch */ | ||
| 1044 | break; | ||
| 1045 | } | ||
| 1046 | case MP_BUS_MCA: /* MCA pin */ | ||
| 1047 | { | ||
| 1048 | trigger = default_MCA_trigger(idx); | ||
| 1049 | break; | ||
| 1050 | } | ||
| 1051 | default: | ||
| 1052 | { | ||
| 1053 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1054 | trigger = 1; | ||
| 1055 | break; | ||
| 1056 | } | ||
| 1057 | } | ||
| 1058 | #endif | ||
| 1059 | break; | 1032 | break; |
| 1060 | } | 1033 | } |
| 1061 | case 1: /* edge */ | 1034 | case MP_BUS_EISA: /* EISA pin */ |
| 1062 | { | 1035 | { |
| 1063 | trigger = 0; | 1036 | trigger = default_EISA_trigger(idx); |
| 1064 | break; | 1037 | break; |
| 1065 | } | 1038 | } |
| 1066 | case 2: /* reserved */ | 1039 | case MP_BUS_PCI: /* PCI pin */ |
| 1067 | { | 1040 | { |
| 1068 | printk(KERN_WARNING "broken BIOS!!\n"); | 1041 | /* set before the switch */ |
| 1069 | trigger = 1; | ||
| 1070 | break; | 1042 | break; |
| 1071 | } | 1043 | } |
| 1072 | case 3: /* level */ | 1044 | case MP_BUS_MCA: /* MCA pin */ |
| 1073 | { | 1045 | { |
| 1074 | trigger = 1; | 1046 | trigger = default_MCA_trigger(idx); |
| 1075 | break; | 1047 | break; |
| 1076 | } | 1048 | } |
| 1077 | default: /* invalid */ | 1049 | default: |
| 1078 | { | 1050 | { |
| 1079 | printk(KERN_WARNING "broken BIOS!!\n"); | 1051 | printk(KERN_WARNING "broken BIOS!!\n"); |
| 1080 | trigger = 0; | 1052 | trigger = 1; |
| 1081 | break; | 1053 | break; |
| 1082 | } | 1054 | } |
| 1083 | } | 1055 | } |
| 1056 | #endif | ||
| 1057 | break; | ||
| 1058 | } | ||
| 1059 | case 1: /* edge */ | ||
| 1060 | { | ||
| 1061 | trigger = 0; | ||
| 1062 | break; | ||
| 1063 | } | ||
| 1064 | case 2: /* reserved */ | ||
| 1065 | { | ||
| 1066 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1067 | trigger = 1; | ||
| 1068 | break; | ||
| 1069 | } | ||
| 1070 | case 3: /* level */ | ||
| 1071 | { | ||
| 1072 | trigger = 1; | ||
| 1073 | break; | ||
| 1074 | } | ||
| 1075 | default: /* invalid */ | ||
| 1076 | { | ||
| 1077 | printk(KERN_WARNING "broken BIOS!!\n"); | ||
| 1078 | trigger = 0; | ||
| 1079 | break; | ||
| 1080 | } | ||
| 1081 | } | ||
| 1084 | return trigger; | 1082 | return trigger; |
| 1085 | } | 1083 | } |
| 1086 | 1084 | ||
| @@ -1148,8 +1146,8 @@ static inline int IO_APIC_irq_trigger(int irq) | |||
| 1148 | 1146 | ||
| 1149 | for (apic = 0; apic < nr_ioapics; apic++) { | 1147 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 1150 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1148 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
| 1151 | idx = find_irq_entry(apic,pin,mp_INT); | 1149 | idx = find_irq_entry(apic, pin, mp_INT); |
| 1152 | if ((idx != -1) && (irq == pin_2_irq(idx,apic,pin))) | 1150 | if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin))) |
| 1153 | return irq_trigger(idx); | 1151 | return irq_trigger(idx); |
| 1154 | } | 1152 | } |
| 1155 | } | 1153 | } |
| @@ -1164,7 +1162,7 @@ static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 } | |||
| 1164 | 1162 | ||
| 1165 | static int __assign_irq_vector(int irq) | 1163 | static int __assign_irq_vector(int irq) |
| 1166 | { | 1164 | { |
| 1167 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset = 0; | 1165 | static int current_vector = FIRST_DEVICE_VECTOR, current_offset; |
| 1168 | int vector, offset; | 1166 | int vector, offset; |
| 1169 | 1167 | ||
| 1170 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); | 1168 | BUG_ON((unsigned)irq >= NR_IRQ_VECTORS); |
| @@ -1237,15 +1235,15 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1237 | /* | 1235 | /* |
| 1238 | * add it to the IO-APIC irq-routing table: | 1236 | * add it to the IO-APIC irq-routing table: |
| 1239 | */ | 1237 | */ |
| 1240 | memset(&entry,0,sizeof(entry)); | 1238 | memset(&entry, 0, sizeof(entry)); |
| 1241 | 1239 | ||
| 1242 | entry.delivery_mode = INT_DELIVERY_MODE; | 1240 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 1243 | entry.dest_mode = INT_DEST_MODE; | 1241 | entry.dest_mode = INT_DEST_MODE; |
| 1244 | entry.mask = 0; /* enable IRQ */ | 1242 | entry.mask = 0; /* enable IRQ */ |
| 1245 | entry.dest.logical.logical_dest = | 1243 | entry.dest.logical.logical_dest = |
| 1246 | cpu_mask_to_apicid(TARGET_CPUS); | 1244 | cpu_mask_to_apicid(TARGET_CPUS); |
| 1247 | 1245 | ||
| 1248 | idx = find_irq_entry(apic,pin,mp_INT); | 1246 | idx = find_irq_entry(apic, pin, mp_INT); |
| 1249 | if (idx == -1) { | 1247 | if (idx == -1) { |
| 1250 | if (first_notcon) { | 1248 | if (first_notcon) { |
| 1251 | apic_printk(APIC_VERBOSE, KERN_DEBUG | 1249 | apic_printk(APIC_VERBOSE, KERN_DEBUG |
| @@ -1289,7 +1287,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1289 | vector = assign_irq_vector(irq); | 1287 | vector = assign_irq_vector(irq); |
| 1290 | entry.vector = vector; | 1288 | entry.vector = vector; |
| 1291 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); | 1289 | ioapic_register_intr(irq, vector, IOAPIC_AUTO); |
| 1292 | 1290 | ||
| 1293 | if (!apic && (irq < 16)) | 1291 | if (!apic && (irq < 16)) |
| 1294 | disable_8259A_irq(irq); | 1292 | disable_8259A_irq(irq); |
| 1295 | } | 1293 | } |
| @@ -1302,25 +1300,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 1302 | } | 1300 | } |
| 1303 | 1301 | ||
| 1304 | /* | 1302 | /* |
| 1305 | * Set up the 8259A-master output pin: | 1303 | * Set up the timer pin, possibly with the 8259A-master behind. |
| 1306 | */ | 1304 | */ |
| 1307 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 1305 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
| 1306 | int vector) | ||
| 1308 | { | 1307 | { |
| 1309 | struct IO_APIC_route_entry entry; | 1308 | struct IO_APIC_route_entry entry; |
| 1310 | 1309 | ||
| 1311 | memset(&entry,0,sizeof(entry)); | 1310 | memset(&entry, 0, sizeof(entry)); |
| 1312 | |||
| 1313 | disable_8259A_irq(0); | ||
| 1314 | |||
| 1315 | /* mask LVT0 */ | ||
| 1316 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
| 1317 | 1311 | ||
| 1318 | /* | 1312 | /* |
| 1319 | * We use logical delivery to get the timer IRQ | 1313 | * We use logical delivery to get the timer IRQ |
| 1320 | * to the first CPU. | 1314 | * to the first CPU. |
| 1321 | */ | 1315 | */ |
| 1322 | entry.dest_mode = INT_DEST_MODE; | 1316 | entry.dest_mode = INT_DEST_MODE; |
| 1323 | entry.mask = 0; /* unmask IRQ now */ | 1317 | entry.mask = 1; /* mask IRQ now */ |
| 1324 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); | 1318 | entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS); |
| 1325 | entry.delivery_mode = INT_DELIVERY_MODE; | 1319 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 1326 | entry.polarity = 0; | 1320 | entry.polarity = 0; |
| @@ -1329,17 +1323,14 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 1329 | 1323 | ||
| 1330 | /* | 1324 | /* |
| 1331 | * The timer IRQ doesn't have to know that behind the | 1325 | * The timer IRQ doesn't have to know that behind the |
| 1332 | * scene we have a 8259A-master in AEOI mode ... | 1326 | * scene we may have a 8259A-master in AEOI mode ... |
| 1333 | */ | 1327 | */ |
| 1334 | irq_desc[0].chip = &ioapic_chip; | 1328 | ioapic_register_intr(0, vector, IOAPIC_EDGE); |
| 1335 | set_irq_handler(0, handle_edge_irq); | ||
| 1336 | 1329 | ||
| 1337 | /* | 1330 | /* |
| 1338 | * Add it to the IO-APIC irq-routing table: | 1331 | * Add it to the IO-APIC irq-routing table: |
| 1339 | */ | 1332 | */ |
| 1340 | ioapic_write_entry(apic, pin, entry); | 1333 | ioapic_write_entry(apic, pin, entry); |
| 1341 | |||
| 1342 | enable_8259A_irq(0); | ||
| 1343 | } | 1334 | } |
| 1344 | 1335 | ||
| 1345 | void __init print_IO_APIC(void) | 1336 | void __init print_IO_APIC(void) |
| @@ -1354,7 +1345,7 @@ void __init print_IO_APIC(void) | |||
| 1354 | if (apic_verbosity == APIC_QUIET) | 1345 | if (apic_verbosity == APIC_QUIET) |
| 1355 | return; | 1346 | return; |
| 1356 | 1347 | ||
| 1357 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); | 1348 | printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries); |
| 1358 | for (i = 0; i < nr_ioapics; i++) | 1349 | for (i = 0; i < nr_ioapics; i++) |
| 1359 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", | 1350 | printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n", |
| 1360 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); | 1351 | mp_ioapics[i].mpc_apicid, nr_ioapic_registers[i]); |
| @@ -1459,7 +1450,7 @@ void __init print_IO_APIC(void) | |||
| 1459 | 1450 | ||
| 1460 | #if 0 | 1451 | #if 0 |
| 1461 | 1452 | ||
| 1462 | static void print_APIC_bitfield (int base) | 1453 | static void print_APIC_bitfield(int base) |
| 1463 | { | 1454 | { |
| 1464 | unsigned int v; | 1455 | unsigned int v; |
| 1465 | int i, j; | 1456 | int i, j; |
| @@ -1480,7 +1471,7 @@ static void print_APIC_bitfield (int base) | |||
| 1480 | } | 1471 | } |
| 1481 | } | 1472 | } |
| 1482 | 1473 | ||
| 1483 | void /*__init*/ print_local_APIC(void * dummy) | 1474 | void /*__init*/ print_local_APIC(void *dummy) |
| 1484 | { | 1475 | { |
| 1485 | unsigned int v, ver, maxlvt; | 1476 | unsigned int v, ver, maxlvt; |
| 1486 | 1477 | ||
| @@ -1489,6 +1480,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
| 1489 | 1480 | ||
| 1490 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1481 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
| 1491 | smp_processor_id(), hard_smp_processor_id()); | 1482 | smp_processor_id(), hard_smp_processor_id()); |
| 1483 | v = apic_read(APIC_ID); | ||
| 1492 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, | 1484 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, |
| 1493 | GET_APIC_ID(read_apic_id())); | 1485 | GET_APIC_ID(read_apic_id())); |
| 1494 | v = apic_read(APIC_LVR); | 1486 | v = apic_read(APIC_LVR); |
| @@ -1563,7 +1555,7 @@ void /*__init*/ print_local_APIC(void * dummy) | |||
| 1563 | printk("\n"); | 1555 | printk("\n"); |
| 1564 | } | 1556 | } |
| 1565 | 1557 | ||
| 1566 | void print_all_local_APICs (void) | 1558 | void print_all_local_APICs(void) |
| 1567 | { | 1559 | { |
| 1568 | on_each_cpu(print_local_APIC, NULL, 1, 1); | 1560 | on_each_cpu(print_local_APIC, NULL, 1, 1); |
| 1569 | } | 1561 | } |
| @@ -1586,11 +1578,11 @@ void /*__init*/ print_PIC(void) | |||
| 1586 | v = inb(0xa0) << 8 | inb(0x20); | 1578 | v = inb(0xa0) << 8 | inb(0x20); |
| 1587 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); | 1579 | printk(KERN_DEBUG "... PIC IRR: %04x\n", v); |
| 1588 | 1580 | ||
| 1589 | outb(0x0b,0xa0); | 1581 | outb(0x0b, 0xa0); |
| 1590 | outb(0x0b,0x20); | 1582 | outb(0x0b, 0x20); |
| 1591 | v = inb(0xa0) << 8 | inb(0x20); | 1583 | v = inb(0xa0) << 8 | inb(0x20); |
| 1592 | outb(0x0a,0xa0); | 1584 | outb(0x0a, 0xa0); |
| 1593 | outb(0x0a,0x20); | 1585 | outb(0x0a, 0x20); |
| 1594 | 1586 | ||
| 1595 | spin_unlock_irqrestore(&i8259A_lock, flags); | 1587 | spin_unlock_irqrestore(&i8259A_lock, flags); |
| 1596 | 1588 | ||
| @@ -1626,7 +1618,7 @@ static void __init enable_IO_APIC(void) | |||
| 1626 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1618 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 1627 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; | 1619 | nr_ioapic_registers[apic] = reg_01.bits.entries+1; |
| 1628 | } | 1620 | } |
| 1629 | for(apic = 0; apic < nr_ioapics; apic++) { | 1621 | for (apic = 0; apic < nr_ioapics; apic++) { |
| 1630 | int pin; | 1622 | int pin; |
| 1631 | /* See if any of the pins is in ExtINT mode */ | 1623 | /* See if any of the pins is in ExtINT mode */ |
| 1632 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1624 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { |
| @@ -1748,7 +1740,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
| 1748 | spin_lock_irqsave(&ioapic_lock, flags); | 1740 | spin_lock_irqsave(&ioapic_lock, flags); |
| 1749 | reg_00.raw = io_apic_read(apic, 0); | 1741 | reg_00.raw = io_apic_read(apic, 0); |
| 1750 | spin_unlock_irqrestore(&ioapic_lock, flags); | 1742 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 1751 | 1743 | ||
| 1752 | old_id = mp_ioapics[apic].mpc_apicid; | 1744 | old_id = mp_ioapics[apic].mpc_apicid; |
| 1753 | 1745 | ||
| 1754 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { | 1746 | if (mp_ioapics[apic].mpc_apicid >= get_physical_broadcast()) { |
| @@ -1800,7 +1792,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
| 1800 | /* | 1792 | /* |
| 1801 | * Read the right value from the MPC table and | 1793 | * Read the right value from the MPC table and |
| 1802 | * write it into the ID register. | 1794 | * write it into the ID register. |
| 1803 | */ | 1795 | */ |
| 1804 | apic_printk(APIC_VERBOSE, KERN_INFO | 1796 | apic_printk(APIC_VERBOSE, KERN_INFO |
| 1805 | "...changing IO-APIC physical APIC ID to %d ...", | 1797 | "...changing IO-APIC physical APIC ID to %d ...", |
| 1806 | mp_ioapics[apic].mpc_apicid); | 1798 | mp_ioapics[apic].mpc_apicid); |
| @@ -2020,7 +2012,7 @@ static void ack_apic(unsigned int irq) | |||
| 2020 | ack_APIC_irq(); | 2012 | ack_APIC_irq(); |
| 2021 | } | 2013 | } |
| 2022 | 2014 | ||
| 2023 | static void mask_lapic_irq (unsigned int irq) | 2015 | static void mask_lapic_irq(unsigned int irq) |
| 2024 | { | 2016 | { |
| 2025 | unsigned long v; | 2017 | unsigned long v; |
| 2026 | 2018 | ||
| @@ -2028,7 +2020,7 @@ static void mask_lapic_irq (unsigned int irq) | |||
| 2028 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); | 2020 | apic_write_around(APIC_LVT0, v | APIC_LVT_MASKED); |
| 2029 | } | 2021 | } |
| 2030 | 2022 | ||
| 2031 | static void unmask_lapic_irq (unsigned int irq) | 2023 | static void unmask_lapic_irq(unsigned int irq) |
| 2032 | { | 2024 | { |
| 2033 | unsigned long v; | 2025 | unsigned long v; |
| 2034 | 2026 | ||
| @@ -2037,7 +2029,7 @@ static void unmask_lapic_irq (unsigned int irq) | |||
| 2037 | } | 2029 | } |
| 2038 | 2030 | ||
| 2039 | static struct irq_chip lapic_chip __read_mostly = { | 2031 | static struct irq_chip lapic_chip __read_mostly = { |
| 2040 | .name = "local-APIC-edge", | 2032 | .name = "local-APIC", |
| 2041 | .mask = mask_lapic_irq, | 2033 | .mask = mask_lapic_irq, |
| 2042 | .unmask = unmask_lapic_irq, | 2034 | .unmask = unmask_lapic_irq, |
| 2043 | .eoi = ack_apic, | 2035 | .eoi = ack_apic, |
| @@ -2046,14 +2038,14 @@ static struct irq_chip lapic_chip __read_mostly = { | |||
| 2046 | static void __init setup_nmi(void) | 2038 | static void __init setup_nmi(void) |
| 2047 | { | 2039 | { |
| 2048 | /* | 2040 | /* |
| 2049 | * Dirty trick to enable the NMI watchdog ... | 2041 | * Dirty trick to enable the NMI watchdog ... |
| 2050 | * We put the 8259A master into AEOI mode and | 2042 | * We put the 8259A master into AEOI mode and |
| 2051 | * unmask on all local APICs LVT0 as NMI. | 2043 | * unmask on all local APICs LVT0 as NMI. |
| 2052 | * | 2044 | * |
| 2053 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') | 2045 | * The idea to use the 8259A in AEOI mode ('8259A Virtual Wire') |
| 2054 | * is from Maciej W. Rozycki - so we do not have to EOI from | 2046 | * is from Maciej W. Rozycki - so we do not have to EOI from |
| 2055 | * the NMI handler or the timer interrupt. | 2047 | * the NMI handler or the timer interrupt. |
| 2056 | */ | 2048 | */ |
| 2057 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); | 2049 | apic_printk(APIC_VERBOSE, KERN_INFO "activating NMI Watchdog ..."); |
| 2058 | 2050 | ||
| 2059 | enable_NMI_through_LVT0(); | 2051 | enable_NMI_through_LVT0(); |
| @@ -2129,11 +2121,16 @@ static inline void __init unlock_ExtINT_logic(void) | |||
| 2129 | static inline void __init check_timer(void) | 2121 | static inline void __init check_timer(void) |
| 2130 | { | 2122 | { |
| 2131 | int apic1, pin1, apic2, pin2; | 2123 | int apic1, pin1, apic2, pin2; |
| 2124 | int no_pin1 = 0; | ||
| 2132 | int vector; | 2125 | int vector; |
| 2126 | unsigned int ver; | ||
| 2133 | unsigned long flags; | 2127 | unsigned long flags; |
| 2134 | 2128 | ||
| 2135 | local_irq_save(flags); | 2129 | local_irq_save(flags); |
| 2136 | 2130 | ||
| 2131 | ver = apic_read(APIC_LVR); | ||
| 2132 | ver = GET_APIC_VERSION(ver); | ||
| 2133 | |||
| 2137 | /* | 2134 | /* |
| 2138 | * get/set the timer IRQ vector: | 2135 | * get/set the timer IRQ vector: |
| 2139 | */ | 2136 | */ |
| @@ -2142,17 +2139,17 @@ static inline void __init check_timer(void) | |||
| 2142 | set_intr_gate(vector, interrupt[0]); | 2139 | set_intr_gate(vector, interrupt[0]); |
| 2143 | 2140 | ||
| 2144 | /* | 2141 | /* |
| 2145 | * Subtle, code in do_timer_interrupt() expects an AEOI | 2142 | * As IRQ0 is to be enabled in the 8259A, the virtual |
| 2146 | * mode for the 8259A whenever interrupts are routed | 2143 | * wire has to be disabled in the local APIC. Also |
| 2147 | * through I/O APICs. Also IRQ0 has to be enabled in | 2144 | * timer interrupts need to be acknowledged manually in |
| 2148 | * the 8259A which implies the virtual wire has to be | 2145 | * the 8259A for the i82489DX when using the NMI |
| 2149 | * disabled in the local APIC. | 2146 | * watchdog as that APIC treats NMIs as level-triggered. |
| 2147 | * The AEOI mode will finish them in the 8259A | ||
| 2148 | * automatically. | ||
| 2150 | */ | 2149 | */ |
| 2151 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2150 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 2152 | init_8259A(1); | 2151 | init_8259A(1); |
| 2153 | timer_ack = 1; | 2152 | timer_ack = (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); |
| 2154 | if (timer_over_8254 > 0) | ||
| 2155 | enable_8259A_irq(0); | ||
| 2156 | 2153 | ||
| 2157 | pin1 = find_isa_irq_pin(0, mp_INT); | 2154 | pin1 = find_isa_irq_pin(0, mp_INT); |
| 2158 | apic1 = find_isa_irq_apic(0, mp_INT); | 2155 | apic1 = find_isa_irq_apic(0, mp_INT); |
| @@ -2162,14 +2159,33 @@ static inline void __init check_timer(void) | |||
| 2162 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 2159 | printk(KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
| 2163 | vector, apic1, pin1, apic2, pin2); | 2160 | vector, apic1, pin1, apic2, pin2); |
| 2164 | 2161 | ||
| 2162 | /* | ||
| 2163 | * Some BIOS writers are clueless and report the ExtINTA | ||
| 2164 | * I/O APIC input from the cascaded 8259A as the timer | ||
| 2165 | * interrupt input. So just in case, if only one pin | ||
| 2166 | * was found above, try it both directly and through the | ||
| 2167 | * 8259A. | ||
| 2168 | */ | ||
| 2169 | if (pin1 == -1) { | ||
| 2170 | pin1 = pin2; | ||
| 2171 | apic1 = apic2; | ||
| 2172 | no_pin1 = 1; | ||
| 2173 | } else if (pin2 == -1) { | ||
| 2174 | pin2 = pin1; | ||
| 2175 | apic2 = apic1; | ||
| 2176 | } | ||
| 2177 | |||
| 2165 | if (pin1 != -1) { | 2178 | if (pin1 != -1) { |
| 2166 | /* | 2179 | /* |
| 2167 | * Ok, does IRQ0 through the IOAPIC work? | 2180 | * Ok, does IRQ0 through the IOAPIC work? |
| 2168 | */ | 2181 | */ |
| 2182 | if (no_pin1) { | ||
| 2183 | add_pin_to_irq(0, apic1, pin1); | ||
| 2184 | setup_timer_IRQ0_pin(apic1, pin1, vector); | ||
| 2185 | } | ||
| 2169 | unmask_IO_APIC_irq(0); | 2186 | unmask_IO_APIC_irq(0); |
| 2170 | if (timer_irq_works()) { | 2187 | if (timer_irq_works()) { |
| 2171 | if (nmi_watchdog == NMI_IO_APIC) { | 2188 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2172 | disable_8259A_irq(0); | ||
| 2173 | setup_nmi(); | 2189 | setup_nmi(); |
| 2174 | enable_8259A_irq(0); | 2190 | enable_8259A_irq(0); |
| 2175 | } | 2191 | } |
| @@ -2178,43 +2194,46 @@ static inline void __init check_timer(void) | |||
| 2178 | goto out; | 2194 | goto out; |
| 2179 | } | 2195 | } |
| 2180 | clear_IO_APIC_pin(apic1, pin1); | 2196 | clear_IO_APIC_pin(apic1, pin1); |
| 2181 | printk(KERN_ERR "..MP-BIOS bug: 8254 timer not connected to " | 2197 | if (!no_pin1) |
| 2182 | "IO-APIC\n"); | 2198 | printk(KERN_ERR "..MP-BIOS bug: " |
| 2183 | } | 2199 | "8254 timer not connected to IO-APIC\n"); |
| 2184 | 2200 | ||
| 2185 | printk(KERN_INFO "...trying to set up timer (IRQ0) through the 8259A ... "); | 2201 | printk(KERN_INFO "...trying to set up timer (IRQ0) " |
| 2186 | if (pin2 != -1) { | 2202 | "through the 8259A ... "); |
| 2187 | printk("\n..... (found pin %d) ...", pin2); | 2203 | printk("\n..... (found pin %d) ...", pin2); |
| 2188 | /* | 2204 | /* |
| 2189 | * legacy devices should be connected to IO APIC #0 | 2205 | * legacy devices should be connected to IO APIC #0 |
| 2190 | */ | 2206 | */ |
| 2191 | setup_ExtINT_IRQ0_pin(apic2, pin2, vector); | 2207 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
| 2208 | setup_timer_IRQ0_pin(apic2, pin2, vector); | ||
| 2209 | unmask_IO_APIC_irq(0); | ||
| 2210 | enable_8259A_irq(0); | ||
| 2192 | if (timer_irq_works()) { | 2211 | if (timer_irq_works()) { |
| 2193 | printk("works.\n"); | 2212 | printk("works.\n"); |
| 2194 | if (pin1 != -1) | 2213 | timer_through_8259 = 1; |
| 2195 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); | ||
| 2196 | else | ||
| 2197 | add_pin_to_irq(0, apic2, pin2); | ||
| 2198 | if (nmi_watchdog == NMI_IO_APIC) { | 2214 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2215 | disable_8259A_irq(0); | ||
| 2199 | setup_nmi(); | 2216 | setup_nmi(); |
| 2217 | enable_8259A_irq(0); | ||
| 2200 | } | 2218 | } |
| 2201 | goto out; | 2219 | goto out; |
| 2202 | } | 2220 | } |
| 2203 | /* | 2221 | /* |
| 2204 | * Cleanup, just in case ... | 2222 | * Cleanup, just in case ... |
| 2205 | */ | 2223 | */ |
| 2224 | disable_8259A_irq(0); | ||
| 2206 | clear_IO_APIC_pin(apic2, pin2); | 2225 | clear_IO_APIC_pin(apic2, pin2); |
| 2226 | printk(" failed.\n"); | ||
| 2207 | } | 2227 | } |
| 2208 | printk(" failed.\n"); | ||
| 2209 | 2228 | ||
| 2210 | if (nmi_watchdog == NMI_IO_APIC) { | 2229 | if (nmi_watchdog == NMI_IO_APIC) { |
| 2211 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 2230 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
| 2212 | nmi_watchdog = 0; | 2231 | nmi_watchdog = NMI_NONE; |
| 2213 | } | 2232 | } |
| 2233 | timer_ack = 0; | ||
| 2214 | 2234 | ||
| 2215 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 2235 | printk(KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
| 2216 | 2236 | ||
| 2217 | disable_8259A_irq(0); | ||
| 2218 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, | 2237 | set_irq_chip_and_handler_name(0, &lapic_chip, handle_fasteoi_irq, |
| 2219 | "fasteoi"); | 2238 | "fasteoi"); |
| 2220 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ | 2239 | apic_write_around(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */ |
| @@ -2224,12 +2243,12 @@ static inline void __init check_timer(void) | |||
| 2224 | printk(" works.\n"); | 2243 | printk(" works.\n"); |
| 2225 | goto out; | 2244 | goto out; |
| 2226 | } | 2245 | } |
| 2246 | disable_8259A_irq(0); | ||
| 2227 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); | 2247 | apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector); |
| 2228 | printk(" failed.\n"); | 2248 | printk(" failed.\n"); |
| 2229 | 2249 | ||
| 2230 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); | 2250 | printk(KERN_INFO "...trying to set up timer as ExtINT IRQ..."); |
| 2231 | 2251 | ||
| 2232 | timer_ack = 0; | ||
| 2233 | init_8259A(0); | 2252 | init_8259A(0); |
| 2234 | make_8259A_irq(0); | 2253 | make_8259A_irq(0); |
| 2235 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); | 2254 | apic_write_around(APIC_LVT0, APIC_DM_EXTINT); |
| @@ -2286,28 +2305,14 @@ void __init setup_IO_APIC(void) | |||
| 2286 | print_IO_APIC(); | 2305 | print_IO_APIC(); |
| 2287 | } | 2306 | } |
| 2288 | 2307 | ||
| 2289 | static int __init setup_disable_8254_timer(char *s) | ||
| 2290 | { | ||
| 2291 | timer_over_8254 = -1; | ||
| 2292 | return 1; | ||
| 2293 | } | ||
| 2294 | static int __init setup_enable_8254_timer(char *s) | ||
| 2295 | { | ||
| 2296 | timer_over_8254 = 2; | ||
| 2297 | return 1; | ||
| 2298 | } | ||
| 2299 | |||
| 2300 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
| 2301 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
| 2302 | |||
| 2303 | /* | 2308 | /* |
| 2304 | * Called after all the initialization is done. If we didnt find any | 2309 | * Called after all the initialization is done. If we didnt find any |
| 2305 | * APIC bugs then we can allow the modify fast path | 2310 | * APIC bugs then we can allow the modify fast path |
| 2306 | */ | 2311 | */ |
| 2307 | 2312 | ||
| 2308 | static int __init io_apic_bug_finalize(void) | 2313 | static int __init io_apic_bug_finalize(void) |
| 2309 | { | 2314 | { |
| 2310 | if(sis_apic_bug == -1) | 2315 | if (sis_apic_bug == -1) |
| 2311 | sis_apic_bug = 0; | 2316 | sis_apic_bug = 0; |
| 2312 | return 0; | 2317 | return 0; |
| 2313 | } | 2318 | } |
| @@ -2318,17 +2323,17 @@ struct sysfs_ioapic_data { | |||
| 2318 | struct sys_device dev; | 2323 | struct sys_device dev; |
| 2319 | struct IO_APIC_route_entry entry[0]; | 2324 | struct IO_APIC_route_entry entry[0]; |
| 2320 | }; | 2325 | }; |
| 2321 | static struct sysfs_ioapic_data * mp_ioapic_data[MAX_IO_APICS]; | 2326 | static struct sysfs_ioapic_data *mp_ioapic_data[MAX_IO_APICS]; |
| 2322 | 2327 | ||
| 2323 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) | 2328 | static int ioapic_suspend(struct sys_device *dev, pm_message_t state) |
| 2324 | { | 2329 | { |
| 2325 | struct IO_APIC_route_entry *entry; | 2330 | struct IO_APIC_route_entry *entry; |
| 2326 | struct sysfs_ioapic_data *data; | 2331 | struct sysfs_ioapic_data *data; |
| 2327 | int i; | 2332 | int i; |
| 2328 | 2333 | ||
| 2329 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2334 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
| 2330 | entry = data->entry; | 2335 | entry = data->entry; |
| 2331 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2336 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
| 2332 | entry[i] = ioapic_read_entry(dev->id, i); | 2337 | entry[i] = ioapic_read_entry(dev->id, i); |
| 2333 | 2338 | ||
| 2334 | return 0; | 2339 | return 0; |
| @@ -2341,7 +2346,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
| 2341 | unsigned long flags; | 2346 | unsigned long flags; |
| 2342 | union IO_APIC_reg_00 reg_00; | 2347 | union IO_APIC_reg_00 reg_00; |
| 2343 | int i; | 2348 | int i; |
| 2344 | 2349 | ||
| 2345 | data = container_of(dev, struct sysfs_ioapic_data, dev); | 2350 | data = container_of(dev, struct sysfs_ioapic_data, dev); |
| 2346 | entry = data->entry; | 2351 | entry = data->entry; |
| 2347 | 2352 | ||
| @@ -2352,7 +2357,7 @@ static int ioapic_resume(struct sys_device *dev) | |||
| 2352 | io_apic_write(dev->id, 0, reg_00.raw); | 2357 | io_apic_write(dev->id, 0, reg_00.raw); |
| 2353 | } | 2358 | } |
| 2354 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2359 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 2355 | for (i = 0; i < nr_ioapic_registers[dev->id]; i ++) | 2360 | for (i = 0; i < nr_ioapic_registers[dev->id]; i++) |
| 2356 | ioapic_write_entry(dev->id, i, entry[i]); | 2361 | ioapic_write_entry(dev->id, i, entry[i]); |
| 2357 | 2362 | ||
| 2358 | return 0; | 2363 | return 0; |
| @@ -2366,24 +2371,23 @@ static struct sysdev_class ioapic_sysdev_class = { | |||
| 2366 | 2371 | ||
| 2367 | static int __init ioapic_init_sysfs(void) | 2372 | static int __init ioapic_init_sysfs(void) |
| 2368 | { | 2373 | { |
| 2369 | struct sys_device * dev; | 2374 | struct sys_device *dev; |
| 2370 | int i, size, error = 0; | 2375 | int i, size, error = 0; |
| 2371 | 2376 | ||
| 2372 | error = sysdev_class_register(&ioapic_sysdev_class); | 2377 | error = sysdev_class_register(&ioapic_sysdev_class); |
| 2373 | if (error) | 2378 | if (error) |
| 2374 | return error; | 2379 | return error; |
| 2375 | 2380 | ||
| 2376 | for (i = 0; i < nr_ioapics; i++ ) { | 2381 | for (i = 0; i < nr_ioapics; i++) { |
| 2377 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] | 2382 | size = sizeof(struct sys_device) + nr_ioapic_registers[i] |
| 2378 | * sizeof(struct IO_APIC_route_entry); | 2383 | * sizeof(struct IO_APIC_route_entry); |
| 2379 | mp_ioapic_data[i] = kmalloc(size, GFP_KERNEL); | 2384 | mp_ioapic_data[i] = kzalloc(size, GFP_KERNEL); |
| 2380 | if (!mp_ioapic_data[i]) { | 2385 | if (!mp_ioapic_data[i]) { |
| 2381 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); | 2386 | printk(KERN_ERR "Can't suspend/resume IOAPIC %d\n", i); |
| 2382 | continue; | 2387 | continue; |
| 2383 | } | 2388 | } |
| 2384 | memset(mp_ioapic_data[i], 0, size); | ||
| 2385 | dev = &mp_ioapic_data[i]->dev; | 2389 | dev = &mp_ioapic_data[i]->dev; |
| 2386 | dev->id = i; | 2390 | dev->id = i; |
| 2387 | dev->cls = &ioapic_sysdev_class; | 2391 | dev->cls = &ioapic_sysdev_class; |
| 2388 | error = sysdev_register(dev); | 2392 | error = sysdev_register(dev); |
| 2389 | if (error) { | 2393 | if (error) { |
| @@ -2458,7 +2462,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
| 2458 | msg->address_lo = | 2462 | msg->address_lo = |
| 2459 | MSI_ADDR_BASE_LO | | 2463 | MSI_ADDR_BASE_LO | |
| 2460 | ((INT_DEST_MODE == 0) ? | 2464 | ((INT_DEST_MODE == 0) ? |
| 2461 | MSI_ADDR_DEST_MODE_PHYSICAL: | 2465 | MSI_ADDR_DEST_MODE_PHYSICAL: |
| 2462 | MSI_ADDR_DEST_MODE_LOGICAL) | | 2466 | MSI_ADDR_DEST_MODE_LOGICAL) | |
| 2463 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2467 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
| 2464 | MSI_ADDR_REDIRECTION_CPU: | 2468 | MSI_ADDR_REDIRECTION_CPU: |
| @@ -2469,7 +2473,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
| 2469 | MSI_DATA_TRIGGER_EDGE | | 2473 | MSI_DATA_TRIGGER_EDGE | |
| 2470 | MSI_DATA_LEVEL_ASSERT | | 2474 | MSI_DATA_LEVEL_ASSERT | |
| 2471 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 2475 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? |
| 2472 | MSI_DATA_DELIVERY_FIXED: | 2476 | MSI_DATA_DELIVERY_FIXED: |
| 2473 | MSI_DATA_DELIVERY_LOWPRI) | | 2477 | MSI_DATA_DELIVERY_LOWPRI) | |
| 2474 | MSI_DATA_VECTOR(vector); | 2478 | MSI_DATA_VECTOR(vector); |
| 2475 | } | 2479 | } |
| @@ -2640,12 +2644,12 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
| 2640 | #endif /* CONFIG_HT_IRQ */ | 2644 | #endif /* CONFIG_HT_IRQ */ |
| 2641 | 2645 | ||
| 2642 | /* -------------------------------------------------------------------------- | 2646 | /* -------------------------------------------------------------------------- |
| 2643 | ACPI-based IOAPIC Configuration | 2647 | ACPI-based IOAPIC Configuration |
| 2644 | -------------------------------------------------------------------------- */ | 2648 | -------------------------------------------------------------------------- */ |
| 2645 | 2649 | ||
| 2646 | #ifdef CONFIG_ACPI | 2650 | #ifdef CONFIG_ACPI |
| 2647 | 2651 | ||
| 2648 | int __init io_apic_get_unique_id (int ioapic, int apic_id) | 2652 | int __init io_apic_get_unique_id(int ioapic, int apic_id) |
| 2649 | { | 2653 | { |
| 2650 | union IO_APIC_reg_00 reg_00; | 2654 | union IO_APIC_reg_00 reg_00; |
| 2651 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; | 2655 | static physid_mask_t apic_id_map = PHYSID_MASK_NONE; |
| @@ -2654,10 +2658,10 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2654 | int i = 0; | 2658 | int i = 0; |
| 2655 | 2659 | ||
| 2656 | /* | 2660 | /* |
| 2657 | * The P4 platform supports up to 256 APIC IDs on two separate APIC | 2661 | * The P4 platform supports up to 256 APIC IDs on two separate APIC |
| 2658 | * buses (one for LAPICs, one for IOAPICs), where predecessors only | 2662 | * buses (one for LAPICs, one for IOAPICs), where predecessors only |
| 2659 | * supports up to 16 on one shared APIC bus. | 2663 | * supports up to 16 on one shared APIC bus. |
| 2660 | * | 2664 | * |
| 2661 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full | 2665 | * TBD: Expand LAPIC/IOAPIC support on P4-class systems to take full |
| 2662 | * advantage of new APIC bus architecture. | 2666 | * advantage of new APIC bus architecture. |
| 2663 | */ | 2667 | */ |
| @@ -2676,7 +2680,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2676 | } | 2680 | } |
| 2677 | 2681 | ||
| 2678 | /* | 2682 | /* |
| 2679 | * Every APIC in a system must have a unique ID or we get lots of nice | 2683 | * Every APIC in a system must have a unique ID or we get lots of nice |
| 2680 | * 'stuck on smp_invalidate_needed IPI wait' messages. | 2684 | * 'stuck on smp_invalidate_needed IPI wait' messages. |
| 2681 | */ | 2685 | */ |
| 2682 | if (check_apicid_used(apic_id_map, apic_id)) { | 2686 | if (check_apicid_used(apic_id_map, apic_id)) { |
| @@ -2693,7 +2697,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2693 | "trying %d\n", ioapic, apic_id, i); | 2697 | "trying %d\n", ioapic, apic_id, i); |
| 2694 | 2698 | ||
| 2695 | apic_id = i; | 2699 | apic_id = i; |
| 2696 | } | 2700 | } |
| 2697 | 2701 | ||
| 2698 | tmp = apicid_to_cpu_present(apic_id); | 2702 | tmp = apicid_to_cpu_present(apic_id); |
| 2699 | physids_or(apic_id_map, apic_id_map, tmp); | 2703 | physids_or(apic_id_map, apic_id_map, tmp); |
| @@ -2720,7 +2724,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id) | |||
| 2720 | } | 2724 | } |
| 2721 | 2725 | ||
| 2722 | 2726 | ||
| 2723 | int __init io_apic_get_version (int ioapic) | 2727 | int __init io_apic_get_version(int ioapic) |
| 2724 | { | 2728 | { |
| 2725 | union IO_APIC_reg_01 reg_01; | 2729 | union IO_APIC_reg_01 reg_01; |
| 2726 | unsigned long flags; | 2730 | unsigned long flags; |
| @@ -2733,7 +2737,7 @@ int __init io_apic_get_version (int ioapic) | |||
| 2733 | } | 2737 | } |
| 2734 | 2738 | ||
| 2735 | 2739 | ||
| 2736 | int __init io_apic_get_redir_entries (int ioapic) | 2740 | int __init io_apic_get_redir_entries(int ioapic) |
| 2737 | { | 2741 | { |
| 2738 | union IO_APIC_reg_01 reg_01; | 2742 | union IO_APIC_reg_01 reg_01; |
| 2739 | unsigned long flags; | 2743 | unsigned long flags; |
| @@ -2746,7 +2750,7 @@ int __init io_apic_get_redir_entries (int ioapic) | |||
| 2746 | } | 2750 | } |
| 2747 | 2751 | ||
| 2748 | 2752 | ||
| 2749 | int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low) | 2753 | int io_apic_set_pci_routing(int ioapic, int pin, int irq, int edge_level, int active_high_low) |
| 2750 | { | 2754 | { |
| 2751 | struct IO_APIC_route_entry entry; | 2755 | struct IO_APIC_route_entry entry; |
| 2752 | 2756 | ||
| @@ -2762,7 +2766,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a | |||
| 2762 | * corresponding device driver registers for this IRQ. | 2766 | * corresponding device driver registers for this IRQ. |
| 2763 | */ | 2767 | */ |
| 2764 | 2768 | ||
| 2765 | memset(&entry,0,sizeof(entry)); | 2769 | memset(&entry, 0, sizeof(entry)); |
| 2766 | 2770 | ||
| 2767 | entry.delivery_mode = INT_DELIVERY_MODE; | 2771 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 2768 | entry.dest_mode = INT_DEST_MODE; | 2772 | entry.dest_mode = INT_DEST_MODE; |
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c index ef1a8dfcc529..e5ef60303562 100644 --- a/arch/x86/kernel/io_apic_64.c +++ b/arch/x86/kernel/io_apic_64.c | |||
| @@ -61,7 +61,7 @@ struct irq_cfg { | |||
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ | 63 | /* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ |
| 64 | struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { | 64 | static struct irq_cfg irq_cfg[NR_IRQS] __read_mostly = { |
| 65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, | 65 | [0] = { .domain = CPU_MASK_ALL, .vector = IRQ0_VECTOR, }, |
| 66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, | 66 | [1] = { .domain = CPU_MASK_ALL, .vector = IRQ1_VECTOR, }, |
| 67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, | 67 | [2] = { .domain = CPU_MASK_ALL, .vector = IRQ2_VECTOR, }, |
| @@ -90,7 +90,7 @@ static int no_timer_check; | |||
| 90 | 90 | ||
| 91 | static int disable_timer_pin_1 __initdata; | 91 | static int disable_timer_pin_1 __initdata; |
| 92 | 92 | ||
| 93 | int timer_over_8254 __initdata = 1; | 93 | int timer_through_8259 __initdata; |
| 94 | 94 | ||
| 95 | /* Where if anywhere is the i8259 connect in external int mode */ | 95 | /* Where if anywhere is the i8259 connect in external int mode */ |
| 96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; | 96 | static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; |
| @@ -183,7 +183,7 @@ static bool io_apic_level_ack_pending(unsigned int irq) | |||
| 183 | break; | 183 | break; |
| 184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); | 184 | reg = io_apic_read(entry->apic, 0x10 + pin*2); |
| 185 | /* Is the remote IRR bit set? */ | 185 | /* Is the remote IRR bit set? */ |
| 186 | if ((reg >> 14) & 1) { | 186 | if (reg & IO_APIC_REDIR_REMOTE_IRR) { |
| 187 | spin_unlock_irqrestore(&ioapic_lock, flags); | 187 | spin_unlock_irqrestore(&ioapic_lock, flags); |
| 188 | return true; | 188 | return true; |
| 189 | } | 189 | } |
| @@ -298,7 +298,7 @@ static void __target_IO_APIC_irq(unsigned int irq, unsigned int dest, u8 vector) | |||
| 298 | break; | 298 | break; |
| 299 | io_apic_write(apic, 0x11 + pin*2, dest); | 299 | io_apic_write(apic, 0x11 + pin*2, dest); |
| 300 | reg = io_apic_read(apic, 0x10 + pin*2); | 300 | reg = io_apic_read(apic, 0x10 + pin*2); |
| 301 | reg &= ~0x000000ff; | 301 | reg &= ~IO_APIC_REDIR_VECTOR_MASK; |
| 302 | reg |= vector; | 302 | reg |= vector; |
| 303 | io_apic_modify(apic, reg); | 303 | io_apic_modify(apic, reg); |
| 304 | if (!entry->next) | 304 | if (!entry->next) |
| @@ -360,16 +360,37 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin) | |||
| 360 | entry->pin = pin; | 360 | entry->pin = pin; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | /* | ||
| 364 | * Reroute an IRQ to a different pin. | ||
| 365 | */ | ||
| 366 | static void __init replace_pin_at_irq(unsigned int irq, | ||
| 367 | int oldapic, int oldpin, | ||
| 368 | int newapic, int newpin) | ||
| 369 | { | ||
| 370 | struct irq_pin_list *entry = irq_2_pin + irq; | ||
| 371 | |||
| 372 | while (1) { | ||
| 373 | if (entry->apic == oldapic && entry->pin == oldpin) { | ||
| 374 | entry->apic = newapic; | ||
| 375 | entry->pin = newpin; | ||
| 376 | } | ||
| 377 | if (!entry->next) | ||
| 378 | break; | ||
| 379 | entry = irq_2_pin + entry->next; | ||
| 380 | } | ||
| 381 | } | ||
| 382 | |||
| 363 | 383 | ||
| 364 | #define DO_ACTION(name,R,ACTION, FINAL) \ | 384 | #define DO_ACTION(name,R,ACTION, FINAL) \ |
| 365 | \ | 385 | \ |
| 366 | static void name##_IO_APIC_irq (unsigned int irq) \ | 386 | static void name##_IO_APIC_irq (unsigned int irq) \ |
| 367 | __DO_ACTION(R, ACTION, FINAL) | 387 | __DO_ACTION(R, ACTION, FINAL) |
| 368 | 388 | ||
| 369 | DO_ACTION( __mask, 0, |= 0x00010000, io_apic_sync(entry->apic) ) | 389 | /* mask = 1 */ |
| 370 | /* mask = 1 */ | 390 | DO_ACTION(__mask, 0, |= IO_APIC_REDIR_MASKED, io_apic_sync(entry->apic)) |
| 371 | DO_ACTION( __unmask, 0, &= 0xfffeffff, ) | 391 | |
| 372 | /* mask = 0 */ | 392 | /* mask = 0 */ |
| 393 | DO_ACTION(__unmask, 0, &= ~IO_APIC_REDIR_MASKED, ) | ||
| 373 | 394 | ||
| 374 | static void mask_IO_APIC_irq (unsigned int irq) | 395 | static void mask_IO_APIC_irq (unsigned int irq) |
| 375 | { | 396 | { |
| @@ -430,20 +451,6 @@ static int __init disable_timer_pin_setup(char *arg) | |||
| 430 | } | 451 | } |
| 431 | __setup("disable_timer_pin_1", disable_timer_pin_setup); | 452 | __setup("disable_timer_pin_1", disable_timer_pin_setup); |
| 432 | 453 | ||
| 433 | static int __init setup_disable_8254_timer(char *s) | ||
| 434 | { | ||
| 435 | timer_over_8254 = -1; | ||
| 436 | return 1; | ||
| 437 | } | ||
| 438 | static int __init setup_enable_8254_timer(char *s) | ||
| 439 | { | ||
| 440 | timer_over_8254 = 2; | ||
| 441 | return 1; | ||
| 442 | } | ||
| 443 | |||
| 444 | __setup("disable_8254_timer", setup_disable_8254_timer); | ||
| 445 | __setup("enable_8254_timer", setup_enable_8254_timer); | ||
| 446 | |||
| 447 | 454 | ||
| 448 | /* | 455 | /* |
| 449 | * Find the IRQ entry number of a certain pin. | 456 | * Find the IRQ entry number of a certain pin. |
| @@ -911,26 +918,21 @@ static void __init setup_IO_APIC_irqs(void) | |||
| 911 | } | 918 | } |
| 912 | 919 | ||
| 913 | /* | 920 | /* |
| 914 | * Set up the 8259A-master output pin as broadcast to all | 921 | * Set up the timer pin, possibly with the 8259A-master behind. |
| 915 | * CPUs. | ||
| 916 | */ | 922 | */ |
| 917 | static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, int vector) | 923 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, |
| 924 | int vector) | ||
| 918 | { | 925 | { |
| 919 | struct IO_APIC_route_entry entry; | 926 | struct IO_APIC_route_entry entry; |
| 920 | 927 | ||
| 921 | memset(&entry, 0, sizeof(entry)); | 928 | memset(&entry, 0, sizeof(entry)); |
| 922 | 929 | ||
| 923 | disable_8259A_irq(0); | ||
| 924 | |||
| 925 | /* mask LVT0 */ | ||
| 926 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | ||
| 927 | |||
| 928 | /* | 930 | /* |
| 929 | * We use logical delivery to get the timer IRQ | 931 | * We use logical delivery to get the timer IRQ |
| 930 | * to the first CPU. | 932 | * to the first CPU. |
| 931 | */ | 933 | */ |
| 932 | entry.dest_mode = INT_DEST_MODE; | 934 | entry.dest_mode = INT_DEST_MODE; |
| 933 | entry.mask = 0; /* unmask IRQ now */ | 935 | entry.mask = 1; /* mask IRQ now */ |
| 934 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); | 936 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); |
| 935 | entry.delivery_mode = INT_DELIVERY_MODE; | 937 | entry.delivery_mode = INT_DELIVERY_MODE; |
| 936 | entry.polarity = 0; | 938 | entry.polarity = 0; |
| @@ -939,7 +941,7 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 939 | 941 | ||
| 940 | /* | 942 | /* |
| 941 | * The timer IRQ doesn't have to know that behind the | 943 | * The timer IRQ doesn't have to know that behind the |
| 942 | * scene we have a 8259A-master in AEOI mode ... | 944 | * scene we may have a 8259A-master in AEOI mode ... |
| 943 | */ | 945 | */ |
| 944 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); | 946 | set_irq_chip_and_handler_name(0, &ioapic_chip, handle_edge_irq, "edge"); |
| 945 | 947 | ||
| @@ -947,8 +949,6 @@ static void __init setup_ExtINT_IRQ0_pin(unsigned int apic, unsigned int pin, in | |||
| 947 | * Add it to the IO-APIC irq-routing table: | 949 | * Add it to the IO-APIC irq-routing table: |
| 948 | */ | 950 | */ |
| 949 | ioapic_write_entry(apic, pin, entry); | 951 | ioapic_write_entry(apic, pin, entry); |
| 950 | |||
| 951 | enable_8259A_irq(0); | ||
| 952 | } | 952 | } |
| 953 | 953 | ||
| 954 | void __apicdebuginit print_IO_APIC(void) | 954 | void __apicdebuginit print_IO_APIC(void) |
| @@ -1077,6 +1077,7 @@ void __apicdebuginit print_local_APIC(void * dummy) | |||
| 1077 | 1077 | ||
| 1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", | 1078 | printk("\n" KERN_DEBUG "printing local APIC contents on CPU#%d/%d:\n", |
| 1079 | smp_processor_id(), hard_smp_processor_id()); | 1079 | smp_processor_id(), hard_smp_processor_id()); |
| 1080 | v = apic_read(APIC_ID); | ||
| 1080 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); | 1081 | printk(KERN_INFO "... APIC ID: %08x (%01x)\n", v, GET_APIC_ID(read_apic_id())); |
| 1081 | v = apic_read(APIC_LVR); | 1082 | v = apic_read(APIC_LVR); |
| 1082 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); | 1083 | printk(KERN_INFO "... APIC VERSION: %08x\n", v); |
| @@ -1659,6 +1660,7 @@ static inline void __init check_timer(void) | |||
| 1659 | struct irq_cfg *cfg = irq_cfg + 0; | 1660 | struct irq_cfg *cfg = irq_cfg + 0; |
| 1660 | int apic1, pin1, apic2, pin2; | 1661 | int apic1, pin1, apic2, pin2; |
| 1661 | unsigned long flags; | 1662 | unsigned long flags; |
| 1663 | int no_pin1 = 0; | ||
| 1662 | 1664 | ||
| 1663 | local_irq_save(flags); | 1665 | local_irq_save(flags); |
| 1664 | 1666 | ||
| @@ -1669,16 +1671,11 @@ static inline void __init check_timer(void) | |||
| 1669 | assign_irq_vector(0, TARGET_CPUS); | 1671 | assign_irq_vector(0, TARGET_CPUS); |
| 1670 | 1672 | ||
| 1671 | /* | 1673 | /* |
| 1672 | * Subtle, code in do_timer_interrupt() expects an AEOI | 1674 | * As IRQ0 is to be enabled in the 8259A, the virtual |
| 1673 | * mode for the 8259A whenever interrupts are routed | 1675 | * wire has to be disabled in the local APIC. |
| 1674 | * through I/O APICs. Also IRQ0 has to be enabled in | ||
| 1675 | * the 8259A which implies the virtual wire has to be | ||
| 1676 | * disabled in the local APIC. | ||
| 1677 | */ | 1676 | */ |
| 1678 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 1677 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
| 1679 | init_8259A(1); | 1678 | init_8259A(1); |
| 1680 | if (timer_over_8254 > 0) | ||
| 1681 | enable_8259A_irq(0); | ||
| 1682 | 1679 | ||
| 1683 | pin1 = find_isa_irq_pin(0, mp_INT); | 1680 | pin1 = find_isa_irq_pin(0, mp_INT); |
| 1684 | apic1 = find_isa_irq_apic(0, mp_INT); | 1681 | apic1 = find_isa_irq_apic(0, mp_INT); |
| @@ -1688,15 +1685,39 @@ static inline void __init check_timer(void) | |||
| 1688 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", | 1685 | apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n", |
| 1689 | cfg->vector, apic1, pin1, apic2, pin2); | 1686 | cfg->vector, apic1, pin1, apic2, pin2); |
| 1690 | 1687 | ||
| 1688 | /* | ||
| 1689 | * Some BIOS writers are clueless and report the ExtINTA | ||
| 1690 | * I/O APIC input from the cascaded 8259A as the timer | ||
| 1691 | * interrupt input. So just in case, if only one pin | ||
| 1692 | * was found above, try it both directly and through the | ||
| 1693 | * 8259A. | ||
| 1694 | */ | ||
| 1695 | if (pin1 == -1) { | ||
| 1696 | pin1 = pin2; | ||
| 1697 | apic1 = apic2; | ||
| 1698 | no_pin1 = 1; | ||
| 1699 | } else if (pin2 == -1) { | ||
| 1700 | pin2 = pin1; | ||
| 1701 | apic2 = apic1; | ||
| 1702 | } | ||
| 1703 | |||
| 1704 | replace_pin_at_irq(0, 0, 0, apic1, pin1); | ||
| 1705 | apic1 = 0; | ||
| 1706 | pin1 = 0; | ||
| 1707 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
| 1708 | |||
| 1691 | if (pin1 != -1) { | 1709 | if (pin1 != -1) { |
| 1692 | /* | 1710 | /* |
| 1693 | * Ok, does IRQ0 through the IOAPIC work? | 1711 | * Ok, does IRQ0 through the IOAPIC work? |
| 1694 | */ | 1712 | */ |
| 1713 | if (no_pin1) { | ||
| 1714 | add_pin_to_irq(0, apic1, pin1); | ||
| 1715 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | ||
| 1716 | } | ||
| 1695 | unmask_IO_APIC_irq(0); | 1717 | unmask_IO_APIC_irq(0); |
| 1696 | if (!no_timer_check && timer_irq_works()) { | 1718 | if (!no_timer_check && timer_irq_works()) { |
| 1697 | nmi_watchdog_default(); | 1719 | nmi_watchdog_default(); |
| 1698 | if (nmi_watchdog == NMI_IO_APIC) { | 1720 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1699 | disable_8259A_irq(0); | ||
| 1700 | setup_nmi(); | 1721 | setup_nmi(); |
| 1701 | enable_8259A_irq(0); | 1722 | enable_8259A_irq(0); |
| 1702 | } | 1723 | } |
| @@ -1705,42 +1726,48 @@ static inline void __init check_timer(void) | |||
| 1705 | goto out; | 1726 | goto out; |
| 1706 | } | 1727 | } |
| 1707 | clear_IO_APIC_pin(apic1, pin1); | 1728 | clear_IO_APIC_pin(apic1, pin1); |
| 1708 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: 8254 timer not " | 1729 | if (!no_pin1) |
| 1709 | "connected to IO-APIC\n"); | 1730 | apic_printk(APIC_QUIET,KERN_ERR "..MP-BIOS bug: " |
| 1710 | } | 1731 | "8254 timer not connected to IO-APIC\n"); |
| 1711 | 1732 | ||
| 1712 | apic_printk(APIC_VERBOSE,KERN_INFO "...trying to set up timer (IRQ0) " | 1733 | apic_printk(APIC_VERBOSE,KERN_INFO |
| 1713 | "through the 8259A ... "); | 1734 | "...trying to set up timer (IRQ0) " |
| 1714 | if (pin2 != -1) { | 1735 | "through the 8259A ... "); |
| 1715 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", | 1736 | apic_printk(APIC_VERBOSE,"\n..... (found apic %d pin %d) ...", |
| 1716 | apic2, pin2); | 1737 | apic2, pin2); |
| 1717 | /* | 1738 | /* |
| 1718 | * legacy devices should be connected to IO APIC #0 | 1739 | * legacy devices should be connected to IO APIC #0 |
| 1719 | */ | 1740 | */ |
| 1720 | setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector); | 1741 | replace_pin_at_irq(0, apic1, pin1, apic2, pin2); |
| 1742 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); | ||
| 1743 | unmask_IO_APIC_irq(0); | ||
| 1744 | enable_8259A_irq(0); | ||
| 1721 | if (timer_irq_works()) { | 1745 | if (timer_irq_works()) { |
| 1722 | apic_printk(APIC_VERBOSE," works.\n"); | 1746 | apic_printk(APIC_VERBOSE," works.\n"); |
| 1747 | timer_through_8259 = 1; | ||
| 1723 | nmi_watchdog_default(); | 1748 | nmi_watchdog_default(); |
| 1724 | if (nmi_watchdog == NMI_IO_APIC) { | 1749 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1750 | disable_8259A_irq(0); | ||
| 1725 | setup_nmi(); | 1751 | setup_nmi(); |
| 1752 | enable_8259A_irq(0); | ||
| 1726 | } | 1753 | } |
| 1727 | goto out; | 1754 | goto out; |
| 1728 | } | 1755 | } |
| 1729 | /* | 1756 | /* |
| 1730 | * Cleanup, just in case ... | 1757 | * Cleanup, just in case ... |
| 1731 | */ | 1758 | */ |
| 1759 | disable_8259A_irq(0); | ||
| 1732 | clear_IO_APIC_pin(apic2, pin2); | 1760 | clear_IO_APIC_pin(apic2, pin2); |
| 1761 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
| 1733 | } | 1762 | } |
| 1734 | apic_printk(APIC_VERBOSE," failed.\n"); | ||
| 1735 | 1763 | ||
| 1736 | if (nmi_watchdog == NMI_IO_APIC) { | 1764 | if (nmi_watchdog == NMI_IO_APIC) { |
| 1737 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); | 1765 | printk(KERN_WARNING "timer doesn't work through the IO-APIC - disabling NMI Watchdog!\n"); |
| 1738 | nmi_watchdog = 0; | 1766 | nmi_watchdog = NMI_NONE; |
| 1739 | } | 1767 | } |
| 1740 | 1768 | ||
| 1741 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); | 1769 | apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as Virtual Wire IRQ..."); |
| 1742 | 1770 | ||
| 1743 | disable_8259A_irq(0); | ||
| 1744 | irq_desc[0].chip = &lapic_irq_type; | 1771 | irq_desc[0].chip = &lapic_irq_type; |
| 1745 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ | 1772 | apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */ |
| 1746 | enable_8259A_irq(0); | 1773 | enable_8259A_irq(0); |
| @@ -1749,6 +1776,7 @@ static inline void __init check_timer(void) | |||
| 1749 | apic_printk(APIC_VERBOSE," works.\n"); | 1776 | apic_printk(APIC_VERBOSE," works.\n"); |
| 1750 | goto out; | 1777 | goto out; |
| 1751 | } | 1778 | } |
| 1779 | disable_8259A_irq(0); | ||
| 1752 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); | 1780 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); |
| 1753 | apic_printk(APIC_VERBOSE," failed.\n"); | 1781 | apic_printk(APIC_VERBOSE," failed.\n"); |
| 1754 | 1782 | ||
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index c0df7b89ca23..9d98cda39ad9 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/kernel_stat.h> | 8 | #include <linux/kernel_stat.h> |
| 9 | #include <linux/mc146818rtc.h> | 9 | #include <linux/mc146818rtc.h> |
| 10 | #include <linux/cache.h> | 10 | #include <linux/cache.h> |
| 11 | #include <linux/interrupt.h> | ||
| 12 | #include <linux/cpu.h> | 11 | #include <linux/cpu.h> |
| 13 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 14 | 13 | ||
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index 147352df28b9..468acd04aa2e 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
| @@ -313,16 +313,20 @@ skip: | |||
| 313 | per_cpu(irq_stat,j).irq_tlb_count); | 313 | per_cpu(irq_stat,j).irq_tlb_count); |
| 314 | seq_printf(p, " TLB shootdowns\n"); | 314 | seq_printf(p, " TLB shootdowns\n"); |
| 315 | #endif | 315 | #endif |
| 316 | #ifdef CONFIG_X86_MCE | ||
| 316 | seq_printf(p, "TRM: "); | 317 | seq_printf(p, "TRM: "); |
| 317 | for_each_online_cpu(j) | 318 | for_each_online_cpu(j) |
| 318 | seq_printf(p, "%10u ", | 319 | seq_printf(p, "%10u ", |
| 319 | per_cpu(irq_stat,j).irq_thermal_count); | 320 | per_cpu(irq_stat,j).irq_thermal_count); |
| 320 | seq_printf(p, " Thermal event interrupts\n"); | 321 | seq_printf(p, " Thermal event interrupts\n"); |
| 322 | #endif | ||
| 323 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 321 | seq_printf(p, "SPU: "); | 324 | seq_printf(p, "SPU: "); |
| 322 | for_each_online_cpu(j) | 325 | for_each_online_cpu(j) |
| 323 | seq_printf(p, "%10u ", | 326 | seq_printf(p, "%10u ", |
| 324 | per_cpu(irq_stat,j).irq_spurious_count); | 327 | per_cpu(irq_stat,j).irq_spurious_count); |
| 325 | seq_printf(p, " Spurious interrupts\n"); | 328 | seq_printf(p, " Spurious interrupts\n"); |
| 329 | #endif | ||
| 326 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); | 330 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); |
| 327 | #if defined(CONFIG_X86_IO_APIC) | 331 | #if defined(CONFIG_X86_IO_APIC) |
| 328 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); | 332 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); |
| @@ -331,6 +335,40 @@ skip: | |||
| 331 | return 0; | 335 | return 0; |
| 332 | } | 336 | } |
| 333 | 337 | ||
| 338 | /* | ||
| 339 | * /proc/stat helpers | ||
| 340 | */ | ||
| 341 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
| 342 | { | ||
| 343 | u64 sum = nmi_count(cpu); | ||
| 344 | |||
| 345 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 346 | sum += per_cpu(irq_stat, cpu).apic_timer_irqs; | ||
| 347 | #endif | ||
| 348 | #ifdef CONFIG_SMP | ||
| 349 | sum += per_cpu(irq_stat, cpu).irq_resched_count; | ||
| 350 | sum += per_cpu(irq_stat, cpu).irq_call_count; | ||
| 351 | sum += per_cpu(irq_stat, cpu).irq_tlb_count; | ||
| 352 | #endif | ||
| 353 | #ifdef CONFIG_X86_MCE | ||
| 354 | sum += per_cpu(irq_stat, cpu).irq_thermal_count; | ||
| 355 | #endif | ||
| 356 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 357 | sum += per_cpu(irq_stat, cpu).irq_spurious_count; | ||
| 358 | #endif | ||
| 359 | return sum; | ||
| 360 | } | ||
| 361 | |||
| 362 | u64 arch_irq_stat(void) | ||
| 363 | { | ||
| 364 | u64 sum = atomic_read(&irq_err_count); | ||
| 365 | |||
| 366 | #ifdef CONFIG_X86_IO_APIC | ||
| 367 | sum += atomic_read(&irq_mis_count); | ||
| 368 | #endif | ||
| 369 | return sum; | ||
| 370 | } | ||
| 371 | |||
| 334 | #ifdef CONFIG_HOTPLUG_CPU | 372 | #ifdef CONFIG_HOTPLUG_CPU |
| 335 | #include <mach_apic.h> | 373 | #include <mach_apic.h> |
| 336 | 374 | ||
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 3aac15466a91..1f78b238d8d2 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
| @@ -135,6 +135,7 @@ skip: | |||
| 135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); | 135 | seq_printf(p, "%10u ", cpu_pda(j)->irq_tlb_count); |
| 136 | seq_printf(p, " TLB shootdowns\n"); | 136 | seq_printf(p, " TLB shootdowns\n"); |
| 137 | #endif | 137 | #endif |
| 138 | #ifdef CONFIG_X86_MCE | ||
| 138 | seq_printf(p, "TRM: "); | 139 | seq_printf(p, "TRM: "); |
| 139 | for_each_online_cpu(j) | 140 | for_each_online_cpu(j) |
| 140 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); | 141 | seq_printf(p, "%10u ", cpu_pda(j)->irq_thermal_count); |
| @@ -143,6 +144,7 @@ skip: | |||
| 143 | for_each_online_cpu(j) | 144 | for_each_online_cpu(j) |
| 144 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); | 145 | seq_printf(p, "%10u ", cpu_pda(j)->irq_threshold_count); |
| 145 | seq_printf(p, " Threshold APIC interrupts\n"); | 146 | seq_printf(p, " Threshold APIC interrupts\n"); |
| 147 | #endif | ||
| 146 | seq_printf(p, "SPU: "); | 148 | seq_printf(p, "SPU: "); |
| 147 | for_each_online_cpu(j) | 149 | for_each_online_cpu(j) |
| 148 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); | 150 | seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count); |
| @@ -153,6 +155,32 @@ skip: | |||
| 153 | } | 155 | } |
| 154 | 156 | ||
| 155 | /* | 157 | /* |
| 158 | * /proc/stat helpers | ||
| 159 | */ | ||
| 160 | u64 arch_irq_stat_cpu(unsigned int cpu) | ||
| 161 | { | ||
| 162 | u64 sum = cpu_pda(cpu)->__nmi_count; | ||
| 163 | |||
| 164 | sum += cpu_pda(cpu)->apic_timer_irqs; | ||
| 165 | #ifdef CONFIG_SMP | ||
| 166 | sum += cpu_pda(cpu)->irq_resched_count; | ||
| 167 | sum += cpu_pda(cpu)->irq_call_count; | ||
| 168 | sum += cpu_pda(cpu)->irq_tlb_count; | ||
| 169 | #endif | ||
| 170 | #ifdef CONFIG_X86_MCE | ||
| 171 | sum += cpu_pda(cpu)->irq_thermal_count; | ||
| 172 | sum += cpu_pda(cpu)->irq_threshold_count; | ||
| 173 | #endif | ||
| 174 | sum += cpu_pda(cpu)->irq_spurious_count; | ||
| 175 | return sum; | ||
| 176 | } | ||
| 177 | |||
| 178 | u64 arch_irq_stat(void) | ||
| 179 | { | ||
| 180 | return atomic_read(&irq_err_count); | ||
| 181 | } | ||
| 182 | |||
| 183 | /* | ||
| 156 | * do_IRQ handles all normal device IRQ's (the special | 184 | * do_IRQ handles all normal device IRQ's (the special |
| 157 | * SMP cross-CPU interrupts have their own specific | 185 | * SMP cross-CPU interrupts have their own specific |
| 158 | * handlers). | 186 | * handlers). |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c new file mode 100644 index 000000000000..d66914287ee1 --- /dev/null +++ b/arch/x86/kernel/irqinit_32.c | |||
| @@ -0,0 +1,114 @@ | |||
| 1 | #include <linux/errno.h> | ||
| 2 | #include <linux/signal.h> | ||
| 3 | #include <linux/sched.h> | ||
| 4 | #include <linux/ioport.h> | ||
| 5 | #include <linux/interrupt.h> | ||
| 6 | #include <linux/slab.h> | ||
| 7 | #include <linux/random.h> | ||
| 8 | #include <linux/init.h> | ||
| 9 | #include <linux/kernel_stat.h> | ||
| 10 | #include <linux/sysdev.h> | ||
| 11 | #include <linux/bitops.h> | ||
| 12 | |||
| 13 | #include <asm/atomic.h> | ||
| 14 | #include <asm/system.h> | ||
| 15 | #include <asm/io.h> | ||
| 16 | #include <asm/timer.h> | ||
| 17 | #include <asm/pgtable.h> | ||
| 18 | #include <asm/delay.h> | ||
| 19 | #include <asm/desc.h> | ||
| 20 | #include <asm/apic.h> | ||
| 21 | #include <asm/arch_hooks.h> | ||
| 22 | #include <asm/i8259.h> | ||
| 23 | |||
| 24 | |||
| 25 | |||
| 26 | /* | ||
| 27 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | ||
| 28 | * as the irq is unreliable, and exception 16 works correctly | ||
| 29 | * (ie as explained in the intel literature). On a 386, you | ||
| 30 | * can't use exception 16 due to bad IBM design, so we have to | ||
| 31 | * rely on the less exact irq13. | ||
| 32 | * | ||
| 33 | * Careful.. Not only is IRQ13 unreliable, but it is also | ||
| 34 | * leads to races. IBM designers who came up with it should | ||
| 35 | * be shot. | ||
| 36 | */ | ||
| 37 | |||
| 38 | |||
| 39 | static irqreturn_t math_error_irq(int cpl, void *dev_id) | ||
| 40 | { | ||
| 41 | extern void math_error(void __user *); | ||
| 42 | outb(0,0xF0); | ||
| 43 | if (ignore_fpu_irq || !boot_cpu_data.hard_math) | ||
| 44 | return IRQ_NONE; | ||
| 45 | math_error((void __user *)get_irq_regs()->ip); | ||
| 46 | return IRQ_HANDLED; | ||
| 47 | } | ||
| 48 | |||
| 49 | /* | ||
| 50 | * New motherboards sometimes make IRQ 13 be a PCI interrupt, | ||
| 51 | * so allow interrupt sharing. | ||
| 52 | */ | ||
| 53 | static struct irqaction fpu_irq = { | ||
| 54 | .handler = math_error_irq, | ||
| 55 | .mask = CPU_MASK_NONE, | ||
| 56 | .name = "fpu", | ||
| 57 | }; | ||
| 58 | |||
| 59 | void __init init_ISA_irqs (void) | ||
| 60 | { | ||
| 61 | int i; | ||
| 62 | |||
| 63 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 64 | init_bsp_APIC(); | ||
| 65 | #endif | ||
| 66 | init_8259A(0); | ||
| 67 | |||
| 68 | /* | ||
| 69 | * 16 old-style INTA-cycle interrupts: | ||
| 70 | */ | ||
| 71 | for (i = 0; i < 16; i++) { | ||
| 72 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 73 | handle_level_irq, "XT"); | ||
| 74 | } | ||
| 75 | } | ||
| 76 | |||
| 77 | /* Overridden in paravirt.c */ | ||
| 78 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 79 | |||
| 80 | void __init native_init_IRQ(void) | ||
| 81 | { | ||
| 82 | int i; | ||
| 83 | |||
| 84 | /* all the set up before the call gates are initialised */ | ||
| 85 | pre_intr_init_hook(); | ||
| 86 | |||
| 87 | /* | ||
| 88 | * Cover the whole vector space, no vector can escape | ||
| 89 | * us. (some of these will be overridden and become | ||
| 90 | * 'special' SMP interrupts) | ||
| 91 | */ | ||
| 92 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 93 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 94 | if (i >= NR_IRQS) | ||
| 95 | break; | ||
| 96 | /* SYSCALL_VECTOR was reserved in trap_init. */ | ||
| 97 | if (!test_bit(vector, used_vectors)) | ||
| 98 | set_intr_gate(vector, interrupt[i]); | ||
| 99 | } | ||
| 100 | |||
| 101 | /* setup after call gates are initialised (usually add in | ||
| 102 | * the architecture specific gates) | ||
| 103 | */ | ||
| 104 | intr_init_hook(); | ||
| 105 | |||
| 106 | /* | ||
| 107 | * External FPU? Set up irq13 if so, for | ||
| 108 | * original braindamaged IBM FERR coupling. | ||
| 109 | */ | ||
| 110 | if (boot_cpu_data.hard_math && !cpu_has_fpu) | ||
| 111 | setup_irq(FPU_IRQ, &fpu_irq); | ||
| 112 | |||
| 113 | irq_ctx_init(smp_processor_id()); | ||
| 114 | } | ||
diff --git a/arch/x86/kernel/irqinit_64.c b/arch/x86/kernel/irqinit_64.c new file mode 100644 index 000000000000..64bc0f14285f --- /dev/null +++ b/arch/x86/kernel/irqinit_64.c | |||
| @@ -0,0 +1,203 @@ | |||
| 1 | #include <linux/linkage.h> | ||
| 2 | #include <linux/errno.h> | ||
| 3 | #include <linux/signal.h> | ||
| 4 | #include <linux/sched.h> | ||
| 5 | #include <linux/ioport.h> | ||
| 6 | #include <linux/interrupt.h> | ||
| 7 | #include <linux/timex.h> | ||
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/random.h> | ||
| 10 | #include <linux/init.h> | ||
| 11 | #include <linux/kernel_stat.h> | ||
| 12 | #include <linux/sysdev.h> | ||
| 13 | #include <linux/bitops.h> | ||
| 14 | |||
| 15 | #include <asm/acpi.h> | ||
| 16 | #include <asm/atomic.h> | ||
| 17 | #include <asm/system.h> | ||
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/hw_irq.h> | ||
| 20 | #include <asm/pgtable.h> | ||
| 21 | #include <asm/delay.h> | ||
| 22 | #include <asm/desc.h> | ||
| 23 | #include <asm/apic.h> | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | |||
| 26 | /* | ||
| 27 | * Common place to define all x86 IRQ vectors | ||
| 28 | * | ||
| 29 | * This builds up the IRQ handler stubs using some ugly macros in irq.h | ||
| 30 | * | ||
| 31 | * These macros create the low-level assembly IRQ routines that save | ||
| 32 | * register context and call do_IRQ(). do_IRQ() then does all the | ||
| 33 | * operations that are needed to keep the AT (or SMP IOAPIC) | ||
| 34 | * interrupt-controller happy. | ||
| 35 | */ | ||
| 36 | |||
| 37 | #define BI(x,y) \ | ||
| 38 | BUILD_IRQ(x##y) | ||
| 39 | |||
| 40 | #define BUILD_16_IRQS(x) \ | ||
| 41 | BI(x,0) BI(x,1) BI(x,2) BI(x,3) \ | ||
| 42 | BI(x,4) BI(x,5) BI(x,6) BI(x,7) \ | ||
| 43 | BI(x,8) BI(x,9) BI(x,a) BI(x,b) \ | ||
| 44 | BI(x,c) BI(x,d) BI(x,e) BI(x,f) | ||
| 45 | |||
| 46 | /* | ||
| 47 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
| 48 | * (these are usually mapped to vectors 0x30-0x3f) | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* | ||
| 52 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
| 53 | * are unused but an SMP system is supposed to have enough memory ... | ||
| 54 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
| 55 | * across the spectrum, so we really want to be prepared to get all | ||
| 56 | * of these. Plus, more powerful systems might have more than 64 | ||
| 57 | * IO-APIC registers. | ||
| 58 | * | ||
| 59 | * (these are usually mapped into the 0x30-0xff vector range) | ||
| 60 | */ | ||
| 61 | BUILD_16_IRQS(0x2) BUILD_16_IRQS(0x3) | ||
| 62 | BUILD_16_IRQS(0x4) BUILD_16_IRQS(0x5) BUILD_16_IRQS(0x6) BUILD_16_IRQS(0x7) | ||
| 63 | BUILD_16_IRQS(0x8) BUILD_16_IRQS(0x9) BUILD_16_IRQS(0xa) BUILD_16_IRQS(0xb) | ||
| 64 | BUILD_16_IRQS(0xc) BUILD_16_IRQS(0xd) BUILD_16_IRQS(0xe) BUILD_16_IRQS(0xf) | ||
| 65 | |||
| 66 | #undef BUILD_16_IRQS | ||
| 67 | #undef BI | ||
| 68 | |||
| 69 | |||
| 70 | #define IRQ(x,y) \ | ||
| 71 | IRQ##x##y##_interrupt | ||
| 72 | |||
| 73 | #define IRQLIST_16(x) \ | ||
| 74 | IRQ(x,0), IRQ(x,1), IRQ(x,2), IRQ(x,3), \ | ||
| 75 | IRQ(x,4), IRQ(x,5), IRQ(x,6), IRQ(x,7), \ | ||
| 76 | IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \ | ||
| 77 | IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f) | ||
| 78 | |||
| 79 | /* for the irq vectors */ | ||
| 80 | static void (*__initdata interrupt[NR_VECTORS - FIRST_EXTERNAL_VECTOR])(void) = { | ||
| 81 | IRQLIST_16(0x2), IRQLIST_16(0x3), | ||
| 82 | IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7), | ||
| 83 | IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb), | ||
| 84 | IRQLIST_16(0xc), IRQLIST_16(0xd), IRQLIST_16(0xe), IRQLIST_16(0xf) | ||
| 85 | }; | ||
| 86 | |||
| 87 | #undef IRQ | ||
| 88 | #undef IRQLIST_16 | ||
| 89 | |||
| 90 | |||
| 91 | |||
| 92 | |||
| 93 | /* | ||
| 94 | * IRQ2 is cascade interrupt to second interrupt controller | ||
| 95 | */ | ||
| 96 | |||
| 97 | static struct irqaction irq2 = { | ||
| 98 | .handler = no_action, | ||
| 99 | .mask = CPU_MASK_NONE, | ||
| 100 | .name = "cascade", | ||
| 101 | }; | ||
| 102 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | ||
| 103 | [0 ... IRQ0_VECTOR - 1] = -1, | ||
| 104 | [IRQ0_VECTOR] = 0, | ||
| 105 | [IRQ1_VECTOR] = 1, | ||
| 106 | [IRQ2_VECTOR] = 2, | ||
| 107 | [IRQ3_VECTOR] = 3, | ||
| 108 | [IRQ4_VECTOR] = 4, | ||
| 109 | [IRQ5_VECTOR] = 5, | ||
| 110 | [IRQ6_VECTOR] = 6, | ||
| 111 | [IRQ7_VECTOR] = 7, | ||
| 112 | [IRQ8_VECTOR] = 8, | ||
| 113 | [IRQ9_VECTOR] = 9, | ||
| 114 | [IRQ10_VECTOR] = 10, | ||
| 115 | [IRQ11_VECTOR] = 11, | ||
| 116 | [IRQ12_VECTOR] = 12, | ||
| 117 | [IRQ13_VECTOR] = 13, | ||
| 118 | [IRQ14_VECTOR] = 14, | ||
| 119 | [IRQ15_VECTOR] = 15, | ||
| 120 | [IRQ15_VECTOR + 1 ... NR_VECTORS - 1] = -1 | ||
| 121 | }; | ||
| 122 | |||
| 123 | static void __init init_ISA_irqs (void) | ||
| 124 | { | ||
| 125 | int i; | ||
| 126 | |||
| 127 | init_bsp_APIC(); | ||
| 128 | init_8259A(0); | ||
| 129 | |||
| 130 | for (i = 0; i < NR_IRQS; i++) { | ||
| 131 | irq_desc[i].status = IRQ_DISABLED; | ||
| 132 | irq_desc[i].action = NULL; | ||
| 133 | irq_desc[i].depth = 1; | ||
| 134 | |||
| 135 | if (i < 16) { | ||
| 136 | /* | ||
| 137 | * 16 old-style INTA-cycle interrupts: | ||
| 138 | */ | ||
| 139 | set_irq_chip_and_handler_name(i, &i8259A_chip, | ||
| 140 | handle_level_irq, "XT"); | ||
| 141 | } else { | ||
| 142 | /* | ||
| 143 | * 'high' PCI IRQs filled in on demand | ||
| 144 | */ | ||
| 145 | irq_desc[i].chip = &no_irq_chip; | ||
| 146 | } | ||
| 147 | } | ||
| 148 | } | ||
| 149 | |||
| 150 | void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ"))); | ||
| 151 | |||
| 152 | void __init native_init_IRQ(void) | ||
| 153 | { | ||
| 154 | int i; | ||
| 155 | |||
| 156 | init_ISA_irqs(); | ||
| 157 | /* | ||
| 158 | * Cover the whole vector space, no vector can escape | ||
| 159 | * us. (some of these will be overridden and become | ||
| 160 | * 'special' SMP interrupts) | ||
| 161 | */ | ||
| 162 | for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) { | ||
| 163 | int vector = FIRST_EXTERNAL_VECTOR + i; | ||
| 164 | if (vector != IA32_SYSCALL_VECTOR) | ||
| 165 | set_intr_gate(vector, interrupt[i]); | ||
| 166 | } | ||
| 167 | |||
| 168 | #ifdef CONFIG_SMP | ||
| 169 | /* | ||
| 170 | * The reschedule interrupt is a CPU-to-CPU reschedule-helper | ||
| 171 | * IPI, driven by wakeup. | ||
| 172 | */ | ||
| 173 | set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt); | ||
| 174 | |||
| 175 | /* IPIs for invalidation */ | ||
| 176 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0); | ||
| 177 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1); | ||
| 178 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2); | ||
| 179 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3); | ||
| 180 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4); | ||
| 181 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5); | ||
| 182 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6); | ||
| 183 | set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7); | ||
| 184 | |||
| 185 | /* IPI for generic function call */ | ||
| 186 | set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt); | ||
| 187 | |||
| 188 | /* Low priority IPI to cleanup after moving an irq */ | ||
| 189 | set_intr_gate(IRQ_MOVE_CLEANUP_VECTOR, irq_move_cleanup_interrupt); | ||
| 190 | #endif | ||
| 191 | set_intr_gate(THERMAL_APIC_VECTOR, thermal_interrupt); | ||
| 192 | set_intr_gate(THRESHOLD_APIC_VECTOR, threshold_interrupt); | ||
| 193 | |||
| 194 | /* self generated IPI for local APIC timer */ | ||
| 195 | set_intr_gate(LOCAL_TIMER_VECTOR, apic_timer_interrupt); | ||
| 196 | |||
| 197 | /* IPI vectors for APIC spurious and error interrupts */ | ||
| 198 | set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt); | ||
| 199 | set_intr_gate(ERROR_APIC_VECTOR, error_interrupt); | ||
| 200 | |||
| 201 | if (!acpi_ioapic) | ||
| 202 | setup_irq(2, &irq2); | ||
| 203 | } | ||
diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 0224c3637c73..21f2bae98c15 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #include <asm/mmu_context.h> | 20 | #include <asm/mmu_context.h> |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
| 23 | static void flush_ldt(void *null) | 23 | static void flush_ldt(void *current_mm) |
| 24 | { | 24 | { |
| 25 | if (current->active_mm) | 25 | if (current->active_mm == current_mm) |
| 26 | load_LDT(¤t->active_mm->context); | 26 | load_LDT(¤t->active_mm->context); |
| 27 | } | 27 | } |
| 28 | #endif | 28 | #endif |
| @@ -68,7 +68,7 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload) | |||
| 68 | load_LDT(pc); | 68 | load_LDT(pc); |
| 69 | mask = cpumask_of_cpu(smp_processor_id()); | 69 | mask = cpumask_of_cpu(smp_processor_id()); |
| 70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) | 70 | if (!cpus_equal(current->mm->cpu_vm_mask, mask)) |
| 71 | smp_call_function(flush_ldt, NULL, 1, 1); | 71 | smp_call_function(flush_ldt, current->mm, 1, 1); |
| 72 | preempt_enable(); | 72 | preempt_enable(); |
| 73 | #else | 73 | #else |
| 74 | load_LDT(pc); | 74 | load_LDT(pc); |
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c index d0b234c9fc31..f4960171bc66 100644 --- a/arch/x86/kernel/machine_kexec_32.c +++ b/arch/x86/kernel/machine_kexec_32.c | |||
| @@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit) | |||
| 39 | curidt.address = (unsigned long)newidt; | 39 | curidt.address = (unsigned long)newidt; |
| 40 | 40 | ||
| 41 | load_idt(&curidt); | 41 | load_idt(&curidt); |
| 42 | }; | 42 | } |
| 43 | 43 | ||
| 44 | 44 | ||
| 45 | static void set_gdt(void *newgdt, __u16 limit) | 45 | static void set_gdt(void *newgdt, __u16 limit) |
| @@ -51,7 +51,7 @@ static void set_gdt(void *newgdt, __u16 limit) | |||
| 51 | curgdt.address = (unsigned long)newgdt; | 51 | curgdt.address = (unsigned long)newgdt; |
| 52 | 52 | ||
| 53 | load_gdt(&curgdt); | 53 | load_gdt(&curgdt); |
| 54 | }; | 54 | } |
| 55 | 55 | ||
| 56 | static void load_segments(void) | 56 | static void load_segments(void) |
| 57 | { | 57 | { |
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c index 69729e38b78a..9758fea87c5b 100644 --- a/arch/x86/kernel/microcode.c +++ b/arch/x86/kernel/microcode.c | |||
| @@ -5,13 +5,14 @@ | |||
| 5 | * 2006 Shaohua Li <shaohua.li@intel.com> | 5 | * 2006 Shaohua Li <shaohua.li@intel.com> |
| 6 | * | 6 | * |
| 7 | * This driver allows to upgrade microcode on Intel processors | 7 | * This driver allows to upgrade microcode on Intel processors |
| 8 | * belonging to IA-32 family - PentiumPro, Pentium II, | 8 | * belonging to IA-32 family - PentiumPro, Pentium II, |
| 9 | * Pentium III, Xeon, Pentium 4, etc. | 9 | * Pentium III, Xeon, Pentium 4, etc. |
| 10 | * | 10 | * |
| 11 | * Reference: Section 8.10 of Volume III, Intel Pentium 4 Manual, | 11 | * Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture |
| 12 | * Order Number 245472 or free download from: | 12 | * Software Developer's Manual |
| 13 | * | 13 | * Order Number 253668 or free download from: |
| 14 | * http://developer.intel.com/design/pentium4/manuals/245472.htm | 14 | * |
| 15 | * http://developer.intel.com/design/pentium4/manuals/253668.htm | ||
| 15 | * | 16 | * |
| 16 | * For more information, go to http://www.urbanmyth.org/microcode | 17 | * For more information, go to http://www.urbanmyth.org/microcode |
| 17 | * | 18 | * |
| @@ -58,12 +59,12 @@ | |||
| 58 | * nature of implementation. | 59 | * nature of implementation. |
| 59 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> | 60 | * 1.11 22 Mar 2002 Tigran Aivazian <tigran@veritas.com> |
| 60 | * Fix the panic when writing zero-length microcode chunk. | 61 | * Fix the panic when writing zero-length microcode chunk. |
| 61 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, | 62 | * 1.12 29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>, |
| 62 | * Jun Nakajima <jun.nakajima@intel.com> | 63 | * Jun Nakajima <jun.nakajima@intel.com> |
| 63 | * Support for the microcode updates in the new format. | 64 | * Support for the microcode updates in the new format. |
| 64 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> | 65 | * 1.13 10 Oct 2003 Tigran Aivazian <tigran@veritas.com> |
| 65 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl | 66 | * Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl |
| 66 | * because we no longer hold a copy of applied microcode | 67 | * because we no longer hold a copy of applied microcode |
| 67 | * in kernel memory. | 68 | * in kernel memory. |
| 68 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> | 69 | * 1.14 25 Jun 2004 Tigran Aivazian <tigran@veritas.com> |
| 69 | * Fix sigmatch() macro to handle old CPUs with pf == 0. | 70 | * Fix sigmatch() macro to handle old CPUs with pf == 0. |
| @@ -320,11 +321,11 @@ static void apply_microcode(int cpu) | |||
| 320 | return; | 321 | return; |
| 321 | 322 | ||
| 322 | /* serialize access to the physical write to MSR 0x79 */ | 323 | /* serialize access to the physical write to MSR 0x79 */ |
| 323 | spin_lock_irqsave(µcode_update_lock, flags); | 324 | spin_lock_irqsave(µcode_update_lock, flags); |
| 324 | 325 | ||
| 325 | /* write microcode via MSR 0x79 */ | 326 | /* write microcode via MSR 0x79 */ |
| 326 | wrmsr(MSR_IA32_UCODE_WRITE, | 327 | wrmsr(MSR_IA32_UCODE_WRITE, |
| 327 | (unsigned long) uci->mc->bits, | 328 | (unsigned long) uci->mc->bits, |
| 328 | (unsigned long) uci->mc->bits >> 16 >> 16); | 329 | (unsigned long) uci->mc->bits >> 16 >> 16); |
| 329 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); | 330 | wrmsr(MSR_IA32_UCODE_REV, 0, 0); |
| 330 | 331 | ||
| @@ -341,7 +342,7 @@ static void apply_microcode(int cpu) | |||
| 341 | return; | 342 | return; |
| 342 | } | 343 | } |
| 343 | printk(KERN_INFO "microcode: CPU%d updated from revision " | 344 | printk(KERN_INFO "microcode: CPU%d updated from revision " |
| 344 | "0x%x to 0x%x, date = %08x \n", | 345 | "0x%x to 0x%x, date = %08x \n", |
| 345 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); | 346 | cpu_num, uci->rev, val[1], uci->mc->hdr.date); |
| 346 | uci->rev = val[1]; | 347 | uci->rev = val[1]; |
| 347 | } | 348 | } |
| @@ -534,7 +535,7 @@ static int cpu_request_microcode(int cpu) | |||
| 534 | c->x86, c->x86_model, c->x86_mask); | 535 | c->x86, c->x86_model, c->x86_mask); |
| 535 | error = request_firmware(&firmware, name, µcode_pdev->dev); | 536 | error = request_firmware(&firmware, name, µcode_pdev->dev); |
| 536 | if (error) { | 537 | if (error) { |
| 537 | pr_debug("microcode: ucode data file %s load failed\n", name); | 538 | pr_debug("microcode: data file %s load failed\n", name); |
| 538 | return error; | 539 | return error; |
| 539 | } | 540 | } |
| 540 | buf = firmware->data; | 541 | buf = firmware->data; |
| @@ -805,6 +806,9 @@ static int __init microcode_init (void) | |||
| 805 | { | 806 | { |
| 806 | int error; | 807 | int error; |
| 807 | 808 | ||
| 809 | printk(KERN_INFO | ||
| 810 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
| 811 | |||
| 808 | error = microcode_dev_init(); | 812 | error = microcode_dev_init(); |
| 809 | if (error) | 813 | if (error) |
| 810 | return error; | 814 | return error; |
| @@ -825,9 +829,6 @@ static int __init microcode_init (void) | |||
| 825 | } | 829 | } |
| 826 | 830 | ||
| 827 | register_hotcpu_notifier(&mc_cpu_notifier); | 831 | register_hotcpu_notifier(&mc_cpu_notifier); |
| 828 | |||
| 829 | printk(KERN_INFO | ||
| 830 | "IA-32 Microcode Update Driver: v" MICROCODE_VERSION " <tigran@aivazian.fsnet.co.uk>\n"); | ||
| 831 | return 0; | 832 | return 0; |
| 832 | } | 833 | } |
| 833 | 834 | ||
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index 84160f74eeb0..6580dae46277 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c | |||
| @@ -24,8 +24,11 @@ | |||
| 24 | #include <linux/kdebug.h> | 24 | #include <linux/kdebug.h> |
| 25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
| 26 | 26 | ||
| 27 | #include <asm/i8259.h> | ||
| 28 | #include <asm/io_apic.h> | ||
| 27 | #include <asm/smp.h> | 29 | #include <asm/smp.h> |
| 28 | #include <asm/nmi.h> | 30 | #include <asm/nmi.h> |
| 31 | #include <asm/timer.h> | ||
| 29 | 32 | ||
| 30 | #include "mach_traps.h" | 33 | #include "mach_traps.h" |
| 31 | 34 | ||
| @@ -81,7 +84,7 @@ int __init check_nmi_watchdog(void) | |||
| 81 | 84 | ||
| 82 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 85 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 83 | if (!prev_nmi_count) | 86 | if (!prev_nmi_count) |
| 84 | return -1; | 87 | goto error; |
| 85 | 88 | ||
| 86 | printk(KERN_INFO "Testing NMI watchdog ... "); | 89 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 87 | 90 | ||
| @@ -118,7 +121,7 @@ int __init check_nmi_watchdog(void) | |||
| 118 | if (!atomic_read(&nmi_active)) { | 121 | if (!atomic_read(&nmi_active)) { |
| 119 | kfree(prev_nmi_count); | 122 | kfree(prev_nmi_count); |
| 120 | atomic_set(&nmi_active, -1); | 123 | atomic_set(&nmi_active, -1); |
| 121 | return -1; | 124 | goto error; |
| 122 | } | 125 | } |
| 123 | printk("OK.\n"); | 126 | printk("OK.\n"); |
| 124 | 127 | ||
| @@ -129,6 +132,12 @@ int __init check_nmi_watchdog(void) | |||
| 129 | 132 | ||
| 130 | kfree(prev_nmi_count); | 133 | kfree(prev_nmi_count); |
| 131 | return 0; | 134 | return 0; |
| 135 | error: | ||
| 136 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) | ||
| 137 | disable_8259A_irq(0); | ||
| 138 | timer_ack = 0; | ||
| 139 | |||
| 140 | return -1; | ||
| 132 | } | 141 | } |
| 133 | 142 | ||
| 134 | static int __init setup_nmi_watchdog(char *str) | 143 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index 5a29ded994fa..0060e44e8989 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | #include <linux/cpumask.h> | 21 | #include <linux/cpumask.h> |
| 22 | #include <linux/kdebug.h> | 22 | #include <linux/kdebug.h> |
| 23 | 23 | ||
| 24 | #include <asm/i8259.h> | ||
| 25 | #include <asm/io_apic.h> | ||
| 24 | #include <asm/smp.h> | 26 | #include <asm/smp.h> |
| 25 | #include <asm/nmi.h> | 27 | #include <asm/nmi.h> |
| 26 | #include <asm/proto.h> | 28 | #include <asm/proto.h> |
| @@ -90,7 +92,7 @@ int __init check_nmi_watchdog(void) | |||
| 90 | 92 | ||
| 91 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); | 93 | prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); |
| 92 | if (!prev_nmi_count) | 94 | if (!prev_nmi_count) |
| 93 | return -1; | 95 | goto error; |
| 94 | 96 | ||
| 95 | printk(KERN_INFO "Testing NMI watchdog ... "); | 97 | printk(KERN_INFO "Testing NMI watchdog ... "); |
| 96 | 98 | ||
| @@ -121,7 +123,7 @@ int __init check_nmi_watchdog(void) | |||
| 121 | if (!atomic_read(&nmi_active)) { | 123 | if (!atomic_read(&nmi_active)) { |
| 122 | kfree(prev_nmi_count); | 124 | kfree(prev_nmi_count); |
| 123 | atomic_set(&nmi_active, -1); | 125 | atomic_set(&nmi_active, -1); |
| 124 | return -1; | 126 | goto error; |
| 125 | } | 127 | } |
| 126 | printk("OK.\n"); | 128 | printk("OK.\n"); |
| 127 | 129 | ||
| @@ -132,6 +134,11 @@ int __init check_nmi_watchdog(void) | |||
| 132 | 134 | ||
| 133 | kfree(prev_nmi_count); | 135 | kfree(prev_nmi_count); |
| 134 | return 0; | 136 | return 0; |
| 137 | error: | ||
| 138 | if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259) | ||
| 139 | disable_8259A_irq(0); | ||
| 140 | |||
| 141 | return -1; | ||
| 135 | } | 142 | } |
| 136 | 143 | ||
| 137 | static int __init setup_nmi_watchdog(char *str) | 144 | static int __init setup_nmi_watchdog(char *str) |
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 74f0c5ea2a03..f1ab0f727007 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
| @@ -380,6 +380,9 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
| 380 | .pte_update = paravirt_nop, | 380 | .pte_update = paravirt_nop, |
| 381 | .pte_update_defer = paravirt_nop, | 381 | .pte_update_defer = paravirt_nop, |
| 382 | 382 | ||
| 383 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
| 384 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
| 385 | |||
| 383 | #ifdef CONFIG_HIGHPTE | 386 | #ifdef CONFIG_HIGHPTE |
| 384 | .kmap_atomic_pte = kmap_atomic, | 387 | .kmap_atomic_pte = kmap_atomic, |
| 385 | #endif | 388 | #endif |
| @@ -403,6 +406,7 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
| 403 | #endif /* PAGETABLE_LEVELS >= 3 */ | 406 | #endif /* PAGETABLE_LEVELS >= 3 */ |
| 404 | 407 | ||
| 405 | .pte_val = native_pte_val, | 408 | .pte_val = native_pte_val, |
| 409 | .pte_flags = native_pte_val, | ||
| 406 | .pgd_val = native_pgd_val, | 410 | .pgd_val = native_pgd_val, |
| 407 | 411 | ||
| 408 | .make_pte = native_make_pte, | 412 | .make_pte = native_make_pte, |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index dc00a1331ace..3c43109ba054 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -77,10 +77,14 @@ void __init dma32_reserve_bootmem(void) | |||
| 77 | if (end_pfn <= MAX_DMA32_PFN) | 77 | if (end_pfn <= MAX_DMA32_PFN) |
| 78 | return; | 78 | return; |
| 79 | 79 | ||
| 80 | /* | ||
| 81 | * check aperture_64.c allocate_aperture() for reason about | ||
| 82 | * using 512M as goal | ||
| 83 | */ | ||
| 80 | align = 64ULL<<20; | 84 | align = 64ULL<<20; |
| 81 | size = round_up(dma32_bootmem_size, align); | 85 | size = round_up(dma32_bootmem_size, align); |
| 82 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, | 86 | dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align, |
| 83 | __pa(MAX_DMA_ADDRESS)); | 87 | 512ULL<<20); |
| 84 | if (dma32_bootmem_ptr) | 88 | if (dma32_bootmem_ptr) |
| 85 | dma32_bootmem_size = size; | 89 | dma32_bootmem_size = size; |
| 86 | else | 90 | else |
| @@ -88,7 +92,6 @@ void __init dma32_reserve_bootmem(void) | |||
| 88 | } | 92 | } |
| 89 | static void __init dma32_free_bootmem(void) | 93 | static void __init dma32_free_bootmem(void) |
| 90 | { | 94 | { |
| 91 | int node; | ||
| 92 | 95 | ||
| 93 | if (end_pfn <= MAX_DMA32_PFN) | 96 | if (end_pfn <= MAX_DMA32_PFN) |
| 94 | return; | 97 | return; |
| @@ -96,9 +99,7 @@ static void __init dma32_free_bootmem(void) | |||
| 96 | if (!dma32_bootmem_ptr) | 99 | if (!dma32_bootmem_ptr) |
| 97 | return; | 100 | return; |
| 98 | 101 | ||
| 99 | for_each_online_node(node) | 102 | free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size); |
| 100 | free_bootmem_node(NODE_DATA(node), __pa(dma32_bootmem_ptr), | ||
| 101 | dma32_bootmem_size); | ||
| 102 | 103 | ||
| 103 | dma32_bootmem_ptr = NULL; | 104 | dma32_bootmem_ptr = NULL; |
| 104 | dma32_bootmem_size = 0; | 105 | dma32_bootmem_size = 0; |
| @@ -357,7 +358,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
| 357 | EXPORT_SYMBOL(dma_supported); | 358 | EXPORT_SYMBOL(dma_supported); |
| 358 | 359 | ||
| 359 | /* Allocate DMA memory on node near device */ | 360 | /* Allocate DMA memory on node near device */ |
| 360 | noinline struct page * | 361 | static noinline struct page * |
| 361 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) | 362 | dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order) |
| 362 | { | 363 | { |
| 363 | int node; | 364 | int node; |
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index aa8ec928caa8..021f3c684a62 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -104,7 +104,6 @@ static unsigned long alloc_iommu(struct device *dev, int size) | |||
| 104 | size, base_index, boundary_size, 0); | 104 | size, base_index, boundary_size, 0); |
| 105 | } | 105 | } |
| 106 | if (offset != -1) { | 106 | if (offset != -1) { |
| 107 | set_bit_string(iommu_gart_bitmap, offset, size); | ||
| 108 | next_bit = offset+size; | 107 | next_bit = offset+size; |
| 109 | if (next_bit >= iommu_pages) { | 108 | if (next_bit >= iommu_pages) { |
| 110 | next_bit = 0; | 109 | next_bit = 0; |
| @@ -534,8 +533,8 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 534 | unsigned aper_size = 0, aper_base_32, aper_order; | 533 | unsigned aper_size = 0, aper_base_32, aper_order; |
| 535 | u64 aper_base; | 534 | u64 aper_base; |
| 536 | 535 | ||
| 537 | pci_read_config_dword(dev, 0x94, &aper_base_32); | 536 | pci_read_config_dword(dev, AMD64_GARTAPERTUREBASE, &aper_base_32); |
| 538 | pci_read_config_dword(dev, 0x90, &aper_order); | 537 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &aper_order); |
| 539 | aper_order = (aper_order >> 1) & 7; | 538 | aper_order = (aper_order >> 1) & 7; |
| 540 | 539 | ||
| 541 | aper_base = aper_base_32 & 0x7fff; | 540 | aper_base = aper_base_32 & 0x7fff; |
| @@ -549,14 +548,63 @@ static __init unsigned read_aperture(struct pci_dev *dev, u32 *size) | |||
| 549 | return aper_base; | 548 | return aper_base; |
| 550 | } | 549 | } |
| 551 | 550 | ||
| 551 | static void enable_gart_translations(void) | ||
| 552 | { | ||
| 553 | int i; | ||
| 554 | |||
| 555 | for (i = 0; i < num_k8_northbridges; i++) { | ||
| 556 | struct pci_dev *dev = k8_northbridges[i]; | ||
| 557 | |||
| 558 | enable_gart_translation(dev, __pa(agp_gatt_table)); | ||
| 559 | } | ||
| 560 | } | ||
| 561 | |||
| 562 | /* | ||
| 563 | * If fix_up_north_bridges is set, the north bridges have to be fixed up on | ||
| 564 | * resume in the same way as they are handled in gart_iommu_hole_init(). | ||
| 565 | */ | ||
| 566 | static bool fix_up_north_bridges; | ||
| 567 | static u32 aperture_order; | ||
| 568 | static u32 aperture_alloc; | ||
| 569 | |||
| 570 | void set_up_gart_resume(u32 aper_order, u32 aper_alloc) | ||
| 571 | { | ||
| 572 | fix_up_north_bridges = true; | ||
| 573 | aperture_order = aper_order; | ||
| 574 | aperture_alloc = aper_alloc; | ||
| 575 | } | ||
| 576 | |||
| 552 | static int gart_resume(struct sys_device *dev) | 577 | static int gart_resume(struct sys_device *dev) |
| 553 | { | 578 | { |
| 579 | printk(KERN_INFO "PCI-DMA: Resuming GART IOMMU\n"); | ||
| 580 | |||
| 581 | if (fix_up_north_bridges) { | ||
| 582 | int i; | ||
| 583 | |||
| 584 | printk(KERN_INFO "PCI-DMA: Restoring GART aperture settings\n"); | ||
| 585 | |||
| 586 | for (i = 0; i < num_k8_northbridges; i++) { | ||
| 587 | struct pci_dev *dev = k8_northbridges[i]; | ||
| 588 | |||
| 589 | /* | ||
| 590 | * Don't enable translations just yet. That is the next | ||
| 591 | * step. Restore the pre-suspend aperture settings. | ||
| 592 | */ | ||
| 593 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, | ||
| 594 | aperture_order << 1); | ||
| 595 | pci_write_config_dword(dev, AMD64_GARTAPERTUREBASE, | ||
| 596 | aperture_alloc >> 25); | ||
| 597 | } | ||
| 598 | } | ||
| 599 | |||
| 600 | enable_gart_translations(); | ||
| 601 | |||
| 554 | return 0; | 602 | return 0; |
| 555 | } | 603 | } |
| 556 | 604 | ||
| 557 | static int gart_suspend(struct sys_device *dev, pm_message_t state) | 605 | static int gart_suspend(struct sys_device *dev, pm_message_t state) |
| 558 | { | 606 | { |
| 559 | return -EINVAL; | 607 | return 0; |
| 560 | } | 608 | } |
| 561 | 609 | ||
| 562 | static struct sysdev_class gart_sysdev_class = { | 610 | static struct sysdev_class gart_sysdev_class = { |
| @@ -614,27 +662,14 @@ static __init int init_k8_gatt(struct agp_kern_info *info) | |||
| 614 | memset(gatt, 0, gatt_size); | 662 | memset(gatt, 0, gatt_size); |
| 615 | agp_gatt_table = gatt; | 663 | agp_gatt_table = gatt; |
| 616 | 664 | ||
| 617 | for (i = 0; i < num_k8_northbridges; i++) { | 665 | enable_gart_translations(); |
| 618 | u32 gatt_reg; | ||
| 619 | u32 ctl; | ||
| 620 | |||
| 621 | dev = k8_northbridges[i]; | ||
| 622 | gatt_reg = __pa(gatt) >> 12; | ||
| 623 | gatt_reg <<= 4; | ||
| 624 | pci_write_config_dword(dev, 0x98, gatt_reg); | ||
| 625 | pci_read_config_dword(dev, 0x90, &ctl); | ||
| 626 | |||
| 627 | ctl |= 1; | ||
| 628 | ctl &= ~((1<<4) | (1<<5)); | ||
| 629 | |||
| 630 | pci_write_config_dword(dev, 0x90, ctl); | ||
| 631 | } | ||
| 632 | 666 | ||
| 633 | error = sysdev_class_register(&gart_sysdev_class); | 667 | error = sysdev_class_register(&gart_sysdev_class); |
| 634 | if (!error) | 668 | if (!error) |
| 635 | error = sysdev_register(&device_gart); | 669 | error = sysdev_register(&device_gart); |
| 636 | if (error) | 670 | if (error) |
| 637 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); | 671 | panic("Could not register gart_sysdev -- would corrupt data on next suspend"); |
| 672 | |||
| 638 | flush_gart(); | 673 | flush_gart(); |
| 639 | 674 | ||
| 640 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", | 675 | printk(KERN_INFO "PCI-DMA: aperture base @ %x size %u KB\n", |
| @@ -677,11 +712,11 @@ void gart_iommu_shutdown(void) | |||
| 677 | u32 ctl; | 712 | u32 ctl; |
| 678 | 713 | ||
| 679 | dev = k8_northbridges[i]; | 714 | dev = k8_northbridges[i]; |
| 680 | pci_read_config_dword(dev, 0x90, &ctl); | 715 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); |
| 681 | 716 | ||
| 682 | ctl &= ~1; | 717 | ctl &= ~GARTEN; |
| 683 | 718 | ||
| 684 | pci_write_config_dword(dev, 0x90, ctl); | 719 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); |
| 685 | } | 720 | } |
| 686 | } | 721 | } |
| 687 | 722 | ||
| @@ -788,10 +823,10 @@ void __init gart_iommu_init(void) | |||
| 788 | wbinvd(); | 823 | wbinvd(); |
| 789 | 824 | ||
| 790 | /* | 825 | /* |
| 791 | * Try to workaround a bug (thanks to BenH) | 826 | * Try to workaround a bug (thanks to BenH): |
| 792 | * Set unmapped entries to a scratch page instead of 0. | 827 | * Set unmapped entries to a scratch page instead of 0. |
| 793 | * Any prefetches that hit unmapped entries won't get an bus abort | 828 | * Any prefetches that hit unmapped entries won't get an bus abort |
| 794 | * then. | 829 | * then. (P2P bridge may be prefetching on DMA reads). |
| 795 | */ | 830 | */ |
| 796 | scratch = get_zeroed_page(GFP_KERNEL); | 831 | scratch = get_zeroed_page(GFP_KERNEL); |
| 797 | if (!scratch) | 832 | if (!scratch) |
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index d89a648fe710..79bdcd11c66e 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -65,6 +65,7 @@ static enum { | |||
| 65 | ICH_FORCE_HPET_RESUME, | 65 | ICH_FORCE_HPET_RESUME, |
| 66 | VT8237_FORCE_HPET_RESUME, | 66 | VT8237_FORCE_HPET_RESUME, |
| 67 | NVIDIA_FORCE_HPET_RESUME, | 67 | NVIDIA_FORCE_HPET_RESUME, |
| 68 | ATI_FORCE_HPET_RESUME, | ||
| 68 | } force_hpet_resume_type; | 69 | } force_hpet_resume_type; |
| 69 | 70 | ||
| 70 | static void __iomem *rcba_base; | 71 | static void __iomem *rcba_base; |
| @@ -158,6 +159,8 @@ static void ich_force_enable_hpet(struct pci_dev *dev) | |||
| 158 | 159 | ||
| 159 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, | 160 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0, |
| 160 | ich_force_enable_hpet); | 161 | ich_force_enable_hpet); |
| 162 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0, | ||
| 163 | ich_force_enable_hpet); | ||
| 161 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, | 164 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1, |
| 162 | ich_force_enable_hpet); | 165 | ich_force_enable_hpet); |
| 163 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, | 166 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0, |
| @@ -174,6 +177,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7, | |||
| 174 | 177 | ||
| 175 | static struct pci_dev *cached_dev; | 178 | static struct pci_dev *cached_dev; |
| 176 | 179 | ||
| 180 | static void hpet_print_force_info(void) | ||
| 181 | { | ||
| 182 | printk(KERN_INFO "HPET not enabled in BIOS. " | ||
| 183 | "You might try hpet=force boot option\n"); | ||
| 184 | } | ||
| 185 | |||
| 177 | static void old_ich_force_hpet_resume(void) | 186 | static void old_ich_force_hpet_resume(void) |
| 178 | { | 187 | { |
| 179 | u32 val; | 188 | u32 val; |
| @@ -253,6 +262,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev) | |||
| 253 | { | 262 | { |
| 254 | if (hpet_force_user) | 263 | if (hpet_force_user) |
| 255 | old_ich_force_enable_hpet(dev); | 264 | old_ich_force_enable_hpet(dev); |
| 265 | else | ||
| 266 | hpet_print_force_info(); | ||
| 256 | } | 267 | } |
| 257 | 268 | ||
| 258 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, | 269 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0, |
| @@ -290,8 +301,13 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev) | |||
| 290 | { | 301 | { |
| 291 | u32 uninitialized_var(val); | 302 | u32 uninitialized_var(val); |
| 292 | 303 | ||
| 293 | if (!hpet_force_user || hpet_address || force_hpet_address) | 304 | if (hpet_address || force_hpet_address) |
| 305 | return; | ||
| 306 | |||
| 307 | if (!hpet_force_user) { | ||
| 308 | hpet_print_force_info(); | ||
| 294 | return; | 309 | return; |
| 310 | } | ||
| 295 | 311 | ||
| 296 | pci_read_config_dword(dev, 0x68, &val); | 312 | pci_read_config_dword(dev, 0x68, &val); |
| 297 | /* | 313 | /* |
| @@ -330,6 +346,36 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, | |||
| 330 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, | 346 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, |
| 331 | vt8237_force_enable_hpet); | 347 | vt8237_force_enable_hpet); |
| 332 | 348 | ||
| 349 | static void ati_force_hpet_resume(void) | ||
| 350 | { | ||
| 351 | pci_write_config_dword(cached_dev, 0x14, 0xfed00000); | ||
| 352 | printk(KERN_DEBUG "Force enabled HPET at resume\n"); | ||
| 353 | } | ||
| 354 | |||
| 355 | static void ati_force_enable_hpet(struct pci_dev *dev) | ||
| 356 | { | ||
| 357 | u32 uninitialized_var(val); | ||
| 358 | |||
| 359 | if (hpet_address || force_hpet_address) | ||
| 360 | return; | ||
| 361 | |||
| 362 | if (!hpet_force_user) { | ||
| 363 | hpet_print_force_info(); | ||
| 364 | return; | ||
| 365 | } | ||
| 366 | |||
| 367 | pci_write_config_dword(dev, 0x14, 0xfed00000); | ||
| 368 | pci_read_config_dword(dev, 0x14, &val); | ||
| 369 | force_hpet_address = val; | ||
| 370 | force_hpet_resume_type = ATI_FORCE_HPET_RESUME; | ||
| 371 | dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n", | ||
| 372 | force_hpet_address); | ||
| 373 | cached_dev = dev; | ||
| 374 | return; | ||
| 375 | } | ||
| 376 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS, | ||
| 377 | ati_force_enable_hpet); | ||
| 378 | |||
| 333 | /* | 379 | /* |
| 334 | * Undocumented chipset feature taken from LinuxBIOS. | 380 | * Undocumented chipset feature taken from LinuxBIOS. |
| 335 | */ | 381 | */ |
| @@ -343,8 +389,13 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev) | |||
| 343 | { | 389 | { |
| 344 | u32 uninitialized_var(val); | 390 | u32 uninitialized_var(val); |
| 345 | 391 | ||
| 346 | if (!hpet_force_user || hpet_address || force_hpet_address) | 392 | if (hpet_address || force_hpet_address) |
| 393 | return; | ||
| 394 | |||
| 395 | if (!hpet_force_user) { | ||
| 396 | hpet_print_force_info(); | ||
| 347 | return; | 397 | return; |
| 398 | } | ||
| 348 | 399 | ||
| 349 | pci_write_config_dword(dev, 0x44, 0xfed00001); | 400 | pci_write_config_dword(dev, 0x44, 0xfed00001); |
| 350 | pci_read_config_dword(dev, 0x44, &val); | 401 | pci_read_config_dword(dev, 0x44, &val); |
| @@ -397,6 +448,9 @@ void force_hpet_resume(void) | |||
| 397 | case NVIDIA_FORCE_HPET_RESUME: | 448 | case NVIDIA_FORCE_HPET_RESUME: |
| 398 | nvidia_force_hpet_resume(); | 449 | nvidia_force_hpet_resume(); |
| 399 | return; | 450 | return; |
| 451 | case ATI_FORCE_HPET_RESUME: | ||
| 452 | ati_force_hpet_resume(); | ||
| 453 | return; | ||
| 400 | default: | 454 | default: |
| 401 | break; | 455 | break; |
| 402 | } | 456 | } |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f6be7d5f82f8..f8a62160e151 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | void (*pm_power_off)(void); | 27 | void (*pm_power_off)(void); |
| 28 | EXPORT_SYMBOL(pm_power_off); | 28 | EXPORT_SYMBOL(pm_power_off); |
| 29 | 29 | ||
| 30 | static long no_idt[3]; | 30 | static const struct desc_ptr no_idt = {}; |
| 31 | static int reboot_mode; | 31 | static int reboot_mode; |
| 32 | enum reboot_type reboot_type = BOOT_KBD; | 32 | enum reboot_type reboot_type = BOOT_KBD; |
| 33 | int reboot_force; | 33 | int reboot_force; |
| @@ -201,15 +201,15 @@ core_initcall(reboot_init); | |||
| 201 | controller to pulse the CPU reset line, which is more thorough, but | 201 | controller to pulse the CPU reset line, which is more thorough, but |
| 202 | doesn't work with at least one type of 486 motherboard. It is easy | 202 | doesn't work with at least one type of 486 motherboard. It is easy |
| 203 | to stop this code working; hence the copious comments. */ | 203 | to stop this code working; hence the copious comments. */ |
| 204 | static unsigned long long | 204 | static const unsigned long long |
| 205 | real_mode_gdt_entries [3] = | 205 | real_mode_gdt_entries [3] = |
| 206 | { | 206 | { |
| 207 | 0x0000000000000000ULL, /* Null descriptor */ | 207 | 0x0000000000000000ULL, /* Null descriptor */ |
| 208 | 0x00009a000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ | 208 | 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ |
| 209 | 0x000092000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ | 209 | 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | static struct desc_ptr | 212 | static const struct desc_ptr |
| 213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, | 213 | real_mode_gdt = { sizeof (real_mode_gdt_entries) - 1, (long)real_mode_gdt_entries }, |
| 214 | real_mode_idt = { 0x3ff, 0 }; | 214 | real_mode_idt = { 0x3ff, 0 }; |
| 215 | 215 | ||
| @@ -231,7 +231,7 @@ real_mode_idt = { 0x3ff, 0 }; | |||
| 231 | 231 | ||
| 232 | More could be done here to set up the registers as if a CPU reset had | 232 | More could be done here to set up the registers as if a CPU reset had |
| 233 | occurred; hopefully real BIOSs don't assume much. */ | 233 | occurred; hopefully real BIOSs don't assume much. */ |
| 234 | static unsigned char real_mode_switch [] = | 234 | static const unsigned char real_mode_switch [] = |
| 235 | { | 235 | { |
| 236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ | 236 | 0x66, 0x0f, 0x20, 0xc0, /* movl %cr0,%eax */ |
| 237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ | 237 | 0x66, 0x83, 0xe0, 0x11, /* andl $0x00000011,%eax */ |
| @@ -245,7 +245,7 @@ static unsigned char real_mode_switch [] = | |||
| 245 | 0x24, 0x10, /* f: andb $0x10,al */ | 245 | 0x24, 0x10, /* f: andb $0x10,al */ |
| 246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ | 246 | 0x66, 0x0f, 0x22, 0xc0 /* movl %eax,%cr0 */ |
| 247 | }; | 247 | }; |
| 248 | static unsigned char jump_to_bios [] = | 248 | static const unsigned char jump_to_bios [] = |
| 249 | { | 249 | { |
| 250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ | 250 | 0xea, 0x00, 0x00, 0xff, 0xff /* ljmp $0xffff,$0x0000 */ |
| 251 | }; | 251 | }; |
| @@ -255,7 +255,7 @@ static unsigned char jump_to_bios [] = | |||
| 255 | * specified by the code and length parameters. | 255 | * specified by the code and length parameters. |
| 256 | * We assume that length will aways be less that 100! | 256 | * We assume that length will aways be less that 100! |
| 257 | */ | 257 | */ |
| 258 | void machine_real_restart(unsigned char *code, int length) | 258 | void machine_real_restart(const unsigned char *code, int length) |
| 259 | { | 259 | { |
| 260 | local_irq_disable(); | 260 | local_irq_disable(); |
| 261 | 261 | ||
| @@ -368,7 +368,7 @@ static void native_machine_emergency_restart(void) | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | case BOOT_TRIPLE: | 370 | case BOOT_TRIPLE: |
| 371 | load_idt((const struct desc_ptr *)&no_idt); | 371 | load_idt(&no_idt); |
| 372 | __asm__ __volatile__("int3"); | 372 | __asm__ __volatile__("int3"); |
| 373 | 373 | ||
| 374 | reboot_type = BOOT_KBD; | 374 | reboot_type = BOOT_KBD; |
diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c index dec0b5ec25c2..61a837743fe5 100644 --- a/arch/x86/kernel/reboot_fixups_32.c +++ b/arch/x86/kernel/reboot_fixups_32.c | |||
| @@ -49,7 +49,7 @@ struct device_fixup { | |||
| 49 | void (*reboot_fixup)(struct pci_dev *); | 49 | void (*reboot_fixup)(struct pci_dev *); |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | static struct device_fixup fixups_table[] = { | 52 | static const struct device_fixup fixups_table[] = { |
| 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, | 53 | { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY, cs5530a_warm_reset }, |
| 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, | 54 | { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, cs5536_warm_reset }, |
| 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, | 55 | { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SC1100_BRIDGE, cs5530a_warm_reset }, |
| @@ -64,7 +64,7 @@ static struct device_fixup fixups_table[] = { | |||
| 64 | */ | 64 | */ |
| 65 | void mach_reboot_fixups(void) | 65 | void mach_reboot_fixups(void) |
| 66 | { | 66 | { |
| 67 | struct device_fixup *cur; | 67 | const struct device_fixup *cur; |
| 68 | struct pci_dev *dev; | 68 | struct pci_dev *dev; |
| 69 | int i; | 69 | int i; |
| 70 | 70 | ||
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index b789ec599923..545440e471b2 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
| @@ -119,7 +119,7 @@ EXPORT_SYMBOL_GPL(edid_info); | |||
| 119 | 119 | ||
| 120 | extern int root_mountflags; | 120 | extern int root_mountflags; |
| 121 | 121 | ||
| 122 | char __initdata command_line[COMMAND_LINE_SIZE]; | 122 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
| 123 | 123 | ||
| 124 | static struct resource standard_io_resources[] = { | 124 | static struct resource standard_io_resources[] = { |
| 125 | { .name = "dma1", .start = 0x00, .end = 0x1f, | 125 | { .name = "dma1", .start = 0x00, .end = 0x1f, |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 3e1cecedde42..f2b666756299 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | #include <asm/pgtable.h> | 59 | #include <asm/pgtable.h> |
| 60 | #include <asm/tlbflush.h> | 60 | #include <asm/tlbflush.h> |
| 61 | #include <asm/mtrr.h> | 61 | #include <asm/mtrr.h> |
| 62 | #include <asm/nmi.h> | ||
| 63 | #include <asm/vmi.h> | 62 | #include <asm/vmi.h> |
| 64 | #include <asm/genapic.h> | 63 | #include <asm/genapic.h> |
| 65 | #include <linux/mc146818rtc.h> | 64 | #include <linux/mc146818rtc.h> |
| @@ -1157,9 +1156,11 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
| 1157 | * If SMP should be disabled, then really disable it! | 1156 | * If SMP should be disabled, then really disable it! |
| 1158 | */ | 1157 | */ |
| 1159 | if (!max_cpus) { | 1158 | if (!max_cpus) { |
| 1160 | printk(KERN_INFO "SMP mode deactivated," | 1159 | printk(KERN_INFO "SMP mode deactivated.\n"); |
| 1161 | "forcing use of dummy APIC emulation.\n"); | ||
| 1162 | smpboot_clear_io_apic(); | 1160 | smpboot_clear_io_apic(); |
| 1161 | |||
| 1162 | localise_nmi_watchdog(); | ||
| 1163 | |||
| 1163 | #ifdef CONFIG_X86_32 | 1164 | #ifdef CONFIG_X86_32 |
| 1164 | connect_bsp_APIC(); | 1165 | connect_bsp_APIC(); |
| 1165 | #endif | 1166 | #endif |
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c index d2ab52cc1d6b..7066cb855a60 100644 --- a/arch/x86/kernel/sys_i386_32.c +++ b/arch/x86/kernel/sys_i386_32.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | #include <linux/utsname.h> | 19 | #include <linux/utsname.h> |
| 20 | #include <linux/ipc.h> | 20 | #include <linux/ipc.h> |
| 21 | 21 | ||
| 22 | #include <asm/uaccess.h> | 22 | #include <linux/uaccess.h> |
| 23 | #include <asm/unistd.h> | 23 | #include <linux/unistd.h> |
| 24 | 24 | ||
| 25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | 25 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, |
| 26 | unsigned long prot, unsigned long flags, | 26 | unsigned long prot, unsigned long flags, |
| @@ -103,7 +103,7 @@ asmlinkage int old_select(struct sel_arg_struct __user *arg) | |||
| 103 | * | 103 | * |
| 104 | * This is really horribly ugly. | 104 | * This is really horribly ugly. |
| 105 | */ | 105 | */ |
| 106 | asmlinkage int sys_ipc (uint call, int first, int second, | 106 | asmlinkage int sys_ipc(uint call, int first, int second, |
| 107 | int third, void __user *ptr, long fifth) | 107 | int third, void __user *ptr, long fifth) |
| 108 | { | 108 | { |
| 109 | int version, ret; | 109 | int version, ret; |
| @@ -113,24 +113,24 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 113 | 113 | ||
| 114 | switch (call) { | 114 | switch (call) { |
| 115 | case SEMOP: | 115 | case SEMOP: |
| 116 | return sys_semtimedop (first, (struct sembuf __user *)ptr, second, NULL); | 116 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL); |
| 117 | case SEMTIMEDOP: | 117 | case SEMTIMEDOP: |
| 118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, | 118 | return sys_semtimedop(first, (struct sembuf __user *)ptr, second, |
| 119 | (const struct timespec __user *)fifth); | 119 | (const struct timespec __user *)fifth); |
| 120 | 120 | ||
| 121 | case SEMGET: | 121 | case SEMGET: |
| 122 | return sys_semget (first, second, third); | 122 | return sys_semget(first, second, third); |
| 123 | case SEMCTL: { | 123 | case SEMCTL: { |
| 124 | union semun fourth; | 124 | union semun fourth; |
| 125 | if (!ptr) | 125 | if (!ptr) |
| 126 | return -EINVAL; | 126 | return -EINVAL; |
| 127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) | 127 | if (get_user(fourth.__pad, (void __user * __user *) ptr)) |
| 128 | return -EFAULT; | 128 | return -EFAULT; |
| 129 | return sys_semctl (first, second, third, fourth); | 129 | return sys_semctl(first, second, third, fourth); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | case MSGSND: | 132 | case MSGSND: |
| 133 | return sys_msgsnd (first, (struct msgbuf __user *) ptr, | 133 | return sys_msgsnd(first, (struct msgbuf __user *) ptr, |
| 134 | second, third); | 134 | second, third); |
| 135 | case MSGRCV: | 135 | case MSGRCV: |
| 136 | switch (version) { | 136 | switch (version) { |
| @@ -138,45 +138,45 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 138 | struct ipc_kludge tmp; | 138 | struct ipc_kludge tmp; |
| 139 | if (!ptr) | 139 | if (!ptr) |
| 140 | return -EINVAL; | 140 | return -EINVAL; |
| 141 | 141 | ||
| 142 | if (copy_from_user(&tmp, | 142 | if (copy_from_user(&tmp, |
| 143 | (struct ipc_kludge __user *) ptr, | 143 | (struct ipc_kludge __user *) ptr, |
| 144 | sizeof (tmp))) | 144 | sizeof(tmp))) |
| 145 | return -EFAULT; | 145 | return -EFAULT; |
| 146 | return sys_msgrcv (first, tmp.msgp, second, | 146 | return sys_msgrcv(first, tmp.msgp, second, |
| 147 | tmp.msgtyp, third); | 147 | tmp.msgtyp, third); |
| 148 | } | 148 | } |
| 149 | default: | 149 | default: |
| 150 | return sys_msgrcv (first, | 150 | return sys_msgrcv(first, |
| 151 | (struct msgbuf __user *) ptr, | 151 | (struct msgbuf __user *) ptr, |
| 152 | second, fifth, third); | 152 | second, fifth, third); |
| 153 | } | 153 | } |
| 154 | case MSGGET: | 154 | case MSGGET: |
| 155 | return sys_msgget ((key_t) first, second); | 155 | return sys_msgget((key_t) first, second); |
| 156 | case MSGCTL: | 156 | case MSGCTL: |
| 157 | return sys_msgctl (first, second, (struct msqid_ds __user *) ptr); | 157 | return sys_msgctl(first, second, (struct msqid_ds __user *) ptr); |
| 158 | 158 | ||
| 159 | case SHMAT: | 159 | case SHMAT: |
| 160 | switch (version) { | 160 | switch (version) { |
| 161 | default: { | 161 | default: { |
| 162 | ulong raddr; | 162 | ulong raddr; |
| 163 | ret = do_shmat (first, (char __user *) ptr, second, &raddr); | 163 | ret = do_shmat(first, (char __user *) ptr, second, &raddr); |
| 164 | if (ret) | 164 | if (ret) |
| 165 | return ret; | 165 | return ret; |
| 166 | return put_user (raddr, (ulong __user *) third); | 166 | return put_user(raddr, (ulong __user *) third); |
| 167 | } | 167 | } |
| 168 | case 1: /* iBCS2 emulator entry point */ | 168 | case 1: /* iBCS2 emulator entry point */ |
| 169 | if (!segment_eq(get_fs(), get_ds())) | 169 | if (!segment_eq(get_fs(), get_ds())) |
| 170 | return -EINVAL; | 170 | return -EINVAL; |
| 171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ | 171 | /* The "(ulong *) third" is valid _only_ because of the kernel segment thing */ |
| 172 | return do_shmat (first, (char __user *) ptr, second, (ulong *) third); | 172 | return do_shmat(first, (char __user *) ptr, second, (ulong *) third); |
| 173 | } | 173 | } |
| 174 | case SHMDT: | 174 | case SHMDT: |
| 175 | return sys_shmdt ((char __user *)ptr); | 175 | return sys_shmdt((char __user *)ptr); |
| 176 | case SHMGET: | 176 | case SHMGET: |
| 177 | return sys_shmget (first, second, third); | 177 | return sys_shmget(first, second, third); |
| 178 | case SHMCTL: | 178 | case SHMCTL: |
| 179 | return sys_shmctl (first, second, | 179 | return sys_shmctl(first, second, |
| 180 | (struct shmid_ds __user *) ptr); | 180 | (struct shmid_ds __user *) ptr); |
| 181 | default: | 181 | default: |
| 182 | return -ENOSYS; | 182 | return -ENOSYS; |
| @@ -186,28 +186,28 @@ asmlinkage int sys_ipc (uint call, int first, int second, | |||
| 186 | /* | 186 | /* |
| 187 | * Old cruft | 187 | * Old cruft |
| 188 | */ | 188 | */ |
| 189 | asmlinkage int sys_uname(struct old_utsname __user * name) | 189 | asmlinkage int sys_uname(struct old_utsname __user *name) |
| 190 | { | 190 | { |
| 191 | int err; | 191 | int err; |
| 192 | if (!name) | 192 | if (!name) |
| 193 | return -EFAULT; | 193 | return -EFAULT; |
| 194 | down_read(&uts_sem); | 194 | down_read(&uts_sem); |
| 195 | err = copy_to_user(name, utsname(), sizeof (*name)); | 195 | err = copy_to_user(name, utsname(), sizeof(*name)); |
| 196 | up_read(&uts_sem); | 196 | up_read(&uts_sem); |
| 197 | return err?-EFAULT:0; | 197 | return err? -EFAULT:0; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | asmlinkage int sys_olduname(struct oldold_utsname __user * name) | 200 | asmlinkage int sys_olduname(struct oldold_utsname __user *name) |
| 201 | { | 201 | { |
| 202 | int error; | 202 | int error; |
| 203 | 203 | ||
| 204 | if (!name) | 204 | if (!name) |
| 205 | return -EFAULT; | 205 | return -EFAULT; |
| 206 | if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname))) | 206 | if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname))) |
| 207 | return -EFAULT; | 207 | return -EFAULT; |
| 208 | 208 | ||
| 209 | down_read(&uts_sem); | 209 | down_read(&uts_sem); |
| 210 | 210 | ||
| 211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, | 211 | error = __copy_to_user(&name->sysname, &utsname()->sysname, |
| 212 | __OLD_UTS_LEN); | 212 | __OLD_UTS_LEN); |
| 213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); | 213 | error |= __put_user(0, name->sysname + __OLD_UTS_LEN); |
| @@ -223,9 +223,9 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name) | |||
| 223 | error |= __copy_to_user(&name->machine, &utsname()->machine, | 223 | error |= __copy_to_user(&name->machine, &utsname()->machine, |
| 224 | __OLD_UTS_LEN); | 224 | __OLD_UTS_LEN); |
| 225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); | 225 | error |= __put_user(0, name->machine + __OLD_UTS_LEN); |
| 226 | 226 | ||
| 227 | up_read(&uts_sem); | 227 | up_read(&uts_sem); |
| 228 | 228 | ||
| 229 | error = error ? -EFAULT : 0; | 229 | error = error ? -EFAULT : 0; |
| 230 | 230 | ||
| 231 | return error; | 231 | return error; |
| @@ -241,6 +241,6 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]) | |||
| 241 | long __res; | 241 | long __res; |
| 242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" | 242 | asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" |
| 243 | : "=a" (__res) | 243 | : "=a" (__res) |
| 244 | : "0" (__NR_execve),"ri" (filename),"c" (argv), "d" (envp) : "memory"); | 244 | : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory"); |
| 245 | return __res; | 245 | return __res; |
| 246 | } | 246 | } |
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 2ff21f398934..5f29f12da50c 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
| @@ -84,8 +84,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id) | |||
| 84 | if (timer_ack) { | 84 | if (timer_ack) { |
| 85 | /* | 85 | /* |
| 86 | * Subtle, when I/O APICs are used we have to ack timer IRQ | 86 | * Subtle, when I/O APICs are used we have to ack timer IRQ |
| 87 | * manually to reset the IRR bit for do_slow_gettimeoffset(). | 87 | * manually to deassert NMI lines for the watchdog if run |
| 88 | * This will also deassert NMI lines for the watchdog if run | ||
| 89 | * on an 82489DX-based system. | 88 | * on an 82489DX-based system. |
| 90 | */ | 89 | */ |
| 91 | spin_lock(&i8259A_lock); | 90 | spin_lock(&i8259A_lock); |
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c index adff76ea97c4..ec6d3b2130c4 100644 --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c | |||
| @@ -71,7 +71,6 @@ asmlinkage void general_protection(void); | |||
| 71 | asmlinkage void page_fault(void); | 71 | asmlinkage void page_fault(void); |
| 72 | asmlinkage void coprocessor_error(void); | 72 | asmlinkage void coprocessor_error(void); |
| 73 | asmlinkage void simd_coprocessor_error(void); | 73 | asmlinkage void simd_coprocessor_error(void); |
| 74 | asmlinkage void reserved(void); | ||
| 75 | asmlinkage void alignment_check(void); | 74 | asmlinkage void alignment_check(void); |
| 76 | asmlinkage void machine_check(void); | 75 | asmlinkage void machine_check(void); |
| 77 | asmlinkage void spurious_interrupt_bug(void); | 76 | asmlinkage void spurious_interrupt_bug(void); |
| @@ -702,12 +701,10 @@ DO_ERROR_INFO( 0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip) | |||
| 702 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) | 701 | DO_ERROR( 4, SIGSEGV, "overflow", overflow) |
| 703 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) | 702 | DO_ERROR( 5, SIGSEGV, "bounds", bounds) |
| 704 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) | 703 | DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip) |
| 705 | DO_ERROR( 7, SIGSEGV, "device not available", device_not_available) | ||
| 706 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) | 704 | DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) |
| 707 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) | 705 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) |
| 708 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) | 706 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) |
| 709 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) | 707 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) |
| 710 | DO_ERROR(18, SIGSEGV, "reserved", reserved) | ||
| 711 | 708 | ||
| 712 | /* Runs on IST stack */ | 709 | /* Runs on IST stack */ |
| 713 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) | 710 | asmlinkage void do_stack_segment(struct pt_regs *regs, long error_code) |
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index 65b70637ad97..774a5a83c296 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c | |||
| @@ -286,7 +286,6 @@ core_initcall(cpufreq_tsc); | |||
| 286 | 286 | ||
| 287 | /* clock source code */ | 287 | /* clock source code */ |
| 288 | 288 | ||
| 289 | static unsigned long current_tsc_khz; | ||
| 290 | static struct clocksource clocksource_tsc; | 289 | static struct clocksource clocksource_tsc; |
| 291 | 290 | ||
| 292 | /* | 291 | /* |
| @@ -439,9 +438,8 @@ void __init tsc_init(void) | |||
| 439 | 438 | ||
| 440 | unsynchronized_tsc(); | 439 | unsynchronized_tsc(); |
| 441 | check_geode_tsc_reliable(); | 440 | check_geode_tsc_reliable(); |
| 442 | current_tsc_khz = tsc_khz; | 441 | clocksource_tsc.mult = clocksource_khz2mult(tsc_khz, |
| 443 | clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, | 442 | clocksource_tsc.shift); |
| 444 | clocksource_tsc.shift); | ||
| 445 | /* lower the rating if we already know its unstable: */ | 443 | /* lower the rating if we already know its unstable: */ |
| 446 | if (check_tsc_unstable()) { | 444 | if (check_tsc_unstable()) { |
| 447 | clocksource_tsc.rating = 0; | 445 | clocksource_tsc.rating = 0; |
diff --git a/arch/x86/kernel/tsc_64.c b/arch/x86/kernel/tsc_64.c index 1784b8077a12..9898fb01edfd 100644 --- a/arch/x86/kernel/tsc_64.c +++ b/arch/x86/kernel/tsc_64.c | |||
| @@ -242,7 +242,7 @@ void __init tsc_calibrate(void) | |||
| 242 | if (hpet) { | 242 | if (hpet) { |
| 243 | printk(KERN_INFO "TSC calibrated against HPET\n"); | 243 | printk(KERN_INFO "TSC calibrated against HPET\n"); |
| 244 | if (hpet2 < hpet1) | 244 | if (hpet2 < hpet1) |
| 245 | hpet2 += 0x100000000; | 245 | hpet2 += 0x100000000UL; |
| 246 | hpet2 -= hpet1; | 246 | hpet2 -= hpet1; |
| 247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; | 247 | tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000; |
| 248 | } else { | 248 | } else { |
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index ce5ed083a1e9..2674f5796275 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
| @@ -60,13 +60,6 @@ SECTIONS | |||
| 60 | 60 | ||
| 61 | BUG_TABLE :text | 61 | BUG_TABLE :text |
| 62 | 62 | ||
| 63 | . = ALIGN(4); | ||
| 64 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
| 65 | __tracedata_start = .; | ||
| 66 | *(.tracedata) | ||
| 67 | __tracedata_end = .; | ||
| 68 | } | ||
| 69 | |||
| 70 | RODATA | 63 | RODATA |
| 71 | 64 | ||
| 72 | /* writeable */ | 65 | /* writeable */ |
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index b29f63bdff5e..fd246e22fe6b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S | |||
| @@ -53,13 +53,6 @@ SECTIONS | |||
| 53 | 53 | ||
| 54 | RODATA | 54 | RODATA |
| 55 | 55 | ||
| 56 | . = ALIGN(4); | ||
| 57 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { | ||
| 58 | __tracedata_start = .; | ||
| 59 | *(.tracedata) | ||
| 60 | __tracedata_end = .; | ||
| 61 | } | ||
| 62 | |||
| 63 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | 56 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ |
| 64 | /* Data */ | 57 | /* Data */ |
| 65 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 58 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index ba8c0b75ab0a..0c029e8959c7 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
| @@ -15,9 +15,12 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/pci_ids.h> | 16 | #include <linux/pci_ids.h> |
| 17 | #include <linux/pci_regs.h> | 17 | #include <linux/pci_regs.h> |
| 18 | |||
| 19 | #include <asm/apic.h> | ||
| 18 | #include <asm/pci-direct.h> | 20 | #include <asm/pci-direct.h> |
| 19 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 20 | #include <asm/paravirt.h> | 22 | #include <asm/paravirt.h> |
| 23 | #include <asm/setup.h> | ||
| 21 | 24 | ||
| 22 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT | 25 | #if defined CONFIG_PCI && defined CONFIG_PARAVIRT |
| 23 | /* | 26 | /* |
diff --git a/arch/x86/math-emu/reg_constant.c b/arch/x86/math-emu/reg_constant.c index 04869e64b18e..00548354912f 100644 --- a/arch/x86/math-emu/reg_constant.c +++ b/arch/x86/math-emu/reg_constant.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include "reg_constant.h" | 16 | #include "reg_constant.h" |
| 17 | #include "control_w.h" | 17 | #include "control_w.h" |
| 18 | 18 | ||
| 19 | #define MAKE_REG(s,e,l,h) { l, h, \ | 19 | #define MAKE_REG(s, e, l, h) { l, h, \ |
| 20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } | 20 | ((EXTENDED_Ebias+(e)) | ((SIGN_##s != 0)*0x8000)) } |
| 21 | 21 | ||
| 22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); | 22 | FPU_REG const CONST_1 = MAKE_REG(POS, 0, 0x00000000, 0x80000000); |
| 23 | #if 0 | 23 | #if 0 |
| @@ -40,7 +40,7 @@ FPU_REG const CONST_PI2extra = MAKE_REG(NEG, -66, | |||
| 40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); | 40 | FPU_REG const CONST_Z = MAKE_REG(POS, EXP_UNDER, 0x0, 0x0); |
| 41 | 41 | ||
| 42 | /* Only the sign and significand (and tag) are used in internal NaNs */ | 42 | /* Only the sign and significand (and tag) are used in internal NaNs */ |
| 43 | /* The 80486 never generates one of these | 43 | /* The 80486 never generates one of these |
| 44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); | 44 | FPU_REG const CONST_SNAN = MAKE_REG(POS, EXP_OVER, 0x00000001, 0x80000000); |
| 45 | */ | 45 | */ |
| 46 | /* This is the real indefinite QNaN */ | 46 | /* This is the real indefinite QNaN */ |
| @@ -49,7 +49,7 @@ FPU_REG const CONST_QNaN = MAKE_REG(NEG, EXP_OVER, 0x00000000, 0xC0000000); | |||
| 49 | /* Only the sign (and tag) is used in internal infinities */ | 49 | /* Only the sign (and tag) is used in internal infinities */ |
| 50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); | 50 | FPU_REG const CONST_INF = MAKE_REG(POS, EXP_OVER, 0x00000000, 0x80000000); |
| 51 | 51 | ||
| 52 | static void fld_const(FPU_REG const *c, int adj, u_char tag) | 52 | static void fld_const(FPU_REG const * c, int adj, u_char tag) |
| 53 | { | 53 | { |
| 54 | FPU_REG *st_new_ptr; | 54 | FPU_REG *st_new_ptr; |
| 55 | 55 | ||
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c index 914ccf983687..8b4eac0ca07d 100644 --- a/arch/x86/mm/discontig_32.c +++ b/arch/x86/mm/discontig_32.c | |||
| @@ -156,7 +156,7 @@ static void __init propagate_e820_map_node(int nid) | |||
| 156 | */ | 156 | */ |
| 157 | static void __init allocate_pgdat(int nid) | 157 | static void __init allocate_pgdat(int nid) |
| 158 | { | 158 | { |
| 159 | if (nid && node_has_online_mem(nid)) | 159 | if (nid && node_has_online_mem(nid) && node_remap_start_vaddr[nid]) |
| 160 | NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; | 160 | NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid]; |
| 161 | else { | 161 | else { |
| 162 | NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); | 162 | NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn)); |
| @@ -164,16 +164,13 @@ static void __init allocate_pgdat(int nid) | |||
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | #ifdef CONFIG_DISCONTIGMEM | ||
| 168 | /* | 167 | /* |
| 169 | * In the discontig memory model, a portion of the kernel virtual area (KVA) | 168 | * In the DISCONTIGMEM and SPARSEMEM memory model, a portion of the kernel |
| 170 | * is reserved and portions of nodes are mapped using it. This is to allow | 169 | * virtual address space (KVA) is reserved and portions of nodes are mapped |
| 171 | * node-local memory to be allocated for structures that would normally require | 170 | * using it. This is to allow node-local memory to be allocated for |
| 172 | * ZONE_NORMAL. The memory is allocated with alloc_remap() and callers | 171 | * structures that would normally require ZONE_NORMAL. The memory is |
| 173 | * should be prepared to allocate from the bootmem allocator instead. This KVA | 172 | * allocated with alloc_remap() and callers should be prepared to allocate |
| 174 | * mechanism is incompatible with SPARSEMEM as it makes assumptions about the | 173 | * from the bootmem allocator instead. |
| 175 | * layout of memory that are broken if alloc_remap() succeeds for some of the | ||
| 176 | * map and fails for others | ||
| 177 | */ | 174 | */ |
| 178 | static unsigned long node_remap_start_pfn[MAX_NUMNODES]; | 175 | static unsigned long node_remap_start_pfn[MAX_NUMNODES]; |
| 179 | static void *node_remap_end_vaddr[MAX_NUMNODES]; | 176 | static void *node_remap_end_vaddr[MAX_NUMNODES]; |
| @@ -290,25 +287,6 @@ static void init_remap_allocator(int nid) | |||
| 290 | (ulong) pfn_to_kaddr(highstart_pfn | 287 | (ulong) pfn_to_kaddr(highstart_pfn |
| 291 | + node_remap_offset[nid] + node_remap_size[nid])); | 288 | + node_remap_offset[nid] + node_remap_size[nid])); |
| 292 | } | 289 | } |
| 293 | #else | ||
| 294 | void *alloc_remap(int nid, unsigned long size) | ||
| 295 | { | ||
| 296 | return NULL; | ||
| 297 | } | ||
| 298 | |||
| 299 | static unsigned long calculate_numa_remap_pages(void) | ||
| 300 | { | ||
| 301 | return 0; | ||
| 302 | } | ||
| 303 | |||
| 304 | static void init_remap_allocator(int nid) | ||
| 305 | { | ||
| 306 | } | ||
| 307 | |||
| 308 | void __init remap_numa_kva(void) | ||
| 309 | { | ||
| 310 | } | ||
| 311 | #endif /* CONFIG_DISCONTIGMEM */ | ||
| 312 | 290 | ||
| 313 | extern void setup_bootmem_allocator(void); | 291 | extern void setup_bootmem_allocator(void); |
| 314 | unsigned long __init setup_memory(void) | 292 | unsigned long __init setup_memory(void) |
| @@ -476,3 +454,21 @@ int memory_add_physaddr_to_nid(u64 addr) | |||
| 476 | 454 | ||
| 477 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 455 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
| 478 | #endif | 456 | #endif |
| 457 | |||
| 458 | #if defined(CONFIG_ACPI_NUMA) && !defined(CONFIG_HAVE_ARCH_PARSE_SRAT) | ||
| 459 | /* | ||
| 460 | * Dummy on 32-bit, for now: | ||
| 461 | */ | ||
| 462 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | ||
| 463 | { | ||
| 464 | } | ||
| 465 | |||
| 466 | void __init | ||
| 467 | acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) | ||
| 468 | { | ||
| 469 | } | ||
| 470 | |||
| 471 | void __init acpi_numa_arch_fixup(void) | ||
| 472 | { | ||
| 473 | } | ||
| 474 | #endif | ||
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 2c24bea92c66..0bb0caed8971 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c | |||
| @@ -42,7 +42,7 @@ static struct addr_marker address_markers[] = { | |||
| 42 | { 0, "User Space" }, | 42 | { 0, "User Space" }, |
| 43 | #ifdef CONFIG_X86_64 | 43 | #ifdef CONFIG_X86_64 |
| 44 | { 0x8000000000000000UL, "Kernel Space" }, | 44 | { 0x8000000000000000UL, "Kernel Space" }, |
| 45 | { 0xffff810000000000UL, "Low Kernel Mapping" }, | 45 | { PAGE_OFFSET, "Low Kernel Mapping" }, |
| 46 | { VMALLOC_START, "vmalloc() Area" }, | 46 | { VMALLOC_START, "vmalloc() Area" }, |
| 47 | { VMEMMAP_START, "Vmemmap" }, | 47 | { VMEMMAP_START, "Vmemmap" }, |
| 48 | { __START_KERNEL_map, "High Kernel Mapping" }, | 48 | { __START_KERNEL_map, "High Kernel Mapping" }, |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 8bcb6f40ccb6..1e64795714c8 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
| @@ -55,11 +55,7 @@ static inline int notify_page_fault(struct pt_regs *regs) | |||
| 55 | int ret = 0; | 55 | int ret = 0; |
| 56 | 56 | ||
| 57 | /* kprobe_running() needs smp_processor_id() */ | 57 | /* kprobe_running() needs smp_processor_id() */ |
| 58 | #ifdef CONFIG_X86_32 | ||
| 59 | if (!user_mode_vm(regs)) { | 58 | if (!user_mode_vm(regs)) { |
| 60 | #else | ||
| 61 | if (!user_mode(regs)) { | ||
| 62 | #endif | ||
| 63 | preempt_disable(); | 59 | preempt_disable(); |
| 64 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) | 60 | if (kprobe_running() && kprobe_fault_handler(regs, 14)) |
| 65 | ret = 1; | 61 | ret = 1; |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index ec30d10154b6..d71be0eb0130 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
| @@ -162,6 +162,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 162 | pgd_t *pgd; | 162 | pgd_t *pgd; |
| 163 | pmd_t *pmd; | 163 | pmd_t *pmd; |
| 164 | pte_t *pte; | 164 | pte_t *pte; |
| 165 | unsigned pages_2m = 0, pages_4k = 0; | ||
| 165 | 166 | ||
| 166 | pgd_idx = pgd_index(PAGE_OFFSET); | 167 | pgd_idx = pgd_index(PAGE_OFFSET); |
| 167 | pgd = pgd_base + pgd_idx; | 168 | pgd = pgd_base + pgd_idx; |
| @@ -197,6 +198,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 197 | is_kernel_text(addr2)) | 198 | is_kernel_text(addr2)) |
| 198 | prot = PAGE_KERNEL_LARGE_EXEC; | 199 | prot = PAGE_KERNEL_LARGE_EXEC; |
| 199 | 200 | ||
| 201 | pages_2m++; | ||
| 200 | set_pmd(pmd, pfn_pmd(pfn, prot)); | 202 | set_pmd(pmd, pfn_pmd(pfn, prot)); |
| 201 | 203 | ||
| 202 | pfn += PTRS_PER_PTE; | 204 | pfn += PTRS_PER_PTE; |
| @@ -213,11 +215,14 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base) | |||
| 213 | if (is_kernel_text(addr)) | 215 | if (is_kernel_text(addr)) |
| 214 | prot = PAGE_KERNEL_EXEC; | 216 | prot = PAGE_KERNEL_EXEC; |
| 215 | 217 | ||
| 218 | pages_4k++; | ||
| 216 | set_pte(pte, pfn_pte(pfn, prot)); | 219 | set_pte(pte, pfn_pte(pfn, prot)); |
| 217 | } | 220 | } |
| 218 | max_pfn_mapped = pfn; | 221 | max_pfn_mapped = pfn; |
| 219 | } | 222 | } |
| 220 | } | 223 | } |
| 224 | update_page_count(PG_LEVEL_2M, pages_2m); | ||
| 225 | update_page_count(PG_LEVEL_4K, pages_4k); | ||
| 221 | } | 226 | } |
| 222 | 227 | ||
| 223 | static inline int page_kills_ppro(unsigned long pagenr) | 228 | static inline int page_kills_ppro(unsigned long pagenr) |
| @@ -571,17 +576,6 @@ void __init mem_init(void) | |||
| 571 | #endif | 576 | #endif |
| 572 | bad_ppro = ppro_with_ram_bug(); | 577 | bad_ppro = ppro_with_ram_bug(); |
| 573 | 578 | ||
| 574 | #ifdef CONFIG_HIGHMEM | ||
| 575 | /* check that fixmap and pkmap do not overlap */ | ||
| 576 | if (PKMAP_BASE + LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) { | ||
| 577 | printk(KERN_ERR | ||
| 578 | "fixmap and kmap areas overlap - this will crash\n"); | ||
| 579 | printk(KERN_ERR "pkstart: %lxh pkend: %lxh fixstart %lxh\n", | ||
| 580 | PKMAP_BASE, PKMAP_BASE + LAST_PKMAP*PAGE_SIZE, | ||
| 581 | FIXADDR_START); | ||
| 582 | BUG(); | ||
| 583 | } | ||
| 584 | #endif | ||
| 585 | /* this will put all low memory onto the freelists */ | 579 | /* this will put all low memory onto the freelists */ |
| 586 | totalram_pages += free_all_bootmem(); | 580 | totalram_pages += free_all_bootmem(); |
| 587 | 581 | ||
| @@ -614,7 +608,6 @@ void __init mem_init(void) | |||
| 614 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) | 608 | (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)) |
| 615 | ); | 609 | ); |
| 616 | 610 | ||
| 617 | #if 1 /* double-sanity-check paranoia */ | ||
| 618 | printk(KERN_INFO "virtual kernel memory layout:\n" | 611 | printk(KERN_INFO "virtual kernel memory layout:\n" |
| 619 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" | 612 | " fixmap : 0x%08lx - 0x%08lx (%4ld kB)\n" |
| 620 | #ifdef CONFIG_HIGHMEM | 613 | #ifdef CONFIG_HIGHMEM |
| @@ -655,7 +648,6 @@ void __init mem_init(void) | |||
| 655 | #endif | 648 | #endif |
| 656 | BUG_ON(VMALLOC_START > VMALLOC_END); | 649 | BUG_ON(VMALLOC_START > VMALLOC_END); |
| 657 | BUG_ON((unsigned long)high_memory > VMALLOC_START); | 650 | BUG_ON((unsigned long)high_memory > VMALLOC_START); |
| 658 | #endif /* double-sanity-check paranoia */ | ||
| 659 | 651 | ||
| 660 | if (boot_cpu_data.wp_works_ok < 0) | 652 | if (boot_cpu_data.wp_works_ok < 0) |
| 661 | test_wp_bit(); | 653 | test_wp_bit(); |
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 819dad973b13..48623ae628fb 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/swap.h> | 18 | #include <linux/swap.h> |
| 19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/initrd.h> | ||
| 21 | #include <linux/pagemap.h> | 22 | #include <linux/pagemap.h> |
| 22 | #include <linux/bootmem.h> | 23 | #include <linux/bootmem.h> |
| 23 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
| @@ -312,6 +313,8 @@ __meminit void early_iounmap(void *addr, unsigned long size) | |||
| 312 | static unsigned long __meminit | 313 | static unsigned long __meminit |
| 313 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | 314 | phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) |
| 314 | { | 315 | { |
| 316 | unsigned long pages = 0; | ||
| 317 | |||
| 315 | int i = pmd_index(address); | 318 | int i = pmd_index(address); |
| 316 | 319 | ||
| 317 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { | 320 | for (; i < PTRS_PER_PMD; i++, address += PMD_SIZE) { |
| @@ -328,9 +331,11 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end) | |||
| 328 | if (pmd_val(*pmd)) | 331 | if (pmd_val(*pmd)) |
| 329 | continue; | 332 | continue; |
| 330 | 333 | ||
| 334 | pages++; | ||
| 331 | set_pte((pte_t *)pmd, | 335 | set_pte((pte_t *)pmd, |
| 332 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 336 | pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 333 | } | 337 | } |
| 338 | update_page_count(PG_LEVEL_2M, pages); | ||
| 334 | return address; | 339 | return address; |
| 335 | } | 340 | } |
| 336 | 341 | ||
| @@ -350,6 +355,7 @@ phys_pmd_update(pud_t *pud, unsigned long address, unsigned long end) | |||
| 350 | static unsigned long __meminit | 355 | static unsigned long __meminit |
| 351 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | 356 | phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) |
| 352 | { | 357 | { |
| 358 | unsigned long pages = 0; | ||
| 353 | unsigned long last_map_addr = end; | 359 | unsigned long last_map_addr = end; |
| 354 | int i = pud_index(addr); | 360 | int i = pud_index(addr); |
| 355 | 361 | ||
| @@ -374,6 +380,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
| 374 | } | 380 | } |
| 375 | 381 | ||
| 376 | if (direct_gbpages) { | 382 | if (direct_gbpages) { |
| 383 | pages++; | ||
| 377 | set_pte((pte_t *)pud, | 384 | set_pte((pte_t *)pud, |
| 378 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); | 385 | pfn_pte(addr >> PAGE_SHIFT, PAGE_KERNEL_LARGE)); |
| 379 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; | 386 | last_map_addr = (addr & PUD_MASK) + PUD_SIZE; |
| @@ -390,6 +397,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end) | |||
| 390 | unmap_low_page(pmd); | 397 | unmap_low_page(pmd); |
| 391 | } | 398 | } |
| 392 | __flush_tlb_all(); | 399 | __flush_tlb_all(); |
| 400 | update_page_count(PG_LEVEL_1G, pages); | ||
| 393 | 401 | ||
| 394 | return last_map_addr >> PAGE_SHIFT; | 402 | return last_map_addr >> PAGE_SHIFT; |
| 395 | } | 403 | } |
| @@ -431,7 +439,7 @@ static void __init init_gbpages(void) | |||
| 431 | direct_gbpages = 0; | 439 | direct_gbpages = 0; |
| 432 | } | 440 | } |
| 433 | 441 | ||
| 434 | #ifdef CONFIG_MEMTEST_BOOTPARAM | 442 | #ifdef CONFIG_MEMTEST |
| 435 | 443 | ||
| 436 | static void __init memtest(unsigned long start_phys, unsigned long size, | 444 | static void __init memtest(unsigned long start_phys, unsigned long size, |
| 437 | unsigned pattern) | 445 | unsigned pattern) |
| @@ -493,7 +501,8 @@ static void __init memtest(unsigned long start_phys, unsigned long size, | |||
| 493 | 501 | ||
| 494 | } | 502 | } |
| 495 | 503 | ||
| 496 | static int memtest_pattern __initdata = CONFIG_MEMTEST_BOOTPARAM_VALUE; | 504 | /* default is disabled */ |
| 505 | static int memtest_pattern __initdata; | ||
| 497 | 506 | ||
| 498 | static int __init parse_memtest(char *arg) | 507 | static int __init parse_memtest(char *arg) |
| 499 | { | 508 | { |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 2b2bb3f9b683..416ea415f5c2 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
| @@ -142,7 +142,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, | |||
| 142 | /* | 142 | /* |
| 143 | * Don't remap the low PCI/ISA area, it's always mapped.. | 143 | * Don't remap the low PCI/ISA area, it's always mapped.. |
| 144 | */ | 144 | */ |
| 145 | if (phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS) | 145 | if (is_ISA_range(phys_addr, last_addr)) |
| 146 | return (__force void __iomem *)phys_to_virt(phys_addr); | 146 | return (__force void __iomem *)phys_to_virt(phys_addr); |
| 147 | 147 | ||
| 148 | /* | 148 | /* |
| @@ -261,7 +261,7 @@ void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size) | |||
| 261 | { | 261 | { |
| 262 | /* | 262 | /* |
| 263 | * Ideally, this should be: | 263 | * Ideally, this should be: |
| 264 | * pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; | 264 | * pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS; |
| 265 | * | 265 | * |
| 266 | * Till we fix all X drivers to use ioremap_wc(), we will use | 266 | * Till we fix all X drivers to use ioremap_wc(), we will use |
| 267 | * UC MINUS. | 267 | * UC MINUS. |
| @@ -285,7 +285,7 @@ EXPORT_SYMBOL(ioremap_nocache); | |||
| 285 | */ | 285 | */ |
| 286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) | 286 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) |
| 287 | { | 287 | { |
| 288 | if (pat_wc_enabled) | 288 | if (pat_enabled) |
| 289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, | 289 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, |
| 290 | __builtin_return_address(0)); | 290 | __builtin_return_address(0)); |
| 291 | else | 291 | else |
| @@ -318,8 +318,8 @@ void iounmap(volatile void __iomem *addr) | |||
| 318 | * vm_area and by simply returning an address into the kernel mapping | 318 | * vm_area and by simply returning an address into the kernel mapping |
| 319 | * of ISA space. So handle that here. | 319 | * of ISA space. So handle that here. |
| 320 | */ | 320 | */ |
| 321 | if (addr >= phys_to_virt(ISA_START_ADDRESS) && | 321 | if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) && |
| 322 | addr < phys_to_virt(ISA_END_ADDRESS)) | 322 | (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) |
| 323 | return; | 323 | return; |
| 324 | 324 | ||
| 325 | addr = (volatile void __iomem *) | 325 | addr = (volatile void __iomem *) |
| @@ -332,7 +332,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 332 | cpa takes care of the direct mappings. */ | 332 | cpa takes care of the direct mappings. */ |
| 333 | read_lock(&vmlist_lock); | 333 | read_lock(&vmlist_lock); |
| 334 | for (p = vmlist; p; p = p->next) { | 334 | for (p = vmlist; p; p = p->next) { |
| 335 | if (p->addr == addr) | 335 | if (p->addr == (void __force *)addr) |
| 336 | break; | 336 | break; |
| 337 | } | 337 | } |
| 338 | read_unlock(&vmlist_lock); | 338 | read_unlock(&vmlist_lock); |
| @@ -346,7 +346,7 @@ void iounmap(volatile void __iomem *addr) | |||
| 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); | 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); |
| 347 | 347 | ||
| 348 | /* Finally remove it */ | 348 | /* Finally remove it */ |
| 349 | o = remove_vm_area((void *)addr); | 349 | o = remove_vm_area((void __force *)addr); |
| 350 | BUG_ON(p != o || o == NULL); | 350 | BUG_ON(p != o || o == NULL); |
| 351 | kfree(p); | 351 | kfree(p); |
| 352 | } | 352 | } |
| @@ -365,7 +365,7 @@ void *xlate_dev_mem_ptr(unsigned long phys) | |||
| 365 | if (page_is_ram(start >> PAGE_SHIFT)) | 365 | if (page_is_ram(start >> PAGE_SHIFT)) |
| 366 | return __va(phys); | 366 | return __va(phys); |
| 367 | 367 | ||
| 368 | addr = (void *)ioremap(start, PAGE_SIZE); | 368 | addr = (void __force *)ioremap(start, PAGE_SIZE); |
| 369 | if (addr) | 369 | if (addr) |
| 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); | 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); |
| 371 | 371 | ||
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c index 1f476e477844..0ea66b532c35 100644 --- a/arch/x86/mm/k8topology_64.c +++ b/arch/x86/mm/k8topology_64.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <asm/numa.h> | 22 | #include <asm/numa.h> |
| 23 | #include <asm/mpspec.h> | 23 | #include <asm/mpspec.h> |
| 24 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
| 25 | #include <asm/k8.h> | ||
| 25 | 26 | ||
| 26 | static __init int find_northbridge(void) | 27 | static __init int find_northbridge(void) |
| 27 | { | 28 | { |
| @@ -73,17 +74,12 @@ static __init void early_get_boot_cpu_id(void) | |||
| 73 | 74 | ||
| 74 | int __init k8_scan_nodes(unsigned long start, unsigned long end) | 75 | int __init k8_scan_nodes(unsigned long start, unsigned long end) |
| 75 | { | 76 | { |
| 77 | unsigned numnodes, cores, bits, apicid_base; | ||
| 76 | unsigned long prevbase; | 78 | unsigned long prevbase; |
| 77 | struct bootnode nodes[8]; | 79 | struct bootnode nodes[8]; |
| 78 | int nodeid, i, nb; | ||
| 79 | unsigned char nodeids[8]; | 80 | unsigned char nodeids[8]; |
| 80 | int found = 0; | 81 | int i, j, nb, found = 0; |
| 81 | u32 reg; | 82 | u32 nodeid, reg; |
| 82 | unsigned numnodes; | ||
| 83 | unsigned cores; | ||
| 84 | unsigned bits; | ||
| 85 | int j; | ||
| 86 | unsigned apicid_base; | ||
| 87 | 83 | ||
| 88 | if (!early_pci_allowed()) | 84 | if (!early_pci_allowed()) |
| 89 | return -1; | 85 | return -1; |
| @@ -105,7 +101,6 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end) | |||
| 105 | prevbase = 0; | 101 | prevbase = 0; |
| 106 | for (i = 0; i < 8; i++) { | 102 | for (i = 0; i < 8; i++) { |
| 107 | unsigned long base, limit; | 103 | unsigned long base, limit; |
| 108 | u32 nodeid; | ||
| 109 | 104 | ||
| 110 | base = read_pci_config(0, nb, 1, 0x40 + i*8); | 105 | base = read_pci_config(0, nb, 1, 0x40 + i*8); |
| 111 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); | 106 | limit = read_pci_config(0, nb, 1, 0x44 + i*8); |
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 60bcb5b6a37e..afd40054d157 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
| @@ -34,6 +34,41 @@ struct cpa_data { | |||
| 34 | unsigned force_split : 1; | 34 | unsigned force_split : 1; |
| 35 | }; | 35 | }; |
| 36 | 36 | ||
| 37 | #ifdef CONFIG_PROC_FS | ||
| 38 | static unsigned long direct_pages_count[PG_LEVEL_NUM]; | ||
| 39 | |||
| 40 | void update_page_count(int level, unsigned long pages) | ||
| 41 | { | ||
| 42 | unsigned long flags; | ||
| 43 | |||
| 44 | /* Protect against CPA */ | ||
| 45 | spin_lock_irqsave(&pgd_lock, flags); | ||
| 46 | direct_pages_count[level] += pages; | ||
| 47 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
| 48 | } | ||
| 49 | |||
| 50 | static void split_page_count(int level) | ||
| 51 | { | ||
| 52 | direct_pages_count[level]--; | ||
| 53 | direct_pages_count[level - 1] += PTRS_PER_PTE; | ||
| 54 | } | ||
| 55 | |||
| 56 | int arch_report_meminfo(char *page) | ||
| 57 | { | ||
| 58 | int n = sprintf(page, "DirectMap4k: %8lu\n" | ||
| 59 | "DirectMap2M: %8lu\n", | ||
| 60 | direct_pages_count[PG_LEVEL_4K], | ||
| 61 | direct_pages_count[PG_LEVEL_2M]); | ||
| 62 | #ifdef CONFIG_X86_64 | ||
| 63 | n += sprintf(page + n, "DirectMap1G: %8lu\n", | ||
| 64 | direct_pages_count[PG_LEVEL_1G]); | ||
| 65 | #endif | ||
| 66 | return n; | ||
| 67 | } | ||
| 68 | #else | ||
| 69 | static inline void split_page_count(int level) { } | ||
| 70 | #endif | ||
| 71 | |||
| 37 | #ifdef CONFIG_X86_64 | 72 | #ifdef CONFIG_X86_64 |
| 38 | 73 | ||
| 39 | static inline unsigned long highmap_start_pfn(void) | 74 | static inline unsigned long highmap_start_pfn(void) |
| @@ -500,6 +535,10 @@ static int split_large_page(pte_t *kpte, unsigned long address) | |||
| 500 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) | 535 | for (i = 0; i < PTRS_PER_PTE; i++, pfn += pfninc) |
| 501 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); | 536 | set_pte(&pbase[i], pfn_pte(pfn, ref_prot)); |
| 502 | 537 | ||
| 538 | if (address >= (unsigned long)__va(0) && | ||
| 539 | address < (unsigned long)__va(max_pfn_mapped << PAGE_SHIFT)) | ||
| 540 | split_page_count(level); | ||
| 541 | |||
| 503 | /* | 542 | /* |
| 504 | * Install the new, split up pagetable. Important details here: | 543 | * Install the new, split up pagetable. Important details here: |
| 505 | * | 544 | * |
| @@ -805,7 +844,7 @@ int _set_memory_wc(unsigned long addr, int numpages) | |||
| 805 | 844 | ||
| 806 | int set_memory_wc(unsigned long addr, int numpages) | 845 | int set_memory_wc(unsigned long addr, int numpages) |
| 807 | { | 846 | { |
| 808 | if (!pat_wc_enabled) | 847 | if (!pat_enabled) |
| 809 | return set_memory_uc(addr, numpages); | 848 | return set_memory_uc(addr, numpages); |
| 810 | 849 | ||
| 811 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, | 850 | if (reserve_memtype(addr, addr + numpages * PAGE_SIZE, |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 06b7a1c90fb8..a885a1019b8a 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -26,11 +26,11 @@ | |||
| 26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 27 | 27 | ||
| 28 | #ifdef CONFIG_X86_PAT | 28 | #ifdef CONFIG_X86_PAT |
| 29 | int __read_mostly pat_wc_enabled = 1; | 29 | int __read_mostly pat_enabled = 1; |
| 30 | 30 | ||
| 31 | void __cpuinit pat_disable(char *reason) | 31 | void __cpuinit pat_disable(char *reason) |
| 32 | { | 32 | { |
| 33 | pat_wc_enabled = 0; | 33 | pat_enabled = 0; |
| 34 | printk(KERN_INFO "%s\n", reason); | 34 | printk(KERN_INFO "%s\n", reason); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| @@ -42,6 +42,19 @@ static int __init nopat(char *str) | |||
| 42 | early_param("nopat", nopat); | 42 | early_param("nopat", nopat); |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | |||
| 46 | static int debug_enable; | ||
| 47 | static int __init pat_debug_setup(char *str) | ||
| 48 | { | ||
| 49 | debug_enable = 1; | ||
| 50 | return 0; | ||
| 51 | } | ||
| 52 | __setup("debugpat", pat_debug_setup); | ||
| 53 | |||
| 54 | #define dprintk(fmt, arg...) \ | ||
| 55 | do { if (debug_enable) printk(KERN_INFO fmt, ##arg); } while (0) | ||
| 56 | |||
| 57 | |||
| 45 | static u64 __read_mostly boot_pat_state; | 58 | static u64 __read_mostly boot_pat_state; |
| 46 | 59 | ||
| 47 | enum { | 60 | enum { |
| @@ -53,24 +66,25 @@ enum { | |||
| 53 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ | 66 | PAT_UC_MINUS = 7, /* UC, but can be overriden by MTRR */ |
| 54 | }; | 67 | }; |
| 55 | 68 | ||
| 56 | #define PAT(x,y) ((u64)PAT_ ## y << ((x)*8)) | 69 | #define PAT(x, y) ((u64)PAT_ ## y << ((x)*8)) |
| 57 | 70 | ||
| 58 | void pat_init(void) | 71 | void pat_init(void) |
| 59 | { | 72 | { |
| 60 | u64 pat; | 73 | u64 pat; |
| 61 | 74 | ||
| 62 | if (!pat_wc_enabled) | 75 | if (!pat_enabled) |
| 63 | return; | 76 | return; |
| 64 | 77 | ||
| 65 | /* Paranoia check. */ | 78 | /* Paranoia check. */ |
| 66 | if (!cpu_has_pat) { | 79 | if (!cpu_has_pat && boot_pat_state) { |
| 67 | printk(KERN_ERR "PAT enabled, but CPU feature cleared\n"); | ||
| 68 | /* | 80 | /* |
| 69 | * Panic if this happens on the secondary CPU, and we | 81 | * If this happens we are on a secondary CPU, but |
| 70 | * switched to PAT on the boot CPU. We have no way to | 82 | * switched to PAT on the boot CPU. We have no way to |
| 71 | * undo PAT. | 83 | * undo PAT. |
| 72 | */ | 84 | */ |
| 73 | BUG_ON(boot_pat_state); | 85 | printk(KERN_ERR "PAT enabled, " |
| 86 | "but not supported by secondary CPU\n"); | ||
| 87 | BUG(); | ||
| 74 | } | 88 | } |
| 75 | 89 | ||
| 76 | /* Set PWT to Write-Combining. All other bits stay the same */ | 90 | /* Set PWT to Write-Combining. All other bits stay the same */ |
| @@ -86,8 +100,8 @@ void pat_init(void) | |||
| 86 | * 011 UC _PAGE_CACHE_UC | 100 | * 011 UC _PAGE_CACHE_UC |
| 87 | * PAT bit unused | 101 | * PAT bit unused |
| 88 | */ | 102 | */ |
| 89 | pat = PAT(0,WB) | PAT(1,WC) | PAT(2,UC_MINUS) | PAT(3,UC) | | 103 | pat = PAT(0, WB) | PAT(1, WC) | PAT(2, UC_MINUS) | PAT(3, UC) | |
| 90 | PAT(4,WB) | PAT(5,WC) | PAT(6,UC_MINUS) | PAT(7,UC); | 104 | PAT(4, WB) | PAT(5, WC) | PAT(6, UC_MINUS) | PAT(7, UC); |
| 91 | 105 | ||
| 92 | /* Boot CPU check */ | 106 | /* Boot CPU check */ |
| 93 | if (!boot_pat_state) | 107 | if (!boot_pat_state) |
| @@ -103,11 +117,11 @@ void pat_init(void) | |||
| 103 | static char *cattr_name(unsigned long flags) | 117 | static char *cattr_name(unsigned long flags) |
| 104 | { | 118 | { |
| 105 | switch (flags & _PAGE_CACHE_MASK) { | 119 | switch (flags & _PAGE_CACHE_MASK) { |
| 106 | case _PAGE_CACHE_UC: return "uncached"; | 120 | case _PAGE_CACHE_UC: return "uncached"; |
| 107 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; | 121 | case _PAGE_CACHE_UC_MINUS: return "uncached-minus"; |
| 108 | case _PAGE_CACHE_WB: return "write-back"; | 122 | case _PAGE_CACHE_WB: return "write-back"; |
| 109 | case _PAGE_CACHE_WC: return "write-combining"; | 123 | case _PAGE_CACHE_WC: return "write-combining"; |
| 110 | default: return "broken"; | 124 | default: return "broken"; |
| 111 | } | 125 | } |
| 112 | } | 126 | } |
| 113 | 127 | ||
| @@ -145,47 +159,50 @@ static DEFINE_SPINLOCK(memtype_lock); /* protects memtype list */ | |||
| 145 | * The intersection is based on "Effective Memory Type" tables in IA-32 | 159 | * The intersection is based on "Effective Memory Type" tables in IA-32 |
| 146 | * SDM vol 3a | 160 | * SDM vol 3a |
| 147 | */ | 161 | */ |
| 148 | static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | 162 | static unsigned long pat_x_mtrr_type(u64 start, u64 end, unsigned long req_type) |
| 149 | unsigned long *ret_prot) | ||
| 150 | { | 163 | { |
| 151 | unsigned long pat_type; | ||
| 152 | u8 mtrr_type; | ||
| 153 | |||
| 154 | pat_type = prot & _PAGE_CACHE_MASK; | ||
| 155 | prot &= (~_PAGE_CACHE_MASK); | ||
| 156 | |||
| 157 | /* | ||
| 158 | * We return the PAT request directly for types where PAT takes | ||
| 159 | * precedence with respect to MTRR and for UC_MINUS. | ||
| 160 | * Consistency checks with other PAT requests is done later | ||
| 161 | * while going through memtype list. | ||
| 162 | */ | ||
| 163 | if (pat_type == _PAGE_CACHE_WC) { | ||
| 164 | *ret_prot = prot | _PAGE_CACHE_WC; | ||
| 165 | return 0; | ||
| 166 | } else if (pat_type == _PAGE_CACHE_UC_MINUS) { | ||
| 167 | *ret_prot = prot | _PAGE_CACHE_UC_MINUS; | ||
| 168 | return 0; | ||
| 169 | } else if (pat_type == _PAGE_CACHE_UC) { | ||
| 170 | *ret_prot = prot | _PAGE_CACHE_UC; | ||
| 171 | return 0; | ||
| 172 | } | ||
| 173 | |||
| 174 | /* | 164 | /* |
| 175 | * Look for MTRR hint to get the effective type in case where PAT | 165 | * Look for MTRR hint to get the effective type in case where PAT |
| 176 | * request is for WB. | 166 | * request is for WB. |
| 177 | */ | 167 | */ |
| 178 | mtrr_type = mtrr_type_lookup(start, end); | 168 | if (req_type == _PAGE_CACHE_WB) { |
| 169 | u8 mtrr_type; | ||
| 170 | |||
| 171 | mtrr_type = mtrr_type_lookup(start, end); | ||
| 172 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) | ||
| 173 | return _PAGE_CACHE_UC; | ||
| 174 | if (mtrr_type == MTRR_TYPE_WRCOMB) | ||
| 175 | return _PAGE_CACHE_WC; | ||
| 176 | } | ||
| 179 | 177 | ||
| 180 | if (mtrr_type == MTRR_TYPE_UNCACHABLE) { | 178 | return req_type; |
| 181 | *ret_prot = prot | _PAGE_CACHE_UC; | 179 | } |
| 182 | } else if (mtrr_type == MTRR_TYPE_WRCOMB) { | 180 | |
| 183 | *ret_prot = prot | _PAGE_CACHE_WC; | 181 | static int chk_conflict(struct memtype *new, struct memtype *entry, |
| 184 | } else { | 182 | unsigned long *type) |
| 185 | *ret_prot = prot | _PAGE_CACHE_WB; | 183 | { |
| 184 | if (new->type != entry->type) { | ||
| 185 | if (type) { | ||
| 186 | new->type = entry->type; | ||
| 187 | *type = entry->type; | ||
| 188 | } else | ||
| 189 | goto conflict; | ||
| 186 | } | 190 | } |
| 187 | 191 | ||
| 192 | /* check overlaps with more than one entry in the list */ | ||
| 193 | list_for_each_entry_continue(entry, &memtype_list, nd) { | ||
| 194 | if (new->end <= entry->start) | ||
| 195 | break; | ||
| 196 | else if (new->type != entry->type) | ||
| 197 | goto conflict; | ||
| 198 | } | ||
| 188 | return 0; | 199 | return 0; |
| 200 | |||
| 201 | conflict: | ||
| 202 | printk(KERN_INFO "%s:%d conflicting memory types " | ||
| 203 | "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start, | ||
| 204 | new->end, cattr_name(new->type), cattr_name(entry->type)); | ||
| 205 | return -EBUSY; | ||
| 189 | } | 206 | } |
| 190 | 207 | ||
| 191 | /* | 208 | /* |
| @@ -198,37 +215,36 @@ static int pat_x_mtrr_type(u64 start, u64 end, unsigned long prot, | |||
| 198 | * req_type will have a special case value '-1', when requester want to inherit | 215 | * req_type will have a special case value '-1', when requester want to inherit |
| 199 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. | 216 | * the memory type from mtrr (if WB), existing PAT, defaulting to UC_MINUS. |
| 200 | * | 217 | * |
| 201 | * If ret_type is NULL, function will return an error if it cannot reserve the | 218 | * If new_type is NULL, function will return an error if it cannot reserve the |
| 202 | * region with req_type. If ret_type is non-null, function will return | 219 | * region with req_type. If new_type is non-NULL, function will return |
| 203 | * available type in ret_type in case of no error. In case of any error | 220 | * available type in new_type in case of no error. In case of any error |
| 204 | * it will return a negative return value. | 221 | * it will return a negative return value. |
| 205 | */ | 222 | */ |
| 206 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, | 223 | int reserve_memtype(u64 start, u64 end, unsigned long req_type, |
| 207 | unsigned long *ret_type) | 224 | unsigned long *new_type) |
| 208 | { | 225 | { |
| 209 | struct memtype *new_entry = NULL; | 226 | struct memtype *new, *entry; |
| 210 | struct memtype *parse; | ||
| 211 | unsigned long actual_type; | 227 | unsigned long actual_type; |
| 228 | struct list_head *where; | ||
| 212 | int err = 0; | 229 | int err = 0; |
| 213 | 230 | ||
| 214 | /* Only track when pat_wc_enabled */ | 231 | BUG_ON(start >= end); /* end is exclusive */ |
| 215 | if (!pat_wc_enabled) { | 232 | |
| 233 | if (!pat_enabled) { | ||
| 216 | /* This is identical to page table setting without PAT */ | 234 | /* This is identical to page table setting without PAT */ |
| 217 | if (ret_type) { | 235 | if (new_type) { |
| 218 | if (req_type == -1) { | 236 | if (req_type == -1) |
| 219 | *ret_type = _PAGE_CACHE_WB; | 237 | *new_type = _PAGE_CACHE_WB; |
| 220 | } else { | 238 | else |
| 221 | *ret_type = req_type; | 239 | *new_type = req_type & _PAGE_CACHE_MASK; |
| 222 | } | ||
| 223 | } | 240 | } |
| 224 | return 0; | 241 | return 0; |
| 225 | } | 242 | } |
| 226 | 243 | ||
| 227 | /* Low ISA region is always mapped WB in page table. No need to track */ | 244 | /* Low ISA region is always mapped WB in page table. No need to track */ |
| 228 | if (start >= ISA_START_ADDRESS && (end - 1) <= ISA_END_ADDRESS) { | 245 | if (is_ISA_range(start, end - 1)) { |
| 229 | if (ret_type) | 246 | if (new_type) |
| 230 | *ret_type = _PAGE_CACHE_WB; | 247 | *new_type = _PAGE_CACHE_WB; |
| 231 | |||
| 232 | return 0; | 248 | return 0; |
| 233 | } | 249 | } |
| 234 | 250 | ||
| @@ -241,206 +257,92 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
| 241 | */ | 257 | */ |
| 242 | u8 mtrr_type = mtrr_type_lookup(start, end); | 258 | u8 mtrr_type = mtrr_type_lookup(start, end); |
| 243 | 259 | ||
| 244 | if (mtrr_type == MTRR_TYPE_WRBACK) { | 260 | if (mtrr_type == MTRR_TYPE_WRBACK) |
| 245 | req_type = _PAGE_CACHE_WB; | ||
| 246 | actual_type = _PAGE_CACHE_WB; | 261 | actual_type = _PAGE_CACHE_WB; |
| 247 | } else { | 262 | else |
| 248 | req_type = _PAGE_CACHE_UC_MINUS; | ||
| 249 | actual_type = _PAGE_CACHE_UC_MINUS; | 263 | actual_type = _PAGE_CACHE_UC_MINUS; |
| 250 | } | 264 | } else |
| 251 | } else { | 265 | actual_type = pat_x_mtrr_type(start, end, |
| 252 | req_type &= _PAGE_CACHE_MASK; | 266 | req_type & _PAGE_CACHE_MASK); |
| 253 | err = pat_x_mtrr_type(start, end, req_type, &actual_type); | ||
| 254 | } | ||
| 255 | |||
| 256 | if (err) { | ||
| 257 | if (ret_type) | ||
| 258 | *ret_type = actual_type; | ||
| 259 | |||
| 260 | return -EINVAL; | ||
| 261 | } | ||
| 262 | 267 | ||
| 263 | new_entry = kmalloc(sizeof(struct memtype), GFP_KERNEL); | 268 | new = kmalloc(sizeof(struct memtype), GFP_KERNEL); |
| 264 | if (!new_entry) | 269 | if (!new) |
| 265 | return -ENOMEM; | 270 | return -ENOMEM; |
| 266 | 271 | ||
| 267 | new_entry->start = start; | 272 | new->start = start; |
| 268 | new_entry->end = end; | 273 | new->end = end; |
| 269 | new_entry->type = actual_type; | 274 | new->type = actual_type; |
| 270 | 275 | ||
| 271 | if (ret_type) | 276 | if (new_type) |
| 272 | *ret_type = actual_type; | 277 | *new_type = actual_type; |
| 273 | 278 | ||
| 274 | spin_lock(&memtype_lock); | 279 | spin_lock(&memtype_lock); |
| 275 | 280 | ||
| 276 | /* Search for existing mapping that overlaps the current range */ | 281 | /* Search for existing mapping that overlaps the current range */ |
| 277 | list_for_each_entry(parse, &memtype_list, nd) { | 282 | where = NULL; |
| 278 | struct memtype *saved_ptr; | 283 | list_for_each_entry(entry, &memtype_list, nd) { |
| 279 | 284 | if (end <= entry->start) { | |
| 280 | if (parse->start >= end) { | 285 | where = entry->nd.prev; |
| 281 | pr_debug("New Entry\n"); | ||
| 282 | list_add(&new_entry->nd, parse->nd.prev); | ||
| 283 | new_entry = NULL; | ||
| 284 | break; | 286 | break; |
| 285 | } | 287 | } else if (start <= entry->start) { /* end > entry->start */ |
| 286 | 288 | err = chk_conflict(new, entry, new_type); | |
| 287 | if (start <= parse->start && end >= parse->start) { | 289 | if (!err) { |
| 288 | if (actual_type != parse->type && ret_type) { | 290 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 289 | actual_type = parse->type; | 291 | entry->start, entry->end); |
| 290 | *ret_type = actual_type; | 292 | where = entry->nd.prev; |
| 291 | new_entry->type = actual_type; | ||
| 292 | } | ||
| 293 | |||
| 294 | if (actual_type != parse->type) { | ||
| 295 | printk( | ||
| 296 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 297 | current->comm, current->pid, | ||
| 298 | start, end, | ||
| 299 | cattr_name(actual_type), | ||
| 300 | cattr_name(parse->type)); | ||
| 301 | err = -EBUSY; | ||
| 302 | break; | ||
| 303 | } | 293 | } |
| 304 | |||
| 305 | saved_ptr = parse; | ||
| 306 | /* | ||
| 307 | * Check to see whether the request overlaps more | ||
| 308 | * than one entry in the list | ||
| 309 | */ | ||
| 310 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
| 311 | if (end <= parse->start) { | ||
| 312 | break; | ||
| 313 | } | ||
| 314 | |||
| 315 | if (actual_type != parse->type) { | ||
| 316 | printk( | ||
| 317 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 318 | current->comm, current->pid, | ||
| 319 | start, end, | ||
| 320 | cattr_name(actual_type), | ||
| 321 | cattr_name(parse->type)); | ||
| 322 | err = -EBUSY; | ||
| 323 | break; | ||
| 324 | } | ||
| 325 | } | ||
| 326 | |||
| 327 | if (err) { | ||
| 328 | break; | ||
| 329 | } | ||
| 330 | |||
| 331 | pr_debug("Overlap at 0x%Lx-0x%Lx\n", | ||
| 332 | saved_ptr->start, saved_ptr->end); | ||
| 333 | /* No conflict. Go ahead and add this new entry */ | ||
| 334 | list_add(&new_entry->nd, saved_ptr->nd.prev); | ||
| 335 | new_entry = NULL; | ||
| 336 | break; | 294 | break; |
| 337 | } | 295 | } else if (start < entry->end) { /* start > entry->start */ |
| 338 | 296 | err = chk_conflict(new, entry, new_type); | |
| 339 | if (start < parse->end) { | 297 | if (!err) { |
| 340 | if (actual_type != parse->type && ret_type) { | 298 | dprintk("Overlap at 0x%Lx-0x%Lx\n", |
| 341 | actual_type = parse->type; | 299 | entry->start, entry->end); |
| 342 | *ret_type = actual_type; | 300 | where = &entry->nd; |
| 343 | new_entry->type = actual_type; | ||
| 344 | } | ||
| 345 | |||
| 346 | if (actual_type != parse->type) { | ||
| 347 | printk( | ||
| 348 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 349 | current->comm, current->pid, | ||
| 350 | start, end, | ||
| 351 | cattr_name(actual_type), | ||
| 352 | cattr_name(parse->type)); | ||
| 353 | err = -EBUSY; | ||
| 354 | break; | ||
| 355 | } | ||
| 356 | |||
| 357 | saved_ptr = parse; | ||
| 358 | /* | ||
| 359 | * Check to see whether the request overlaps more | ||
| 360 | * than one entry in the list | ||
| 361 | */ | ||
| 362 | list_for_each_entry_continue(parse, &memtype_list, nd) { | ||
| 363 | if (end <= parse->start) { | ||
| 364 | break; | ||
| 365 | } | ||
| 366 | |||
| 367 | if (actual_type != parse->type) { | ||
| 368 | printk( | ||
| 369 | KERN_INFO "%s:%d conflicting memory types %Lx-%Lx %s<->%s\n", | ||
| 370 | current->comm, current->pid, | ||
| 371 | start, end, | ||
| 372 | cattr_name(actual_type), | ||
| 373 | cattr_name(parse->type)); | ||
| 374 | err = -EBUSY; | ||
| 375 | break; | ||
| 376 | } | ||
| 377 | } | ||
| 378 | |||
| 379 | if (err) { | ||
| 380 | break; | ||
| 381 | } | 301 | } |
| 382 | |||
| 383 | pr_debug(KERN_INFO "Overlap at 0x%Lx-0x%Lx\n", | ||
| 384 | saved_ptr->start, saved_ptr->end); | ||
| 385 | /* No conflict. Go ahead and add this new entry */ | ||
| 386 | list_add(&new_entry->nd, &saved_ptr->nd); | ||
| 387 | new_entry = NULL; | ||
| 388 | break; | 302 | break; |
| 389 | } | 303 | } |
| 390 | } | 304 | } |
| 391 | 305 | ||
| 392 | if (err) { | 306 | if (err) { |
| 393 | printk(KERN_INFO | 307 | printk(KERN_INFO "reserve_memtype failed 0x%Lx-0x%Lx, " |
| 394 | "reserve_memtype failed 0x%Lx-0x%Lx, track %s, req %s\n", | 308 | "track %s, req %s\n", |
| 395 | start, end, cattr_name(new_entry->type), | 309 | start, end, cattr_name(new->type), cattr_name(req_type)); |
| 396 | cattr_name(req_type)); | 310 | kfree(new); |
| 397 | kfree(new_entry); | ||
| 398 | spin_unlock(&memtype_lock); | 311 | spin_unlock(&memtype_lock); |
| 399 | return err; | 312 | return err; |
| 400 | } | 313 | } |
| 401 | 314 | ||
| 402 | if (new_entry) { | 315 | if (where) |
| 403 | /* No conflict. Not yet added to the list. Add to the tail */ | 316 | list_add(&new->nd, where); |
| 404 | list_add_tail(&new_entry->nd, &memtype_list); | 317 | else |
| 405 | pr_debug("New Entry\n"); | 318 | list_add_tail(&new->nd, &memtype_list); |
| 406 | } | ||
| 407 | |||
| 408 | if (ret_type) { | ||
| 409 | pr_debug( | ||
| 410 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
| 411 | start, end, cattr_name(actual_type), | ||
| 412 | cattr_name(req_type), cattr_name(*ret_type)); | ||
| 413 | } else { | ||
| 414 | pr_debug( | ||
| 415 | "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s\n", | ||
| 416 | start, end, cattr_name(actual_type), | ||
| 417 | cattr_name(req_type)); | ||
| 418 | } | ||
| 419 | 319 | ||
| 420 | spin_unlock(&memtype_lock); | 320 | spin_unlock(&memtype_lock); |
| 321 | |||
| 322 | dprintk("reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", | ||
| 323 | start, end, cattr_name(new->type), cattr_name(req_type), | ||
| 324 | new_type ? cattr_name(*new_type) : "-"); | ||
| 325 | |||
| 421 | return err; | 326 | return err; |
| 422 | } | 327 | } |
| 423 | 328 | ||
| 424 | int free_memtype(u64 start, u64 end) | 329 | int free_memtype(u64 start, u64 end) |
| 425 | { | 330 | { |
| 426 | struct memtype *ml; | 331 | struct memtype *entry; |
| 427 | int err = -EINVAL; | 332 | int err = -EINVAL; |
| 428 | 333 | ||
| 429 | /* Only track when pat_wc_enabled */ | 334 | if (!pat_enabled) |
| 430 | if (!pat_wc_enabled) { | ||
| 431 | return 0; | 335 | return 0; |
| 432 | } | ||
| 433 | 336 | ||
| 434 | /* Low ISA region is always mapped WB. No need to track */ | 337 | /* Low ISA region is always mapped WB. No need to track */ |
| 435 | if (start >= ISA_START_ADDRESS && end <= ISA_END_ADDRESS) { | 338 | if (is_ISA_range(start, end - 1)) |
| 436 | return 0; | 339 | return 0; |
| 437 | } | ||
| 438 | 340 | ||
| 439 | spin_lock(&memtype_lock); | 341 | spin_lock(&memtype_lock); |
| 440 | list_for_each_entry(ml, &memtype_list, nd) { | 342 | list_for_each_entry(entry, &memtype_list, nd) { |
| 441 | if (ml->start == start && ml->end == end) { | 343 | if (entry->start == start && entry->end == end) { |
| 442 | list_del(&ml->nd); | 344 | list_del(&entry->nd); |
| 443 | kfree(ml); | 345 | kfree(entry); |
| 444 | err = 0; | 346 | err = 0; |
| 445 | break; | 347 | break; |
| 446 | } | 348 | } |
| @@ -452,7 +354,7 @@ int free_memtype(u64 start, u64 end) | |||
| 452 | current->comm, current->pid, start, end); | 354 | current->comm, current->pid, start, end); |
| 453 | } | 355 | } |
| 454 | 356 | ||
| 455 | pr_debug("free_memtype request 0x%Lx-0x%Lx\n", start, end); | 357 | dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); |
| 456 | return err; | 358 | return err; |
| 457 | } | 359 | } |
| 458 | 360 | ||
| @@ -521,12 +423,12 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 521 | * caching for the high addresses through the KEN pin, but | 423 | * caching for the high addresses through the KEN pin, but |
| 522 | * we maintain the tradition of paranoia in this code. | 424 | * we maintain the tradition of paranoia in this code. |
| 523 | */ | 425 | */ |
| 524 | if (!pat_wc_enabled && | 426 | if (!pat_enabled && |
| 525 | ! ( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) || | 427 | !(boot_cpu_has(X86_FEATURE_MTRR) || |
| 526 | test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) || | 428 | boot_cpu_has(X86_FEATURE_K6_MTRR) || |
| 527 | test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) || | 429 | boot_cpu_has(X86_FEATURE_CYRIX_ARR) || |
| 528 | test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability)) && | 430 | boot_cpu_has(X86_FEATURE_CENTAUR_MCR)) && |
| 529 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { | 431 | (pfn << PAGE_SHIFT) >= __pa(high_memory)) { |
| 530 | flags = _PAGE_CACHE_UC; | 432 | flags = _PAGE_CACHE_UC; |
| 531 | } | 433 | } |
| 532 | #endif | 434 | #endif |
| @@ -548,7 +450,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, | |||
| 548 | return 0; | 450 | return 0; |
| 549 | 451 | ||
| 550 | if (pfn <= max_pfn_mapped && | 452 | if (pfn <= max_pfn_mapped && |
| 551 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { | 453 | ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { |
| 552 | free_memtype(offset, offset + size); | 454 | free_memtype(offset, offset + size); |
| 553 | printk(KERN_INFO | 455 | printk(KERN_INFO |
| 554 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", | 456 | "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", |
| @@ -586,4 +488,3 @@ void unmap_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot) | |||
| 586 | 488 | ||
| 587 | free_memtype(addr, addr + size); | 489 | free_memtype(addr, addr + size); |
| 588 | } | 490 | } |
| 589 | |||
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c index 50159764f694..ee1d6d39edd4 100644 --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c | |||
| @@ -255,7 +255,7 @@ int ptep_test_and_clear_young(struct vm_area_struct *vma, | |||
| 255 | 255 | ||
| 256 | if (pte_young(*ptep)) | 256 | if (pte_young(*ptep)) |
| 257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, | 257 | ret = test_and_clear_bit(_PAGE_BIT_ACCESSED, |
| 258 | &ptep->pte); | 258 | (unsigned long *) &ptep->pte); |
| 259 | 259 | ||
| 260 | if (ret) | 260 | if (ret) |
| 261 | pte_update(vma->vm_mm, addr, ptep); | 261 | pte_update(vma->vm_mm, addr, ptep); |
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 99649dccad28..391d51035871 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c | |||
| @@ -495,6 +495,7 @@ int __node_distance(int a, int b) | |||
| 495 | 495 | ||
| 496 | EXPORT_SYMBOL(__node_distance); | 496 | EXPORT_SYMBOL(__node_distance); |
| 497 | 497 | ||
| 498 | #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) | ||
| 498 | int memory_add_physaddr_to_nid(u64 start) | 499 | int memory_add_physaddr_to_nid(u64 start) |
| 499 | { | 500 | { |
| 500 | int i, ret = 0; | 501 | int i, ret = 0; |
| @@ -506,4 +507,4 @@ int memory_add_physaddr_to_nid(u64 start) | |||
| 506 | return ret; | 507 | return ret; |
| 507 | } | 508 | } |
| 508 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); | 509 | EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid); |
| 509 | 510 | #endif | |
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index d95de2f199cd..464279da49c4 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
| @@ -218,7 +218,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do | |||
| 218 | return bus; | 218 | return bus; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | extern int pci_routeirq; | ||
| 222 | static int __init pci_acpi_init(void) | 221 | static int __init pci_acpi_init(void) |
| 223 | { | 222 | { |
| 224 | struct pci_dev *dev = NULL; | 223 | struct pci_dev *dev = NULL; |
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 10fb308fded8..6ccd7a108cd4 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
| @@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
| 299 | return -EINVAL; | 299 | return -EINVAL; |
| 300 | 300 | ||
| 301 | prot = pgprot_val(vma->vm_page_prot); | 301 | prot = pgprot_val(vma->vm_page_prot); |
| 302 | if (pat_wc_enabled && write_combine) | 302 | if (pat_enabled && write_combine) |
| 303 | prot |= _PAGE_CACHE_WC; | 303 | prot |= _PAGE_CACHE_WC; |
| 304 | else if (pat_wc_enabled || boot_cpu_data.x86 > 3) | 304 | else if (pat_enabled || boot_cpu_data.x86 > 3) |
| 305 | /* | 305 | /* |
| 306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. | 306 | * ioremap() and ioremap_nocache() defaults to UC MINUS for now. |
| 307 | * To avoid attribute conflicts, request UC MINUS here | 307 | * To avoid attribute conflicts, request UC MINUS here |
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index ca8df9c260bc..f0859de23e20 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/dmi.h> | 13 | #include <linux/dmi.h> |
| 14 | #include <asm/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <asm/smp.h> | 15 | #include <linux/smp.h> |
| 16 | #include <asm/io_apic.h> | 16 | #include <asm/io_apic.h> |
| 17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
| 18 | #include <linux/acpi.h> | 18 | #include <linux/acpi.h> |
| @@ -61,7 +61,7 @@ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL; | |||
| 61 | * and perform checksum verification. | 61 | * and perform checksum verification. |
| 62 | */ | 62 | */ |
| 63 | 63 | ||
| 64 | static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | 64 | static inline struct irq_routing_table *pirq_check_routing_table(u8 *addr) |
| 65 | { | 65 | { |
| 66 | struct irq_routing_table *rt; | 66 | struct irq_routing_table *rt; |
| 67 | int i; | 67 | int i; |
| @@ -74,7 +74,7 @@ static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr) | |||
| 74 | rt->size < sizeof(struct irq_routing_table)) | 74 | rt->size < sizeof(struct irq_routing_table)) |
| 75 | return NULL; | 75 | return NULL; |
| 76 | sum = 0; | 76 | sum = 0; |
| 77 | for (i=0; i < rt->size; i++) | 77 | for (i = 0; i < rt->size; i++) |
| 78 | sum += addr[i]; | 78 | sum += addr[i]; |
| 79 | if (!sum) { | 79 | if (!sum) { |
| 80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); | 80 | DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt); |
| @@ -100,7 +100,7 @@ static struct irq_routing_table * __init pirq_find_routing_table(void) | |||
| 100 | return rt; | 100 | return rt; |
| 101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); | 101 | printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n"); |
| 102 | } | 102 | } |
| 103 | for(addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { | 103 | for (addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) { |
| 104 | rt = pirq_check_routing_table(addr); | 104 | rt = pirq_check_routing_table(addr); |
| 105 | if (rt) | 105 | if (rt) |
| 106 | return rt; | 106 | return rt; |
| @@ -122,20 +122,20 @@ static void __init pirq_peer_trick(void) | |||
| 122 | struct irq_info *e; | 122 | struct irq_info *e; |
| 123 | 123 | ||
| 124 | memset(busmap, 0, sizeof(busmap)); | 124 | memset(busmap, 0, sizeof(busmap)); |
| 125 | for(i=0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { | 125 | for (i = 0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) { |
| 126 | e = &rt->slots[i]; | 126 | e = &rt->slots[i]; |
| 127 | #ifdef DEBUG | 127 | #ifdef DEBUG |
| 128 | { | 128 | { |
| 129 | int j; | 129 | int j; |
| 130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); | 130 | DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot); |
| 131 | for(j=0; j<4; j++) | 131 | for (j = 0; j < 4; j++) |
| 132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); | 132 | DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap); |
| 133 | DBG("\n"); | 133 | DBG("\n"); |
| 134 | } | 134 | } |
| 135 | #endif | 135 | #endif |
| 136 | busmap[e->bus] = 1; | 136 | busmap[e->bus] = 1; |
| 137 | } | 137 | } |
| 138 | for(i = 1; i < 256; i++) { | 138 | for (i = 1; i < 256; i++) { |
| 139 | int node; | 139 | int node; |
| 140 | if (!busmap[i] || pci_find_bus(0, i)) | 140 | if (!busmap[i] || pci_find_bus(0, i)) |
| 141 | continue; | 141 | continue; |
| @@ -285,7 +285,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | |||
| 285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; | 285 | static const unsigned char pirqmap[4] = { 1, 0, 2, 3 }; |
| 286 | 286 | ||
| 287 | WARN_ON_ONCE(pirq > 4); | 287 | WARN_ON_ONCE(pirq > 4); |
| 288 | return read_config_nybble(router,0x43, pirqmap[pirq-1]); | 288 | return read_config_nybble(router, 0x43, pirqmap[pirq-1]); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 291 | static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
| @@ -314,7 +314,7 @@ static int pirq_opti_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 314 | 314 | ||
| 315 | /* | 315 | /* |
| 316 | * Cyrix: nibble offset 0x5C | 316 | * Cyrix: nibble offset 0x5C |
| 317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA | 317 | * 0x5C bits 7:4 is INTB bits 3:0 is INTA |
| 318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC | 318 | * 0x5D bits 7:4 is INTD bits 3:0 is INTC |
| 319 | */ | 319 | */ |
| 320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) | 320 | static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq) |
| @@ -350,7 +350,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 350 | * Apparently there are systems implementing PCI routing table using | 350 | * Apparently there are systems implementing PCI routing table using |
| 351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. | 351 | * link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D. |
| 352 | * We try our best to handle both link mappings. | 352 | * We try our best to handle both link mappings. |
| 353 | * | 353 | * |
| 354 | * Currently (2003-05-21) it appears most SiS chipsets follow the | 354 | * Currently (2003-05-21) it appears most SiS chipsets follow the |
| 355 | * definition of routing registers from the SiS-5595 southbridge. | 355 | * definition of routing registers from the SiS-5595 southbridge. |
| 356 | * According to the SiS 5595 datasheets the revision id's of the | 356 | * According to the SiS 5595 datasheets the revision id's of the |
| @@ -370,7 +370,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq, | |||
| 370 | * | 370 | * |
| 371 | * 0x62: USBIRQ: | 371 | * 0x62: USBIRQ: |
| 372 | * bit 6 OHCI function disabled (0), enabled (1) | 372 | * bit 6 OHCI function disabled (0), enabled (1) |
| 373 | * | 373 | * |
| 374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved | 374 | * 0x6a: ACPI/SCI IRQ: bits 4-6 reserved |
| 375 | * | 375 | * |
| 376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved | 376 | * 0x7e: Data Acq. Module IRQ - bits 4-6 reserved |
| @@ -487,9 +487,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
| 487 | u8 irq; | 487 | u8 irq; |
| 488 | irq = 0; | 488 | irq = 0; |
| 489 | if (pirq <= 4) | 489 | if (pirq <= 4) |
| 490 | { | ||
| 491 | irq = read_config_nybble(router, 0x56, pirq - 1); | 490 | irq = read_config_nybble(router, 0x56, pirq - 1); |
| 492 | } | ||
| 493 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", | 491 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n", |
| 494 | dev->vendor, dev->device, pirq, irq); | 492 | dev->vendor, dev->device, pirq, irq); |
| 495 | return irq; | 493 | return irq; |
| @@ -497,12 +495,10 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq | |||
| 497 | 495 | ||
| 498 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) | 496 | static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq) |
| 499 | { | 497 | { |
| 500 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", | 498 | printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", |
| 501 | dev->vendor, dev->device, pirq, irq); | 499 | dev->vendor, dev->device, pirq, irq); |
| 502 | if (pirq <= 4) | 500 | if (pirq <= 4) |
| 503 | { | ||
| 504 | write_config_nybble(router, 0x56, pirq - 1, irq); | 501 | write_config_nybble(router, 0x56, pirq - 1, irq); |
| 505 | } | ||
| 506 | return 1; | 502 | return 1; |
| 507 | } | 503 | } |
| 508 | 504 | ||
| @@ -549,50 +545,49 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route | |||
| 549 | if (pci_dev_present(pirq_440gx)) | 545 | if (pci_dev_present(pirq_440gx)) |
| 550 | return 0; | 546 | return 0; |
| 551 | 547 | ||
| 552 | switch(device) | 548 | switch (device) { |
| 553 | { | 549 | case PCI_DEVICE_ID_INTEL_82371FB_0: |
| 554 | case PCI_DEVICE_ID_INTEL_82371FB_0: | 550 | case PCI_DEVICE_ID_INTEL_82371SB_0: |
| 555 | case PCI_DEVICE_ID_INTEL_82371SB_0: | 551 | case PCI_DEVICE_ID_INTEL_82371AB_0: |
| 556 | case PCI_DEVICE_ID_INTEL_82371AB_0: | 552 | case PCI_DEVICE_ID_INTEL_82371MX: |
| 557 | case PCI_DEVICE_ID_INTEL_82371MX: | 553 | case PCI_DEVICE_ID_INTEL_82443MX_0: |
| 558 | case PCI_DEVICE_ID_INTEL_82443MX_0: | 554 | case PCI_DEVICE_ID_INTEL_82801AA_0: |
| 559 | case PCI_DEVICE_ID_INTEL_82801AA_0: | 555 | case PCI_DEVICE_ID_INTEL_82801AB_0: |
| 560 | case PCI_DEVICE_ID_INTEL_82801AB_0: | 556 | case PCI_DEVICE_ID_INTEL_82801BA_0: |
| 561 | case PCI_DEVICE_ID_INTEL_82801BA_0: | 557 | case PCI_DEVICE_ID_INTEL_82801BA_10: |
| 562 | case PCI_DEVICE_ID_INTEL_82801BA_10: | 558 | case PCI_DEVICE_ID_INTEL_82801CA_0: |
| 563 | case PCI_DEVICE_ID_INTEL_82801CA_0: | 559 | case PCI_DEVICE_ID_INTEL_82801CA_12: |
| 564 | case PCI_DEVICE_ID_INTEL_82801CA_12: | 560 | case PCI_DEVICE_ID_INTEL_82801DB_0: |
| 565 | case PCI_DEVICE_ID_INTEL_82801DB_0: | 561 | case PCI_DEVICE_ID_INTEL_82801E_0: |
| 566 | case PCI_DEVICE_ID_INTEL_82801E_0: | 562 | case PCI_DEVICE_ID_INTEL_82801EB_0: |
| 567 | case PCI_DEVICE_ID_INTEL_82801EB_0: | 563 | case PCI_DEVICE_ID_INTEL_ESB_1: |
| 568 | case PCI_DEVICE_ID_INTEL_ESB_1: | 564 | case PCI_DEVICE_ID_INTEL_ICH6_0: |
| 569 | case PCI_DEVICE_ID_INTEL_ICH6_0: | 565 | case PCI_DEVICE_ID_INTEL_ICH6_1: |
| 570 | case PCI_DEVICE_ID_INTEL_ICH6_1: | 566 | case PCI_DEVICE_ID_INTEL_ICH7_0: |
| 571 | case PCI_DEVICE_ID_INTEL_ICH7_0: | 567 | case PCI_DEVICE_ID_INTEL_ICH7_1: |
| 572 | case PCI_DEVICE_ID_INTEL_ICH7_1: | 568 | case PCI_DEVICE_ID_INTEL_ICH7_30: |
| 573 | case PCI_DEVICE_ID_INTEL_ICH7_30: | 569 | case PCI_DEVICE_ID_INTEL_ICH7_31: |
| 574 | case PCI_DEVICE_ID_INTEL_ICH7_31: | 570 | case PCI_DEVICE_ID_INTEL_ESB2_0: |
| 575 | case PCI_DEVICE_ID_INTEL_ESB2_0: | 571 | case PCI_DEVICE_ID_INTEL_ICH8_0: |
| 576 | case PCI_DEVICE_ID_INTEL_ICH8_0: | 572 | case PCI_DEVICE_ID_INTEL_ICH8_1: |
| 577 | case PCI_DEVICE_ID_INTEL_ICH8_1: | 573 | case PCI_DEVICE_ID_INTEL_ICH8_2: |
| 578 | case PCI_DEVICE_ID_INTEL_ICH8_2: | 574 | case PCI_DEVICE_ID_INTEL_ICH8_3: |
| 579 | case PCI_DEVICE_ID_INTEL_ICH8_3: | 575 | case PCI_DEVICE_ID_INTEL_ICH8_4: |
| 580 | case PCI_DEVICE_ID_INTEL_ICH8_4: | 576 | case PCI_DEVICE_ID_INTEL_ICH9_0: |
| 581 | case PCI_DEVICE_ID_INTEL_ICH9_0: | 577 | case PCI_DEVICE_ID_INTEL_ICH9_1: |
| 582 | case PCI_DEVICE_ID_INTEL_ICH9_1: | 578 | case PCI_DEVICE_ID_INTEL_ICH9_2: |
| 583 | case PCI_DEVICE_ID_INTEL_ICH9_2: | 579 | case PCI_DEVICE_ID_INTEL_ICH9_3: |
| 584 | case PCI_DEVICE_ID_INTEL_ICH9_3: | 580 | case PCI_DEVICE_ID_INTEL_ICH9_4: |
| 585 | case PCI_DEVICE_ID_INTEL_ICH9_4: | 581 | case PCI_DEVICE_ID_INTEL_ICH9_5: |
| 586 | case PCI_DEVICE_ID_INTEL_ICH9_5: | 582 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: |
| 587 | case PCI_DEVICE_ID_INTEL_TOLAPAI_0: | 583 | case PCI_DEVICE_ID_INTEL_ICH10_0: |
| 588 | case PCI_DEVICE_ID_INTEL_ICH10_0: | 584 | case PCI_DEVICE_ID_INTEL_ICH10_1: |
| 589 | case PCI_DEVICE_ID_INTEL_ICH10_1: | 585 | case PCI_DEVICE_ID_INTEL_ICH10_2: |
| 590 | case PCI_DEVICE_ID_INTEL_ICH10_2: | 586 | case PCI_DEVICE_ID_INTEL_ICH10_3: |
| 591 | case PCI_DEVICE_ID_INTEL_ICH10_3: | 587 | r->name = "PIIX/ICH"; |
| 592 | r->name = "PIIX/ICH"; | 588 | r->get = pirq_piix_get; |
| 593 | r->get = pirq_piix_get; | 589 | r->set = pirq_piix_set; |
| 594 | r->set = pirq_piix_set; | 590 | return 1; |
| 595 | return 1; | ||
| 596 | } | 591 | } |
| 597 | return 0; | 592 | return 0; |
| 598 | } | 593 | } |
| @@ -606,7 +601,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 606 | * workarounds for some buggy BIOSes | 601 | * workarounds for some buggy BIOSes |
| 607 | */ | 602 | */ |
| 608 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { | 603 | if (device == PCI_DEVICE_ID_VIA_82C586_0) { |
| 609 | switch(router->device) { | 604 | switch (router->device) { |
| 610 | case PCI_DEVICE_ID_VIA_82C686: | 605 | case PCI_DEVICE_ID_VIA_82C686: |
| 611 | /* | 606 | /* |
| 612 | * Asus k7m bios wrongly reports 82C686A | 607 | * Asus k7m bios wrongly reports 82C686A |
| @@ -631,7 +626,7 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 631 | } | 626 | } |
| 632 | } | 627 | } |
| 633 | 628 | ||
| 634 | switch(device) { | 629 | switch (device) { |
| 635 | case PCI_DEVICE_ID_VIA_82C586_0: | 630 | case PCI_DEVICE_ID_VIA_82C586_0: |
| 636 | r->name = "VIA"; | 631 | r->name = "VIA"; |
| 637 | r->get = pirq_via586_get; | 632 | r->get = pirq_via586_get; |
| @@ -654,13 +649,12 @@ static __init int via_router_probe(struct irq_router *r, | |||
| 654 | 649 | ||
| 655 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 650 | static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 656 | { | 651 | { |
| 657 | switch(device) | 652 | switch (device) { |
| 658 | { | 653 | case PCI_DEVICE_ID_VLSI_82C534: |
| 659 | case PCI_DEVICE_ID_VLSI_82C534: | 654 | r->name = "VLSI 82C534"; |
| 660 | r->name = "VLSI 82C534"; | 655 | r->get = pirq_vlsi_get; |
| 661 | r->get = pirq_vlsi_get; | 656 | r->set = pirq_vlsi_set; |
| 662 | r->set = pirq_vlsi_set; | 657 | return 1; |
| 663 | return 1; | ||
| 664 | } | 658 | } |
| 665 | return 0; | 659 | return 0; |
| 666 | } | 660 | } |
| @@ -668,14 +662,13 @@ static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router | |||
| 668 | 662 | ||
| 669 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 663 | static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 670 | { | 664 | { |
| 671 | switch(device) | 665 | switch (device) { |
| 672 | { | 666 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: |
| 673 | case PCI_DEVICE_ID_SERVERWORKS_OSB4: | 667 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: |
| 674 | case PCI_DEVICE_ID_SERVERWORKS_CSB5: | 668 | r->name = "ServerWorks"; |
| 675 | r->name = "ServerWorks"; | 669 | r->get = pirq_serverworks_get; |
| 676 | r->get = pirq_serverworks_get; | 670 | r->set = pirq_serverworks_set; |
| 677 | r->set = pirq_serverworks_set; | 671 | return 1; |
| 678 | return 1; | ||
| 679 | } | 672 | } |
| 680 | return 0; | 673 | return 0; |
| 681 | } | 674 | } |
| @@ -684,7 +677,7 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 684 | { | 677 | { |
| 685 | if (device != PCI_DEVICE_ID_SI_503) | 678 | if (device != PCI_DEVICE_ID_SI_503) |
| 686 | return 0; | 679 | return 0; |
| 687 | 680 | ||
| 688 | r->name = "SIS"; | 681 | r->name = "SIS"; |
| 689 | r->get = pirq_sis_get; | 682 | r->get = pirq_sis_get; |
| 690 | r->set = pirq_sis_set; | 683 | r->set = pirq_sis_set; |
| @@ -693,47 +686,43 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 693 | 686 | ||
| 694 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 687 | static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 695 | { | 688 | { |
| 696 | switch(device) | 689 | switch (device) { |
| 697 | { | 690 | case PCI_DEVICE_ID_CYRIX_5520: |
| 698 | case PCI_DEVICE_ID_CYRIX_5520: | 691 | r->name = "NatSemi"; |
| 699 | r->name = "NatSemi"; | 692 | r->get = pirq_cyrix_get; |
| 700 | r->get = pirq_cyrix_get; | 693 | r->set = pirq_cyrix_set; |
| 701 | r->set = pirq_cyrix_set; | 694 | return 1; |
| 702 | return 1; | ||
| 703 | } | 695 | } |
| 704 | return 0; | 696 | return 0; |
| 705 | } | 697 | } |
| 706 | 698 | ||
| 707 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 699 | static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 708 | { | 700 | { |
| 709 | switch(device) | 701 | switch (device) { |
| 710 | { | 702 | case PCI_DEVICE_ID_OPTI_82C700: |
| 711 | case PCI_DEVICE_ID_OPTI_82C700: | 703 | r->name = "OPTI"; |
| 712 | r->name = "OPTI"; | 704 | r->get = pirq_opti_get; |
| 713 | r->get = pirq_opti_get; | 705 | r->set = pirq_opti_set; |
| 714 | r->set = pirq_opti_set; | 706 | return 1; |
| 715 | return 1; | ||
| 716 | } | 707 | } |
| 717 | return 0; | 708 | return 0; |
| 718 | } | 709 | } |
| 719 | 710 | ||
| 720 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 711 | static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 721 | { | 712 | { |
| 722 | switch(device) | 713 | switch (device) { |
| 723 | { | 714 | case PCI_DEVICE_ID_ITE_IT8330G_0: |
| 724 | case PCI_DEVICE_ID_ITE_IT8330G_0: | 715 | r->name = "ITE"; |
| 725 | r->name = "ITE"; | 716 | r->get = pirq_ite_get; |
| 726 | r->get = pirq_ite_get; | 717 | r->set = pirq_ite_set; |
| 727 | r->set = pirq_ite_set; | 718 | return 1; |
| 728 | return 1; | ||
| 729 | } | 719 | } |
| 730 | return 0; | 720 | return 0; |
| 731 | } | 721 | } |
| 732 | 722 | ||
| 733 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 723 | static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 734 | { | 724 | { |
| 735 | switch(device) | 725 | switch (device) { |
| 736 | { | ||
| 737 | case PCI_DEVICE_ID_AL_M1533: | 726 | case PCI_DEVICE_ID_AL_M1533: |
| 738 | case PCI_DEVICE_ID_AL_M1563: | 727 | case PCI_DEVICE_ID_AL_M1563: |
| 739 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); | 728 | printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n"); |
| @@ -747,25 +736,24 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, | |||
| 747 | 736 | ||
| 748 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 737 | static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 749 | { | 738 | { |
| 750 | switch(device) | 739 | switch (device) { |
| 751 | { | 740 | case PCI_DEVICE_ID_AMD_VIPER_740B: |
| 752 | case PCI_DEVICE_ID_AMD_VIPER_740B: | 741 | r->name = "AMD756"; |
| 753 | r->name = "AMD756"; | 742 | break; |
| 754 | break; | 743 | case PCI_DEVICE_ID_AMD_VIPER_7413: |
| 755 | case PCI_DEVICE_ID_AMD_VIPER_7413: | 744 | r->name = "AMD766"; |
| 756 | r->name = "AMD766"; | 745 | break; |
| 757 | break; | 746 | case PCI_DEVICE_ID_AMD_VIPER_7443: |
| 758 | case PCI_DEVICE_ID_AMD_VIPER_7443: | 747 | r->name = "AMD768"; |
| 759 | r->name = "AMD768"; | 748 | break; |
| 760 | break; | 749 | default: |
| 761 | default: | 750 | return 0; |
| 762 | return 0; | ||
| 763 | } | 751 | } |
| 764 | r->get = pirq_amd756_get; | 752 | r->get = pirq_amd756_get; |
| 765 | r->set = pirq_amd756_set; | 753 | r->set = pirq_amd756_set; |
| 766 | return 1; | 754 | return 1; |
| 767 | } | 755 | } |
| 768 | 756 | ||
| 769 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) | 757 | static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device) |
| 770 | { | 758 | { |
| 771 | switch (device) { | 759 | switch (device) { |
| @@ -807,7 +795,7 @@ static struct pci_dev *pirq_router_dev; | |||
| 807 | * FIXME: should we have an option to say "generic for | 795 | * FIXME: should we have an option to say "generic for |
| 808 | * chipset" ? | 796 | * chipset" ? |
| 809 | */ | 797 | */ |
| 810 | 798 | ||
| 811 | static void __init pirq_find_router(struct irq_router *r) | 799 | static void __init pirq_find_router(struct irq_router *r) |
| 812 | { | 800 | { |
| 813 | struct irq_routing_table *rt = pirq_table; | 801 | struct irq_routing_table *rt = pirq_table; |
| @@ -826,7 +814,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
| 826 | r->name = "default"; | 814 | r->name = "default"; |
| 827 | r->get = NULL; | 815 | r->get = NULL; |
| 828 | r->set = NULL; | 816 | r->set = NULL; |
| 829 | 817 | ||
| 830 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", | 818 | DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", |
| 831 | rt->rtr_vendor, rt->rtr_device); | 819 | rt->rtr_vendor, rt->rtr_device); |
| 832 | 820 | ||
| @@ -837,7 +825,7 @@ static void __init pirq_find_router(struct irq_router *r) | |||
| 837 | return; | 825 | return; |
| 838 | } | 826 | } |
| 839 | 827 | ||
| 840 | for( h = pirq_routers; h->vendor; h++) { | 828 | for (h = pirq_routers; h->vendor; h++) { |
| 841 | /* First look for a router match */ | 829 | /* First look for a router match */ |
| 842 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) | 830 | if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device)) |
| 843 | break; | 831 | break; |
| @@ -889,7 +877,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 889 | 877 | ||
| 890 | if (!pirq_table) | 878 | if (!pirq_table) |
| 891 | return 0; | 879 | return 0; |
| 892 | 880 | ||
| 893 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); | 881 | DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin); |
| 894 | info = pirq_get_info(dev); | 882 | info = pirq_get_info(dev); |
| 895 | if (!info) { | 883 | if (!info) { |
| @@ -928,8 +916,10 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 928 | */ | 916 | */ |
| 929 | newirq = dev->irq; | 917 | newirq = dev->irq; |
| 930 | if (newirq && !((1 << newirq) & mask)) { | 918 | if (newirq && !((1 << newirq) & mask)) { |
| 931 | if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; | 919 | if (pci_probe & PCI_USE_PIRQ_MASK) |
| 932 | else printk("\n" KERN_WARNING | 920 | newirq = 0; |
| 921 | else | ||
| 922 | printk("\n" KERN_WARNING | ||
| 933 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " | 923 | "PCI: IRQ %i for device %s doesn't match PIRQ mask " |
| 934 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, | 924 | "- try pci=usepirqmask\n" KERN_DEBUG, newirq, |
| 935 | pci_name(dev)); | 925 | pci_name(dev)); |
| @@ -949,8 +939,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 949 | irq = pirq & 0xf; | 939 | irq = pirq & 0xf; |
| 950 | DBG(" -> hardcoded IRQ %d\n", irq); | 940 | DBG(" -> hardcoded IRQ %d\n", irq); |
| 951 | msg = "Hardcoded"; | 941 | msg = "Hardcoded"; |
| 952 | } else if ( r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ | 942 | } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \ |
| 953 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask)) ) { | 943 | ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) { |
| 954 | DBG(" -> got IRQ %d\n", irq); | 944 | DBG(" -> got IRQ %d\n", irq); |
| 955 | msg = "Found"; | 945 | msg = "Found"; |
| 956 | eisa_set_level_irq(irq); | 946 | eisa_set_level_irq(irq); |
| @@ -985,15 +975,15 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) | |||
| 985 | continue; | 975 | continue; |
| 986 | if (info->irq[pin].link == pirq) { | 976 | if (info->irq[pin].link == pirq) { |
| 987 | /* We refuse to override the dev->irq information. Give a warning! */ | 977 | /* We refuse to override the dev->irq information. Give a warning! */ |
| 988 | if ( dev2->irq && dev2->irq != irq && \ | 978 | if (dev2->irq && dev2->irq != irq && \ |
| 989 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ | 979 | (!(pci_probe & PCI_USE_PIRQ_MASK) || \ |
| 990 | ((1 << dev2->irq) & mask)) ) { | 980 | ((1 << dev2->irq) & mask))) { |
| 991 | #ifndef CONFIG_PCI_MSI | 981 | #ifndef CONFIG_PCI_MSI |
| 992 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", | 982 | printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", |
| 993 | pci_name(dev2), dev2->irq, irq); | 983 | pci_name(dev2), dev2->irq, irq); |
| 994 | #endif | 984 | #endif |
| 995 | continue; | 985 | continue; |
| 996 | } | 986 | } |
| 997 | dev2->irq = irq; | 987 | dev2->irq = irq; |
| 998 | pirq_penalty[irq]++; | 988 | pirq_penalty[irq]++; |
| 999 | if (dev != dev2) | 989 | if (dev != dev2) |
| @@ -1031,8 +1021,7 @@ static void __init pcibios_fixup_irqs(void) | |||
| 1031 | /* | 1021 | /* |
| 1032 | * Recalculate IRQ numbers if we use the I/O APIC. | 1022 | * Recalculate IRQ numbers if we use the I/O APIC. |
| 1033 | */ | 1023 | */ |
| 1034 | if (io_apic_assign_pci_irqs) | 1024 | if (io_apic_assign_pci_irqs) { |
| 1035 | { | ||
| 1036 | int irq; | 1025 | int irq; |
| 1037 | 1026 | ||
| 1038 | if (pin) { | 1027 | if (pin) { |
| @@ -1045,10 +1034,10 @@ static void __init pcibios_fixup_irqs(void) | |||
| 1045 | * busses itself so we should get into this branch reliably. | 1034 | * busses itself so we should get into this branch reliably. |
| 1046 | */ | 1035 | */ |
| 1047 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1036 | if (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
| 1048 | struct pci_dev * bridge = dev->bus->self; | 1037 | struct pci_dev *bridge = dev->bus->self; |
| 1049 | 1038 | ||
| 1050 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1039 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
| 1051 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1040 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
| 1052 | PCI_SLOT(bridge->devfn), pin); | 1041 | PCI_SLOT(bridge->devfn), pin); |
| 1053 | if (irq >= 0) | 1042 | if (irq >= 0) |
| 1054 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1043 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
| @@ -1138,7 +1127,7 @@ static int __init pcibios_irq_init(void) | |||
| 1138 | pirq_find_router(&pirq_router); | 1127 | pirq_find_router(&pirq_router); |
| 1139 | if (pirq_table->exclusive_irqs) { | 1128 | if (pirq_table->exclusive_irqs) { |
| 1140 | int i; | 1129 | int i; |
| 1141 | for (i=0; i<16; i++) | 1130 | for (i = 0; i < 16; i++) |
| 1142 | if (!(pirq_table->exclusive_irqs & (1 << i))) | 1131 | if (!(pirq_table->exclusive_irqs & (1 << i))) |
| 1143 | pirq_penalty[i] += 100; | 1132 | pirq_penalty[i] += 100; |
| 1144 | } | 1133 | } |
| @@ -1203,10 +1192,10 @@ static int pirq_enable_irq(struct pci_dev *dev) | |||
| 1203 | */ | 1192 | */ |
| 1204 | temp_dev = dev; | 1193 | temp_dev = dev; |
| 1205 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ | 1194 | while (irq < 0 && dev->bus->parent) { /* go back to the bridge */ |
| 1206 | struct pci_dev * bridge = dev->bus->self; | 1195 | struct pci_dev *bridge = dev->bus->self; |
| 1207 | 1196 | ||
| 1208 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; | 1197 | pin = (pin + PCI_SLOT(dev->devfn)) % 4; |
| 1209 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, | 1198 | irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, |
| 1210 | PCI_SLOT(bridge->devfn), pin); | 1199 | PCI_SLOT(bridge->devfn), pin); |
| 1211 | if (irq >= 0) | 1200 | if (irq >= 0) |
| 1212 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", | 1201 | printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", |
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index 0cfebecf2a8f..23faaa890ffc 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
| @@ -374,7 +374,7 @@ reject: | |||
| 374 | 374 | ||
| 375 | static int __initdata known_bridge; | 375 | static int __initdata known_bridge; |
| 376 | 376 | ||
| 377 | void __init __pci_mmcfg_init(int early) | 377 | static void __init __pci_mmcfg_init(int early) |
| 378 | { | 378 | { |
| 379 | /* MMCONFIG disabled */ | 379 | /* MMCONFIG disabled */ |
| 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) | 380 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |
diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c index 3fdd51497a83..19a6cfaf5db9 100644 --- a/arch/x86/vdso/vma.c +++ b/arch/x86/vdso/vma.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include "vextern.h" /* Just for VMAGIC. */ | 16 | #include "vextern.h" /* Just for VMAGIC. */ |
| 17 | #undef VEXTERN | 17 | #undef VEXTERN |
| 18 | 18 | ||
| 19 | int vdso_enabled = 1; | 19 | unsigned int __read_mostly vdso_enabled = 1; |
| 20 | 20 | ||
| 21 | extern char vdso_start[], vdso_end[]; | 21 | extern char vdso_start[], vdso_end[]; |
| 22 | extern unsigned short vdso_sync_cpuid; | 22 | extern unsigned short vdso_sync_cpuid; |
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 6c388e593bc8..c2cc99580871 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig | |||
| @@ -12,3 +12,13 @@ config XEN | |||
| 12 | This is the Linux Xen port. Enabling this will allow the | 12 | This is the Linux Xen port. Enabling this will allow the |
| 13 | kernel to boot in a paravirtualized environment under the | 13 | kernel to boot in a paravirtualized environment under the |
| 14 | Xen hypervisor. | 14 | Xen hypervisor. |
| 15 | |||
| 16 | config XEN_MAX_DOMAIN_MEMORY | ||
| 17 | int "Maximum allowed size of a domain in gigabytes" | ||
| 18 | default 8 | ||
| 19 | depends on XEN | ||
| 20 | help | ||
| 21 | The pseudo-physical to machine address array is sized | ||
| 22 | according to the maximum possible memory size of a Xen | ||
| 23 | domain. This array uses 1 page per gigabyte, so there's no | ||
| 24 | need to be too stingy here. \ No newline at end of file | ||
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 3d8df981d5fd..2ba2d1649131 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ | 1 | obj-y := enlighten.o setup.o multicalls.o mmu.o \ |
| 2 | time.o manage.o xen-asm.o grant-table.o | 2 | time.o xen-asm.o grant-table.o suspend.o |
| 3 | 3 | ||
| 4 | obj-$(CONFIG_SMP) += smp.o | 4 | obj-$(CONFIG_SMP) += smp.o |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f09c1c69c37a..bd74229081c3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
| @@ -75,13 +75,13 @@ DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ | |||
| 75 | struct start_info *xen_start_info; | 75 | struct start_info *xen_start_info; |
| 76 | EXPORT_SYMBOL_GPL(xen_start_info); | 76 | EXPORT_SYMBOL_GPL(xen_start_info); |
| 77 | 77 | ||
| 78 | static /* __initdata */ struct shared_info dummy_shared_info; | 78 | struct shared_info xen_dummy_shared_info; |
| 79 | 79 | ||
| 80 | /* | 80 | /* |
| 81 | * Point at some empty memory to start with. We map the real shared_info | 81 | * Point at some empty memory to start with. We map the real shared_info |
| 82 | * page as soon as fixmap is up and running. | 82 | * page as soon as fixmap is up and running. |
| 83 | */ | 83 | */ |
| 84 | struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info; | 84 | struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info; |
| 85 | 85 | ||
| 86 | /* | 86 | /* |
| 87 | * Flag to determine whether vcpu info placement is available on all | 87 | * Flag to determine whether vcpu info placement is available on all |
| @@ -98,13 +98,13 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&dummy_shared_info; | |||
| 98 | */ | 98 | */ |
| 99 | static int have_vcpu_info_placement = 1; | 99 | static int have_vcpu_info_placement = 1; |
| 100 | 100 | ||
| 101 | static void __init xen_vcpu_setup(int cpu) | 101 | static void xen_vcpu_setup(int cpu) |
| 102 | { | 102 | { |
| 103 | struct vcpu_register_vcpu_info info; | 103 | struct vcpu_register_vcpu_info info; |
| 104 | int err; | 104 | int err; |
| 105 | struct vcpu_info *vcpup; | 105 | struct vcpu_info *vcpup; |
| 106 | 106 | ||
| 107 | BUG_ON(HYPERVISOR_shared_info == &dummy_shared_info); | 107 | BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info); |
| 108 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; | 108 | per_cpu(xen_vcpu, cpu) = &HYPERVISOR_shared_info->vcpu_info[cpu]; |
| 109 | 109 | ||
| 110 | if (!have_vcpu_info_placement) | 110 | if (!have_vcpu_info_placement) |
| @@ -136,11 +136,41 @@ static void __init xen_vcpu_setup(int cpu) | |||
| 136 | } | 136 | } |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | /* | ||
| 140 | * On restore, set the vcpu placement up again. | ||
| 141 | * If it fails, then we're in a bad state, since | ||
| 142 | * we can't back out from using it... | ||
| 143 | */ | ||
| 144 | void xen_vcpu_restore(void) | ||
| 145 | { | ||
| 146 | if (have_vcpu_info_placement) { | ||
| 147 | int cpu; | ||
| 148 | |||
| 149 | for_each_online_cpu(cpu) { | ||
| 150 | bool other_cpu = (cpu != smp_processor_id()); | ||
| 151 | |||
| 152 | if (other_cpu && | ||
| 153 | HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL)) | ||
| 154 | BUG(); | ||
| 155 | |||
| 156 | xen_vcpu_setup(cpu); | ||
| 157 | |||
| 158 | if (other_cpu && | ||
| 159 | HYPERVISOR_vcpu_op(VCPUOP_up, cpu, NULL)) | ||
| 160 | BUG(); | ||
| 161 | } | ||
| 162 | |||
| 163 | BUG_ON(!have_vcpu_info_placement); | ||
| 164 | } | ||
| 165 | } | ||
| 166 | |||
| 139 | static void __init xen_banner(void) | 167 | static void __init xen_banner(void) |
| 140 | { | 168 | { |
| 141 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", | 169 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", |
| 142 | pv_info.name); | 170 | pv_info.name); |
| 143 | printk(KERN_INFO "Hypervisor signature: %s\n", xen_start_info->magic); | 171 | printk(KERN_INFO "Hypervisor signature: %s%s\n", |
| 172 | xen_start_info->magic, | ||
| 173 | xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); | ||
| 144 | } | 174 | } |
| 145 | 175 | ||
| 146 | static void xen_cpuid(unsigned int *ax, unsigned int *bx, | 176 | static void xen_cpuid(unsigned int *ax, unsigned int *bx, |
| @@ -235,13 +265,13 @@ static void xen_irq_enable(void) | |||
| 235 | { | 265 | { |
| 236 | struct vcpu_info *vcpu; | 266 | struct vcpu_info *vcpu; |
| 237 | 267 | ||
| 238 | /* There's a one instruction preempt window here. We need to | 268 | /* We don't need to worry about being preempted here, since |
| 239 | make sure we're don't switch CPUs between getting the vcpu | 269 | either a) interrupts are disabled, so no preemption, or b) |
| 240 | pointer and updating the mask. */ | 270 | the caller is confused and is trying to re-enable interrupts |
| 241 | preempt_disable(); | 271 | on an indeterminate processor. */ |
| 272 | |||
| 242 | vcpu = x86_read_percpu(xen_vcpu); | 273 | vcpu = x86_read_percpu(xen_vcpu); |
| 243 | vcpu->evtchn_upcall_mask = 0; | 274 | vcpu->evtchn_upcall_mask = 0; |
| 244 | preempt_enable_no_resched(); | ||
| 245 | 275 | ||
| 246 | /* Doesn't matter if we get preempted here, because any | 276 | /* Doesn't matter if we get preempted here, because any |
| 247 | pending event will get dealt with anyway. */ | 277 | pending event will get dealt with anyway. */ |
| @@ -254,7 +284,7 @@ static void xen_irq_enable(void) | |||
| 254 | static void xen_safe_halt(void) | 284 | static void xen_safe_halt(void) |
| 255 | { | 285 | { |
| 256 | /* Blocking includes an implicit local_irq_enable(). */ | 286 | /* Blocking includes an implicit local_irq_enable(). */ |
| 257 | if (HYPERVISOR_sched_op(SCHEDOP_block, 0) != 0) | 287 | if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0) |
| 258 | BUG(); | 288 | BUG(); |
| 259 | } | 289 | } |
| 260 | 290 | ||
| @@ -607,6 +637,30 @@ static void xen_flush_tlb_others(const cpumask_t *cpus, struct mm_struct *mm, | |||
| 607 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 637 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
| 608 | } | 638 | } |
| 609 | 639 | ||
| 640 | static void xen_clts(void) | ||
| 641 | { | ||
| 642 | struct multicall_space mcs; | ||
| 643 | |||
| 644 | mcs = xen_mc_entry(0); | ||
| 645 | |||
| 646 | MULTI_fpu_taskswitch(mcs.mc, 0); | ||
| 647 | |||
| 648 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
| 649 | } | ||
| 650 | |||
| 651 | static void xen_write_cr0(unsigned long cr0) | ||
| 652 | { | ||
| 653 | struct multicall_space mcs; | ||
| 654 | |||
| 655 | /* Only pay attention to cr0.TS; everything else is | ||
| 656 | ignored. */ | ||
| 657 | mcs = xen_mc_entry(0); | ||
| 658 | |||
| 659 | MULTI_fpu_taskswitch(mcs.mc, (cr0 & X86_CR0_TS) != 0); | ||
| 660 | |||
| 661 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
| 662 | } | ||
| 663 | |||
| 610 | static void xen_write_cr2(unsigned long cr2) | 664 | static void xen_write_cr2(unsigned long cr2) |
| 611 | { | 665 | { |
| 612 | x86_read_percpu(xen_vcpu)->arch.cr2 = cr2; | 666 | x86_read_percpu(xen_vcpu)->arch.cr2 = cr2; |
| @@ -624,8 +678,10 @@ static unsigned long xen_read_cr2_direct(void) | |||
| 624 | 678 | ||
| 625 | static void xen_write_cr4(unsigned long cr4) | 679 | static void xen_write_cr4(unsigned long cr4) |
| 626 | { | 680 | { |
| 627 | /* Just ignore cr4 changes; Xen doesn't allow us to do | 681 | cr4 &= ~X86_CR4_PGE; |
| 628 | anything anyway. */ | 682 | cr4 &= ~X86_CR4_PSE; |
| 683 | |||
| 684 | native_write_cr4(cr4); | ||
| 629 | } | 685 | } |
| 630 | 686 | ||
| 631 | static unsigned long xen_read_cr3(void) | 687 | static unsigned long xen_read_cr3(void) |
| @@ -831,7 +887,7 @@ static __init void xen_pagetable_setup_start(pgd_t *base) | |||
| 831 | PFN_DOWN(__pa(xen_start_info->pt_base))); | 887 | PFN_DOWN(__pa(xen_start_info->pt_base))); |
| 832 | } | 888 | } |
| 833 | 889 | ||
| 834 | static __init void setup_shared_info(void) | 890 | void xen_setup_shared_info(void) |
| 835 | { | 891 | { |
| 836 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { | 892 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { |
| 837 | unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); | 893 | unsigned long addr = fix_to_virt(FIX_PARAVIRT_BOOTMAP); |
| @@ -854,6 +910,8 @@ static __init void setup_shared_info(void) | |||
| 854 | /* In UP this is as good a place as any to set up shared info */ | 910 | /* In UP this is as good a place as any to set up shared info */ |
| 855 | xen_setup_vcpu_info_placement(); | 911 | xen_setup_vcpu_info_placement(); |
| 856 | #endif | 912 | #endif |
| 913 | |||
| 914 | xen_setup_mfn_list_list(); | ||
| 857 | } | 915 | } |
| 858 | 916 | ||
| 859 | static __init void xen_pagetable_setup_done(pgd_t *base) | 917 | static __init void xen_pagetable_setup_done(pgd_t *base) |
| @@ -866,15 +924,23 @@ static __init void xen_pagetable_setup_done(pgd_t *base) | |||
| 866 | pv_mmu_ops.release_pmd = xen_release_pmd; | 924 | pv_mmu_ops.release_pmd = xen_release_pmd; |
| 867 | pv_mmu_ops.set_pte = xen_set_pte; | 925 | pv_mmu_ops.set_pte = xen_set_pte; |
| 868 | 926 | ||
| 869 | setup_shared_info(); | 927 | xen_setup_shared_info(); |
| 870 | 928 | ||
| 871 | /* Actually pin the pagetable down, but we can't set PG_pinned | 929 | /* Actually pin the pagetable down, but we can't set PG_pinned |
| 872 | yet because the page structures don't exist yet. */ | 930 | yet because the page structures don't exist yet. */ |
| 873 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); | 931 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(base))); |
| 874 | } | 932 | } |
| 875 | 933 | ||
| 934 | static __init void xen_post_allocator_init(void) | ||
| 935 | { | ||
| 936 | pv_mmu_ops.set_pmd = xen_set_pmd; | ||
| 937 | pv_mmu_ops.set_pud = xen_set_pud; | ||
| 938 | |||
| 939 | xen_mark_init_mm_pinned(); | ||
| 940 | } | ||
| 941 | |||
| 876 | /* This is called once we have the cpu_possible_map */ | 942 | /* This is called once we have the cpu_possible_map */ |
| 877 | void __init xen_setup_vcpu_info_placement(void) | 943 | void xen_setup_vcpu_info_placement(void) |
| 878 | { | 944 | { |
| 879 | int cpu; | 945 | int cpu; |
| 880 | 946 | ||
| @@ -960,7 +1026,7 @@ static const struct pv_init_ops xen_init_ops __initdata = { | |||
| 960 | .banner = xen_banner, | 1026 | .banner = xen_banner, |
| 961 | .memory_setup = xen_memory_setup, | 1027 | .memory_setup = xen_memory_setup, |
| 962 | .arch_setup = xen_arch_setup, | 1028 | .arch_setup = xen_arch_setup, |
| 963 | .post_allocator_init = xen_mark_init_mm_pinned, | 1029 | .post_allocator_init = xen_post_allocator_init, |
| 964 | }; | 1030 | }; |
| 965 | 1031 | ||
| 966 | static const struct pv_time_ops xen_time_ops __initdata = { | 1032 | static const struct pv_time_ops xen_time_ops __initdata = { |
| @@ -978,10 +1044,10 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = { | |||
| 978 | .set_debugreg = xen_set_debugreg, | 1044 | .set_debugreg = xen_set_debugreg, |
| 979 | .get_debugreg = xen_get_debugreg, | 1045 | .get_debugreg = xen_get_debugreg, |
| 980 | 1046 | ||
| 981 | .clts = native_clts, | 1047 | .clts = xen_clts, |
| 982 | 1048 | ||
| 983 | .read_cr0 = native_read_cr0, | 1049 | .read_cr0 = native_read_cr0, |
| 984 | .write_cr0 = native_write_cr0, | 1050 | .write_cr0 = xen_write_cr0, |
| 985 | 1051 | ||
| 986 | .read_cr4 = native_read_cr4, | 1052 | .read_cr4 = native_read_cr4, |
| 987 | .read_cr4_safe = native_read_cr4_safe, | 1053 | .read_cr4_safe = native_read_cr4_safe, |
| @@ -1072,9 +1138,13 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1072 | 1138 | ||
| 1073 | .set_pte = NULL, /* see xen_pagetable_setup_* */ | 1139 | .set_pte = NULL, /* see xen_pagetable_setup_* */ |
| 1074 | .set_pte_at = xen_set_pte_at, | 1140 | .set_pte_at = xen_set_pte_at, |
| 1075 | .set_pmd = xen_set_pmd, | 1141 | .set_pmd = xen_set_pmd_hyper, |
| 1142 | |||
| 1143 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
| 1144 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
| 1076 | 1145 | ||
| 1077 | .pte_val = xen_pte_val, | 1146 | .pte_val = xen_pte_val, |
| 1147 | .pte_flags = native_pte_val, | ||
| 1078 | .pgd_val = xen_pgd_val, | 1148 | .pgd_val = xen_pgd_val, |
| 1079 | 1149 | ||
| 1080 | .make_pte = xen_make_pte, | 1150 | .make_pte = xen_make_pte, |
| @@ -1082,7 +1152,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = { | |||
| 1082 | 1152 | ||
| 1083 | .set_pte_atomic = xen_set_pte_atomic, | 1153 | .set_pte_atomic = xen_set_pte_atomic, |
| 1084 | .set_pte_present = xen_set_pte_at, | 1154 | .set_pte_present = xen_set_pte_at, |
| 1085 | .set_pud = xen_set_pud, | 1155 | .set_pud = xen_set_pud_hyper, |
| 1086 | .pte_clear = xen_pte_clear, | 1156 | .pte_clear = xen_pte_clear, |
| 1087 | .pmd_clear = xen_pmd_clear, | 1157 | .pmd_clear = xen_pmd_clear, |
| 1088 | 1158 | ||
| @@ -1114,11 +1184,13 @@ static const struct smp_ops xen_smp_ops __initdata = { | |||
| 1114 | 1184 | ||
| 1115 | static void xen_reboot(int reason) | 1185 | static void xen_reboot(int reason) |
| 1116 | { | 1186 | { |
| 1187 | struct sched_shutdown r = { .reason = reason }; | ||
| 1188 | |||
| 1117 | #ifdef CONFIG_SMP | 1189 | #ifdef CONFIG_SMP |
| 1118 | smp_send_stop(); | 1190 | smp_send_stop(); |
| 1119 | #endif | 1191 | #endif |
| 1120 | 1192 | ||
| 1121 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, reason)) | 1193 | if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r)) |
| 1122 | BUG(); | 1194 | BUG(); |
| 1123 | } | 1195 | } |
| 1124 | 1196 | ||
| @@ -1173,6 +1245,8 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1173 | 1245 | ||
| 1174 | BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); | 1246 | BUG_ON(memcmp(xen_start_info->magic, "xen-3", 5) != 0); |
| 1175 | 1247 | ||
| 1248 | xen_setup_features(); | ||
| 1249 | |||
| 1176 | /* Install Xen paravirt ops */ | 1250 | /* Install Xen paravirt ops */ |
| 1177 | pv_info = xen_info; | 1251 | pv_info = xen_info; |
| 1178 | pv_init_ops = xen_init_ops; | 1252 | pv_init_ops = xen_init_ops; |
| @@ -1182,17 +1256,20 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1182 | pv_apic_ops = xen_apic_ops; | 1256 | pv_apic_ops = xen_apic_ops; |
| 1183 | pv_mmu_ops = xen_mmu_ops; | 1257 | pv_mmu_ops = xen_mmu_ops; |
| 1184 | 1258 | ||
| 1259 | if (xen_feature(XENFEAT_mmu_pt_update_preserve_ad)) { | ||
| 1260 | pv_mmu_ops.ptep_modify_prot_start = xen_ptep_modify_prot_start; | ||
| 1261 | pv_mmu_ops.ptep_modify_prot_commit = xen_ptep_modify_prot_commit; | ||
| 1262 | } | ||
| 1263 | |||
| 1185 | machine_ops = xen_machine_ops; | 1264 | machine_ops = xen_machine_ops; |
| 1186 | 1265 | ||
| 1187 | #ifdef CONFIG_SMP | 1266 | #ifdef CONFIG_SMP |
| 1188 | smp_ops = xen_smp_ops; | 1267 | smp_ops = xen_smp_ops; |
| 1189 | #endif | 1268 | #endif |
| 1190 | 1269 | ||
| 1191 | xen_setup_features(); | ||
| 1192 | |||
| 1193 | /* Get mfn list */ | 1270 | /* Get mfn list */ |
| 1194 | if (!xen_feature(XENFEAT_auto_translated_physmap)) | 1271 | if (!xen_feature(XENFEAT_auto_translated_physmap)) |
| 1195 | phys_to_machine_mapping = (unsigned long *)xen_start_info->mfn_list; | 1272 | xen_build_dynamic_phys_to_machine(); |
| 1196 | 1273 | ||
| 1197 | pgd = (pgd_t *)xen_start_info->pt_base; | 1274 | pgd = (pgd_t *)xen_start_info->pt_base; |
| 1198 | 1275 | ||
| @@ -1232,8 +1309,11 @@ asmlinkage void __init xen_start_kernel(void) | |||
| 1232 | ? __pa(xen_start_info->mod_start) : 0; | 1309 | ? __pa(xen_start_info->mod_start) : 0; |
| 1233 | boot_params.hdr.ramdisk_size = xen_start_info->mod_len; | 1310 | boot_params.hdr.ramdisk_size = xen_start_info->mod_len; |
| 1234 | 1311 | ||
| 1235 | if (!is_initial_xendomain()) | 1312 | if (!is_initial_xendomain()) { |
| 1313 | add_preferred_console("xenboot", 0, NULL); | ||
| 1314 | add_preferred_console("tty", 0, NULL); | ||
| 1236 | add_preferred_console("hvc", 0, NULL); | 1315 | add_preferred_console("hvc", 0, NULL); |
| 1316 | } | ||
| 1237 | 1317 | ||
| 1238 | /* Start the world */ | 1318 | /* Start the world */ |
| 1239 | start_kernel(); | 1319 | start_kernel(); |
diff --git a/arch/x86/xen/manage.c b/arch/x86/xen/manage.c deleted file mode 100644 index aa7af9e6abc0..000000000000 --- a/arch/x86/xen/manage.c +++ /dev/null | |||
| @@ -1,143 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Handle extern requests for shutdown, reboot and sysrq | ||
| 3 | */ | ||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/err.h> | ||
| 6 | #include <linux/reboot.h> | ||
| 7 | #include <linux/sysrq.h> | ||
| 8 | |||
| 9 | #include <xen/xenbus.h> | ||
| 10 | |||
| 11 | #define SHUTDOWN_INVALID -1 | ||
| 12 | #define SHUTDOWN_POWEROFF 0 | ||
| 13 | #define SHUTDOWN_SUSPEND 2 | ||
| 14 | /* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only | ||
| 15 | * report a crash, not be instructed to crash! | ||
| 16 | * HALT is the same as POWEROFF, as far as we're concerned. The tools use | ||
| 17 | * the distinction when we return the reason code to them. | ||
| 18 | */ | ||
| 19 | #define SHUTDOWN_HALT 4 | ||
| 20 | |||
| 21 | /* Ignore multiple shutdown requests. */ | ||
| 22 | static int shutting_down = SHUTDOWN_INVALID; | ||
| 23 | |||
| 24 | static void shutdown_handler(struct xenbus_watch *watch, | ||
| 25 | const char **vec, unsigned int len) | ||
| 26 | { | ||
| 27 | char *str; | ||
| 28 | struct xenbus_transaction xbt; | ||
| 29 | int err; | ||
| 30 | |||
| 31 | if (shutting_down != SHUTDOWN_INVALID) | ||
| 32 | return; | ||
| 33 | |||
| 34 | again: | ||
| 35 | err = xenbus_transaction_start(&xbt); | ||
| 36 | if (err) | ||
| 37 | return; | ||
| 38 | |||
| 39 | str = (char *)xenbus_read(xbt, "control", "shutdown", NULL); | ||
| 40 | /* Ignore read errors and empty reads. */ | ||
| 41 | if (XENBUS_IS_ERR_READ(str)) { | ||
| 42 | xenbus_transaction_end(xbt, 1); | ||
| 43 | return; | ||
| 44 | } | ||
| 45 | |||
| 46 | xenbus_write(xbt, "control", "shutdown", ""); | ||
| 47 | |||
| 48 | err = xenbus_transaction_end(xbt, 0); | ||
| 49 | if (err == -EAGAIN) { | ||
| 50 | kfree(str); | ||
| 51 | goto again; | ||
| 52 | } | ||
| 53 | |||
| 54 | if (strcmp(str, "poweroff") == 0 || | ||
| 55 | strcmp(str, "halt") == 0) | ||
| 56 | orderly_poweroff(false); | ||
| 57 | else if (strcmp(str, "reboot") == 0) | ||
| 58 | ctrl_alt_del(); | ||
| 59 | else { | ||
| 60 | printk(KERN_INFO "Ignoring shutdown request: %s\n", str); | ||
| 61 | shutting_down = SHUTDOWN_INVALID; | ||
| 62 | } | ||
| 63 | |||
| 64 | kfree(str); | ||
| 65 | } | ||
| 66 | |||
| 67 | static void sysrq_handler(struct xenbus_watch *watch, const char **vec, | ||
| 68 | unsigned int len) | ||
| 69 | { | ||
| 70 | char sysrq_key = '\0'; | ||
| 71 | struct xenbus_transaction xbt; | ||
| 72 | int err; | ||
| 73 | |||
| 74 | again: | ||
| 75 | err = xenbus_transaction_start(&xbt); | ||
| 76 | if (err) | ||
| 77 | return; | ||
| 78 | if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) { | ||
| 79 | printk(KERN_ERR "Unable to read sysrq code in " | ||
| 80 | "control/sysrq\n"); | ||
| 81 | xenbus_transaction_end(xbt, 1); | ||
| 82 | return; | ||
| 83 | } | ||
| 84 | |||
| 85 | if (sysrq_key != '\0') | ||
| 86 | xenbus_printf(xbt, "control", "sysrq", "%c", '\0'); | ||
| 87 | |||
| 88 | err = xenbus_transaction_end(xbt, 0); | ||
| 89 | if (err == -EAGAIN) | ||
| 90 | goto again; | ||
| 91 | |||
| 92 | if (sysrq_key != '\0') | ||
| 93 | handle_sysrq(sysrq_key, NULL); | ||
| 94 | } | ||
| 95 | |||
| 96 | static struct xenbus_watch shutdown_watch = { | ||
| 97 | .node = "control/shutdown", | ||
| 98 | .callback = shutdown_handler | ||
| 99 | }; | ||
| 100 | |||
| 101 | static struct xenbus_watch sysrq_watch = { | ||
| 102 | .node = "control/sysrq", | ||
| 103 | .callback = sysrq_handler | ||
| 104 | }; | ||
| 105 | |||
| 106 | static int setup_shutdown_watcher(void) | ||
| 107 | { | ||
| 108 | int err; | ||
| 109 | |||
| 110 | err = register_xenbus_watch(&shutdown_watch); | ||
| 111 | if (err) { | ||
| 112 | printk(KERN_ERR "Failed to set shutdown watcher\n"); | ||
| 113 | return err; | ||
| 114 | } | ||
| 115 | |||
| 116 | err = register_xenbus_watch(&sysrq_watch); | ||
| 117 | if (err) { | ||
| 118 | printk(KERN_ERR "Failed to set sysrq watcher\n"); | ||
| 119 | return err; | ||
| 120 | } | ||
| 121 | |||
| 122 | return 0; | ||
| 123 | } | ||
| 124 | |||
| 125 | static int shutdown_event(struct notifier_block *notifier, | ||
| 126 | unsigned long event, | ||
| 127 | void *data) | ||
| 128 | { | ||
| 129 | setup_shutdown_watcher(); | ||
| 130 | return NOTIFY_DONE; | ||
| 131 | } | ||
| 132 | |||
| 133 | static int __init setup_shutdown_event(void) | ||
| 134 | { | ||
| 135 | static struct notifier_block xenstore_notifier = { | ||
| 136 | .notifier_call = shutdown_event | ||
| 137 | }; | ||
| 138 | register_xenstore_notifier(&xenstore_notifier); | ||
| 139 | |||
| 140 | return 0; | ||
| 141 | } | ||
| 142 | |||
| 143 | subsys_initcall(setup_shutdown_event); | ||
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 4e527e7893a8..42b3b9ed641d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -56,6 +56,131 @@ | |||
| 56 | #include "multicalls.h" | 56 | #include "multicalls.h" |
| 57 | #include "mmu.h" | 57 | #include "mmu.h" |
| 58 | 58 | ||
| 59 | #define P2M_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(unsigned long)) | ||
| 60 | #define TOP_ENTRIES (MAX_DOMAIN_PAGES / P2M_ENTRIES_PER_PAGE) | ||
| 61 | |||
| 62 | /* Placeholder for holes in the address space */ | ||
| 63 | static unsigned long p2m_missing[P2M_ENTRIES_PER_PAGE] | ||
| 64 | __attribute__((section(".data.page_aligned"))) = | ||
| 65 | { [ 0 ... P2M_ENTRIES_PER_PAGE-1 ] = ~0UL }; | ||
| 66 | |||
| 67 | /* Array of pointers to pages containing p2m entries */ | ||
| 68 | static unsigned long *p2m_top[TOP_ENTRIES] | ||
| 69 | __attribute__((section(".data.page_aligned"))) = | ||
| 70 | { [ 0 ... TOP_ENTRIES - 1] = &p2m_missing[0] }; | ||
| 71 | |||
| 72 | /* Arrays of p2m arrays expressed in mfns used for save/restore */ | ||
| 73 | static unsigned long p2m_top_mfn[TOP_ENTRIES] | ||
| 74 | __attribute__((section(".bss.page_aligned"))); | ||
| 75 | |||
| 76 | static unsigned long p2m_top_mfn_list[ | ||
| 77 | PAGE_ALIGN(TOP_ENTRIES / P2M_ENTRIES_PER_PAGE)] | ||
| 78 | __attribute__((section(".bss.page_aligned"))); | ||
| 79 | |||
| 80 | static inline unsigned p2m_top_index(unsigned long pfn) | ||
| 81 | { | ||
| 82 | BUG_ON(pfn >= MAX_DOMAIN_PAGES); | ||
| 83 | return pfn / P2M_ENTRIES_PER_PAGE; | ||
| 84 | } | ||
| 85 | |||
| 86 | static inline unsigned p2m_index(unsigned long pfn) | ||
| 87 | { | ||
| 88 | return pfn % P2M_ENTRIES_PER_PAGE; | ||
| 89 | } | ||
| 90 | |||
| 91 | /* Build the parallel p2m_top_mfn structures */ | ||
| 92 | void xen_setup_mfn_list_list(void) | ||
| 93 | { | ||
| 94 | unsigned pfn, idx; | ||
| 95 | |||
| 96 | for(pfn = 0; pfn < MAX_DOMAIN_PAGES; pfn += P2M_ENTRIES_PER_PAGE) { | ||
| 97 | unsigned topidx = p2m_top_index(pfn); | ||
| 98 | |||
| 99 | p2m_top_mfn[topidx] = virt_to_mfn(p2m_top[topidx]); | ||
| 100 | } | ||
| 101 | |||
| 102 | for(idx = 0; idx < ARRAY_SIZE(p2m_top_mfn_list); idx++) { | ||
| 103 | unsigned topidx = idx * P2M_ENTRIES_PER_PAGE; | ||
| 104 | p2m_top_mfn_list[idx] = virt_to_mfn(&p2m_top_mfn[topidx]); | ||
| 105 | } | ||
| 106 | |||
| 107 | BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info); | ||
| 108 | |||
| 109 | HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list = | ||
| 110 | virt_to_mfn(p2m_top_mfn_list); | ||
| 111 | HYPERVISOR_shared_info->arch.max_pfn = xen_start_info->nr_pages; | ||
| 112 | } | ||
| 113 | |||
| 114 | /* Set up p2m_top to point to the domain-builder provided p2m pages */ | ||
| 115 | void __init xen_build_dynamic_phys_to_machine(void) | ||
| 116 | { | ||
| 117 | unsigned long *mfn_list = (unsigned long *)xen_start_info->mfn_list; | ||
| 118 | unsigned long max_pfn = min(MAX_DOMAIN_PAGES, xen_start_info->nr_pages); | ||
| 119 | unsigned pfn; | ||
| 120 | |||
| 121 | for(pfn = 0; pfn < max_pfn; pfn += P2M_ENTRIES_PER_PAGE) { | ||
| 122 | unsigned topidx = p2m_top_index(pfn); | ||
| 123 | |||
| 124 | p2m_top[topidx] = &mfn_list[pfn]; | ||
| 125 | } | ||
| 126 | } | ||
| 127 | |||
| 128 | unsigned long get_phys_to_machine(unsigned long pfn) | ||
| 129 | { | ||
| 130 | unsigned topidx, idx; | ||
| 131 | |||
| 132 | if (unlikely(pfn >= MAX_DOMAIN_PAGES)) | ||
| 133 | return INVALID_P2M_ENTRY; | ||
| 134 | |||
| 135 | topidx = p2m_top_index(pfn); | ||
| 136 | idx = p2m_index(pfn); | ||
| 137 | return p2m_top[topidx][idx]; | ||
| 138 | } | ||
| 139 | EXPORT_SYMBOL_GPL(get_phys_to_machine); | ||
| 140 | |||
| 141 | static void alloc_p2m(unsigned long **pp, unsigned long *mfnp) | ||
| 142 | { | ||
| 143 | unsigned long *p; | ||
| 144 | unsigned i; | ||
| 145 | |||
| 146 | p = (void *)__get_free_page(GFP_KERNEL | __GFP_NOFAIL); | ||
| 147 | BUG_ON(p == NULL); | ||
| 148 | |||
| 149 | for(i = 0; i < P2M_ENTRIES_PER_PAGE; i++) | ||
| 150 | p[i] = INVALID_P2M_ENTRY; | ||
| 151 | |||
| 152 | if (cmpxchg(pp, p2m_missing, p) != p2m_missing) | ||
| 153 | free_page((unsigned long)p); | ||
| 154 | else | ||
| 155 | *mfnp = virt_to_mfn(p); | ||
| 156 | } | ||
| 157 | |||
| 158 | void set_phys_to_machine(unsigned long pfn, unsigned long mfn) | ||
| 159 | { | ||
| 160 | unsigned topidx, idx; | ||
| 161 | |||
| 162 | if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) { | ||
| 163 | BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY); | ||
| 164 | return; | ||
| 165 | } | ||
| 166 | |||
| 167 | if (unlikely(pfn >= MAX_DOMAIN_PAGES)) { | ||
| 168 | BUG_ON(mfn != INVALID_P2M_ENTRY); | ||
| 169 | return; | ||
| 170 | } | ||
| 171 | |||
| 172 | topidx = p2m_top_index(pfn); | ||
| 173 | if (p2m_top[topidx] == p2m_missing) { | ||
| 174 | /* no need to allocate a page to store an invalid entry */ | ||
| 175 | if (mfn == INVALID_P2M_ENTRY) | ||
| 176 | return; | ||
| 177 | alloc_p2m(&p2m_top[topidx], &p2m_top_mfn[topidx]); | ||
| 178 | } | ||
| 179 | |||
| 180 | idx = p2m_index(pfn); | ||
| 181 | p2m_top[topidx][idx] = mfn; | ||
| 182 | } | ||
| 183 | |||
| 59 | xmaddr_t arbitrary_virt_to_machine(unsigned long address) | 184 | xmaddr_t arbitrary_virt_to_machine(unsigned long address) |
| 60 | { | 185 | { |
| 61 | unsigned int level; | 186 | unsigned int level; |
| @@ -98,24 +223,60 @@ void make_lowmem_page_readwrite(void *vaddr) | |||
| 98 | } | 223 | } |
| 99 | 224 | ||
| 100 | 225 | ||
| 101 | void xen_set_pmd(pmd_t *ptr, pmd_t val) | 226 | static bool page_pinned(void *ptr) |
| 227 | { | ||
| 228 | struct page *page = virt_to_page(ptr); | ||
| 229 | |||
| 230 | return PagePinned(page); | ||
| 231 | } | ||
| 232 | |||
| 233 | static void extend_mmu_update(const struct mmu_update *update) | ||
| 102 | { | 234 | { |
| 103 | struct multicall_space mcs; | 235 | struct multicall_space mcs; |
| 104 | struct mmu_update *u; | 236 | struct mmu_update *u; |
| 105 | 237 | ||
| 106 | preempt_disable(); | 238 | mcs = xen_mc_extend_args(__HYPERVISOR_mmu_update, sizeof(*u)); |
| 239 | |||
| 240 | if (mcs.mc != NULL) | ||
| 241 | mcs.mc->args[1]++; | ||
| 242 | else { | ||
| 243 | mcs = __xen_mc_entry(sizeof(*u)); | ||
| 244 | MULTI_mmu_update(mcs.mc, mcs.args, 1, NULL, DOMID_SELF); | ||
| 245 | } | ||
| 107 | 246 | ||
| 108 | mcs = xen_mc_entry(sizeof(*u)); | ||
| 109 | u = mcs.args; | 247 | u = mcs.args; |
| 110 | u->ptr = virt_to_machine(ptr).maddr; | 248 | *u = *update; |
| 111 | u->val = pmd_val_ma(val); | 249 | } |
| 112 | MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF); | 250 | |
| 251 | void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val) | ||
| 252 | { | ||
| 253 | struct mmu_update u; | ||
| 254 | |||
| 255 | preempt_disable(); | ||
| 256 | |||
| 257 | xen_mc_batch(); | ||
| 258 | |||
| 259 | u.ptr = virt_to_machine(ptr).maddr; | ||
| 260 | u.val = pmd_val_ma(val); | ||
| 261 | extend_mmu_update(&u); | ||
| 113 | 262 | ||
| 114 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 263 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
| 115 | 264 | ||
| 116 | preempt_enable(); | 265 | preempt_enable(); |
| 117 | } | 266 | } |
| 118 | 267 | ||
| 268 | void xen_set_pmd(pmd_t *ptr, pmd_t val) | ||
| 269 | { | ||
| 270 | /* If page is not pinned, we can just update the entry | ||
| 271 | directly */ | ||
| 272 | if (!page_pinned(ptr)) { | ||
| 273 | *ptr = val; | ||
| 274 | return; | ||
| 275 | } | ||
| 276 | |||
| 277 | xen_set_pmd_hyper(ptr, val); | ||
| 278 | } | ||
| 279 | |||
| 119 | /* | 280 | /* |
| 120 | * Associate a virtual page frame with a given physical page frame | 281 | * Associate a virtual page frame with a given physical page frame |
| 121 | * and protection flags for that frame. | 282 | * and protection flags for that frame. |
| @@ -179,6 +340,26 @@ out: | |||
| 179 | preempt_enable(); | 340 | preempt_enable(); |
| 180 | } | 341 | } |
| 181 | 342 | ||
| 343 | pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | ||
| 344 | { | ||
| 345 | /* Just return the pte as-is. We preserve the bits on commit */ | ||
| 346 | return *ptep; | ||
| 347 | } | ||
| 348 | |||
| 349 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | ||
| 350 | pte_t *ptep, pte_t pte) | ||
| 351 | { | ||
| 352 | struct mmu_update u; | ||
| 353 | |||
| 354 | xen_mc_batch(); | ||
| 355 | |||
| 356 | u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD; | ||
| 357 | u.val = pte_val_ma(pte); | ||
| 358 | extend_mmu_update(&u); | ||
| 359 | |||
| 360 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
| 361 | } | ||
| 362 | |||
| 182 | /* Assume pteval_t is equivalent to all the other *val_t types. */ | 363 | /* Assume pteval_t is equivalent to all the other *val_t types. */ |
| 183 | static pteval_t pte_mfn_to_pfn(pteval_t val) | 364 | static pteval_t pte_mfn_to_pfn(pteval_t val) |
| 184 | { | 365 | { |
| @@ -229,24 +410,35 @@ pmdval_t xen_pmd_val(pmd_t pmd) | |||
| 229 | return pte_mfn_to_pfn(pmd.pmd); | 410 | return pte_mfn_to_pfn(pmd.pmd); |
| 230 | } | 411 | } |
| 231 | 412 | ||
| 232 | void xen_set_pud(pud_t *ptr, pud_t val) | 413 | void xen_set_pud_hyper(pud_t *ptr, pud_t val) |
| 233 | { | 414 | { |
| 234 | struct multicall_space mcs; | 415 | struct mmu_update u; |
| 235 | struct mmu_update *u; | ||
| 236 | 416 | ||
| 237 | preempt_disable(); | 417 | preempt_disable(); |
| 238 | 418 | ||
| 239 | mcs = xen_mc_entry(sizeof(*u)); | 419 | xen_mc_batch(); |
| 240 | u = mcs.args; | 420 | |
| 241 | u->ptr = virt_to_machine(ptr).maddr; | 421 | u.ptr = virt_to_machine(ptr).maddr; |
| 242 | u->val = pud_val_ma(val); | 422 | u.val = pud_val_ma(val); |
| 243 | MULTI_mmu_update(mcs.mc, u, 1, NULL, DOMID_SELF); | 423 | extend_mmu_update(&u); |
| 244 | 424 | ||
| 245 | xen_mc_issue(PARAVIRT_LAZY_MMU); | 425 | xen_mc_issue(PARAVIRT_LAZY_MMU); |
| 246 | 426 | ||
| 247 | preempt_enable(); | 427 | preempt_enable(); |
| 248 | } | 428 | } |
| 249 | 429 | ||
| 430 | void xen_set_pud(pud_t *ptr, pud_t val) | ||
| 431 | { | ||
| 432 | /* If page is not pinned, we can just update the entry | ||
| 433 | directly */ | ||
| 434 | if (!page_pinned(ptr)) { | ||
| 435 | *ptr = val; | ||
| 436 | return; | ||
| 437 | } | ||
| 438 | |||
| 439 | xen_set_pud_hyper(ptr, val); | ||
| 440 | } | ||
| 441 | |||
| 250 | void xen_set_pte(pte_t *ptep, pte_t pte) | 442 | void xen_set_pte(pte_t *ptep, pte_t pte) |
| 251 | { | 443 | { |
| 252 | ptep->pte_high = pte.pte_high; | 444 | ptep->pte_high = pte.pte_high; |
| @@ -268,7 +460,7 @@ void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) | |||
| 268 | 460 | ||
| 269 | void xen_pmd_clear(pmd_t *pmdp) | 461 | void xen_pmd_clear(pmd_t *pmdp) |
| 270 | { | 462 | { |
| 271 | xen_set_pmd(pmdp, __pmd(0)); | 463 | set_pmd(pmdp, __pmd(0)); |
| 272 | } | 464 | } |
| 273 | 465 | ||
| 274 | pmd_t xen_make_pmd(pmdval_t pmd) | 466 | pmd_t xen_make_pmd(pmdval_t pmd) |
| @@ -441,6 +633,29 @@ void xen_pgd_pin(pgd_t *pgd) | |||
| 441 | xen_mc_issue(0); | 633 | xen_mc_issue(0); |
| 442 | } | 634 | } |
| 443 | 635 | ||
| 636 | /* | ||
| 637 | * On save, we need to pin all pagetables to make sure they get their | ||
| 638 | * mfns turned into pfns. Search the list for any unpinned pgds and pin | ||
| 639 | * them (unpinned pgds are not currently in use, probably because the | ||
| 640 | * process is under construction or destruction). | ||
| 641 | */ | ||
| 642 | void xen_mm_pin_all(void) | ||
| 643 | { | ||
| 644 | unsigned long flags; | ||
| 645 | struct page *page; | ||
| 646 | |||
| 647 | spin_lock_irqsave(&pgd_lock, flags); | ||
| 648 | |||
| 649 | list_for_each_entry(page, &pgd_list, lru) { | ||
| 650 | if (!PagePinned(page)) { | ||
| 651 | xen_pgd_pin((pgd_t *)page_address(page)); | ||
| 652 | SetPageSavePinned(page); | ||
| 653 | } | ||
| 654 | } | ||
| 655 | |||
| 656 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
| 657 | } | ||
| 658 | |||
| 444 | /* The init_mm pagetable is really pinned as soon as its created, but | 659 | /* The init_mm pagetable is really pinned as soon as its created, but |
| 445 | that's before we have page structures to store the bits. So do all | 660 | that's before we have page structures to store the bits. So do all |
| 446 | the book-keeping now. */ | 661 | the book-keeping now. */ |
| @@ -498,6 +713,29 @@ static void xen_pgd_unpin(pgd_t *pgd) | |||
| 498 | xen_mc_issue(0); | 713 | xen_mc_issue(0); |
| 499 | } | 714 | } |
| 500 | 715 | ||
| 716 | /* | ||
| 717 | * On resume, undo any pinning done at save, so that the rest of the | ||
| 718 | * kernel doesn't see any unexpected pinned pagetables. | ||
| 719 | */ | ||
| 720 | void xen_mm_unpin_all(void) | ||
| 721 | { | ||
| 722 | unsigned long flags; | ||
| 723 | struct page *page; | ||
| 724 | |||
| 725 | spin_lock_irqsave(&pgd_lock, flags); | ||
| 726 | |||
| 727 | list_for_each_entry(page, &pgd_list, lru) { | ||
| 728 | if (PageSavePinned(page)) { | ||
| 729 | BUG_ON(!PagePinned(page)); | ||
| 730 | printk("unpinning pinned %p\n", page_address(page)); | ||
| 731 | xen_pgd_unpin((pgd_t *)page_address(page)); | ||
| 732 | ClearPageSavePinned(page); | ||
| 733 | } | ||
| 734 | } | ||
| 735 | |||
| 736 | spin_unlock_irqrestore(&pgd_lock, flags); | ||
| 737 | } | ||
| 738 | |||
| 501 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next) | 739 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next) |
| 502 | { | 740 | { |
| 503 | spin_lock(&next->page_table_lock); | 741 | spin_lock(&next->page_table_lock); |
| @@ -591,7 +829,7 @@ void xen_exit_mmap(struct mm_struct *mm) | |||
| 591 | spin_lock(&mm->page_table_lock); | 829 | spin_lock(&mm->page_table_lock); |
| 592 | 830 | ||
| 593 | /* pgd may not be pinned in the error exit path of execve */ | 831 | /* pgd may not be pinned in the error exit path of execve */ |
| 594 | if (PagePinned(virt_to_page(mm->pgd))) | 832 | if (page_pinned(mm->pgd)) |
| 595 | xen_pgd_unpin(mm->pgd); | 833 | xen_pgd_unpin(mm->pgd); |
| 596 | 834 | ||
| 597 | spin_unlock(&mm->page_table_lock); | 835 | spin_unlock(&mm->page_table_lock); |
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index 5fe961caffd4..297bf9f5b8bc 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
| @@ -25,10 +25,6 @@ enum pt_level { | |||
| 25 | 25 | ||
| 26 | void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); | 26 | void set_pte_mfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); |
| 27 | 27 | ||
| 28 | void xen_set_pte(pte_t *ptep, pte_t pteval); | ||
| 29 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | ||
| 30 | pte_t *ptep, pte_t pteval); | ||
| 31 | void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval); | ||
| 32 | 28 | ||
| 33 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next); | 29 | void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next); |
| 34 | void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm); | 30 | void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm); |
| @@ -45,11 +41,19 @@ pte_t xen_make_pte(pteval_t); | |||
| 45 | pmd_t xen_make_pmd(pmdval_t); | 41 | pmd_t xen_make_pmd(pmdval_t); |
| 46 | pgd_t xen_make_pgd(pgdval_t); | 42 | pgd_t xen_make_pgd(pgdval_t); |
| 47 | 43 | ||
| 44 | void xen_set_pte(pte_t *ptep, pte_t pteval); | ||
| 48 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, | 45 | void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, |
| 49 | pte_t *ptep, pte_t pteval); | 46 | pte_t *ptep, pte_t pteval); |
| 50 | void xen_set_pte_atomic(pte_t *ptep, pte_t pte); | 47 | void xen_set_pte_atomic(pte_t *ptep, pte_t pte); |
| 48 | void xen_set_pmd(pmd_t *pmdp, pmd_t pmdval); | ||
| 51 | void xen_set_pud(pud_t *ptr, pud_t val); | 49 | void xen_set_pud(pud_t *ptr, pud_t val); |
| 50 | void xen_set_pmd_hyper(pmd_t *pmdp, pmd_t pmdval); | ||
| 51 | void xen_set_pud_hyper(pud_t *ptr, pud_t val); | ||
| 52 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | 52 | void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep); |
| 53 | void xen_pmd_clear(pmd_t *pmdp); | 53 | void xen_pmd_clear(pmd_t *pmdp); |
| 54 | 54 | ||
| 55 | pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep); | ||
| 56 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | ||
| 57 | pte_t *ptep, pte_t pte); | ||
| 58 | |||
| 55 | #endif /* _XEN_MMU_H */ | 59 | #endif /* _XEN_MMU_H */ |
diff --git a/arch/x86/xen/multicalls.c b/arch/x86/xen/multicalls.c index 5791eb2e3750..3c63c4da7ed1 100644 --- a/arch/x86/xen/multicalls.c +++ b/arch/x86/xen/multicalls.c | |||
| @@ -29,14 +29,14 @@ | |||
| 29 | #define MC_DEBUG 1 | 29 | #define MC_DEBUG 1 |
| 30 | 30 | ||
| 31 | #define MC_BATCH 32 | 31 | #define MC_BATCH 32 |
| 32 | #define MC_ARGS (MC_BATCH * 16 / sizeof(u64)) | 32 | #define MC_ARGS (MC_BATCH * 16) |
| 33 | 33 | ||
| 34 | struct mc_buffer { | 34 | struct mc_buffer { |
| 35 | struct multicall_entry entries[MC_BATCH]; | 35 | struct multicall_entry entries[MC_BATCH]; |
| 36 | #if MC_DEBUG | 36 | #if MC_DEBUG |
| 37 | struct multicall_entry debug[MC_BATCH]; | 37 | struct multicall_entry debug[MC_BATCH]; |
| 38 | #endif | 38 | #endif |
| 39 | u64 args[MC_ARGS]; | 39 | unsigned char args[MC_ARGS]; |
| 40 | struct callback { | 40 | struct callback { |
| 41 | void (*fn)(void *); | 41 | void (*fn)(void *); |
| 42 | void *data; | 42 | void *data; |
| @@ -107,20 +107,48 @@ struct multicall_space __xen_mc_entry(size_t args) | |||
| 107 | { | 107 | { |
| 108 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); | 108 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); |
| 109 | struct multicall_space ret; | 109 | struct multicall_space ret; |
| 110 | unsigned argspace = (args + sizeof(u64) - 1) / sizeof(u64); | 110 | unsigned argidx = roundup(b->argidx, sizeof(u64)); |
| 111 | 111 | ||
| 112 | BUG_ON(preemptible()); | 112 | BUG_ON(preemptible()); |
| 113 | BUG_ON(argspace > MC_ARGS); | 113 | BUG_ON(b->argidx > MC_ARGS); |
| 114 | 114 | ||
| 115 | if (b->mcidx == MC_BATCH || | 115 | if (b->mcidx == MC_BATCH || |
| 116 | (b->argidx + argspace) > MC_ARGS) | 116 | (argidx + args) > MC_ARGS) { |
| 117 | xen_mc_flush(); | 117 | xen_mc_flush(); |
| 118 | argidx = roundup(b->argidx, sizeof(u64)); | ||
| 119 | } | ||
| 118 | 120 | ||
| 119 | ret.mc = &b->entries[b->mcidx]; | 121 | ret.mc = &b->entries[b->mcidx]; |
| 120 | b->mcidx++; | 122 | b->mcidx++; |
| 123 | ret.args = &b->args[argidx]; | ||
| 124 | b->argidx = argidx + args; | ||
| 125 | |||
| 126 | BUG_ON(b->argidx > MC_ARGS); | ||
| 127 | return ret; | ||
| 128 | } | ||
| 129 | |||
| 130 | struct multicall_space xen_mc_extend_args(unsigned long op, size_t size) | ||
| 131 | { | ||
| 132 | struct mc_buffer *b = &__get_cpu_var(mc_buffer); | ||
| 133 | struct multicall_space ret = { NULL, NULL }; | ||
| 134 | |||
| 135 | BUG_ON(preemptible()); | ||
| 136 | BUG_ON(b->argidx > MC_ARGS); | ||
| 137 | |||
| 138 | if (b->mcidx == 0) | ||
| 139 | return ret; | ||
| 140 | |||
| 141 | if (b->entries[b->mcidx - 1].op != op) | ||
| 142 | return ret; | ||
| 143 | |||
| 144 | if ((b->argidx + size) > MC_ARGS) | ||
| 145 | return ret; | ||
| 146 | |||
| 147 | ret.mc = &b->entries[b->mcidx - 1]; | ||
| 121 | ret.args = &b->args[b->argidx]; | 148 | ret.args = &b->args[b->argidx]; |
| 122 | b->argidx += argspace; | 149 | b->argidx += size; |
| 123 | 150 | ||
| 151 | BUG_ON(b->argidx > MC_ARGS); | ||
| 124 | return ret; | 152 | return ret; |
| 125 | } | 153 | } |
| 126 | 154 | ||
diff --git a/arch/x86/xen/multicalls.h b/arch/x86/xen/multicalls.h index 8bae996d99a3..858938241616 100644 --- a/arch/x86/xen/multicalls.h +++ b/arch/x86/xen/multicalls.h | |||
| @@ -45,4 +45,16 @@ static inline void xen_mc_issue(unsigned mode) | |||
| 45 | /* Set up a callback to be called when the current batch is flushed */ | 45 | /* Set up a callback to be called when the current batch is flushed */ |
| 46 | void xen_mc_callback(void (*fn)(void *), void *data); | 46 | void xen_mc_callback(void (*fn)(void *), void *data); |
| 47 | 47 | ||
| 48 | /* | ||
| 49 | * Try to extend the arguments of the previous multicall command. The | ||
| 50 | * previous command's op must match. If it does, then it attempts to | ||
| 51 | * extend the argument space allocated to the multicall entry by | ||
| 52 | * arg_size bytes. | ||
| 53 | * | ||
| 54 | * The returned multicall_space will return with mc pointing to the | ||
| 55 | * command on success, or NULL on failure, and args pointing to the | ||
| 56 | * newly allocated space. | ||
| 57 | */ | ||
| 58 | struct multicall_space xen_mc_extend_args(unsigned long op, size_t arg_size); | ||
| 59 | |||
| 48 | #endif /* _XEN_MULTICALLS_H */ | 60 | #endif /* _XEN_MULTICALLS_H */ |
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 82517e4a752a..488447878a9d 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <asm/xen/hypervisor.h> | 16 | #include <asm/xen/hypervisor.h> |
| 17 | #include <asm/xen/hypercall.h> | 17 | #include <asm/xen/hypercall.h> |
| 18 | 18 | ||
| 19 | #include <xen/page.h> | ||
| 19 | #include <xen/interface/callback.h> | 20 | #include <xen/interface/callback.h> |
| 20 | #include <xen/interface/physdev.h> | 21 | #include <xen/interface/physdev.h> |
| 21 | #include <xen/features.h> | 22 | #include <xen/features.h> |
| @@ -27,8 +28,6 @@ | |||
| 27 | extern const char xen_hypervisor_callback[]; | 28 | extern const char xen_hypervisor_callback[]; |
| 28 | extern const char xen_failsafe_callback[]; | 29 | extern const char xen_failsafe_callback[]; |
| 29 | 30 | ||
| 30 | unsigned long *phys_to_machine_mapping; | ||
| 31 | EXPORT_SYMBOL(phys_to_machine_mapping); | ||
| 32 | 31 | ||
| 33 | /** | 32 | /** |
| 34 | * machine_specific_memory_setup - Hook for machine specific memory setup. | 33 | * machine_specific_memory_setup - Hook for machine specific memory setup. |
| @@ -38,6 +37,8 @@ char * __init xen_memory_setup(void) | |||
| 38 | { | 37 | { |
| 39 | unsigned long max_pfn = xen_start_info->nr_pages; | 38 | unsigned long max_pfn = xen_start_info->nr_pages; |
| 40 | 39 | ||
| 40 | max_pfn = min(MAX_DOMAIN_PAGES, max_pfn); | ||
| 41 | |||
| 41 | e820.nr_map = 0; | 42 | e820.nr_map = 0; |
| 42 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); | 43 | add_memory_region(0, LOWMEMSIZE(), E820_RAM); |
| 43 | add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); | 44 | add_memory_region(HIGH_MEMORY, PFN_PHYS(max_pfn)-HIGH_MEMORY, E820_RAM); |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 94e69000f982..d2e3c20127d7 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include "xen-ops.h" | 35 | #include "xen-ops.h" |
| 36 | #include "mmu.h" | 36 | #include "mmu.h" |
| 37 | 37 | ||
| 38 | static cpumask_t xen_cpu_initialized_map; | 38 | cpumask_t xen_cpu_initialized_map; |
| 39 | static DEFINE_PER_CPU(int, resched_irq) = -1; | 39 | static DEFINE_PER_CPU(int, resched_irq) = -1; |
| 40 | static DEFINE_PER_CPU(int, callfunc_irq) = -1; | 40 | static DEFINE_PER_CPU(int, callfunc_irq) = -1; |
| 41 | static DEFINE_PER_CPU(int, debug_irq) = -1; | 41 | static DEFINE_PER_CPU(int, debug_irq) = -1; |
| @@ -65,6 +65,12 @@ static struct call_data_struct *call_data; | |||
| 65 | */ | 65 | */ |
| 66 | static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) | 66 | static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) |
| 67 | { | 67 | { |
| 68 | #ifdef CONFIG_X86_32 | ||
| 69 | __get_cpu_var(irq_stat).irq_resched_count++; | ||
| 70 | #else | ||
| 71 | add_pda(irq_resched_count, 1); | ||
| 72 | #endif | ||
| 73 | |||
| 68 | return IRQ_HANDLED; | 74 | return IRQ_HANDLED; |
| 69 | } | 75 | } |
| 70 | 76 | ||
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c new file mode 100644 index 000000000000..251669a932d4 --- /dev/null +++ b/arch/x86/xen/suspend.c | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | #include <linux/types.h> | ||
| 2 | |||
| 3 | #include <xen/interface/xen.h> | ||
| 4 | #include <xen/grant_table.h> | ||
| 5 | #include <xen/events.h> | ||
| 6 | |||
| 7 | #include <asm/xen/hypercall.h> | ||
| 8 | #include <asm/xen/page.h> | ||
| 9 | |||
| 10 | #include "xen-ops.h" | ||
| 11 | #include "mmu.h" | ||
| 12 | |||
| 13 | void xen_pre_suspend(void) | ||
| 14 | { | ||
| 15 | xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn); | ||
| 16 | xen_start_info->console.domU.mfn = | ||
| 17 | mfn_to_pfn(xen_start_info->console.domU.mfn); | ||
| 18 | |||
| 19 | BUG_ON(!irqs_disabled()); | ||
| 20 | |||
| 21 | HYPERVISOR_shared_info = &xen_dummy_shared_info; | ||
| 22 | if (HYPERVISOR_update_va_mapping(fix_to_virt(FIX_PARAVIRT_BOOTMAP), | ||
| 23 | __pte_ma(0), 0)) | ||
| 24 | BUG(); | ||
| 25 | } | ||
| 26 | |||
| 27 | void xen_post_suspend(int suspend_cancelled) | ||
| 28 | { | ||
| 29 | xen_setup_shared_info(); | ||
| 30 | |||
| 31 | if (suspend_cancelled) { | ||
| 32 | xen_start_info->store_mfn = | ||
| 33 | pfn_to_mfn(xen_start_info->store_mfn); | ||
| 34 | xen_start_info->console.domU.mfn = | ||
| 35 | pfn_to_mfn(xen_start_info->console.domU.mfn); | ||
| 36 | } else { | ||
| 37 | #ifdef CONFIG_SMP | ||
| 38 | xen_cpu_initialized_map = cpu_online_map; | ||
| 39 | #endif | ||
| 40 | xen_vcpu_restore(); | ||
| 41 | xen_timer_resume(); | ||
| 42 | } | ||
| 43 | |||
| 44 | } | ||
| 45 | |||
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index 41e217503c96..64f0038b9558 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c | |||
| @@ -459,6 +459,19 @@ void xen_setup_cpu_clockevents(void) | |||
| 459 | clockevents_register_device(&__get_cpu_var(xen_clock_events)); | 459 | clockevents_register_device(&__get_cpu_var(xen_clock_events)); |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | void xen_timer_resume(void) | ||
| 463 | { | ||
| 464 | int cpu; | ||
| 465 | |||
| 466 | if (xen_clockevent != &xen_vcpuop_clockevent) | ||
| 467 | return; | ||
| 468 | |||
| 469 | for_each_online_cpu(cpu) { | ||
| 470 | if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL)) | ||
| 471 | BUG(); | ||
| 472 | } | ||
| 473 | } | ||
| 474 | |||
| 462 | __init void xen_time_init(void) | 475 | __init void xen_time_init(void) |
| 463 | { | 476 | { |
| 464 | int cpu = smp_processor_id(); | 477 | int cpu = smp_processor_id(); |
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 6ec3b4f7719b..7c0cf6320a0a 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <asm/boot.h> | 8 | #include <asm/boot.h> |
| 9 | #include <xen/interface/elfnote.h> | 9 | #include <xen/interface/elfnote.h> |
| 10 | #include <asm/xen/interface.h> | ||
| 10 | 11 | ||
| 11 | __INIT | 12 | __INIT |
| 12 | ENTRY(startup_xen) | 13 | ENTRY(startup_xen) |
| @@ -32,5 +33,9 @@ ENTRY(hypercall_page) | |||
| 32 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") | 33 | ELFNOTE(Xen, XEN_ELFNOTE_FEATURES, .asciz "!writable_page_tables|pae_pgdir_above_4gb") |
| 33 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") | 34 | ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE, .asciz "yes") |
| 34 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") | 35 | ELFNOTE(Xen, XEN_ELFNOTE_LOADER, .asciz "generic") |
| 36 | ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID, | ||
| 37 | .quad _PAGE_PRESENT; .quad _PAGE_PRESENT) | ||
| 38 | ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long 1) | ||
| 39 | ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW, .long __HYPERVISOR_VIRT_START) | ||
| 35 | 40 | ||
| 36 | #endif /*CONFIG_XEN */ | 41 | #endif /*CONFIG_XEN */ |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index f1063ae08037..9a055592a307 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
| @@ -9,18 +9,26 @@ | |||
| 9 | extern const char xen_hypervisor_callback[]; | 9 | extern const char xen_hypervisor_callback[]; |
| 10 | extern const char xen_failsafe_callback[]; | 10 | extern const char xen_failsafe_callback[]; |
| 11 | 11 | ||
| 12 | struct trap_info; | ||
| 12 | void xen_copy_trap_info(struct trap_info *traps); | 13 | void xen_copy_trap_info(struct trap_info *traps); |
| 13 | 14 | ||
| 14 | DECLARE_PER_CPU(unsigned long, xen_cr3); | 15 | DECLARE_PER_CPU(unsigned long, xen_cr3); |
| 15 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); | 16 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); |
| 16 | 17 | ||
| 17 | extern struct start_info *xen_start_info; | 18 | extern struct start_info *xen_start_info; |
| 19 | extern struct shared_info xen_dummy_shared_info; | ||
| 18 | extern struct shared_info *HYPERVISOR_shared_info; | 20 | extern struct shared_info *HYPERVISOR_shared_info; |
| 19 | 21 | ||
| 22 | void xen_setup_mfn_list_list(void); | ||
| 23 | void xen_setup_shared_info(void); | ||
| 24 | |||
| 20 | char * __init xen_memory_setup(void); | 25 | char * __init xen_memory_setup(void); |
| 21 | void __init xen_arch_setup(void); | 26 | void __init xen_arch_setup(void); |
| 22 | void __init xen_init_IRQ(void); | 27 | void __init xen_init_IRQ(void); |
| 23 | void xen_enable_sysenter(void); | 28 | void xen_enable_sysenter(void); |
| 29 | void xen_vcpu_restore(void); | ||
| 30 | |||
| 31 | void __init xen_build_dynamic_phys_to_machine(void); | ||
| 24 | 32 | ||
| 25 | void xen_setup_timer(int cpu); | 33 | void xen_setup_timer(int cpu); |
| 26 | void xen_setup_cpu_clockevents(void); | 34 | void xen_setup_cpu_clockevents(void); |
| @@ -29,6 +37,7 @@ void __init xen_time_init(void); | |||
| 29 | unsigned long xen_get_wallclock(void); | 37 | unsigned long xen_get_wallclock(void); |
| 30 | int xen_set_wallclock(unsigned long time); | 38 | int xen_set_wallclock(unsigned long time); |
| 31 | unsigned long long xen_sched_clock(void); | 39 | unsigned long long xen_sched_clock(void); |
| 40 | void xen_timer_resume(void); | ||
| 32 | 41 | ||
| 33 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); | 42 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); |
| 34 | 43 | ||
| @@ -54,6 +63,8 @@ int xen_smp_call_function_single(int cpu, void (*func) (void *info), void *info, | |||
| 54 | int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *), | 63 | int xen_smp_call_function_mask(cpumask_t mask, void (*func)(void *), |
| 55 | void *info, int wait); | 64 | void *info, int wait); |
| 56 | 65 | ||
| 66 | extern cpumask_t xen_cpu_initialized_map; | ||
| 67 | |||
| 57 | 68 | ||
| 58 | /* Declare an asm function, along with symbols needed to make it | 69 | /* Declare an asm function, along with symbols needed to make it |
| 59 | inlineable */ | 70 | inlineable */ |
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c index 2b4b392dcbc1..87a7f1d02578 100644 --- a/drivers/base/power/trace.c +++ b/drivers/base/power/trace.c | |||
| @@ -153,7 +153,7 @@ EXPORT_SYMBOL(set_trace_device); | |||
| 153 | * it's not any guarantee, but it's a high _likelihood_ that | 153 | * it's not any guarantee, but it's a high _likelihood_ that |
| 154 | * the match is valid). | 154 | * the match is valid). |
| 155 | */ | 155 | */ |
| 156 | void generate_resume_trace(void *tracedata, unsigned int user) | 156 | void generate_resume_trace(const void *tracedata, unsigned int user) |
| 157 | { | 157 | { |
| 158 | unsigned short lineno = *(unsigned short *)tracedata; | 158 | unsigned short lineno = *(unsigned short *)tracedata; |
| 159 | const char *file = *(const char **)(tracedata + 2); | 159 | const char *file = *(const char **)(tracedata + 2); |
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 13665db363d6..481ffe87c716 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -16,28 +16,9 @@ | |||
| 16 | #include <asm/page.h> /* PAGE_SIZE */ | 16 | #include <asm/page.h> /* PAGE_SIZE */ |
| 17 | #include <asm/e820.h> | 17 | #include <asm/e820.h> |
| 18 | #include <asm/k8.h> | 18 | #include <asm/k8.h> |
| 19 | #include <asm/gart.h> | ||
| 19 | #include "agp.h" | 20 | #include "agp.h" |
| 20 | 21 | ||
| 21 | /* PTE bits. */ | ||
| 22 | #define GPTE_VALID 1 | ||
| 23 | #define GPTE_COHERENT 2 | ||
| 24 | |||
| 25 | /* Aperture control register bits. */ | ||
| 26 | #define GARTEN (1<<0) | ||
| 27 | #define DISGARTCPU (1<<4) | ||
| 28 | #define DISGARTIO (1<<5) | ||
| 29 | |||
| 30 | /* GART cache control register bits. */ | ||
| 31 | #define INVGART (1<<0) | ||
| 32 | #define GARTPTEERR (1<<1) | ||
| 33 | |||
| 34 | /* K8 On-cpu GART registers */ | ||
| 35 | #define AMD64_GARTAPERTURECTL 0x90 | ||
| 36 | #define AMD64_GARTAPERTUREBASE 0x94 | ||
| 37 | #define AMD64_GARTTABLEBASE 0x98 | ||
| 38 | #define AMD64_GARTCACHECTL 0x9c | ||
| 39 | #define AMD64_GARTEN (1<<0) | ||
| 40 | |||
| 41 | /* NVIDIA K8 registers */ | 22 | /* NVIDIA K8 registers */ |
| 42 | #define NVIDIA_X86_64_0_APBASE 0x10 | 23 | #define NVIDIA_X86_64_0_APBASE 0x10 |
| 43 | #define NVIDIA_X86_64_1_APBASE1 0x50 | 24 | #define NVIDIA_X86_64_1_APBASE1 0x50 |
| @@ -165,29 +146,18 @@ static int amd64_fetch_size(void) | |||
| 165 | * In a multiprocessor x86-64 system, this function gets | 146 | * In a multiprocessor x86-64 system, this function gets |
| 166 | * called once for each CPU. | 147 | * called once for each CPU. |
| 167 | */ | 148 | */ |
| 168 | static u64 amd64_configure (struct pci_dev *hammer, u64 gatt_table) | 149 | static u64 amd64_configure(struct pci_dev *hammer, u64 gatt_table) |
| 169 | { | 150 | { |
| 170 | u64 aperturebase; | 151 | u64 aperturebase; |
| 171 | u32 tmp; | 152 | u32 tmp; |
| 172 | u64 addr, aper_base; | 153 | u64 aper_base; |
| 173 | 154 | ||
| 174 | /* Address to map to */ | 155 | /* Address to map to */ |
| 175 | pci_read_config_dword (hammer, AMD64_GARTAPERTUREBASE, &tmp); | 156 | pci_read_config_dword(hammer, AMD64_GARTAPERTUREBASE, &tmp); |
| 176 | aperturebase = tmp << 25; | 157 | aperturebase = tmp << 25; |
| 177 | aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK); | 158 | aper_base = (aperturebase & PCI_BASE_ADDRESS_MEM_MASK); |
| 178 | 159 | ||
| 179 | /* address of the mappings table */ | 160 | enable_gart_translation(hammer, gatt_table); |
| 180 | addr = (u64) gatt_table; | ||
| 181 | addr >>= 12; | ||
| 182 | tmp = (u32) addr<<4; | ||
| 183 | tmp &= ~0xf; | ||
| 184 | pci_write_config_dword (hammer, AMD64_GARTTABLEBASE, tmp); | ||
| 185 | |||
| 186 | /* Enable GART translation for this hammer. */ | ||
| 187 | pci_read_config_dword(hammer, AMD64_GARTAPERTURECTL, &tmp); | ||
| 188 | tmp |= GARTEN; | ||
| 189 | tmp &= ~(DISGARTCPU | DISGARTIO); | ||
| 190 | pci_write_config_dword(hammer, AMD64_GARTAPERTURECTL, tmp); | ||
| 191 | 161 | ||
| 192 | return aper_base; | 162 | return aper_base; |
| 193 | } | 163 | } |
| @@ -226,9 +196,9 @@ static void amd64_cleanup(void) | |||
| 226 | for (i = 0; i < num_k8_northbridges; i++) { | 196 | for (i = 0; i < num_k8_northbridges; i++) { |
| 227 | struct pci_dev *dev = k8_northbridges[i]; | 197 | struct pci_dev *dev = k8_northbridges[i]; |
| 228 | /* disable gart translation */ | 198 | /* disable gart translation */ |
| 229 | pci_read_config_dword (dev, AMD64_GARTAPERTURECTL, &tmp); | 199 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &tmp); |
| 230 | tmp &= ~AMD64_GARTEN; | 200 | tmp &= ~AMD64_GARTEN; |
| 231 | pci_write_config_dword (dev, AMD64_GARTAPERTURECTL, tmp); | 201 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, tmp); |
| 232 | } | 202 | } |
| 233 | } | 203 | } |
| 234 | 204 | ||
| @@ -258,24 +228,10 @@ static const struct agp_bridge_driver amd_8151_driver = { | |||
| 258 | }; | 228 | }; |
| 259 | 229 | ||
| 260 | /* Some basic sanity checks for the aperture. */ | 230 | /* Some basic sanity checks for the aperture. */ |
| 261 | static int __devinit aperture_valid(u64 aper, u32 size) | 231 | static int __devinit agp_aperture_valid(u64 aper, u32 size) |
| 262 | { | 232 | { |
| 263 | if (aper == 0) { | 233 | if (!aperture_valid(aper, size, 32*1024*1024)) |
| 264 | printk(KERN_ERR PFX "No aperture\n"); | ||
| 265 | return 0; | ||
| 266 | } | ||
| 267 | if (size < 32*1024*1024) { | ||
| 268 | printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); | ||
| 269 | return 0; | ||
| 270 | } | ||
| 271 | if ((u64)aper + size > 0x100000000ULL) { | ||
| 272 | printk(KERN_ERR PFX "Aperture out of bounds\n"); | ||
| 273 | return 0; | 234 | return 0; |
| 274 | } | ||
| 275 | if (e820_any_mapped(aper, aper + size, E820_RAM)) { | ||
| 276 | printk(KERN_ERR PFX "Aperture pointing to RAM\n"); | ||
| 277 | return 0; | ||
| 278 | } | ||
| 279 | 235 | ||
| 280 | /* Request the Aperture. This catches cases when someone else | 236 | /* Request the Aperture. This catches cases when someone else |
| 281 | already put a mapping in there - happens with some very broken BIOS | 237 | already put a mapping in there - happens with some very broken BIOS |
| @@ -308,11 +264,11 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, | |||
| 308 | u32 nb_order, nb_base; | 264 | u32 nb_order, nb_base; |
| 309 | u16 apsize; | 265 | u16 apsize; |
| 310 | 266 | ||
| 311 | pci_read_config_dword(nb, 0x90, &nb_order); | 267 | pci_read_config_dword(nb, AMD64_GARTAPERTURECTL, &nb_order); |
| 312 | nb_order = (nb_order >> 1) & 7; | 268 | nb_order = (nb_order >> 1) & 7; |
| 313 | pci_read_config_dword(nb, 0x94, &nb_base); | 269 | pci_read_config_dword(nb, AMD64_GARTAPERTUREBASE, &nb_base); |
| 314 | nb_aper = nb_base << 25; | 270 | nb_aper = nb_base << 25; |
| 315 | if (aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) { | 271 | if (agp_aperture_valid(nb_aper, (32*1024*1024)<<nb_order)) { |
| 316 | return 0; | 272 | return 0; |
| 317 | } | 273 | } |
| 318 | 274 | ||
| @@ -331,12 +287,23 @@ static __devinit int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, | |||
| 331 | pci_read_config_dword(agp, 0x10, &aper_low); | 287 | pci_read_config_dword(agp, 0x10, &aper_low); |
| 332 | pci_read_config_dword(agp, 0x14, &aper_hi); | 288 | pci_read_config_dword(agp, 0x14, &aper_hi); |
| 333 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); | 289 | aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); |
| 290 | |||
| 291 | /* | ||
| 292 | * On some sick chips APSIZE is 0. This means it wants 4G | ||
| 293 | * so let double check that order, and lets trust the AMD NB settings | ||
| 294 | */ | ||
| 295 | if (order >=0 && aper + (32ULL<<(20 + order)) > 0x100000000ULL) { | ||
| 296 | printk(KERN_INFO "Aperture size %u MB is not right, using settings from NB\n", | ||
| 297 | 32 << order); | ||
| 298 | order = nb_order; | ||
| 299 | } | ||
| 300 | |||
| 334 | printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); | 301 | printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); |
| 335 | if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order)) | 302 | if (order < 0 || !agp_aperture_valid(aper, (32*1024*1024)<<order)) |
| 336 | return -1; | 303 | return -1; |
| 337 | 304 | ||
| 338 | pci_write_config_dword(nb, 0x90, order << 1); | 305 | pci_write_config_dword(nb, AMD64_GARTAPERTURECTL, order << 1); |
| 339 | pci_write_config_dword(nb, 0x94, aper >> 25); | 306 | pci_write_config_dword(nb, AMD64_GARTAPERTUREBASE, aper >> 25); |
| 340 | 307 | ||
| 341 | return 0; | 308 | return 0; |
| 342 | } | 309 | } |
diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c index dd68f8541c2d..db2ae4216279 100644 --- a/drivers/char/hvc_xen.c +++ b/drivers/char/hvc_xen.c | |||
| @@ -39,9 +39,14 @@ static int xencons_irq; | |||
| 39 | 39 | ||
| 40 | /* ------------------------------------------------------------------ */ | 40 | /* ------------------------------------------------------------------ */ |
| 41 | 41 | ||
| 42 | static unsigned long console_pfn = ~0ul; | ||
| 43 | |||
| 42 | static inline struct xencons_interface *xencons_interface(void) | 44 | static inline struct xencons_interface *xencons_interface(void) |
| 43 | { | 45 | { |
| 44 | return mfn_to_virt(xen_start_info->console.domU.mfn); | 46 | if (console_pfn == ~0ul) |
| 47 | return mfn_to_virt(xen_start_info->console.domU.mfn); | ||
| 48 | else | ||
| 49 | return __va(console_pfn << PAGE_SHIFT); | ||
| 45 | } | 50 | } |
| 46 | 51 | ||
| 47 | static inline void notify_daemon(void) | 52 | static inline void notify_daemon(void) |
| @@ -101,20 +106,32 @@ static int __init xen_init(void) | |||
| 101 | { | 106 | { |
| 102 | struct hvc_struct *hp; | 107 | struct hvc_struct *hp; |
| 103 | 108 | ||
| 104 | if (!is_running_on_xen()) | 109 | if (!is_running_on_xen() || |
| 105 | return 0; | 110 | is_initial_xendomain() || |
| 111 | !xen_start_info->console.domU.evtchn) | ||
| 112 | return -ENODEV; | ||
| 106 | 113 | ||
| 107 | xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn); | 114 | xencons_irq = bind_evtchn_to_irq(xen_start_info->console.domU.evtchn); |
| 108 | if (xencons_irq < 0) | 115 | if (xencons_irq < 0) |
| 109 | xencons_irq = 0 /* NO_IRQ */; | 116 | xencons_irq = 0; /* NO_IRQ */ |
| 117 | |||
| 110 | hp = hvc_alloc(HVC_COOKIE, xencons_irq, &hvc_ops, 256); | 118 | hp = hvc_alloc(HVC_COOKIE, xencons_irq, &hvc_ops, 256); |
| 111 | if (IS_ERR(hp)) | 119 | if (IS_ERR(hp)) |
| 112 | return PTR_ERR(hp); | 120 | return PTR_ERR(hp); |
| 113 | 121 | ||
| 114 | hvc = hp; | 122 | hvc = hp; |
| 123 | |||
| 124 | console_pfn = mfn_to_pfn(xen_start_info->console.domU.mfn); | ||
| 125 | |||
| 115 | return 0; | 126 | return 0; |
| 116 | } | 127 | } |
| 117 | 128 | ||
| 129 | void xen_console_resume(void) | ||
| 130 | { | ||
| 131 | if (xencons_irq) | ||
| 132 | rebind_evtchn_irq(xen_start_info->console.domU.evtchn, xencons_irq); | ||
| 133 | } | ||
| 134 | |||
| 118 | static void __exit xen_fini(void) | 135 | static void __exit xen_fini(void) |
| 119 | { | 136 | { |
| 120 | if (hvc) | 137 | if (hvc) |
| @@ -134,12 +151,28 @@ module_init(xen_init); | |||
| 134 | module_exit(xen_fini); | 151 | module_exit(xen_fini); |
| 135 | console_initcall(xen_cons_init); | 152 | console_initcall(xen_cons_init); |
| 136 | 153 | ||
| 154 | static void raw_console_write(const char *str, int len) | ||
| 155 | { | ||
| 156 | while(len > 0) { | ||
| 157 | int rc = HYPERVISOR_console_io(CONSOLEIO_write, len, (char *)str); | ||
| 158 | if (rc <= 0) | ||
| 159 | break; | ||
| 160 | |||
| 161 | str += rc; | ||
| 162 | len -= rc; | ||
| 163 | } | ||
| 164 | } | ||
| 165 | |||
| 166 | #ifdef CONFIG_EARLY_PRINTK | ||
| 137 | static void xenboot_write_console(struct console *console, const char *string, | 167 | static void xenboot_write_console(struct console *console, const char *string, |
| 138 | unsigned len) | 168 | unsigned len) |
| 139 | { | 169 | { |
| 140 | unsigned int linelen, off = 0; | 170 | unsigned int linelen, off = 0; |
| 141 | const char *pos; | 171 | const char *pos; |
| 142 | 172 | ||
| 173 | raw_console_write(string, len); | ||
| 174 | |||
| 175 | write_console(0, "(early) ", 8); | ||
| 143 | while (off < len && NULL != (pos = strchr(string+off, '\n'))) { | 176 | while (off < len && NULL != (pos = strchr(string+off, '\n'))) { |
| 144 | linelen = pos-string+off; | 177 | linelen = pos-string+off; |
| 145 | if (off + linelen > len) | 178 | if (off + linelen > len) |
| @@ -155,5 +188,23 @@ static void xenboot_write_console(struct console *console, const char *string, | |||
| 155 | struct console xenboot_console = { | 188 | struct console xenboot_console = { |
| 156 | .name = "xenboot", | 189 | .name = "xenboot", |
| 157 | .write = xenboot_write_console, | 190 | .write = xenboot_write_console, |
| 158 | .flags = CON_PRINTBUFFER | CON_BOOT, | 191 | .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, |
| 159 | }; | 192 | }; |
| 193 | #endif /* CONFIG_EARLY_PRINTK */ | ||
| 194 | |||
| 195 | void xen_raw_console_write(const char *str) | ||
| 196 | { | ||
| 197 | raw_console_write(str, strlen(str)); | ||
| 198 | } | ||
| 199 | |||
| 200 | void xen_raw_printk(const char *fmt, ...) | ||
| 201 | { | ||
| 202 | static char buf[512]; | ||
| 203 | va_list ap; | ||
| 204 | |||
| 205 | va_start(ap, fmt); | ||
| 206 | vsnprintf(buf, sizeof(buf), fmt, ap); | ||
| 207 | va_end(ap); | ||
| 208 | |||
| 209 | xen_raw_console_write(buf); | ||
| 210 | } | ||
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index 0f47f4697cdf..9ce3b3baf3a2 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c | |||
| @@ -66,6 +66,9 @@ static irqreturn_t input_handler(int rq, void *dev_id) | |||
| 66 | case XENKBD_TYPE_MOTION: | 66 | case XENKBD_TYPE_MOTION: |
| 67 | input_report_rel(dev, REL_X, event->motion.rel_x); | 67 | input_report_rel(dev, REL_X, event->motion.rel_x); |
| 68 | input_report_rel(dev, REL_Y, event->motion.rel_y); | 68 | input_report_rel(dev, REL_Y, event->motion.rel_y); |
| 69 | if (event->motion.rel_z) | ||
| 70 | input_report_rel(dev, REL_WHEEL, | ||
| 71 | -event->motion.rel_z); | ||
| 69 | break; | 72 | break; |
| 70 | case XENKBD_TYPE_KEY: | 73 | case XENKBD_TYPE_KEY: |
| 71 | dev = NULL; | 74 | dev = NULL; |
| @@ -84,6 +87,9 @@ static irqreturn_t input_handler(int rq, void *dev_id) | |||
| 84 | case XENKBD_TYPE_POS: | 87 | case XENKBD_TYPE_POS: |
| 85 | input_report_abs(dev, ABS_X, event->pos.abs_x); | 88 | input_report_abs(dev, ABS_X, event->pos.abs_x); |
| 86 | input_report_abs(dev, ABS_Y, event->pos.abs_y); | 89 | input_report_abs(dev, ABS_Y, event->pos.abs_y); |
| 90 | if (event->pos.rel_z) | ||
| 91 | input_report_rel(dev, REL_WHEEL, | ||
| 92 | -event->pos.rel_z); | ||
| 87 | break; | 93 | break; |
| 88 | } | 94 | } |
| 89 | if (dev) | 95 | if (dev) |
| @@ -152,7 +158,7 @@ static int __devinit xenkbd_probe(struct xenbus_device *dev, | |||
| 152 | ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); | 158 | ptr->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS); |
| 153 | for (i = BTN_LEFT; i <= BTN_TASK; i++) | 159 | for (i = BTN_LEFT; i <= BTN_TASK; i++) |
| 154 | set_bit(i, ptr->keybit); | 160 | set_bit(i, ptr->keybit); |
| 155 | ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y); | 161 | ptr->relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL); |
| 156 | input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); | 162 | input_set_abs_params(ptr, ABS_X, 0, XENFB_WIDTH, 0, 0); |
| 157 | input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); | 163 | input_set_abs_params(ptr, ABS_Y, 0, XENFB_HEIGHT, 0, 0); |
| 158 | 164 | ||
| @@ -294,6 +300,16 @@ InitWait: | |||
| 294 | */ | 300 | */ |
| 295 | if (dev->state != XenbusStateConnected) | 301 | if (dev->state != XenbusStateConnected) |
| 296 | goto InitWait; /* no InitWait seen yet, fudge it */ | 302 | goto InitWait; /* no InitWait seen yet, fudge it */ |
| 303 | |||
| 304 | /* Set input abs params to match backend screen res */ | ||
| 305 | if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, | ||
| 306 | "width", "%d", &val) > 0) | ||
| 307 | input_set_abs_params(info->ptr, ABS_X, 0, val, 0, 0); | ||
| 308 | |||
| 309 | if (xenbus_scanf(XBT_NIL, info->xbdev->otherend, | ||
| 310 | "height", "%d", &val) > 0) | ||
| 311 | input_set_abs_params(info->ptr, ABS_Y, 0, val, 0, 0); | ||
| 312 | |||
| 297 | break; | 313 | break; |
| 298 | 314 | ||
| 299 | case XenbusStateClosing: | 315 | case XenbusStateClosing: |
| @@ -337,4 +353,6 @@ static void __exit xenkbd_cleanup(void) | |||
| 337 | module_init(xenkbd_init); | 353 | module_init(xenkbd_init); |
| 338 | module_exit(xenkbd_cleanup); | 354 | module_exit(xenkbd_cleanup); |
| 339 | 355 | ||
| 356 | MODULE_DESCRIPTION("Xen virtual keyboard/pointer device frontend"); | ||
| 340 | MODULE_LICENSE("GPL"); | 357 | MODULE_LICENSE("GPL"); |
| 358 | MODULE_ALIAS("xen:vkbd"); | ||
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h index 005bd045d2eb..5faefeaf6790 100644 --- a/drivers/lguest/lg.h +++ b/drivers/lguest/lg.h | |||
| @@ -136,7 +136,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user); | |||
| 136 | * first step in the migration to the kernel types. pte_pfn is already defined | 136 | * first step in the migration to the kernel types. pte_pfn is already defined |
| 137 | * in the kernel. */ | 137 | * in the kernel. */ |
| 138 | #define pgd_flags(x) (pgd_val(x) & ~PAGE_MASK) | 138 | #define pgd_flags(x) (pgd_val(x) & ~PAGE_MASK) |
| 139 | #define pte_flags(x) (pte_val(x) & ~PAGE_MASK) | ||
| 140 | #define pgd_pfn(x) (pgd_val(x) >> PAGE_SHIFT) | 139 | #define pgd_pfn(x) (pgd_val(x) >> PAGE_SHIFT) |
| 141 | 140 | ||
| 142 | /* interrupts_and_traps.c: */ | 141 | /* interrupts_and_traps.c: */ |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 65210fca37ed..d89475d36988 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -114,6 +114,7 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 114 | unsigned int nob = data->blocks; | 114 | unsigned int nob = data->blocks; |
| 115 | unsigned long long clks; | 115 | unsigned long long clks; |
| 116 | unsigned int timeout; | 116 | unsigned int timeout; |
| 117 | bool dalgn = 0; | ||
| 117 | u32 dcmd; | 118 | u32 dcmd; |
| 118 | int i; | 119 | int i; |
| 119 | 120 | ||
| @@ -152,6 +153,9 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 152 | host->sg_cpu[i].dcmd = dcmd | length; | 153 | host->sg_cpu[i].dcmd = dcmd | length; |
| 153 | if (length & 31 && !(data->flags & MMC_DATA_READ)) | 154 | if (length & 31 && !(data->flags & MMC_DATA_READ)) |
| 154 | host->sg_cpu[i].dcmd |= DCMD_ENDIRQEN; | 155 | host->sg_cpu[i].dcmd |= DCMD_ENDIRQEN; |
| 156 | /* Not aligned to 8-byte boundary? */ | ||
| 157 | if (sg_dma_address(&data->sg[i]) & 0x7) | ||
| 158 | dalgn = 1; | ||
| 155 | if (data->flags & MMC_DATA_READ) { | 159 | if (data->flags & MMC_DATA_READ) { |
| 156 | host->sg_cpu[i].dsadr = host->res->start + MMC_RXFIFO; | 160 | host->sg_cpu[i].dsadr = host->res->start + MMC_RXFIFO; |
| 157 | host->sg_cpu[i].dtadr = sg_dma_address(&data->sg[i]); | 161 | host->sg_cpu[i].dtadr = sg_dma_address(&data->sg[i]); |
| @@ -165,6 +169,15 @@ static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data) | |||
| 165 | host->sg_cpu[host->dma_len - 1].ddadr = DDADR_STOP; | 169 | host->sg_cpu[host->dma_len - 1].ddadr = DDADR_STOP; |
| 166 | wmb(); | 170 | wmb(); |
| 167 | 171 | ||
| 172 | /* | ||
| 173 | * The PXA27x DMA controller encounters overhead when working with | ||
| 174 | * unaligned (to 8-byte boundaries) data, so switch on byte alignment | ||
| 175 | * mode only if we have unaligned data. | ||
| 176 | */ | ||
| 177 | if (dalgn) | ||
| 178 | DALGN |= (1 << host->dma); | ||
| 179 | else | ||
| 180 | DALGN &= (1 << host->dma); | ||
| 168 | DDADR(host->dma) = host->sg_dma; | 181 | DDADR(host->dma) = host->sg_dma; |
| 169 | DCSR(host->dma) = DCSR_RUN; | 182 | DCSR(host->dma) = DCSR_RUN; |
| 170 | } | 183 | } |
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 7158dbb6e4b4..42a436478b78 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c | |||
| @@ -924,6 +924,15 @@ static int register_root_hub(struct usb_hcd *hcd) | |||
| 924 | return retval; | 924 | return retval; |
| 925 | } | 925 | } |
| 926 | 926 | ||
| 927 | void usb_enable_root_hub_irq (struct usb_bus *bus) | ||
| 928 | { | ||
| 929 | struct usb_hcd *hcd; | ||
| 930 | |||
| 931 | hcd = container_of (bus, struct usb_hcd, self); | ||
| 932 | if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT) | ||
| 933 | hcd->driver->hub_irq_enable (hcd); | ||
| 934 | } | ||
| 935 | |||
| 927 | 936 | ||
| 928 | /*-------------------------------------------------------------------------*/ | 937 | /*-------------------------------------------------------------------------*/ |
| 929 | 938 | ||
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h index a0bf5df6cb6f..b9de1569b39e 100644 --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h | |||
| @@ -210,6 +210,8 @@ struct hc_driver { | |||
| 210 | int (*bus_suspend)(struct usb_hcd *); | 210 | int (*bus_suspend)(struct usb_hcd *); |
| 211 | int (*bus_resume)(struct usb_hcd *); | 211 | int (*bus_resume)(struct usb_hcd *); |
| 212 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); | 212 | int (*start_port_reset)(struct usb_hcd *, unsigned port_num); |
| 213 | void (*hub_irq_enable)(struct usb_hcd *); | ||
| 214 | /* Needed only if port-change IRQs are level-triggered */ | ||
| 213 | 215 | ||
| 214 | /* force handover of high-speed port to full-speed companion */ | 216 | /* force handover of high-speed port to full-speed companion */ |
| 215 | void (*relinquish_port)(struct usb_hcd *, int); | 217 | void (*relinquish_port)(struct usb_hcd *, int); |
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 512d2d57d41e..4cfe32a16c37 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -2073,6 +2073,8 @@ int usb_port_resume(struct usb_device *udev) | |||
| 2073 | } | 2073 | } |
| 2074 | 2074 | ||
| 2075 | clear_bit(port1, hub->busy_bits); | 2075 | clear_bit(port1, hub->busy_bits); |
| 2076 | if (!hub->hdev->parent && !hub->busy_bits[0]) | ||
| 2077 | usb_enable_root_hub_irq(hub->hdev->bus); | ||
| 2076 | 2078 | ||
| 2077 | if (status == 0) | 2079 | if (status == 0) |
| 2078 | status = finish_port_resume(udev); | 2080 | status = finish_port_resume(udev); |
| @@ -3002,6 +3004,11 @@ static void hub_events(void) | |||
| 3002 | 3004 | ||
| 3003 | hub->activating = 0; | 3005 | hub->activating = 0; |
| 3004 | 3006 | ||
| 3007 | /* If this is a root hub, tell the HCD it's okay to | ||
| 3008 | * re-enable port-change interrupts now. */ | ||
| 3009 | if (!hdev->parent && !hub->busy_bits[0]) | ||
| 3010 | usb_enable_root_hub_irq(hdev->bus); | ||
| 3011 | |||
| 3005 | loop_autopm: | 3012 | loop_autopm: |
| 3006 | /* Allow autosuspend if we're not going to run again */ | 3013 | /* Allow autosuspend if we're not going to run again */ |
| 3007 | if (list_empty(&hub->event_list)) | 3014 | if (list_empty(&hub->event_list)) |
| @@ -3227,6 +3234,8 @@ int usb_reset_device(struct usb_device *udev) | |||
| 3227 | break; | 3234 | break; |
| 3228 | } | 3235 | } |
| 3229 | clear_bit(port1, parent_hub->busy_bits); | 3236 | clear_bit(port1, parent_hub->busy_bits); |
| 3237 | if (!parent_hdev->parent && !parent_hub->busy_bits[0]) | ||
| 3238 | usb_enable_root_hub_irq(parent_hdev->bus); | ||
| 3230 | 3239 | ||
| 3231 | if (ret < 0) | 3240 | if (ret < 0) |
| 3232 | goto re_enumerate; | 3241 | goto re_enumerate; |
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c index c96db1153dcf..e534f9de0f05 100644 --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c | |||
| @@ -261,6 +261,7 @@ static const struct hc_driver ohci_at91_hc_driver = { | |||
| 261 | */ | 261 | */ |
| 262 | .hub_status_data = ohci_hub_status_data, | 262 | .hub_status_data = ohci_hub_status_data, |
| 263 | .hub_control = ohci_hub_control, | 263 | .hub_control = ohci_hub_control, |
| 264 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 264 | #ifdef CONFIG_PM | 265 | #ifdef CONFIG_PM |
| 265 | .bus_suspend = ohci_bus_suspend, | 266 | .bus_suspend = ohci_bus_suspend, |
| 266 | .bus_resume = ohci_bus_resume, | 267 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index 1b9abdba920b..f90fe0c7373f 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
| @@ -288,6 +288,7 @@ static const struct hc_driver ohci_au1xxx_hc_driver = { | |||
| 288 | */ | 288 | */ |
| 289 | .hub_status_data = ohci_hub_status_data, | 289 | .hub_status_data = ohci_hub_status_data, |
| 290 | .hub_control = ohci_hub_control, | 290 | .hub_control = ohci_hub_control, |
| 291 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 291 | #ifdef CONFIG_PM | 292 | #ifdef CONFIG_PM |
| 292 | .bus_suspend = ohci_bus_suspend, | 293 | .bus_suspend = ohci_bus_suspend, |
| 293 | .bus_resume = ohci_bus_resume, | 294 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c index 06aadfb0ec29..5adaf36e47d0 100644 --- a/drivers/usb/host/ohci-ep93xx.c +++ b/drivers/usb/host/ohci-ep93xx.c | |||
| @@ -135,6 +135,7 @@ static struct hc_driver ohci_ep93xx_hc_driver = { | |||
| 135 | .get_frame_number = ohci_get_frame, | 135 | .get_frame_number = ohci_get_frame, |
| 136 | .hub_status_data = ohci_hub_status_data, | 136 | .hub_status_data = ohci_hub_status_data, |
| 137 | .hub_control = ohci_hub_control, | 137 | .hub_control = ohci_hub_control, |
| 138 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 138 | #ifdef CONFIG_PM | 139 | #ifdef CONFIG_PM |
| 139 | .bus_suspend = ohci_bus_suspend, | 140 | .bus_suspend = ohci_bus_suspend, |
| 140 | .bus_resume = ohci_bus_resume, | 141 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c index 79a78029f896..b56739221d11 100644 --- a/drivers/usb/host/ohci-hub.c +++ b/drivers/usb/host/ohci-hub.c | |||
| @@ -36,6 +36,18 @@ | |||
| 36 | 36 | ||
| 37 | /*-------------------------------------------------------------------------*/ | 37 | /*-------------------------------------------------------------------------*/ |
| 38 | 38 | ||
| 39 | /* hcd->hub_irq_enable() */ | ||
| 40 | static void ohci_rhsc_enable (struct usb_hcd *hcd) | ||
| 41 | { | ||
| 42 | struct ohci_hcd *ohci = hcd_to_ohci (hcd); | ||
| 43 | |||
| 44 | spin_lock_irq(&ohci->lock); | ||
| 45 | if (!ohci->autostop) | ||
| 46 | del_timer(&hcd->rh_timer); /* Prevent next poll */ | ||
| 47 | ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable); | ||
| 48 | spin_unlock_irq(&ohci->lock); | ||
| 49 | } | ||
| 50 | |||
| 39 | #define OHCI_SCHED_ENABLES \ | 51 | #define OHCI_SCHED_ENABLES \ |
| 40 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) | 52 | (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE) |
| 41 | 53 | ||
| @@ -362,28 +374,18 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 362 | int any_connected) | 374 | int any_connected) |
| 363 | { | 375 | { |
| 364 | int poll_rh = 1; | 376 | int poll_rh = 1; |
| 365 | int rhsc; | ||
| 366 | 377 | ||
| 367 | rhsc = ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC; | ||
| 368 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { | 378 | switch (ohci->hc_control & OHCI_CTRL_HCFS) { |
| 369 | 379 | ||
| 370 | case OHCI_USB_OPER: | 380 | case OHCI_USB_OPER: |
| 371 | /* If no status changes are pending, enable status-change | 381 | /* keep on polling until we know a device is connected |
| 372 | * interrupts. | 382 | * and RHSC is enabled */ |
| 373 | */ | ||
| 374 | if (!rhsc && !changed) { | ||
| 375 | rhsc = OHCI_INTR_RHSC; | ||
| 376 | ohci_writel(ohci, rhsc, &ohci->regs->intrenable); | ||
| 377 | } | ||
| 378 | |||
| 379 | /* Keep on polling until we know a device is connected | ||
| 380 | * and RHSC is enabled, or until we autostop. | ||
| 381 | */ | ||
| 382 | if (!ohci->autostop) { | 383 | if (!ohci->autostop) { |
| 383 | if (any_connected || | 384 | if (any_connected || |
| 384 | !device_may_wakeup(&ohci_to_hcd(ohci) | 385 | !device_may_wakeup(&ohci_to_hcd(ohci) |
| 385 | ->self.root_hub->dev)) { | 386 | ->self.root_hub->dev)) { |
| 386 | if (rhsc) | 387 | if (ohci_readl(ohci, &ohci->regs->intrenable) & |
| 388 | OHCI_INTR_RHSC) | ||
| 387 | poll_rh = 0; | 389 | poll_rh = 0; |
| 388 | } else { | 390 | } else { |
| 389 | ohci->autostop = 1; | 391 | ohci->autostop = 1; |
| @@ -396,13 +398,12 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 396 | ohci->autostop = 0; | 398 | ohci->autostop = 0; |
| 397 | ohci->next_statechange = jiffies + | 399 | ohci->next_statechange = jiffies + |
| 398 | STATECHANGE_DELAY; | 400 | STATECHANGE_DELAY; |
| 399 | } else if (rhsc && time_after_eq(jiffies, | 401 | } else if (time_after_eq(jiffies, |
| 400 | ohci->next_statechange) | 402 | ohci->next_statechange) |
| 401 | && !ohci->ed_rm_list | 403 | && !ohci->ed_rm_list |
| 402 | && !(ohci->hc_control & | 404 | && !(ohci->hc_control & |
| 403 | OHCI_SCHED_ENABLES)) { | 405 | OHCI_SCHED_ENABLES)) { |
| 404 | ohci_rh_suspend(ohci, 1); | 406 | ohci_rh_suspend(ohci, 1); |
| 405 | poll_rh = 0; | ||
| 406 | } | 407 | } |
| 407 | } | 408 | } |
| 408 | break; | 409 | break; |
| @@ -416,12 +417,6 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | |||
| 416 | else | 417 | else |
| 417 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); | 418 | usb_hcd_resume_root_hub(ohci_to_hcd(ohci)); |
| 418 | } else { | 419 | } else { |
| 419 | if (!rhsc && (ohci->autostop || | ||
| 420 | ohci_to_hcd(ohci)->self.root_hub-> | ||
| 421 | do_remote_wakeup)) | ||
| 422 | ohci_writel(ohci, OHCI_INTR_RHSC, | ||
| 423 | &ohci->regs->intrenable); | ||
| 424 | |||
| 425 | /* everything is idle, no need for polling */ | 420 | /* everything is idle, no need for polling */ |
| 426 | poll_rh = 0; | 421 | poll_rh = 0; |
| 427 | } | 422 | } |
| @@ -443,16 +438,12 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci) | |||
| 443 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, | 438 | static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed, |
| 444 | int any_connected) | 439 | int any_connected) |
| 445 | { | 440 | { |
| 446 | /* If RHSC is enabled, don't poll */ | 441 | int poll_rh = 1; |
| 447 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) | ||
| 448 | return 0; | ||
| 449 | 442 | ||
| 450 | /* If no status changes are pending, enable status-change interrupts */ | 443 | /* keep on polling until RHSC is enabled */ |
| 451 | if (!changed) { | 444 | if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC) |
| 452 | ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable); | 445 | poll_rh = 0; |
| 453 | return 0; | 446 | return poll_rh; |
| 454 | } | ||
| 455 | return 1; | ||
| 456 | } | 447 | } |
| 457 | 448 | ||
| 458 | #endif /* CONFIG_PM */ | 449 | #endif /* CONFIG_PM */ |
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c index 96d14fa1d833..13c12ed22252 100644 --- a/drivers/usb/host/ohci-lh7a404.c +++ b/drivers/usb/host/ohci-lh7a404.c | |||
| @@ -193,6 +193,7 @@ static const struct hc_driver ohci_lh7a404_hc_driver = { | |||
| 193 | */ | 193 | */ |
| 194 | .hub_status_data = ohci_hub_status_data, | 194 | .hub_status_data = ohci_hub_status_data, |
| 195 | .hub_control = ohci_hub_control, | 195 | .hub_control = ohci_hub_control, |
| 196 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 196 | #ifdef CONFIG_PM | 197 | #ifdef CONFIG_PM |
| 197 | .bus_suspend = ohci_bus_suspend, | 198 | .bus_suspend = ohci_bus_suspend, |
| 198 | .bus_resume = ohci_bus_resume, | 199 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 6859fb5f1d6f..3a7c24c03671 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c | |||
| @@ -466,6 +466,7 @@ static const struct hc_driver ohci_omap_hc_driver = { | |||
| 466 | */ | 466 | */ |
| 467 | .hub_status_data = ohci_hub_status_data, | 467 | .hub_status_data = ohci_hub_status_data, |
| 468 | .hub_control = ohci_hub_control, | 468 | .hub_control = ohci_hub_control, |
| 469 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 469 | #ifdef CONFIG_PM | 470 | #ifdef CONFIG_PM |
| 470 | .bus_suspend = ohci_bus_suspend, | 471 | .bus_suspend = ohci_bus_suspend, |
| 471 | .bus_resume = ohci_bus_resume, | 472 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 3bf175d95a23..4696cc912e16 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -327,6 +327,7 @@ static const struct hc_driver ohci_pci_hc_driver = { | |||
| 327 | */ | 327 | */ |
| 328 | .hub_status_data = ohci_hub_status_data, | 328 | .hub_status_data = ohci_hub_status_data, |
| 329 | .hub_control = ohci_hub_control, | 329 | .hub_control = ohci_hub_control, |
| 330 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 330 | #ifdef CONFIG_PM | 331 | #ifdef CONFIG_PM |
| 331 | .bus_suspend = ohci_bus_suspend, | 332 | .bus_suspend = ohci_bus_suspend, |
| 332 | .bus_resume = ohci_bus_resume, | 333 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c index 664f07ee8732..28b458f20cc3 100644 --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c | |||
| @@ -280,6 +280,7 @@ static const struct hc_driver ohci_pnx4008_hc_driver = { | |||
| 280 | */ | 280 | */ |
| 281 | .hub_status_data = ohci_hub_status_data, | 281 | .hub_status_data = ohci_hub_status_data, |
| 282 | .hub_control = ohci_hub_control, | 282 | .hub_control = ohci_hub_control, |
| 283 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 283 | #ifdef CONFIG_PM | 284 | #ifdef CONFIG_PM |
| 284 | .bus_suspend = ohci_bus_suspend, | 285 | .bus_suspend = ohci_bus_suspend, |
| 285 | .bus_resume = ohci_bus_resume, | 286 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c index 28467e288a93..605d59cba28e 100644 --- a/drivers/usb/host/ohci-pnx8550.c +++ b/drivers/usb/host/ohci-pnx8550.c | |||
| @@ -201,6 +201,7 @@ static const struct hc_driver ohci_pnx8550_hc_driver = { | |||
| 201 | */ | 201 | */ |
| 202 | .hub_status_data = ohci_hub_status_data, | 202 | .hub_status_data = ohci_hub_status_data, |
| 203 | .hub_control = ohci_hub_control, | 203 | .hub_control = ohci_hub_control, |
| 204 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 204 | #ifdef CONFIG_PM | 205 | #ifdef CONFIG_PM |
| 205 | .bus_suspend = ohci_bus_suspend, | 206 | .bus_suspend = ohci_bus_suspend, |
| 206 | .bus_resume = ohci_bus_resume, | 207 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 50e55db13636..a67252791223 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c | |||
| @@ -72,6 +72,7 @@ static const struct hc_driver ohci_ppc_of_hc_driver = { | |||
| 72 | */ | 72 | */ |
| 73 | .hub_status_data = ohci_hub_status_data, | 73 | .hub_status_data = ohci_hub_status_data, |
| 74 | .hub_control = ohci_hub_control, | 74 | .hub_control = ohci_hub_control, |
| 75 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 75 | #ifdef CONFIG_PM | 76 | #ifdef CONFIG_PM |
| 76 | .bus_suspend = ohci_bus_suspend, | 77 | .bus_suspend = ohci_bus_suspend, |
| 77 | .bus_resume = ohci_bus_resume, | 78 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c index cd3398b675b2..523c30125577 100644 --- a/drivers/usb/host/ohci-ppc-soc.c +++ b/drivers/usb/host/ohci-ppc-soc.c | |||
| @@ -172,6 +172,7 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = { | |||
| 172 | */ | 172 | */ |
| 173 | .hub_status_data = ohci_hub_status_data, | 173 | .hub_status_data = ohci_hub_status_data, |
| 174 | .hub_control = ohci_hub_control, | 174 | .hub_control = ohci_hub_control, |
| 175 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 175 | #ifdef CONFIG_PM | 176 | #ifdef CONFIG_PM |
| 176 | .bus_suspend = ohci_bus_suspend, | 177 | .bus_suspend = ohci_bus_suspend, |
| 177 | .bus_resume = ohci_bus_resume, | 178 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index bfdeb0d22d05..c1935ae537f8 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c | |||
| @@ -68,6 +68,7 @@ static const struct hc_driver ps3_ohci_hc_driver = { | |||
| 68 | .get_frame_number = ohci_get_frame, | 68 | .get_frame_number = ohci_get_frame, |
| 69 | .hub_status_data = ohci_hub_status_data, | 69 | .hub_status_data = ohci_hub_status_data, |
| 70 | .hub_control = ohci_hub_control, | 70 | .hub_control = ohci_hub_control, |
| 71 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 71 | .start_port_reset = ohci_start_port_reset, | 72 | .start_port_reset = ohci_start_port_reset, |
| 72 | #if defined(CONFIG_PM) | 73 | #if defined(CONFIG_PM) |
| 73 | .bus_suspend = ohci_bus_suspend, | 74 | .bus_suspend = ohci_bus_suspend, |
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c index 70b0d4b459e7..d4ee27d92be8 100644 --- a/drivers/usb/host/ohci-pxa27x.c +++ b/drivers/usb/host/ohci-pxa27x.c | |||
| @@ -298,6 +298,7 @@ static const struct hc_driver ohci_pxa27x_hc_driver = { | |||
| 298 | */ | 298 | */ |
| 299 | .hub_status_data = ohci_hub_status_data, | 299 | .hub_status_data = ohci_hub_status_data, |
| 300 | .hub_control = ohci_hub_control, | 300 | .hub_control = ohci_hub_control, |
| 301 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 301 | #ifdef CONFIG_PM | 302 | #ifdef CONFIG_PM |
| 302 | .bus_suspend = ohci_bus_suspend, | 303 | .bus_suspend = ohci_bus_suspend, |
| 303 | .bus_resume = ohci_bus_resume, | 304 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c index a73d2ff322e2..ead4772f0f27 100644 --- a/drivers/usb/host/ohci-s3c2410.c +++ b/drivers/usb/host/ohci-s3c2410.c | |||
| @@ -466,6 +466,7 @@ static const struct hc_driver ohci_s3c2410_hc_driver = { | |||
| 466 | */ | 466 | */ |
| 467 | .hub_status_data = ohci_s3c2410_hub_status_data, | 467 | .hub_status_data = ohci_s3c2410_hub_status_data, |
| 468 | .hub_control = ohci_s3c2410_hub_control, | 468 | .hub_control = ohci_s3c2410_hub_control, |
| 469 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 469 | #ifdef CONFIG_PM | 470 | #ifdef CONFIG_PM |
| 470 | .bus_suspend = ohci_bus_suspend, | 471 | .bus_suspend = ohci_bus_suspend, |
| 471 | .bus_resume = ohci_bus_resume, | 472 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c index 99438c65981b..0f48f2d99226 100644 --- a/drivers/usb/host/ohci-sa1111.c +++ b/drivers/usb/host/ohci-sa1111.c | |||
| @@ -231,6 +231,7 @@ static const struct hc_driver ohci_sa1111_hc_driver = { | |||
| 231 | */ | 231 | */ |
| 232 | .hub_status_data = ohci_hub_status_data, | 232 | .hub_status_data = ohci_hub_status_data, |
| 233 | .hub_control = ohci_hub_control, | 233 | .hub_control = ohci_hub_control, |
| 234 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 234 | #ifdef CONFIG_PM | 235 | #ifdef CONFIG_PM |
| 235 | .bus_suspend = ohci_bus_suspend, | 236 | .bus_suspend = ohci_bus_suspend, |
| 236 | .bus_resume = ohci_bus_resume, | 237 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c index 60f03cc7ec4f..e7ee607278fe 100644 --- a/drivers/usb/host/ohci-sh.c +++ b/drivers/usb/host/ohci-sh.c | |||
| @@ -68,6 +68,7 @@ static const struct hc_driver ohci_sh_hc_driver = { | |||
| 68 | */ | 68 | */ |
| 69 | .hub_status_data = ohci_hub_status_data, | 69 | .hub_status_data = ohci_hub_status_data, |
| 70 | .hub_control = ohci_hub_control, | 70 | .hub_control = ohci_hub_control, |
| 71 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 71 | #ifdef CONFIG_PM | 72 | #ifdef CONFIG_PM |
| 72 | .bus_suspend = ohci_bus_suspend, | 73 | .bus_suspend = ohci_bus_suspend, |
| 73 | .bus_resume = ohci_bus_resume, | 74 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index e899a77dfb83..e610698c6b60 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c | |||
| @@ -75,6 +75,7 @@ static const struct hc_driver ohci_sm501_hc_driver = { | |||
| 75 | */ | 75 | */ |
| 76 | .hub_status_data = ohci_hub_status_data, | 76 | .hub_status_data = ohci_hub_status_data, |
| 77 | .hub_control = ohci_hub_control, | 77 | .hub_control = ohci_hub_control, |
| 78 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 78 | #ifdef CONFIG_PM | 79 | #ifdef CONFIG_PM |
| 79 | .bus_suspend = ohci_bus_suspend, | 80 | .bus_suspend = ohci_bus_suspend, |
| 80 | .bus_resume = ohci_bus_resume, | 81 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c index c4265caec780..7275186db315 100644 --- a/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c | |||
| @@ -81,6 +81,7 @@ static const struct hc_driver ssb_ohci_hc_driver = { | |||
| 81 | 81 | ||
| 82 | .hub_status_data = ohci_hub_status_data, | 82 | .hub_status_data = ohci_hub_status_data, |
| 83 | .hub_control = ohci_hub_control, | 83 | .hub_control = ohci_hub_control, |
| 84 | .hub_irq_enable = ohci_rhsc_enable, | ||
| 84 | #ifdef CONFIG_PM | 85 | #ifdef CONFIG_PM |
| 85 | .bus_suspend = ohci_bus_suspend, | 86 | .bus_suspend = ohci_bus_suspend, |
| 86 | .bus_resume = ohci_bus_resume, | 87 | .bus_resume = ohci_bus_resume, |
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index f29307405bb3..9b6323f768b2 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
| @@ -2934,6 +2934,16 @@ static int u132_start_port_reset(struct usb_hcd *hcd, unsigned port_num) | |||
| 2934 | return 0; | 2934 | return 0; |
| 2935 | } | 2935 | } |
| 2936 | 2936 | ||
| 2937 | static void u132_hub_irq_enable(struct usb_hcd *hcd) | ||
| 2938 | { | ||
| 2939 | struct u132 *u132 = hcd_to_u132(hcd); | ||
| 2940 | if (u132->going > 1) { | ||
| 2941 | dev_err(&u132->platform_dev->dev, "device has been removed %d\n" | ||
| 2942 | , u132->going); | ||
| 2943 | } else if (u132->going > 0) | ||
| 2944 | dev_err(&u132->platform_dev->dev, "device is being removed\n"); | ||
| 2945 | } | ||
| 2946 | |||
| 2937 | 2947 | ||
| 2938 | #ifdef CONFIG_PM | 2948 | #ifdef CONFIG_PM |
| 2939 | static int u132_bus_suspend(struct usb_hcd *hcd) | 2949 | static int u132_bus_suspend(struct usb_hcd *hcd) |
| @@ -2985,6 +2995,7 @@ static struct hc_driver u132_hc_driver = { | |||
| 2985 | .bus_suspend = u132_bus_suspend, | 2995 | .bus_suspend = u132_bus_suspend, |
| 2986 | .bus_resume = u132_bus_resume, | 2996 | .bus_resume = u132_bus_resume, |
| 2987 | .start_port_reset = u132_start_port_reset, | 2997 | .start_port_reset = u132_start_port_reset, |
| 2998 | .hub_irq_enable = u132_hub_irq_enable, | ||
| 2988 | }; | 2999 | }; |
| 2989 | 3000 | ||
| 2990 | /* | 3001 | /* |
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index 619a6f8d65a2..47ed39b52f9c 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * frame buffer. | 18 | * frame buffer. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/console.h> | ||
| 21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 22 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 23 | #include <linux/fb.h> | 24 | #include <linux/fb.h> |
| @@ -42,37 +43,68 @@ struct xenfb_info { | |||
| 42 | struct xenfb_page *page; | 43 | struct xenfb_page *page; |
| 43 | unsigned long *mfns; | 44 | unsigned long *mfns; |
| 44 | int update_wanted; /* XENFB_TYPE_UPDATE wanted */ | 45 | int update_wanted; /* XENFB_TYPE_UPDATE wanted */ |
| 46 | int feature_resize; /* XENFB_TYPE_RESIZE ok */ | ||
| 47 | struct xenfb_resize resize; /* protected by resize_lock */ | ||
| 48 | int resize_dpy; /* ditto */ | ||
| 49 | spinlock_t resize_lock; | ||
| 45 | 50 | ||
| 46 | struct xenbus_device *xbdev; | 51 | struct xenbus_device *xbdev; |
| 47 | }; | 52 | }; |
| 48 | 53 | ||
| 49 | static u32 xenfb_mem_len = XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8; | 54 | #define XENFB_DEFAULT_FB_LEN (XENFB_WIDTH * XENFB_HEIGHT * XENFB_DEPTH / 8) |
| 50 | 55 | ||
| 56 | enum { KPARAM_MEM, KPARAM_WIDTH, KPARAM_HEIGHT, KPARAM_CNT }; | ||
| 57 | static int video[KPARAM_CNT] = { 2, XENFB_WIDTH, XENFB_HEIGHT }; | ||
| 58 | module_param_array(video, int, NULL, 0); | ||
| 59 | MODULE_PARM_DESC(video, | ||
| 60 | "Video memory size in MB, width, height in pixels (default 2,800,600)"); | ||
| 61 | |||
| 62 | static void xenfb_make_preferred_console(void); | ||
| 51 | static int xenfb_remove(struct xenbus_device *); | 63 | static int xenfb_remove(struct xenbus_device *); |
| 52 | static void xenfb_init_shared_page(struct xenfb_info *); | 64 | static void xenfb_init_shared_page(struct xenfb_info *, struct fb_info *); |
| 53 | static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); | 65 | static int xenfb_connect_backend(struct xenbus_device *, struct xenfb_info *); |
| 54 | static void xenfb_disconnect_backend(struct xenfb_info *); | 66 | static void xenfb_disconnect_backend(struct xenfb_info *); |
| 55 | 67 | ||
| 68 | static void xenfb_send_event(struct xenfb_info *info, | ||
| 69 | union xenfb_out_event *event) | ||
| 70 | { | ||
| 71 | u32 prod; | ||
| 72 | |||
| 73 | prod = info->page->out_prod; | ||
| 74 | /* caller ensures !xenfb_queue_full() */ | ||
| 75 | mb(); /* ensure ring space available */ | ||
| 76 | XENFB_OUT_RING_REF(info->page, prod) = *event; | ||
| 77 | wmb(); /* ensure ring contents visible */ | ||
| 78 | info->page->out_prod = prod + 1; | ||
| 79 | |||
| 80 | notify_remote_via_irq(info->irq); | ||
| 81 | } | ||
| 82 | |||
| 56 | static void xenfb_do_update(struct xenfb_info *info, | 83 | static void xenfb_do_update(struct xenfb_info *info, |
| 57 | int x, int y, int w, int h) | 84 | int x, int y, int w, int h) |
| 58 | { | 85 | { |
| 59 | union xenfb_out_event event; | 86 | union xenfb_out_event event; |
| 60 | u32 prod; | ||
| 61 | 87 | ||
| 88 | memset(&event, 0, sizeof(event)); | ||
| 62 | event.type = XENFB_TYPE_UPDATE; | 89 | event.type = XENFB_TYPE_UPDATE; |
| 63 | event.update.x = x; | 90 | event.update.x = x; |
| 64 | event.update.y = y; | 91 | event.update.y = y; |
| 65 | event.update.width = w; | 92 | event.update.width = w; |
| 66 | event.update.height = h; | 93 | event.update.height = h; |
| 67 | 94 | ||
| 68 | prod = info->page->out_prod; | ||
| 69 | /* caller ensures !xenfb_queue_full() */ | 95 | /* caller ensures !xenfb_queue_full() */ |
| 70 | mb(); /* ensure ring space available */ | 96 | xenfb_send_event(info, &event); |
| 71 | XENFB_OUT_RING_REF(info->page, prod) = event; | 97 | } |
| 72 | wmb(); /* ensure ring contents visible */ | ||
| 73 | info->page->out_prod = prod + 1; | ||
| 74 | 98 | ||
| 75 | notify_remote_via_irq(info->irq); | 99 | static void xenfb_do_resize(struct xenfb_info *info) |
| 100 | { | ||
| 101 | union xenfb_out_event event; | ||
| 102 | |||
| 103 | memset(&event, 0, sizeof(event)); | ||
| 104 | event.resize = info->resize; | ||
| 105 | |||
| 106 | /* caller ensures !xenfb_queue_full() */ | ||
| 107 | xenfb_send_event(info, &event); | ||
| 76 | } | 108 | } |
| 77 | 109 | ||
| 78 | static int xenfb_queue_full(struct xenfb_info *info) | 110 | static int xenfb_queue_full(struct xenfb_info *info) |
| @@ -84,12 +116,28 @@ static int xenfb_queue_full(struct xenfb_info *info) | |||
| 84 | return prod - cons == XENFB_OUT_RING_LEN; | 116 | return prod - cons == XENFB_OUT_RING_LEN; |
| 85 | } | 117 | } |
| 86 | 118 | ||
| 119 | static void xenfb_handle_resize_dpy(struct xenfb_info *info) | ||
| 120 | { | ||
| 121 | unsigned long flags; | ||
| 122 | |||
| 123 | spin_lock_irqsave(&info->resize_lock, flags); | ||
| 124 | if (info->resize_dpy) { | ||
| 125 | if (!xenfb_queue_full(info)) { | ||
| 126 | info->resize_dpy = 0; | ||
| 127 | xenfb_do_resize(info); | ||
| 128 | } | ||
| 129 | } | ||
| 130 | spin_unlock_irqrestore(&info->resize_lock, flags); | ||
| 131 | } | ||
| 132 | |||
| 87 | static void xenfb_refresh(struct xenfb_info *info, | 133 | static void xenfb_refresh(struct xenfb_info *info, |
| 88 | int x1, int y1, int w, int h) | 134 | int x1, int y1, int w, int h) |
| 89 | { | 135 | { |
| 90 | unsigned long flags; | 136 | unsigned long flags; |
| 91 | int y2 = y1 + h - 1; | ||
| 92 | int x2 = x1 + w - 1; | 137 | int x2 = x1 + w - 1; |
| 138 | int y2 = y1 + h - 1; | ||
| 139 | |||
| 140 | xenfb_handle_resize_dpy(info); | ||
| 93 | 141 | ||
| 94 | if (!info->update_wanted) | 142 | if (!info->update_wanted) |
| 95 | return; | 143 | return; |
| @@ -222,6 +270,57 @@ static ssize_t xenfb_write(struct fb_info *p, const char __user *buf, | |||
| 222 | return res; | 270 | return res; |
| 223 | } | 271 | } |
| 224 | 272 | ||
| 273 | static int | ||
| 274 | xenfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) | ||
| 275 | { | ||
| 276 | struct xenfb_info *xenfb_info; | ||
| 277 | int required_mem_len; | ||
| 278 | |||
| 279 | xenfb_info = info->par; | ||
| 280 | |||
| 281 | if (!xenfb_info->feature_resize) { | ||
| 282 | if (var->xres == video[KPARAM_WIDTH] && | ||
| 283 | var->yres == video[KPARAM_HEIGHT] && | ||
| 284 | var->bits_per_pixel == xenfb_info->page->depth) { | ||
| 285 | return 0; | ||
| 286 | } | ||
| 287 | return -EINVAL; | ||
| 288 | } | ||
| 289 | |||
| 290 | /* Can't resize past initial width and height */ | ||
| 291 | if (var->xres > video[KPARAM_WIDTH] || var->yres > video[KPARAM_HEIGHT]) | ||
| 292 | return -EINVAL; | ||
| 293 | |||
| 294 | required_mem_len = var->xres * var->yres * xenfb_info->page->depth / 8; | ||
| 295 | if (var->bits_per_pixel == xenfb_info->page->depth && | ||
| 296 | var->xres <= info->fix.line_length / (XENFB_DEPTH / 8) && | ||
| 297 | required_mem_len <= info->fix.smem_len) { | ||
| 298 | var->xres_virtual = var->xres; | ||
| 299 | var->yres_virtual = var->yres; | ||
| 300 | return 0; | ||
| 301 | } | ||
| 302 | return -EINVAL; | ||
| 303 | } | ||
| 304 | |||
| 305 | static int xenfb_set_par(struct fb_info *info) | ||
| 306 | { | ||
| 307 | struct xenfb_info *xenfb_info; | ||
| 308 | unsigned long flags; | ||
| 309 | |||
| 310 | xenfb_info = info->par; | ||
| 311 | |||
| 312 | spin_lock_irqsave(&xenfb_info->resize_lock, flags); | ||
| 313 | xenfb_info->resize.type = XENFB_TYPE_RESIZE; | ||
| 314 | xenfb_info->resize.width = info->var.xres; | ||
| 315 | xenfb_info->resize.height = info->var.yres; | ||
| 316 | xenfb_info->resize.stride = info->fix.line_length; | ||
| 317 | xenfb_info->resize.depth = info->var.bits_per_pixel; | ||
| 318 | xenfb_info->resize.offset = 0; | ||
| 319 | xenfb_info->resize_dpy = 1; | ||
| 320 | spin_unlock_irqrestore(&xenfb_info->resize_lock, flags); | ||
| 321 | return 0; | ||
| 322 | } | ||
| 323 | |||
| 225 | static struct fb_ops xenfb_fb_ops = { | 324 | static struct fb_ops xenfb_fb_ops = { |
| 226 | .owner = THIS_MODULE, | 325 | .owner = THIS_MODULE, |
| 227 | .fb_read = fb_sys_read, | 326 | .fb_read = fb_sys_read, |
| @@ -230,6 +329,8 @@ static struct fb_ops xenfb_fb_ops = { | |||
| 230 | .fb_fillrect = xenfb_fillrect, | 329 | .fb_fillrect = xenfb_fillrect, |
| 231 | .fb_copyarea = xenfb_copyarea, | 330 | .fb_copyarea = xenfb_copyarea, |
| 232 | .fb_imageblit = xenfb_imageblit, | 331 | .fb_imageblit = xenfb_imageblit, |
| 332 | .fb_check_var = xenfb_check_var, | ||
| 333 | .fb_set_par = xenfb_set_par, | ||
| 233 | }; | 334 | }; |
| 234 | 335 | ||
| 235 | static irqreturn_t xenfb_event_handler(int rq, void *dev_id) | 336 | static irqreturn_t xenfb_event_handler(int rq, void *dev_id) |
| @@ -258,6 +359,8 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 258 | { | 359 | { |
| 259 | struct xenfb_info *info; | 360 | struct xenfb_info *info; |
| 260 | struct fb_info *fb_info; | 361 | struct fb_info *fb_info; |
| 362 | int fb_size; | ||
| 363 | int val; | ||
| 261 | int ret; | 364 | int ret; |
| 262 | 365 | ||
| 263 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 366 | info = kzalloc(sizeof(*info), GFP_KERNEL); |
| @@ -265,18 +368,35 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 265 | xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); | 368 | xenbus_dev_fatal(dev, -ENOMEM, "allocating info structure"); |
| 266 | return -ENOMEM; | 369 | return -ENOMEM; |
| 267 | } | 370 | } |
| 371 | |||
| 372 | /* Limit kernel param videoram amount to what is in xenstore */ | ||
| 373 | if (xenbus_scanf(XBT_NIL, dev->otherend, "videoram", "%d", &val) == 1) { | ||
| 374 | if (val < video[KPARAM_MEM]) | ||
| 375 | video[KPARAM_MEM] = val; | ||
| 376 | } | ||
| 377 | |||
| 378 | /* If requested res does not fit in available memory, use default */ | ||
| 379 | fb_size = video[KPARAM_MEM] * 1024 * 1024; | ||
| 380 | if (video[KPARAM_WIDTH] * video[KPARAM_HEIGHT] * XENFB_DEPTH / 8 | ||
| 381 | > fb_size) { | ||
| 382 | video[KPARAM_WIDTH] = XENFB_WIDTH; | ||
| 383 | video[KPARAM_HEIGHT] = XENFB_HEIGHT; | ||
| 384 | fb_size = XENFB_DEFAULT_FB_LEN; | ||
| 385 | } | ||
| 386 | |||
| 268 | dev->dev.driver_data = info; | 387 | dev->dev.driver_data = info; |
| 269 | info->xbdev = dev; | 388 | info->xbdev = dev; |
| 270 | info->irq = -1; | 389 | info->irq = -1; |
| 271 | info->x1 = info->y1 = INT_MAX; | 390 | info->x1 = info->y1 = INT_MAX; |
| 272 | spin_lock_init(&info->dirty_lock); | 391 | spin_lock_init(&info->dirty_lock); |
| 392 | spin_lock_init(&info->resize_lock); | ||
| 273 | 393 | ||
| 274 | info->fb = vmalloc(xenfb_mem_len); | 394 | info->fb = vmalloc(fb_size); |
| 275 | if (info->fb == NULL) | 395 | if (info->fb == NULL) |
| 276 | goto error_nomem; | 396 | goto error_nomem; |
| 277 | memset(info->fb, 0, xenfb_mem_len); | 397 | memset(info->fb, 0, fb_size); |
| 278 | 398 | ||
| 279 | info->nr_pages = (xenfb_mem_len + PAGE_SIZE - 1) >> PAGE_SHIFT; | 399 | info->nr_pages = (fb_size + PAGE_SIZE - 1) >> PAGE_SHIFT; |
| 280 | 400 | ||
| 281 | info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); | 401 | info->mfns = vmalloc(sizeof(unsigned long) * info->nr_pages); |
| 282 | if (!info->mfns) | 402 | if (!info->mfns) |
| @@ -287,8 +407,6 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 287 | if (!info->page) | 407 | if (!info->page) |
| 288 | goto error_nomem; | 408 | goto error_nomem; |
| 289 | 409 | ||
| 290 | xenfb_init_shared_page(info); | ||
| 291 | |||
| 292 | /* abusing framebuffer_alloc() to allocate pseudo_palette */ | 410 | /* abusing framebuffer_alloc() to allocate pseudo_palette */ |
| 293 | fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); | 411 | fb_info = framebuffer_alloc(sizeof(u32) * 256, NULL); |
| 294 | if (fb_info == NULL) | 412 | if (fb_info == NULL) |
| @@ -301,9 +419,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 301 | fb_info->screen_base = info->fb; | 419 | fb_info->screen_base = info->fb; |
| 302 | 420 | ||
| 303 | fb_info->fbops = &xenfb_fb_ops; | 421 | fb_info->fbops = &xenfb_fb_ops; |
| 304 | fb_info->var.xres_virtual = fb_info->var.xres = info->page->width; | 422 | fb_info->var.xres_virtual = fb_info->var.xres = video[KPARAM_WIDTH]; |
| 305 | fb_info->var.yres_virtual = fb_info->var.yres = info->page->height; | 423 | fb_info->var.yres_virtual = fb_info->var.yres = video[KPARAM_HEIGHT]; |
| 306 | fb_info->var.bits_per_pixel = info->page->depth; | 424 | fb_info->var.bits_per_pixel = XENFB_DEPTH; |
| 307 | 425 | ||
| 308 | fb_info->var.red = (struct fb_bitfield){16, 8, 0}; | 426 | fb_info->var.red = (struct fb_bitfield){16, 8, 0}; |
| 309 | fb_info->var.green = (struct fb_bitfield){8, 8, 0}; | 427 | fb_info->var.green = (struct fb_bitfield){8, 8, 0}; |
| @@ -315,9 +433,9 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 315 | fb_info->var.vmode = FB_VMODE_NONINTERLACED; | 433 | fb_info->var.vmode = FB_VMODE_NONINTERLACED; |
| 316 | 434 | ||
| 317 | fb_info->fix.visual = FB_VISUAL_TRUECOLOR; | 435 | fb_info->fix.visual = FB_VISUAL_TRUECOLOR; |
| 318 | fb_info->fix.line_length = info->page->line_length; | 436 | fb_info->fix.line_length = fb_info->var.xres * XENFB_DEPTH / 8; |
| 319 | fb_info->fix.smem_start = 0; | 437 | fb_info->fix.smem_start = 0; |
| 320 | fb_info->fix.smem_len = xenfb_mem_len; | 438 | fb_info->fix.smem_len = fb_size; |
| 321 | strcpy(fb_info->fix.id, "xen"); | 439 | strcpy(fb_info->fix.id, "xen"); |
| 322 | fb_info->fix.type = FB_TYPE_PACKED_PIXELS; | 440 | fb_info->fix.type = FB_TYPE_PACKED_PIXELS; |
| 323 | fb_info->fix.accel = FB_ACCEL_NONE; | 441 | fb_info->fix.accel = FB_ACCEL_NONE; |
| @@ -334,6 +452,8 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 334 | fb_info->fbdefio = &xenfb_defio; | 452 | fb_info->fbdefio = &xenfb_defio; |
| 335 | fb_deferred_io_init(fb_info); | 453 | fb_deferred_io_init(fb_info); |
| 336 | 454 | ||
| 455 | xenfb_init_shared_page(info, fb_info); | ||
| 456 | |||
| 337 | ret = register_framebuffer(fb_info); | 457 | ret = register_framebuffer(fb_info); |
| 338 | if (ret) { | 458 | if (ret) { |
| 339 | fb_deferred_io_cleanup(fb_info); | 459 | fb_deferred_io_cleanup(fb_info); |
| @@ -348,6 +468,7 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 348 | if (ret < 0) | 468 | if (ret < 0) |
| 349 | goto error; | 469 | goto error; |
| 350 | 470 | ||
| 471 | xenfb_make_preferred_console(); | ||
| 351 | return 0; | 472 | return 0; |
| 352 | 473 | ||
| 353 | error_nomem: | 474 | error_nomem: |
| @@ -358,12 +479,34 @@ static int __devinit xenfb_probe(struct xenbus_device *dev, | |||
| 358 | return ret; | 479 | return ret; |
| 359 | } | 480 | } |
| 360 | 481 | ||
| 482 | static __devinit void | ||
| 483 | xenfb_make_preferred_console(void) | ||
| 484 | { | ||
| 485 | struct console *c; | ||
| 486 | |||
| 487 | if (console_set_on_cmdline) | ||
| 488 | return; | ||
| 489 | |||
| 490 | acquire_console_sem(); | ||
| 491 | for (c = console_drivers; c; c = c->next) { | ||
| 492 | if (!strcmp(c->name, "tty") && c->index == 0) | ||
| 493 | break; | ||
| 494 | } | ||
| 495 | release_console_sem(); | ||
| 496 | if (c) { | ||
| 497 | unregister_console(c); | ||
| 498 | c->flags |= CON_CONSDEV; | ||
| 499 | c->flags &= ~CON_PRINTBUFFER; /* don't print again */ | ||
| 500 | register_console(c); | ||
| 501 | } | ||
| 502 | } | ||
| 503 | |||
| 361 | static int xenfb_resume(struct xenbus_device *dev) | 504 | static int xenfb_resume(struct xenbus_device *dev) |
| 362 | { | 505 | { |
| 363 | struct xenfb_info *info = dev->dev.driver_data; | 506 | struct xenfb_info *info = dev->dev.driver_data; |
| 364 | 507 | ||
| 365 | xenfb_disconnect_backend(info); | 508 | xenfb_disconnect_backend(info); |
| 366 | xenfb_init_shared_page(info); | 509 | xenfb_init_shared_page(info, info->fb_info); |
| 367 | return xenfb_connect_backend(dev, info); | 510 | return xenfb_connect_backend(dev, info); |
| 368 | } | 511 | } |
| 369 | 512 | ||
| @@ -391,20 +534,23 @@ static unsigned long vmalloc_to_mfn(void *address) | |||
| 391 | return pfn_to_mfn(vmalloc_to_pfn(address)); | 534 | return pfn_to_mfn(vmalloc_to_pfn(address)); |
| 392 | } | 535 | } |
| 393 | 536 | ||
| 394 | static void xenfb_init_shared_page(struct xenfb_info *info) | 537 | static void xenfb_init_shared_page(struct xenfb_info *info, |
| 538 | struct fb_info *fb_info) | ||
| 395 | { | 539 | { |
| 396 | int i; | 540 | int i; |
| 541 | int epd = PAGE_SIZE / sizeof(info->mfns[0]); | ||
| 397 | 542 | ||
| 398 | for (i = 0; i < info->nr_pages; i++) | 543 | for (i = 0; i < info->nr_pages; i++) |
| 399 | info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); | 544 | info->mfns[i] = vmalloc_to_mfn(info->fb + i * PAGE_SIZE); |
| 400 | 545 | ||
| 401 | info->page->pd[0] = vmalloc_to_mfn(info->mfns); | 546 | for (i = 0; i * epd < info->nr_pages; i++) |
| 402 | info->page->pd[1] = 0; | 547 | info->page->pd[i] = vmalloc_to_mfn(&info->mfns[i * epd]); |
| 403 | info->page->width = XENFB_WIDTH; | 548 | |
| 404 | info->page->height = XENFB_HEIGHT; | 549 | info->page->width = fb_info->var.xres; |
| 405 | info->page->depth = XENFB_DEPTH; | 550 | info->page->height = fb_info->var.yres; |
| 406 | info->page->line_length = (info->page->depth / 8) * info->page->width; | 551 | info->page->depth = fb_info->var.bits_per_pixel; |
| 407 | info->page->mem_length = xenfb_mem_len; | 552 | info->page->line_length = fb_info->fix.line_length; |
| 553 | info->page->mem_length = fb_info->fix.smem_len; | ||
| 408 | info->page->in_cons = info->page->in_prod = 0; | 554 | info->page->in_cons = info->page->in_prod = 0; |
| 409 | info->page->out_cons = info->page->out_prod = 0; | 555 | info->page->out_cons = info->page->out_prod = 0; |
| 410 | } | 556 | } |
| @@ -504,6 +650,11 @@ InitWait: | |||
| 504 | val = 0; | 650 | val = 0; |
| 505 | if (val) | 651 | if (val) |
| 506 | info->update_wanted = 1; | 652 | info->update_wanted = 1; |
| 653 | |||
| 654 | if (xenbus_scanf(XBT_NIL, dev->otherend, | ||
| 655 | "feature-resize", "%d", &val) < 0) | ||
| 656 | val = 0; | ||
| 657 | info->feature_resize = val; | ||
| 507 | break; | 658 | break; |
| 508 | 659 | ||
| 509 | case XenbusStateClosing: | 660 | case XenbusStateClosing: |
| @@ -547,4 +698,6 @@ static void __exit xenfb_cleanup(void) | |||
| 547 | module_init(xenfb_init); | 698 | module_init(xenfb_init); |
| 548 | module_exit(xenfb_cleanup); | 699 | module_exit(xenfb_cleanup); |
| 549 | 700 | ||
| 701 | MODULE_DESCRIPTION("Xen virtual framebuffer device frontend"); | ||
| 550 | MODULE_LICENSE("GPL"); | 702 | MODULE_LICENSE("GPL"); |
| 703 | MODULE_ALIAS("xen:vfb"); | ||
diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile index 37af04f1ffd9..363286c54290 100644 --- a/drivers/xen/Makefile +++ b/drivers/xen/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | obj-y += grant-table.o features.o events.o | 1 | obj-y += grant-table.o features.o events.o manage.o |
| 2 | obj-y += xenbus/ | 2 | obj-y += xenbus/ |
| 3 | obj-$(CONFIG_XEN_XENCOMM) += xencomm.o | 3 | obj-$(CONFIG_XEN_XENCOMM) += xencomm.o |
| 4 | obj-$(CONFIG_XEN_BALLOON) += balloon.o | 4 | obj-$(CONFIG_XEN_BALLOON) += balloon.o |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index ab25ba6cbbb9..591bc29b55f5 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -225,7 +225,7 @@ static int increase_reservation(unsigned long nr_pages) | |||
| 225 | page = balloon_next_page(page); | 225 | page = balloon_next_page(page); |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | reservation.extent_start = (unsigned long)frame_list; | 228 | set_xen_guest_handle(reservation.extent_start, frame_list); |
| 229 | reservation.nr_extents = nr_pages; | 229 | reservation.nr_extents = nr_pages; |
| 230 | rc = HYPERVISOR_memory_op( | 230 | rc = HYPERVISOR_memory_op( |
| 231 | XENMEM_populate_physmap, &reservation); | 231 | XENMEM_populate_physmap, &reservation); |
| @@ -321,7 +321,7 @@ static int decrease_reservation(unsigned long nr_pages) | |||
| 321 | balloon_append(pfn_to_page(pfn)); | 321 | balloon_append(pfn_to_page(pfn)); |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | reservation.extent_start = (unsigned long)frame_list; | 324 | set_xen_guest_handle(reservation.extent_start, frame_list); |
| 325 | reservation.nr_extents = nr_pages; | 325 | reservation.nr_extents = nr_pages; |
| 326 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); | 326 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); |
| 327 | BUG_ON(ret != nr_pages); | 327 | BUG_ON(ret != nr_pages); |
| @@ -368,7 +368,7 @@ static void balloon_process(struct work_struct *work) | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | /* Resets the Xen limit, sets new target, and kicks off processing. */ | 370 | /* Resets the Xen limit, sets new target, and kicks off processing. */ |
| 371 | void balloon_set_new_target(unsigned long target) | 371 | static void balloon_set_new_target(unsigned long target) |
| 372 | { | 372 | { |
| 373 | /* No need for lock. Not read-modify-write updates. */ | 373 | /* No need for lock. Not read-modify-write updates. */ |
| 374 | balloon_stats.hard_limit = ~0UL; | 374 | balloon_stats.hard_limit = ~0UL; |
| @@ -483,7 +483,7 @@ static int dealloc_pte_fn( | |||
| 483 | .extent_order = 0, | 483 | .extent_order = 0, |
| 484 | .domid = DOMID_SELF | 484 | .domid = DOMID_SELF |
| 485 | }; | 485 | }; |
| 486 | reservation.extent_start = (unsigned long)&mfn; | 486 | set_xen_guest_handle(reservation.extent_start, &mfn); |
| 487 | set_pte_at(&init_mm, addr, pte, __pte_ma(0ull)); | 487 | set_pte_at(&init_mm, addr, pte, __pte_ma(0ull)); |
| 488 | set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY); | 488 | set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY); |
| 489 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); | 489 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation); |
| @@ -519,7 +519,7 @@ static struct page **alloc_empty_pages_and_pagevec(int nr_pages) | |||
| 519 | .extent_order = 0, | 519 | .extent_order = 0, |
| 520 | .domid = DOMID_SELF | 520 | .domid = DOMID_SELF |
| 521 | }; | 521 | }; |
| 522 | reservation.extent_start = (unsigned long)&gmfn; | 522 | set_xen_guest_handle(reservation.extent_start, &gmfn); |
| 523 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, | 523 | ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, |
| 524 | &reservation); | 524 | &reservation); |
| 525 | if (ret == 1) | 525 | if (ret == 1) |
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 76e5b7386af9..332dd63750a0 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -355,7 +355,7 @@ static void unbind_from_irq(unsigned int irq) | |||
| 355 | 355 | ||
| 356 | spin_lock(&irq_mapping_update_lock); | 356 | spin_lock(&irq_mapping_update_lock); |
| 357 | 357 | ||
| 358 | if (VALID_EVTCHN(evtchn) && (--irq_bindcount[irq] == 0)) { | 358 | if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) { |
| 359 | close.port = evtchn; | 359 | close.port = evtchn; |
| 360 | if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0) | 360 | if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0) |
| 361 | BUG(); | 361 | BUG(); |
| @@ -375,7 +375,7 @@ static void unbind_from_irq(unsigned int irq) | |||
| 375 | evtchn_to_irq[evtchn] = -1; | 375 | evtchn_to_irq[evtchn] = -1; |
| 376 | irq_info[irq] = IRQ_UNBOUND; | 376 | irq_info[irq] = IRQ_UNBOUND; |
| 377 | 377 | ||
| 378 | dynamic_irq_init(irq); | 378 | dynamic_irq_cleanup(irq); |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | spin_unlock(&irq_mapping_update_lock); | 381 | spin_unlock(&irq_mapping_update_lock); |
| @@ -557,6 +557,33 @@ out: | |||
| 557 | put_cpu(); | 557 | put_cpu(); |
| 558 | } | 558 | } |
| 559 | 559 | ||
| 560 | /* Rebind a new event channel to an existing irq. */ | ||
| 561 | void rebind_evtchn_irq(int evtchn, int irq) | ||
| 562 | { | ||
| 563 | /* Make sure the irq is masked, since the new event channel | ||
| 564 | will also be masked. */ | ||
| 565 | disable_irq(irq); | ||
| 566 | |||
| 567 | spin_lock(&irq_mapping_update_lock); | ||
| 568 | |||
| 569 | /* After resume the irq<->evtchn mappings are all cleared out */ | ||
| 570 | BUG_ON(evtchn_to_irq[evtchn] != -1); | ||
| 571 | /* Expect irq to have been bound before, | ||
| 572 | so the bindcount should be non-0 */ | ||
| 573 | BUG_ON(irq_bindcount[irq] == 0); | ||
| 574 | |||
| 575 | evtchn_to_irq[evtchn] = irq; | ||
| 576 | irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn); | ||
| 577 | |||
| 578 | spin_unlock(&irq_mapping_update_lock); | ||
| 579 | |||
| 580 | /* new event channels are always bound to cpu 0 */ | ||
| 581 | irq_set_affinity(irq, cpumask_of_cpu(0)); | ||
| 582 | |||
| 583 | /* Unmask the event channel. */ | ||
| 584 | enable_irq(irq); | ||
| 585 | } | ||
| 586 | |||
| 560 | /* Rebind an evtchn so that it gets delivered to a specific cpu */ | 587 | /* Rebind an evtchn so that it gets delivered to a specific cpu */ |
| 561 | static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu) | 588 | static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu) |
| 562 | { | 589 | { |
| @@ -647,6 +674,89 @@ static int retrigger_dynirq(unsigned int irq) | |||
| 647 | return ret; | 674 | return ret; |
| 648 | } | 675 | } |
| 649 | 676 | ||
| 677 | static void restore_cpu_virqs(unsigned int cpu) | ||
| 678 | { | ||
| 679 | struct evtchn_bind_virq bind_virq; | ||
| 680 | int virq, irq, evtchn; | ||
| 681 | |||
| 682 | for (virq = 0; virq < NR_VIRQS; virq++) { | ||
| 683 | if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1) | ||
| 684 | continue; | ||
| 685 | |||
| 686 | BUG_ON(irq_info[irq].type != IRQT_VIRQ); | ||
| 687 | BUG_ON(irq_info[irq].index != virq); | ||
| 688 | |||
| 689 | /* Get a new binding from Xen. */ | ||
| 690 | bind_virq.virq = virq; | ||
| 691 | bind_virq.vcpu = cpu; | ||
| 692 | if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, | ||
| 693 | &bind_virq) != 0) | ||
| 694 | BUG(); | ||
| 695 | evtchn = bind_virq.port; | ||
| 696 | |||
| 697 | /* Record the new mapping. */ | ||
| 698 | evtchn_to_irq[evtchn] = irq; | ||
| 699 | irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn); | ||
| 700 | bind_evtchn_to_cpu(evtchn, cpu); | ||
| 701 | |||
| 702 | /* Ready for use. */ | ||
| 703 | unmask_evtchn(evtchn); | ||
| 704 | } | ||
| 705 | } | ||
| 706 | |||
| 707 | static void restore_cpu_ipis(unsigned int cpu) | ||
| 708 | { | ||
| 709 | struct evtchn_bind_ipi bind_ipi; | ||
| 710 | int ipi, irq, evtchn; | ||
| 711 | |||
| 712 | for (ipi = 0; ipi < XEN_NR_IPIS; ipi++) { | ||
| 713 | if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1) | ||
| 714 | continue; | ||
| 715 | |||
| 716 | BUG_ON(irq_info[irq].type != IRQT_IPI); | ||
| 717 | BUG_ON(irq_info[irq].index != ipi); | ||
| 718 | |||
| 719 | /* Get a new binding from Xen. */ | ||
| 720 | bind_ipi.vcpu = cpu; | ||
| 721 | if (HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, | ||
| 722 | &bind_ipi) != 0) | ||
| 723 | BUG(); | ||
| 724 | evtchn = bind_ipi.port; | ||
| 725 | |||
| 726 | /* Record the new mapping. */ | ||
| 727 | evtchn_to_irq[evtchn] = irq; | ||
| 728 | irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn); | ||
| 729 | bind_evtchn_to_cpu(evtchn, cpu); | ||
| 730 | |||
| 731 | /* Ready for use. */ | ||
| 732 | unmask_evtchn(evtchn); | ||
| 733 | |||
| 734 | } | ||
| 735 | } | ||
| 736 | |||
| 737 | void xen_irq_resume(void) | ||
| 738 | { | ||
| 739 | unsigned int cpu, irq, evtchn; | ||
| 740 | |||
| 741 | init_evtchn_cpu_bindings(); | ||
| 742 | |||
| 743 | /* New event-channel space is not 'live' yet. */ | ||
| 744 | for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++) | ||
| 745 | mask_evtchn(evtchn); | ||
| 746 | |||
| 747 | /* No IRQ <-> event-channel mappings. */ | ||
| 748 | for (irq = 0; irq < NR_IRQS; irq++) | ||
| 749 | irq_info[irq].evtchn = 0; /* zap event-channel binding */ | ||
| 750 | |||
| 751 | for (evtchn = 0; evtchn < NR_EVENT_CHANNELS; evtchn++) | ||
| 752 | evtchn_to_irq[evtchn] = -1; | ||
| 753 | |||
| 754 | for_each_possible_cpu(cpu) { | ||
| 755 | restore_cpu_virqs(cpu); | ||
| 756 | restore_cpu_ipis(cpu); | ||
| 757 | } | ||
| 758 | } | ||
| 759 | |||
| 650 | static struct irq_chip xen_dynamic_chip __read_mostly = { | 760 | static struct irq_chip xen_dynamic_chip __read_mostly = { |
| 651 | .name = "xen-dyn", | 761 | .name = "xen-dyn", |
| 652 | .mask = disable_dynirq, | 762 | .mask = disable_dynirq, |
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 52b6b41b909d..e9e11168616a 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -471,14 +471,14 @@ static int gnttab_map(unsigned int start_idx, unsigned int end_idx) | |||
| 471 | return 0; | 471 | return 0; |
| 472 | } | 472 | } |
| 473 | 473 | ||
| 474 | static int gnttab_resume(void) | 474 | int gnttab_resume(void) |
| 475 | { | 475 | { |
| 476 | if (max_nr_grant_frames() < nr_grant_frames) | 476 | if (max_nr_grant_frames() < nr_grant_frames) |
| 477 | return -ENOSYS; | 477 | return -ENOSYS; |
| 478 | return gnttab_map(0, nr_grant_frames - 1); | 478 | return gnttab_map(0, nr_grant_frames - 1); |
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | static int gnttab_suspend(void) | 481 | int gnttab_suspend(void) |
| 482 | { | 482 | { |
| 483 | arch_gnttab_unmap_shared(shared, nr_grant_frames); | 483 | arch_gnttab_unmap_shared(shared, nr_grant_frames); |
| 484 | return 0; | 484 | return 0; |
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c new file mode 100644 index 000000000000..5b546e365f00 --- /dev/null +++ b/drivers/xen/manage.c | |||
| @@ -0,0 +1,252 @@ | |||
| 1 | /* | ||
| 2 | * Handle extern requests for shutdown, reboot and sysrq | ||
| 3 | */ | ||
| 4 | #include <linux/kernel.h> | ||
| 5 | #include <linux/err.h> | ||
| 6 | #include <linux/reboot.h> | ||
| 7 | #include <linux/sysrq.h> | ||
| 8 | #include <linux/stop_machine.h> | ||
| 9 | #include <linux/freezer.h> | ||
| 10 | |||
| 11 | #include <xen/xenbus.h> | ||
| 12 | #include <xen/grant_table.h> | ||
| 13 | #include <xen/events.h> | ||
| 14 | #include <xen/hvc-console.h> | ||
| 15 | #include <xen/xen-ops.h> | ||
| 16 | |||
| 17 | #include <asm/xen/hypercall.h> | ||
| 18 | #include <asm/xen/page.h> | ||
| 19 | |||
| 20 | enum shutdown_state { | ||
| 21 | SHUTDOWN_INVALID = -1, | ||
| 22 | SHUTDOWN_POWEROFF = 0, | ||
| 23 | SHUTDOWN_SUSPEND = 2, | ||
| 24 | /* Code 3 is SHUTDOWN_CRASH, which we don't use because the domain can only | ||
| 25 | report a crash, not be instructed to crash! | ||
| 26 | HALT is the same as POWEROFF, as far as we're concerned. The tools use | ||
| 27 | the distinction when we return the reason code to them. */ | ||
| 28 | SHUTDOWN_HALT = 4, | ||
| 29 | }; | ||
| 30 | |||
| 31 | /* Ignore multiple shutdown requests. */ | ||
| 32 | static enum shutdown_state shutting_down = SHUTDOWN_INVALID; | ||
| 33 | |||
| 34 | #ifdef CONFIG_PM_SLEEP | ||
| 35 | static int xen_suspend(void *data) | ||
| 36 | { | ||
| 37 | int *cancelled = data; | ||
| 38 | int err; | ||
| 39 | |||
| 40 | BUG_ON(!irqs_disabled()); | ||
| 41 | |||
| 42 | load_cr3(swapper_pg_dir); | ||
| 43 | |||
| 44 | err = device_power_down(PMSG_SUSPEND); | ||
| 45 | if (err) { | ||
| 46 | printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n", | ||
| 47 | err); | ||
| 48 | return err; | ||
| 49 | } | ||
| 50 | |||
| 51 | xen_mm_pin_all(); | ||
| 52 | gnttab_suspend(); | ||
| 53 | xen_pre_suspend(); | ||
| 54 | |||
| 55 | /* | ||
| 56 | * This hypercall returns 1 if suspend was cancelled | ||
| 57 | * or the domain was merely checkpointed, and 0 if it | ||
| 58 | * is resuming in a new domain. | ||
| 59 | */ | ||
| 60 | *cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info)); | ||
| 61 | |||
| 62 | xen_post_suspend(*cancelled); | ||
| 63 | gnttab_resume(); | ||
| 64 | xen_mm_unpin_all(); | ||
| 65 | |||
| 66 | device_power_up(); | ||
| 67 | |||
| 68 | if (!*cancelled) { | ||
| 69 | xen_irq_resume(); | ||
| 70 | xen_console_resume(); | ||
| 71 | } | ||
| 72 | |||
| 73 | return 0; | ||
| 74 | } | ||
| 75 | |||
| 76 | static void do_suspend(void) | ||
| 77 | { | ||
| 78 | int err; | ||
| 79 | int cancelled = 1; | ||
| 80 | |||
| 81 | shutting_down = SHUTDOWN_SUSPEND; | ||
| 82 | |||
| 83 | #ifdef CONFIG_PREEMPT | ||
| 84 | /* If the kernel is preemptible, we need to freeze all the processes | ||
| 85 | to prevent them from being in the middle of a pagetable update | ||
| 86 | during suspend. */ | ||
| 87 | err = freeze_processes(); | ||
| 88 | if (err) { | ||
| 89 | printk(KERN_ERR "xen suspend: freeze failed %d\n", err); | ||
| 90 | return; | ||
| 91 | } | ||
| 92 | #endif | ||
| 93 | |||
| 94 | err = device_suspend(PMSG_SUSPEND); | ||
| 95 | if (err) { | ||
| 96 | printk(KERN_ERR "xen suspend: device_suspend %d\n", err); | ||
| 97 | goto out; | ||
| 98 | } | ||
| 99 | |||
| 100 | printk("suspending xenbus...\n"); | ||
| 101 | /* XXX use normal device tree? */ | ||
| 102 | xenbus_suspend(); | ||
| 103 | |||
| 104 | err = stop_machine_run(xen_suspend, &cancelled, 0); | ||
| 105 | if (err) { | ||
| 106 | printk(KERN_ERR "failed to start xen_suspend: %d\n", err); | ||
| 107 | goto out; | ||
| 108 | } | ||
| 109 | |||
| 110 | if (!cancelled) | ||
| 111 | xenbus_resume(); | ||
| 112 | else | ||
| 113 | xenbus_suspend_cancel(); | ||
| 114 | |||
| 115 | device_resume(); | ||
| 116 | |||
| 117 | /* Make sure timer events get retriggered on all CPUs */ | ||
| 118 | clock_was_set(); | ||
| 119 | out: | ||
| 120 | #ifdef CONFIG_PREEMPT | ||
| 121 | thaw_processes(); | ||
| 122 | #endif | ||
| 123 | shutting_down = SHUTDOWN_INVALID; | ||
| 124 | } | ||
| 125 | #endif /* CONFIG_PM_SLEEP */ | ||
| 126 | |||
| 127 | static void shutdown_handler(struct xenbus_watch *watch, | ||
| 128 | const char **vec, unsigned int len) | ||
| 129 | { | ||
| 130 | char *str; | ||
| 131 | struct xenbus_transaction xbt; | ||
| 132 | int err; | ||
| 133 | |||
| 134 | if (shutting_down != SHUTDOWN_INVALID) | ||
| 135 | return; | ||
| 136 | |||
| 137 | again: | ||
| 138 | err = xenbus_transaction_start(&xbt); | ||
| 139 | if (err) | ||
| 140 | return; | ||
| 141 | |||
| 142 | str = (char *)xenbus_read(xbt, "control", "shutdown", NULL); | ||
| 143 | /* Ignore read errors and empty reads. */ | ||
| 144 | if (XENBUS_IS_ERR_READ(str)) { | ||
| 145 | xenbus_transaction_end(xbt, 1); | ||
| 146 | return; | ||
| 147 | } | ||
| 148 | |||
| 149 | xenbus_write(xbt, "control", "shutdown", ""); | ||
| 150 | |||
| 151 | err = xenbus_transaction_end(xbt, 0); | ||
| 152 | if (err == -EAGAIN) { | ||
| 153 | kfree(str); | ||
| 154 | goto again; | ||
| 155 | } | ||
| 156 | |||
| 157 | if (strcmp(str, "poweroff") == 0 || | ||
| 158 | strcmp(str, "halt") == 0) { | ||
| 159 | shutting_down = SHUTDOWN_POWEROFF; | ||
| 160 | orderly_poweroff(false); | ||
| 161 | } else if (strcmp(str, "reboot") == 0) { | ||
| 162 | shutting_down = SHUTDOWN_POWEROFF; /* ? */ | ||
| 163 | ctrl_alt_del(); | ||
| 164 | #ifdef CONFIG_PM_SLEEP | ||
| 165 | } else if (strcmp(str, "suspend") == 0) { | ||
| 166 | do_suspend(); | ||
| 167 | #endif | ||
| 168 | } else { | ||
| 169 | printk(KERN_INFO "Ignoring shutdown request: %s\n", str); | ||
| 170 | shutting_down = SHUTDOWN_INVALID; | ||
| 171 | } | ||
| 172 | |||
| 173 | kfree(str); | ||
| 174 | } | ||
| 175 | |||
| 176 | static void sysrq_handler(struct xenbus_watch *watch, const char **vec, | ||
| 177 | unsigned int len) | ||
| 178 | { | ||
| 179 | char sysrq_key = '\0'; | ||
| 180 | struct xenbus_transaction xbt; | ||
| 181 | int err; | ||
| 182 | |||
| 183 | again: | ||
| 184 | err = xenbus_transaction_start(&xbt); | ||
| 185 | if (err) | ||
| 186 | return; | ||
| 187 | if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) { | ||
| 188 | printk(KERN_ERR "Unable to read sysrq code in " | ||
| 189 | "control/sysrq\n"); | ||
| 190 | xenbus_transaction_end(xbt, 1); | ||
| 191 | return; | ||
| 192 | } | ||
| 193 | |||
| 194 | if (sysrq_key != '\0') | ||
| 195 | xenbus_printf(xbt, "control", "sysrq", "%c", '\0'); | ||
| 196 | |||
| 197 | err = xenbus_transaction_end(xbt, 0); | ||
| 198 | if (err == -EAGAIN) | ||
| 199 | goto again; | ||
| 200 | |||
| 201 | if (sysrq_key != '\0') | ||
| 202 | handle_sysrq(sysrq_key, NULL); | ||
| 203 | } | ||
| 204 | |||
| 205 | static struct xenbus_watch shutdown_watch = { | ||
| 206 | .node = "control/shutdown", | ||
| 207 | .callback = shutdown_handler | ||
| 208 | }; | ||
| 209 | |||
| 210 | static struct xenbus_watch sysrq_watch = { | ||
| 211 | .node = "control/sysrq", | ||
| 212 | .callback = sysrq_handler | ||
| 213 | }; | ||
| 214 | |||
| 215 | static int setup_shutdown_watcher(void) | ||
| 216 | { | ||
| 217 | int err; | ||
| 218 | |||
| 219 | err = register_xenbus_watch(&shutdown_watch); | ||
| 220 | if (err) { | ||
| 221 | printk(KERN_ERR "Failed to set shutdown watcher\n"); | ||
| 222 | return err; | ||
| 223 | } | ||
| 224 | |||
| 225 | err = register_xenbus_watch(&sysrq_watch); | ||
| 226 | if (err) { | ||
| 227 | printk(KERN_ERR "Failed to set sysrq watcher\n"); | ||
| 228 | return err; | ||
| 229 | } | ||
| 230 | |||
| 231 | return 0; | ||
| 232 | } | ||
| 233 | |||
| 234 | static int shutdown_event(struct notifier_block *notifier, | ||
| 235 | unsigned long event, | ||
| 236 | void *data) | ||
| 237 | { | ||
| 238 | setup_shutdown_watcher(); | ||
| 239 | return NOTIFY_DONE; | ||
| 240 | } | ||
| 241 | |||
| 242 | static int __init setup_shutdown_event(void) | ||
| 243 | { | ||
| 244 | static struct notifier_block xenstore_notifier = { | ||
| 245 | .notifier_call = shutdown_event | ||
| 246 | }; | ||
| 247 | register_xenstore_notifier(&xenstore_notifier); | ||
| 248 | |||
| 249 | return 0; | ||
| 250 | } | ||
| 251 | |||
| 252 | subsys_initcall(setup_shutdown_event); | ||
diff --git a/drivers/xen/xenbus/xenbus_comms.c b/drivers/xen/xenbus/xenbus_comms.c index 6efbe3f29ca5..090c61ee8fd0 100644 --- a/drivers/xen/xenbus/xenbus_comms.c +++ b/drivers/xen/xenbus/xenbus_comms.c | |||
| @@ -203,7 +203,6 @@ int xb_read(void *data, unsigned len) | |||
| 203 | int xb_init_comms(void) | 203 | int xb_init_comms(void) |
| 204 | { | 204 | { |
| 205 | struct xenstore_domain_interface *intf = xen_store_interface; | 205 | struct xenstore_domain_interface *intf = xen_store_interface; |
| 206 | int err; | ||
| 207 | 206 | ||
| 208 | if (intf->req_prod != intf->req_cons) | 207 | if (intf->req_prod != intf->req_cons) |
| 209 | printk(KERN_ERR "XENBUS request ring is not quiescent " | 208 | printk(KERN_ERR "XENBUS request ring is not quiescent " |
| @@ -216,18 +215,20 @@ int xb_init_comms(void) | |||
| 216 | intf->rsp_cons = intf->rsp_prod; | 215 | intf->rsp_cons = intf->rsp_prod; |
| 217 | } | 216 | } |
| 218 | 217 | ||
| 219 | if (xenbus_irq) | 218 | if (xenbus_irq) { |
| 220 | unbind_from_irqhandler(xenbus_irq, &xb_waitq); | 219 | /* Already have an irq; assume we're resuming */ |
| 220 | rebind_evtchn_irq(xen_store_evtchn, xenbus_irq); | ||
| 221 | } else { | ||
| 222 | int err; | ||
| 223 | err = bind_evtchn_to_irqhandler(xen_store_evtchn, wake_waiting, | ||
| 224 | 0, "xenbus", &xb_waitq); | ||
| 225 | if (err <= 0) { | ||
| 226 | printk(KERN_ERR "XENBUS request irq failed %i\n", err); | ||
| 227 | return err; | ||
| 228 | } | ||
| 221 | 229 | ||
| 222 | err = bind_evtchn_to_irqhandler( | 230 | xenbus_irq = err; |
| 223 | xen_store_evtchn, wake_waiting, | ||
| 224 | 0, "xenbus", &xb_waitq); | ||
| 225 | if (err <= 0) { | ||
| 226 | printk(KERN_ERR "XENBUS request irq failed %i\n", err); | ||
| 227 | return err; | ||
| 228 | } | 231 | } |
| 229 | 232 | ||
| 230 | xenbus_irq = err; | ||
| 231 | |||
| 232 | return 0; | 233 | return 0; |
| 233 | } | 234 | } |
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 7e277f2ad466..c652d469dc08 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -123,6 +123,11 @@ static int uptime_read_proc(char *page, char **start, off_t off, | |||
| 123 | return proc_calc_metrics(page, start, off, count, eof, len); | 123 | return proc_calc_metrics(page, start, off, count, eof, len); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | int __attribute__((weak)) arch_report_meminfo(char *page) | ||
| 127 | { | ||
| 128 | return 0; | ||
| 129 | } | ||
| 130 | |||
| 126 | static int meminfo_read_proc(char *page, char **start, off_t off, | 131 | static int meminfo_read_proc(char *page, char **start, off_t off, |
| 127 | int count, int *eof, void *data) | 132 | int count, int *eof, void *data) |
| 128 | { | 133 | { |
| @@ -221,6 +226,8 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 221 | 226 | ||
| 222 | len += hugetlb_report_meminfo(page + len); | 227 | len += hugetlb_report_meminfo(page + len); |
| 223 | 228 | ||
| 229 | len += arch_report_meminfo(page + len); | ||
| 230 | |||
| 224 | return proc_calc_metrics(page, start, off, count, eof, len); | 231 | return proc_calc_metrics(page, start, off, count, eof, len); |
| 225 | #undef K | 232 | #undef K |
| 226 | } | 233 | } |
| @@ -472,6 +479,13 @@ static const struct file_operations proc_vmalloc_operations = { | |||
| 472 | }; | 479 | }; |
| 473 | #endif | 480 | #endif |
| 474 | 481 | ||
| 482 | #ifndef arch_irq_stat_cpu | ||
| 483 | #define arch_irq_stat_cpu(cpu) 0 | ||
| 484 | #endif | ||
| 485 | #ifndef arch_irq_stat | ||
| 486 | #define arch_irq_stat() 0 | ||
| 487 | #endif | ||
| 488 | |||
| 475 | static int show_stat(struct seq_file *p, void *v) | 489 | static int show_stat(struct seq_file *p, void *v) |
| 476 | { | 490 | { |
| 477 | int i; | 491 | int i; |
| @@ -509,7 +523,9 @@ static int show_stat(struct seq_file *p, void *v) | |||
| 509 | sum += temp; | 523 | sum += temp; |
| 510 | per_irq_sum[j] += temp; | 524 | per_irq_sum[j] += temp; |
| 511 | } | 525 | } |
| 526 | sum += arch_irq_stat_cpu(i); | ||
| 512 | } | 527 | } |
| 528 | sum += arch_irq_stat(); | ||
| 513 | 529 | ||
| 514 | seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n", | 530 | seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n", |
| 515 | (unsigned long long)cputime64_to_clock_t(user), | 531 | (unsigned long long)cputime64_to_clock_t(user), |
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 44ef329531c3..4fce3db2cecc 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
| @@ -197,6 +197,63 @@ static inline int pmd_none_or_clear_bad(pmd_t *pmd) | |||
| 197 | } | 197 | } |
| 198 | #endif /* CONFIG_MMU */ | 198 | #endif /* CONFIG_MMU */ |
| 199 | 199 | ||
| 200 | static inline pte_t __ptep_modify_prot_start(struct mm_struct *mm, | ||
| 201 | unsigned long addr, | ||
| 202 | pte_t *ptep) | ||
| 203 | { | ||
| 204 | /* | ||
| 205 | * Get the current pte state, but zero it out to make it | ||
| 206 | * non-present, preventing the hardware from asynchronously | ||
| 207 | * updating it. | ||
| 208 | */ | ||
| 209 | return ptep_get_and_clear(mm, addr, ptep); | ||
| 210 | } | ||
| 211 | |||
| 212 | static inline void __ptep_modify_prot_commit(struct mm_struct *mm, | ||
| 213 | unsigned long addr, | ||
| 214 | pte_t *ptep, pte_t pte) | ||
| 215 | { | ||
| 216 | /* | ||
| 217 | * The pte is non-present, so there's no hardware state to | ||
| 218 | * preserve. | ||
| 219 | */ | ||
| 220 | set_pte_at(mm, addr, ptep, pte); | ||
| 221 | } | ||
| 222 | |||
| 223 | #ifndef __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION | ||
| 224 | /* | ||
| 225 | * Start a pte protection read-modify-write transaction, which | ||
| 226 | * protects against asynchronous hardware modifications to the pte. | ||
| 227 | * The intention is not to prevent the hardware from making pte | ||
| 228 | * updates, but to prevent any updates it may make from being lost. | ||
| 229 | * | ||
| 230 | * This does not protect against other software modifications of the | ||
| 231 | * pte; the appropriate pte lock must be held over the transation. | ||
| 232 | * | ||
| 233 | * Note that this interface is intended to be batchable, meaning that | ||
| 234 | * ptep_modify_prot_commit may not actually update the pte, but merely | ||
| 235 | * queue the update to be done at some later time. The update must be | ||
| 236 | * actually committed before the pte lock is released, however. | ||
| 237 | */ | ||
| 238 | static inline pte_t ptep_modify_prot_start(struct mm_struct *mm, | ||
| 239 | unsigned long addr, | ||
| 240 | pte_t *ptep) | ||
| 241 | { | ||
| 242 | return __ptep_modify_prot_start(mm, addr, ptep); | ||
| 243 | } | ||
| 244 | |||
| 245 | /* | ||
| 246 | * Commit an update to a pte, leaving any hardware-controlled bits in | ||
| 247 | * the PTE unmodified. | ||
| 248 | */ | ||
| 249 | static inline void ptep_modify_prot_commit(struct mm_struct *mm, | ||
| 250 | unsigned long addr, | ||
| 251 | pte_t *ptep, pte_t pte) | ||
| 252 | { | ||
| 253 | __ptep_modify_prot_commit(mm, addr, ptep, pte); | ||
| 254 | } | ||
| 255 | #endif /* __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION */ | ||
| 256 | |||
| 200 | /* | 257 | /* |
| 201 | * A facility to provide lazy MMU batching. This allows PTE updates and | 258 | * A facility to provide lazy MMU batching. This allows PTE updates and |
| 202 | * page invalidations to be delayed until a call to leave lazy MMU mode | 259 | * page invalidations to be delayed until a call to leave lazy MMU mode |
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f054778e916c..f1992dc5c424 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -93,6 +93,8 @@ | |||
| 93 | VMLINUX_SYMBOL(__end_rio_route_ops) = .; \ | 93 | VMLINUX_SYMBOL(__end_rio_route_ops) = .; \ |
| 94 | } \ | 94 | } \ |
| 95 | \ | 95 | \ |
| 96 | TRACEDATA \ | ||
| 97 | \ | ||
| 96 | /* Kernel symbol table: Normal symbols */ \ | 98 | /* Kernel symbol table: Normal symbols */ \ |
| 97 | __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ | 99 | __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ |
| 98 | VMLINUX_SYMBOL(__start___ksymtab) = .; \ | 100 | VMLINUX_SYMBOL(__start___ksymtab) = .; \ |
| @@ -318,6 +320,18 @@ | |||
| 318 | __stop___bug_table = .; \ | 320 | __stop___bug_table = .; \ |
| 319 | } | 321 | } |
| 320 | 322 | ||
| 323 | #ifdef CONFIG_PM_TRACE | ||
| 324 | #define TRACEDATA \ | ||
| 325 | . = ALIGN(4); \ | ||
| 326 | .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \ | ||
| 327 | __tracedata_start = .; \ | ||
| 328 | *(.tracedata) \ | ||
| 329 | __tracedata_end = .; \ | ||
| 330 | } | ||
| 331 | #else | ||
| 332 | #define TRACEDATA | ||
| 333 | #endif | ||
| 334 | |||
| 321 | #define NOTES \ | 335 | #define NOTES \ |
| 322 | .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ | 336 | .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ |
| 323 | VMLINUX_SYMBOL(__start_notes) = .; \ | 337 | VMLINUX_SYMBOL(__start_notes) = .; \ |
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index 3c387cda95fa..313bcaf4b6c3 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
| @@ -36,7 +36,6 @@ extern void generic_apic_probe(void); | |||
| 36 | #ifdef CONFIG_X86_LOCAL_APIC | 36 | #ifdef CONFIG_X86_LOCAL_APIC |
| 37 | 37 | ||
| 38 | extern int apic_verbosity; | 38 | extern int apic_verbosity; |
| 39 | extern int timer_over_8254; | ||
| 40 | extern int local_apic_timer_c2_ok; | 39 | extern int local_apic_timer_c2_ok; |
| 41 | 40 | ||
| 42 | extern int ioapic_force; | 41 | extern int ioapic_force; |
diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h index 90dec0c23646..70939820c55f 100644 --- a/include/asm-x86/asm.h +++ b/include/asm-x86/asm.h | |||
| @@ -1,33 +1,29 @@ | |||
| 1 | #ifndef _ASM_X86_ASM_H | 1 | #ifndef _ASM_X86_ASM_H |
| 2 | #define _ASM_X86_ASM_H | 2 | #define _ASM_X86_ASM_H |
| 3 | 3 | ||
| 4 | #ifdef CONFIG_X86_32 | 4 | #ifdef __ASSEMBLY__ |
| 5 | /* 32 bits */ | 5 | # define __ASM_FORM(x) x |
| 6 | 6 | #else | |
| 7 | # define _ASM_PTR " .long " | 7 | # define __ASM_FORM(x) " " #x " " |
| 8 | # define _ASM_ALIGN " .balign 4 " | 8 | #endif |
| 9 | # define _ASM_MOV_UL " movl " | ||
| 10 | |||
| 11 | # define _ASM_INC " incl " | ||
| 12 | # define _ASM_DEC " decl " | ||
| 13 | # define _ASM_ADD " addl " | ||
| 14 | # define _ASM_SUB " subl " | ||
| 15 | # define _ASM_XADD " xaddl " | ||
| 16 | 9 | ||
| 10 | #ifdef CONFIG_X86_32 | ||
| 11 | # define __ASM_SEL(a,b) __ASM_FORM(a) | ||
| 17 | #else | 12 | #else |
| 18 | /* 64 bits */ | 13 | # define __ASM_SEL(a,b) __ASM_FORM(b) |
| 14 | #endif | ||
| 19 | 15 | ||
| 20 | # define _ASM_PTR " .quad " | 16 | #define __ASM_SIZE(inst) __ASM_SEL(inst##l, inst##q) |
| 21 | # define _ASM_ALIGN " .balign 8 " | ||
| 22 | # define _ASM_MOV_UL " movq " | ||
| 23 | 17 | ||
| 24 | # define _ASM_INC " incq " | 18 | #define _ASM_PTR __ASM_SEL(.long, .quad) |
| 25 | # define _ASM_DEC " decq " | 19 | #define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8) |
| 26 | # define _ASM_ADD " addq " | 20 | #define _ASM_MOV_UL __ASM_SIZE(mov) |
| 27 | # define _ASM_SUB " subq " | ||
| 28 | # define _ASM_XADD " xaddq " | ||
| 29 | 21 | ||
| 30 | #endif /* CONFIG_X86_32 */ | 22 | #define _ASM_INC __ASM_SIZE(inc) |
| 23 | #define _ASM_DEC __ASM_SIZE(dec) | ||
| 24 | #define _ASM_ADD __ASM_SIZE(add) | ||
| 25 | #define _ASM_SUB __ASM_SIZE(sub) | ||
| 26 | #define _ASM_XADD __ASM_SIZE(xadd) | ||
| 31 | 27 | ||
| 32 | /* Exception table entry */ | 28 | /* Exception table entry */ |
| 33 | # define _ASM_EXTABLE(from,to) \ | 29 | # define _ASM_EXTABLE(from,to) \ |
diff --git a/include/asm-x86/atomic_64.h b/include/asm-x86/atomic_64.h index 3e0cd7d38335..fe589c153db8 100644 --- a/include/asm-x86/atomic_64.h +++ b/include/asm-x86/atomic_64.h | |||
| @@ -11,12 +11,6 @@ | |||
| 11 | * resource counting etc.. | 11 | * resource counting etc.. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #ifdef CONFIG_SMP | ||
| 15 | #define LOCK "lock ; " | ||
| 16 | #else | ||
| 17 | #define LOCK "" | ||
| 18 | #endif | ||
| 19 | |||
| 20 | /* | 14 | /* |
| 21 | * Make sure gcc doesn't try to be clever and move things around | 15 | * Make sure gcc doesn't try to be clever and move things around |
| 22 | * on us. We need to use _exactly_ the address the user gave us, | 16 | * on us. We need to use _exactly_ the address the user gave us, |
diff --git a/include/asm-x86/bitops.h b/include/asm-x86/bitops.h index ee4b3ead6a43..96b1829cea15 100644 --- a/include/asm-x86/bitops.h +++ b/include/asm-x86/bitops.h | |||
| @@ -23,11 +23,21 @@ | |||
| 23 | #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) | 23 | #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1) |
| 24 | /* Technically wrong, but this avoids compilation errors on some gcc | 24 | /* Technically wrong, but this avoids compilation errors on some gcc |
| 25 | versions. */ | 25 | versions. */ |
| 26 | #define ADDR "=m" (*(volatile long *) addr) | 26 | #define BITOP_ADDR(x) "=m" (*(volatile long *) (x)) |
| 27 | #else | 27 | #else |
| 28 | #define ADDR "+m" (*(volatile long *) addr) | 28 | #define BITOP_ADDR(x) "+m" (*(volatile long *) (x)) |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #define ADDR BITOP_ADDR(addr) | ||
| 32 | |||
| 33 | /* | ||
| 34 | * We do the locked ops that don't return the old value as | ||
| 35 | * a mask operation on a byte. | ||
| 36 | */ | ||
| 37 | #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr)) | ||
| 38 | #define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3)) | ||
| 39 | #define CONST_MASK(nr) (1 << ((nr) & 7)) | ||
| 40 | |||
| 31 | /** | 41 | /** |
| 32 | * set_bit - Atomically set a bit in memory | 42 | * set_bit - Atomically set a bit in memory |
| 33 | * @nr: the bit to set | 43 | * @nr: the bit to set |
| @@ -43,9 +53,17 @@ | |||
| 43 | * Note that @nr may be almost arbitrarily large; this function is not | 53 | * Note that @nr may be almost arbitrarily large; this function is not |
| 44 | * restricted to acting on a single-word quantity. | 54 | * restricted to acting on a single-word quantity. |
| 45 | */ | 55 | */ |
| 46 | static inline void set_bit(int nr, volatile void *addr) | 56 | static inline void set_bit(unsigned int nr, volatile unsigned long *addr) |
| 47 | { | 57 | { |
| 48 | asm volatile(LOCK_PREFIX "bts %1,%0" : ADDR : "Ir" (nr) : "memory"); | 58 | if (IS_IMMEDIATE(nr)) { |
| 59 | asm volatile(LOCK_PREFIX "orb %1,%0" | ||
| 60 | : CONST_MASK_ADDR(nr, addr) | ||
| 61 | : "iq" ((u8)CONST_MASK(nr)) | ||
| 62 | : "memory"); | ||
| 63 | } else { | ||
| 64 | asm volatile(LOCK_PREFIX "bts %1,%0" | ||
| 65 | : BITOP_ADDR(addr) : "Ir" (nr) : "memory"); | ||
| 66 | } | ||
| 49 | } | 67 | } |
| 50 | 68 | ||
| 51 | /** | 69 | /** |
| @@ -57,7 +75,7 @@ static inline void set_bit(int nr, volatile void *addr) | |||
| 57 | * If it's called on the same region of memory simultaneously, the effect | 75 | * If it's called on the same region of memory simultaneously, the effect |
| 58 | * may be that only one operation succeeds. | 76 | * may be that only one operation succeeds. |
| 59 | */ | 77 | */ |
| 60 | static inline void __set_bit(int nr, volatile void *addr) | 78 | static inline void __set_bit(int nr, volatile unsigned long *addr) |
| 61 | { | 79 | { |
| 62 | asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory"); | 80 | asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory"); |
| 63 | } | 81 | } |
| @@ -72,9 +90,17 @@ static inline void __set_bit(int nr, volatile void *addr) | |||
| 72 | * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() | 90 | * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit() |
| 73 | * in order to ensure changes are visible on other processors. | 91 | * in order to ensure changes are visible on other processors. |
| 74 | */ | 92 | */ |
| 75 | static inline void clear_bit(int nr, volatile void *addr) | 93 | static inline void clear_bit(int nr, volatile unsigned long *addr) |
| 76 | { | 94 | { |
| 77 | asm volatile(LOCK_PREFIX "btr %1,%0" : ADDR : "Ir" (nr)); | 95 | if (IS_IMMEDIATE(nr)) { |
| 96 | asm volatile(LOCK_PREFIX "andb %1,%0" | ||
| 97 | : CONST_MASK_ADDR(nr, addr) | ||
| 98 | : "iq" ((u8)~CONST_MASK(nr))); | ||
| 99 | } else { | ||
| 100 | asm volatile(LOCK_PREFIX "btr %1,%0" | ||
| 101 | : BITOP_ADDR(addr) | ||
| 102 | : "Ir" (nr)); | ||
| 103 | } | ||
| 78 | } | 104 | } |
| 79 | 105 | ||
| 80 | /* | 106 | /* |
| @@ -85,13 +111,13 @@ static inline void clear_bit(int nr, volatile void *addr) | |||
| 85 | * clear_bit() is atomic and implies release semantics before the memory | 111 | * clear_bit() is atomic and implies release semantics before the memory |
| 86 | * operation. It can be used for an unlock. | 112 | * operation. It can be used for an unlock. |
| 87 | */ | 113 | */ |
| 88 | static inline void clear_bit_unlock(unsigned nr, volatile void *addr) | 114 | static inline void clear_bit_unlock(unsigned nr, volatile unsigned long *addr) |
| 89 | { | 115 | { |
| 90 | barrier(); | 116 | barrier(); |
| 91 | clear_bit(nr, addr); | 117 | clear_bit(nr, addr); |
| 92 | } | 118 | } |
| 93 | 119 | ||
| 94 | static inline void __clear_bit(int nr, volatile void *addr) | 120 | static inline void __clear_bit(int nr, volatile unsigned long *addr) |
| 95 | { | 121 | { |
| 96 | asm volatile("btr %1,%0" : ADDR : "Ir" (nr)); | 122 | asm volatile("btr %1,%0" : ADDR : "Ir" (nr)); |
| 97 | } | 123 | } |
| @@ -108,7 +134,7 @@ static inline void __clear_bit(int nr, volatile void *addr) | |||
| 108 | * No memory barrier is required here, because x86 cannot reorder stores past | 134 | * No memory barrier is required here, because x86 cannot reorder stores past |
| 109 | * older loads. Same principle as spin_unlock. | 135 | * older loads. Same principle as spin_unlock. |
| 110 | */ | 136 | */ |
| 111 | static inline void __clear_bit_unlock(unsigned nr, volatile void *addr) | 137 | static inline void __clear_bit_unlock(unsigned nr, volatile unsigned long *addr) |
| 112 | { | 138 | { |
| 113 | barrier(); | 139 | barrier(); |
| 114 | __clear_bit(nr, addr); | 140 | __clear_bit(nr, addr); |
| @@ -126,7 +152,7 @@ static inline void __clear_bit_unlock(unsigned nr, volatile void *addr) | |||
| 126 | * If it's called on the same region of memory simultaneously, the effect | 152 | * If it's called on the same region of memory simultaneously, the effect |
| 127 | * may be that only one operation succeeds. | 153 | * may be that only one operation succeeds. |
| 128 | */ | 154 | */ |
| 129 | static inline void __change_bit(int nr, volatile void *addr) | 155 | static inline void __change_bit(int nr, volatile unsigned long *addr) |
| 130 | { | 156 | { |
| 131 | asm volatile("btc %1,%0" : ADDR : "Ir" (nr)); | 157 | asm volatile("btc %1,%0" : ADDR : "Ir" (nr)); |
| 132 | } | 158 | } |
| @@ -140,7 +166,7 @@ static inline void __change_bit(int nr, volatile void *addr) | |||
| 140 | * Note that @nr may be almost arbitrarily large; this function is not | 166 | * Note that @nr may be almost arbitrarily large; this function is not |
| 141 | * restricted to acting on a single-word quantity. | 167 | * restricted to acting on a single-word quantity. |
| 142 | */ | 168 | */ |
| 143 | static inline void change_bit(int nr, volatile void *addr) | 169 | static inline void change_bit(int nr, volatile unsigned long *addr) |
| 144 | { | 170 | { |
| 145 | asm volatile(LOCK_PREFIX "btc %1,%0" : ADDR : "Ir" (nr)); | 171 | asm volatile(LOCK_PREFIX "btc %1,%0" : ADDR : "Ir" (nr)); |
| 146 | } | 172 | } |
| @@ -153,7 +179,7 @@ static inline void change_bit(int nr, volatile void *addr) | |||
| 153 | * This operation is atomic and cannot be reordered. | 179 | * This operation is atomic and cannot be reordered. |
| 154 | * It also implies a memory barrier. | 180 | * It also implies a memory barrier. |
| 155 | */ | 181 | */ |
| 156 | static inline int test_and_set_bit(int nr, volatile void *addr) | 182 | static inline int test_and_set_bit(int nr, volatile unsigned long *addr) |
| 157 | { | 183 | { |
| 158 | int oldbit; | 184 | int oldbit; |
| 159 | 185 | ||
| @@ -170,7 +196,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) | |||
| 170 | * | 196 | * |
| 171 | * This is the same as test_and_set_bit on x86. | 197 | * This is the same as test_and_set_bit on x86. |
| 172 | */ | 198 | */ |
| 173 | static inline int test_and_set_bit_lock(int nr, volatile void *addr) | 199 | static inline int test_and_set_bit_lock(int nr, volatile unsigned long *addr) |
| 174 | { | 200 | { |
| 175 | return test_and_set_bit(nr, addr); | 201 | return test_and_set_bit(nr, addr); |
| 176 | } | 202 | } |
| @@ -184,7 +210,7 @@ static inline int test_and_set_bit_lock(int nr, volatile void *addr) | |||
| 184 | * If two examples of this operation race, one can appear to succeed | 210 | * If two examples of this operation race, one can appear to succeed |
| 185 | * but actually fail. You must protect multiple accesses with a lock. | 211 | * but actually fail. You must protect multiple accesses with a lock. |
| 186 | */ | 212 | */ |
| 187 | static inline int __test_and_set_bit(int nr, volatile void *addr) | 213 | static inline int __test_and_set_bit(int nr, volatile unsigned long *addr) |
| 188 | { | 214 | { |
| 189 | int oldbit; | 215 | int oldbit; |
| 190 | 216 | ||
| @@ -203,7 +229,7 @@ static inline int __test_and_set_bit(int nr, volatile void *addr) | |||
| 203 | * This operation is atomic and cannot be reordered. | 229 | * This operation is atomic and cannot be reordered. |
| 204 | * It also implies a memory barrier. | 230 | * It also implies a memory barrier. |
| 205 | */ | 231 | */ |
| 206 | static inline int test_and_clear_bit(int nr, volatile void *addr) | 232 | static inline int test_and_clear_bit(int nr, volatile unsigned long *addr) |
| 207 | { | 233 | { |
| 208 | int oldbit; | 234 | int oldbit; |
| 209 | 235 | ||
| @@ -223,7 +249,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) | |||
| 223 | * If two examples of this operation race, one can appear to succeed | 249 | * If two examples of this operation race, one can appear to succeed |
| 224 | * but actually fail. You must protect multiple accesses with a lock. | 250 | * but actually fail. You must protect multiple accesses with a lock. |
| 225 | */ | 251 | */ |
| 226 | static inline int __test_and_clear_bit(int nr, volatile void *addr) | 252 | static inline int __test_and_clear_bit(int nr, volatile unsigned long *addr) |
| 227 | { | 253 | { |
| 228 | int oldbit; | 254 | int oldbit; |
| 229 | 255 | ||
| @@ -235,7 +261,7 @@ static inline int __test_and_clear_bit(int nr, volatile void *addr) | |||
| 235 | } | 261 | } |
| 236 | 262 | ||
| 237 | /* WARNING: non atomic and it can be reordered! */ | 263 | /* WARNING: non atomic and it can be reordered! */ |
| 238 | static inline int __test_and_change_bit(int nr, volatile void *addr) | 264 | static inline int __test_and_change_bit(int nr, volatile unsigned long *addr) |
| 239 | { | 265 | { |
| 240 | int oldbit; | 266 | int oldbit; |
| 241 | 267 | ||
| @@ -255,7 +281,7 @@ static inline int __test_and_change_bit(int nr, volatile void *addr) | |||
| 255 | * This operation is atomic and cannot be reordered. | 281 | * This operation is atomic and cannot be reordered. |
| 256 | * It also implies a memory barrier. | 282 | * It also implies a memory barrier. |
| 257 | */ | 283 | */ |
| 258 | static inline int test_and_change_bit(int nr, volatile void *addr) | 284 | static inline int test_and_change_bit(int nr, volatile unsigned long *addr) |
| 259 | { | 285 | { |
| 260 | int oldbit; | 286 | int oldbit; |
| 261 | 287 | ||
| @@ -266,13 +292,13 @@ static inline int test_and_change_bit(int nr, volatile void *addr) | |||
| 266 | return oldbit; | 292 | return oldbit; |
| 267 | } | 293 | } |
| 268 | 294 | ||
| 269 | static inline int constant_test_bit(int nr, const volatile void *addr) | 295 | static inline int constant_test_bit(int nr, const volatile unsigned long *addr) |
| 270 | { | 296 | { |
| 271 | return ((1UL << (nr % BITS_PER_LONG)) & | 297 | return ((1UL << (nr % BITS_PER_LONG)) & |
| 272 | (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0; | 298 | (((unsigned long *)addr)[nr / BITS_PER_LONG])) != 0; |
| 273 | } | 299 | } |
| 274 | 300 | ||
| 275 | static inline int variable_test_bit(int nr, volatile const void *addr) | 301 | static inline int variable_test_bit(int nr, volatile const unsigned long *addr) |
| 276 | { | 302 | { |
| 277 | int oldbit; | 303 | int oldbit; |
| 278 | 304 | ||
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h index 0d609c837a41..78b47e7404eb 100644 --- a/include/asm-x86/cpufeature.h +++ b/include/asm-x86/cpufeature.h | |||
| @@ -142,11 +142,11 @@ extern const char * const x86_power_flags[32]; | |||
| 142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) | 142 | #define clear_cpu_cap(c, bit) clear_bit(bit, (unsigned long *)((c)->x86_capability)) |
| 143 | #define setup_clear_cpu_cap(bit) do { \ | 143 | #define setup_clear_cpu_cap(bit) do { \ |
| 144 | clear_cpu_cap(&boot_cpu_data, bit); \ | 144 | clear_cpu_cap(&boot_cpu_data, bit); \ |
| 145 | set_bit(bit, cleared_cpu_caps); \ | 145 | set_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
| 146 | } while (0) | 146 | } while (0) |
| 147 | #define setup_force_cpu_cap(bit) do { \ | 147 | #define setup_force_cpu_cap(bit) do { \ |
| 148 | set_cpu_cap(&boot_cpu_data, bit); \ | 148 | set_cpu_cap(&boot_cpu_data, bit); \ |
| 149 | clear_bit(bit, cleared_cpu_caps); \ | 149 | clear_bit(bit, (unsigned long *)cleared_cpu_caps); \ |
| 150 | } while (0) | 150 | } while (0) |
| 151 | 151 | ||
| 152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) | 152 | #define cpu_has_fpu boot_cpu_has(X86_FEATURE_FPU) |
diff --git a/include/asm-x86/current.h b/include/asm-x86/current.h index d2526d3f7346..7515c19d4988 100644 --- a/include/asm-x86/current.h +++ b/include/asm-x86/current.h | |||
| @@ -1,5 +1,39 @@ | |||
| 1 | #ifndef _X86_CURRENT_H | ||
| 2 | #define _X86_CURRENT_H | ||
| 3 | |||
| 1 | #ifdef CONFIG_X86_32 | 4 | #ifdef CONFIG_X86_32 |
| 2 | # include "current_32.h" | 5 | #include <linux/compiler.h> |
| 3 | #else | 6 | #include <asm/percpu.h> |
| 4 | # include "current_64.h" | 7 | |
| 5 | #endif | 8 | struct task_struct; |
| 9 | |||
| 10 | DECLARE_PER_CPU(struct task_struct *, current_task); | ||
| 11 | static __always_inline struct task_struct *get_current(void) | ||
| 12 | { | ||
| 13 | return x86_read_percpu(current_task); | ||
| 14 | } | ||
| 15 | |||
| 16 | #else /* X86_32 */ | ||
| 17 | |||
| 18 | #ifndef __ASSEMBLY__ | ||
| 19 | #include <asm/pda.h> | ||
| 20 | |||
| 21 | struct task_struct; | ||
| 22 | |||
| 23 | static __always_inline struct task_struct *get_current(void) | ||
| 24 | { | ||
| 25 | return read_pda(pcurrent); | ||
| 26 | } | ||
| 27 | |||
| 28 | #else /* __ASSEMBLY__ */ | ||
| 29 | |||
| 30 | #include <asm/asm-offsets.h> | ||
| 31 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | ||
| 32 | |||
| 33 | #endif /* __ASSEMBLY__ */ | ||
| 34 | |||
| 35 | #endif /* X86_32 */ | ||
| 36 | |||
| 37 | #define current get_current() | ||
| 38 | |||
| 39 | #endif /* X86_CURRENT_H */ | ||
diff --git a/include/asm-x86/current_32.h b/include/asm-x86/current_32.h deleted file mode 100644 index 5af9bdb97a16..000000000000 --- a/include/asm-x86/current_32.h +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | #ifndef _I386_CURRENT_H | ||
| 2 | #define _I386_CURRENT_H | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | #include <asm/percpu.h> | ||
| 6 | |||
| 7 | struct task_struct; | ||
| 8 | |||
| 9 | DECLARE_PER_CPU(struct task_struct *, current_task); | ||
| 10 | static __always_inline struct task_struct *get_current(void) | ||
| 11 | { | ||
| 12 | return x86_read_percpu(current_task); | ||
| 13 | } | ||
| 14 | |||
| 15 | #define current get_current() | ||
| 16 | |||
| 17 | #endif /* !(_I386_CURRENT_H) */ | ||
diff --git a/include/asm-x86/current_64.h b/include/asm-x86/current_64.h deleted file mode 100644 index 2d368ede2fc1..000000000000 --- a/include/asm-x86/current_64.h +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | #ifndef _X86_64_CURRENT_H | ||
| 2 | #define _X86_64_CURRENT_H | ||
| 3 | |||
| 4 | #if !defined(__ASSEMBLY__) | ||
| 5 | struct task_struct; | ||
| 6 | |||
| 7 | #include <asm/pda.h> | ||
| 8 | |||
| 9 | static inline struct task_struct *get_current(void) | ||
| 10 | { | ||
| 11 | struct task_struct *t = read_pda(pcurrent); | ||
| 12 | return t; | ||
| 13 | } | ||
| 14 | |||
| 15 | #define current get_current() | ||
| 16 | |||
| 17 | #else | ||
| 18 | |||
| 19 | #ifndef ASM_OFFSET_H | ||
| 20 | #include <asm/asm-offsets.h> | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg | ||
| 24 | |||
| 25 | #endif | ||
| 26 | |||
| 27 | #endif /* !(_X86_64_CURRENT_H) */ | ||
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index 7004251fc66b..5103d0b2c46c 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h | |||
| @@ -24,6 +24,7 @@ struct e820map { | |||
| 24 | 24 | ||
| 25 | #define ISA_START_ADDRESS 0xa0000 | 25 | #define ISA_START_ADDRESS 0xa0000 |
| 26 | #define ISA_END_ADDRESS 0x100000 | 26 | #define ISA_END_ADDRESS 0x100000 |
| 27 | #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) | ||
| 27 | 28 | ||
| 28 | #define BIOS_BEGIN 0x000a0000 | 29 | #define BIOS_BEGIN 0x000a0000 |
| 29 | #define BIOS_END 0x00100000 | 30 | #define BIOS_END 0x00100000 |
diff --git a/include/asm-x86/fixmap_32.h b/include/asm-x86/fixmap_32.h index 4b96148e90c1..f0df7ee96816 100644 --- a/include/asm-x86/fixmap_32.h +++ b/include/asm-x86/fixmap_32.h | |||
| @@ -79,10 +79,6 @@ enum fixed_addresses { | |||
| 79 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ | 79 | FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */ |
| 80 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, | 80 | FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1, |
| 81 | #endif | 81 | #endif |
| 82 | #ifdef CONFIG_ACPI | ||
| 83 | FIX_ACPI_BEGIN, | ||
| 84 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
| 85 | #endif | ||
| 86 | #ifdef CONFIG_PCI_MMCONFIG | 82 | #ifdef CONFIG_PCI_MMCONFIG |
| 87 | FIX_PCIE_MCFG, | 83 | FIX_PCIE_MCFG, |
| 88 | #endif | 84 | #endif |
| @@ -103,6 +99,10 @@ enum fixed_addresses { | |||
| 103 | (__end_of_permanent_fixed_addresses & 511), | 99 | (__end_of_permanent_fixed_addresses & 511), |
| 104 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, | 100 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_NESTING - 1, |
| 105 | FIX_WP_TEST, | 101 | FIX_WP_TEST, |
| 102 | #ifdef CONFIG_ACPI | ||
| 103 | FIX_ACPI_BEGIN, | ||
| 104 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
| 105 | #endif | ||
| 106 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | 106 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
| 107 | FIX_OHCI1394_BASE, | 107 | FIX_OHCI1394_BASE, |
| 108 | #endif | 108 | #endif |
diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h index 90958ed993fa..eeca2f51fd8f 100644 --- a/include/asm-x86/gart.h +++ b/include/asm-x86/gart.h | |||
| @@ -1,16 +1,20 @@ | |||
| 1 | #ifndef _ASM_X8664_IOMMU_H | 1 | #ifndef _ASM_X8664_IOMMU_H |
| 2 | #define _ASM_X8664_IOMMU_H 1 | 2 | #define _ASM_X8664_IOMMU_H 1 |
| 3 | 3 | ||
| 4 | #include <asm/e820.h> | ||
| 5 | |||
| 4 | extern void pci_iommu_shutdown(void); | 6 | extern void pci_iommu_shutdown(void); |
| 5 | extern void no_iommu_init(void); | 7 | extern void no_iommu_init(void); |
| 6 | extern int force_iommu, no_iommu; | 8 | extern int force_iommu, no_iommu; |
| 7 | extern int iommu_detected; | 9 | extern int iommu_detected; |
| 10 | extern int agp_amd64_init(void); | ||
| 8 | #ifdef CONFIG_GART_IOMMU | 11 | #ifdef CONFIG_GART_IOMMU |
| 9 | extern void gart_iommu_init(void); | 12 | extern void gart_iommu_init(void); |
| 10 | extern void gart_iommu_shutdown(void); | 13 | extern void gart_iommu_shutdown(void); |
| 11 | extern void __init gart_parse_options(char *); | 14 | extern void __init gart_parse_options(char *); |
| 12 | extern void early_gart_iommu_check(void); | 15 | extern void early_gart_iommu_check(void); |
| 13 | extern void gart_iommu_hole_init(void); | 16 | extern void gart_iommu_hole_init(void); |
| 17 | extern void set_up_gart_resume(u32, u32); | ||
| 14 | extern int fallback_aper_order; | 18 | extern int fallback_aper_order; |
| 15 | extern int fallback_aper_force; | 19 | extern int fallback_aper_force; |
| 16 | extern int gart_iommu_aperture; | 20 | extern int gart_iommu_aperture; |
| @@ -31,4 +35,63 @@ static inline void gart_iommu_shutdown(void) | |||
| 31 | 35 | ||
| 32 | #endif | 36 | #endif |
| 33 | 37 | ||
| 38 | /* PTE bits. */ | ||
| 39 | #define GPTE_VALID 1 | ||
| 40 | #define GPTE_COHERENT 2 | ||
| 41 | |||
| 42 | /* Aperture control register bits. */ | ||
| 43 | #define GARTEN (1<<0) | ||
| 44 | #define DISGARTCPU (1<<4) | ||
| 45 | #define DISGARTIO (1<<5) | ||
| 46 | |||
| 47 | /* GART cache control register bits. */ | ||
| 48 | #define INVGART (1<<0) | ||
| 49 | #define GARTPTEERR (1<<1) | ||
| 50 | |||
| 51 | /* K8 On-cpu GART registers */ | ||
| 52 | #define AMD64_GARTAPERTURECTL 0x90 | ||
| 53 | #define AMD64_GARTAPERTUREBASE 0x94 | ||
| 54 | #define AMD64_GARTTABLEBASE 0x98 | ||
| 55 | #define AMD64_GARTCACHECTL 0x9c | ||
| 56 | #define AMD64_GARTEN (1<<0) | ||
| 57 | |||
| 58 | static inline void enable_gart_translation(struct pci_dev *dev, u64 addr) | ||
| 59 | { | ||
| 60 | u32 tmp, ctl; | ||
| 61 | |||
| 62 | /* address of the mappings table */ | ||
| 63 | addr >>= 12; | ||
| 64 | tmp = (u32) addr<<4; | ||
| 65 | tmp &= ~0xf; | ||
| 66 | pci_write_config_dword(dev, AMD64_GARTTABLEBASE, tmp); | ||
| 67 | |||
| 68 | /* Enable GART translation for this hammer. */ | ||
| 69 | pci_read_config_dword(dev, AMD64_GARTAPERTURECTL, &ctl); | ||
| 70 | ctl |= GARTEN; | ||
| 71 | ctl &= ~(DISGARTCPU | DISGARTIO); | ||
| 72 | pci_write_config_dword(dev, AMD64_GARTAPERTURECTL, ctl); | ||
| 73 | } | ||
| 74 | |||
| 75 | static inline int aperture_valid(u64 aper_base, u32 aper_size, u32 min_size) | ||
| 76 | { | ||
| 77 | if (!aper_base) | ||
| 78 | return 0; | ||
| 79 | |||
| 80 | if (aper_base + aper_size > 0x100000000ULL) { | ||
| 81 | printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n"); | ||
| 82 | return 0; | ||
| 83 | } | ||
| 84 | if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) { | ||
| 85 | printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n"); | ||
| 86 | return 0; | ||
| 87 | } | ||
| 88 | if (aper_size < min_size) { | ||
| 89 | printk(KERN_ERR "Aperture too small (%d MB) than (%d MB)\n", | ||
| 90 | aper_size>>20, min_size>>20); | ||
| 91 | return 0; | ||
| 92 | } | ||
| 93 | |||
| 94 | return 1; | ||
| 95 | } | ||
| 96 | |||
| 34 | #endif | 97 | #endif |
diff --git a/include/asm-x86/hardirq.h b/include/asm-x86/hardirq.h index 314434d664e7..000787df66e6 100644 --- a/include/asm-x86/hardirq.h +++ b/include/asm-x86/hardirq.h | |||
| @@ -3,3 +3,9 @@ | |||
| 3 | #else | 3 | #else |
| 4 | # include "hardirq_64.h" | 4 | # include "hardirq_64.h" |
| 5 | #endif | 5 | #endif |
| 6 | |||
| 7 | extern u64 arch_irq_stat_cpu(unsigned int cpu); | ||
| 8 | #define arch_irq_stat_cpu arch_irq_stat_cpu | ||
| 9 | |||
| 10 | extern u64 arch_irq_stat(void); | ||
| 11 | #define arch_irq_stat arch_irq_stat | ||
diff --git a/include/asm-x86/i8259.h b/include/asm-x86/i8259.h index 45d4df3e51e6..2f98df91f1f2 100644 --- a/include/asm-x86/i8259.h +++ b/include/asm-x86/i8259.h | |||
| @@ -55,4 +55,6 @@ static inline void outb_pic(unsigned char value, unsigned int port) | |||
| 55 | udelay(2); | 55 | udelay(2); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | extern struct irq_chip i8259A_chip; | ||
| 59 | |||
| 58 | #endif /* __ASM_I8259_H__ */ | 60 | #endif /* __ASM_I8259_H__ */ |
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h index d593e14f0341..dc0f55f2b034 100644 --- a/include/asm-x86/io_apic.h +++ b/include/asm-x86/io_apic.h | |||
| @@ -11,6 +11,15 @@ | |||
| 11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar | 11 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | /* I/O Unit Redirection Table */ | ||
| 15 | #define IO_APIC_REDIR_VECTOR_MASK 0x000FF | ||
| 16 | #define IO_APIC_REDIR_DEST_LOGICAL 0x00800 | ||
| 17 | #define IO_APIC_REDIR_DEST_PHYSICAL 0x00000 | ||
| 18 | #define IO_APIC_REDIR_SEND_PENDING (1 << 12) | ||
| 19 | #define IO_APIC_REDIR_REMOTE_IRR (1 << 14) | ||
| 20 | #define IO_APIC_REDIR_LEVEL_TRIGGER (1 << 15) | ||
| 21 | #define IO_APIC_REDIR_MASKED (1 << 16) | ||
| 22 | |||
| 14 | /* | 23 | /* |
| 15 | * The structure of the IO-APIC: | 24 | * The structure of the IO-APIC: |
| 16 | */ | 25 | */ |
| @@ -137,6 +146,9 @@ extern int sis_apic_bug; | |||
| 137 | /* 1 if "noapic" boot option passed */ | 146 | /* 1 if "noapic" boot option passed */ |
| 138 | extern int skip_ioapic_setup; | 147 | extern int skip_ioapic_setup; |
| 139 | 148 | ||
| 149 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ | ||
| 150 | extern int timer_through_8259; | ||
| 151 | |||
| 140 | static inline void disable_ioapic_setup(void) | 152 | static inline void disable_ioapic_setup(void) |
| 141 | { | 153 | { |
| 142 | skip_ioapic_setup = 1; | 154 | skip_ioapic_setup = 1; |
| @@ -162,6 +174,7 @@ extern void ioapic_init_mappings(void); | |||
| 162 | 174 | ||
| 163 | #else /* !CONFIG_X86_IO_APIC */ | 175 | #else /* !CONFIG_X86_IO_APIC */ |
| 164 | #define io_apic_assign_pci_irqs 0 | 176 | #define io_apic_assign_pci_irqs 0 |
| 177 | static const int timer_through_8259 = 0; | ||
| 165 | #endif | 178 | #endif |
| 166 | 179 | ||
| 167 | #endif | 180 | #endif |
diff --git a/include/asm-x86/kvm_para.h b/include/asm-x86/kvm_para.h index bfd9900742bf..76f392146daa 100644 --- a/include/asm-x86/kvm_para.h +++ b/include/asm-x86/kvm_para.h | |||
| @@ -71,7 +71,8 @@ static inline long kvm_hypercall0(unsigned int nr) | |||
| 71 | long ret; | 71 | long ret; |
| 72 | asm volatile(KVM_HYPERCALL | 72 | asm volatile(KVM_HYPERCALL |
| 73 | : "=a"(ret) | 73 | : "=a"(ret) |
| 74 | : "a"(nr)); | 74 | : "a"(nr) |
| 75 | : "memory"); | ||
| 75 | return ret; | 76 | return ret; |
| 76 | } | 77 | } |
| 77 | 78 | ||
| @@ -80,7 +81,8 @@ static inline long kvm_hypercall1(unsigned int nr, unsigned long p1) | |||
| 80 | long ret; | 81 | long ret; |
| 81 | asm volatile(KVM_HYPERCALL | 82 | asm volatile(KVM_HYPERCALL |
| 82 | : "=a"(ret) | 83 | : "=a"(ret) |
| 83 | : "a"(nr), "b"(p1)); | 84 | : "a"(nr), "b"(p1) |
| 85 | : "memory"); | ||
| 84 | return ret; | 86 | return ret; |
| 85 | } | 87 | } |
| 86 | 88 | ||
| @@ -90,7 +92,8 @@ static inline long kvm_hypercall2(unsigned int nr, unsigned long p1, | |||
| 90 | long ret; | 92 | long ret; |
| 91 | asm volatile(KVM_HYPERCALL | 93 | asm volatile(KVM_HYPERCALL |
| 92 | : "=a"(ret) | 94 | : "=a"(ret) |
| 93 | : "a"(nr), "b"(p1), "c"(p2)); | 95 | : "a"(nr), "b"(p1), "c"(p2) |
| 96 | : "memory"); | ||
| 94 | return ret; | 97 | return ret; |
| 95 | } | 98 | } |
| 96 | 99 | ||
| @@ -100,7 +103,8 @@ static inline long kvm_hypercall3(unsigned int nr, unsigned long p1, | |||
| 100 | long ret; | 103 | long ret; |
| 101 | asm volatile(KVM_HYPERCALL | 104 | asm volatile(KVM_HYPERCALL |
| 102 | : "=a"(ret) | 105 | : "=a"(ret) |
| 103 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3)); | 106 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3) |
| 107 | : "memory"); | ||
| 104 | return ret; | 108 | return ret; |
| 105 | } | 109 | } |
| 106 | 110 | ||
| @@ -111,7 +115,8 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, | |||
| 111 | long ret; | 115 | long ret; |
| 112 | asm volatile(KVM_HYPERCALL | 116 | asm volatile(KVM_HYPERCALL |
| 113 | : "=a"(ret) | 117 | : "=a"(ret) |
| 114 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4)); | 118 | : "a"(nr), "b"(p1), "c"(p2), "d"(p3), "S"(p4) |
| 119 | : "memory"); | ||
| 115 | return ret; | 120 | return ret; |
| 116 | } | 121 | } |
| 117 | 122 | ||
diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h index 56d0e1fa0258..b63c52182006 100644 --- a/include/asm-x86/mach-default/smpboot_hooks.h +++ b/include/asm-x86/mach-default/smpboot_hooks.h | |||
| @@ -41,8 +41,10 @@ static inline void __init smpboot_setup_io_apic(void) | |||
| 41 | */ | 41 | */ |
| 42 | if (!skip_ioapic_setup && nr_ioapics) | 42 | if (!skip_ioapic_setup && nr_ioapics) |
| 43 | setup_IO_APIC(); | 43 | setup_IO_APIC(); |
| 44 | else | 44 | else { |
| 45 | nr_ioapics = 0; | 45 | nr_ioapics = 0; |
| 46 | localise_nmi_watchdog(); | ||
| 47 | } | ||
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | static inline void smpboot_clear_io_apic(void) | 50 | static inline void smpboot_clear_io_apic(void) |
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h index 1e363021e72f..05449ef830a7 100644 --- a/include/asm-x86/nmi.h +++ b/include/asm-x86/nmi.h | |||
| @@ -15,27 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | int do_nmi_callback(struct pt_regs *regs, int cpu); | 16 | int do_nmi_callback(struct pt_regs *regs, int cpu); |
| 17 | 17 | ||
| 18 | #ifdef CONFIG_PM | ||
| 19 | |||
| 20 | /** Replace the PM callback routine for NMI. */ | ||
| 21 | struct pm_dev *set_nmi_pm_callback(pm_callback callback); | ||
| 22 | |||
| 23 | /** Unset the PM callback routine back to the default. */ | ||
| 24 | void unset_nmi_pm_callback(struct pm_dev *dev); | ||
| 25 | |||
| 26 | #else | ||
| 27 | |||
| 28 | static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback) | ||
| 29 | { | ||
| 30 | return 0; | ||
| 31 | } | ||
| 32 | |||
| 33 | static inline void unset_nmi_pm_callback(struct pm_dev *dev) | ||
| 34 | { | ||
| 35 | } | ||
| 36 | |||
| 37 | #endif /* CONFIG_PM */ | ||
| 38 | |||
| 39 | #ifdef CONFIG_X86_64 | 18 | #ifdef CONFIG_X86_64 |
| 40 | extern void default_do_nmi(struct pt_regs *); | 19 | extern void default_do_nmi(struct pt_regs *); |
| 41 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); | 20 | extern void die_nmi(char *str, struct pt_regs *regs, int do_panic); |
| @@ -46,7 +25,6 @@ extern void nmi_watchdog_default(void); | |||
| 46 | 25 | ||
| 47 | extern int check_nmi_watchdog(void); | 26 | extern int check_nmi_watchdog(void); |
| 48 | extern int nmi_watchdog_enabled; | 27 | extern int nmi_watchdog_enabled; |
| 49 | extern int unknown_nmi_panic; | ||
| 50 | extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); | 28 | extern int avail_to_resrv_perfctr_nmi_bit(unsigned int); |
| 51 | extern int avail_to_resrv_perfctr_nmi(unsigned int); | 29 | extern int avail_to_resrv_perfctr_nmi(unsigned int); |
| 52 | extern int reserve_perfctr_nmi(unsigned int); | 30 | extern int reserve_perfctr_nmi(unsigned int); |
| @@ -78,6 +56,11 @@ extern int unknown_nmi_panic; | |||
| 78 | void __trigger_all_cpu_backtrace(void); | 56 | void __trigger_all_cpu_backtrace(void); |
| 79 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() | 57 | #define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace() |
| 80 | 58 | ||
| 59 | static inline void localise_nmi_watchdog(void) | ||
| 60 | { | ||
| 61 | if (nmi_watchdog == NMI_IO_APIC) | ||
| 62 | nmi_watchdog = NMI_LOCAL_APIC; | ||
| 63 | } | ||
| 81 | #endif | 64 | #endif |
| 82 | 65 | ||
| 83 | void lapic_watchdog_stop(void); | 66 | void lapic_watchdog_stop(void); |
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index dc936dddf161..b52ed85f32f5 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
| @@ -51,8 +51,15 @@ | |||
| 51 | 51 | ||
| 52 | #ifndef __ASSEMBLY__ | 52 | #ifndef __ASSEMBLY__ |
| 53 | 53 | ||
| 54 | typedef struct { pgdval_t pgd; } pgd_t; | ||
| 55 | typedef struct { pgprotval_t pgprot; } pgprot_t; | ||
| 56 | |||
| 54 | extern int page_is_ram(unsigned long pagenr); | 57 | extern int page_is_ram(unsigned long pagenr); |
| 55 | extern int devmem_is_allowed(unsigned long pagenr); | 58 | extern int devmem_is_allowed(unsigned long pagenr); |
| 59 | extern void map_devmem(unsigned long pfn, unsigned long size, | ||
| 60 | pgprot_t vma_prot); | ||
| 61 | extern void unmap_devmem(unsigned long pfn, unsigned long size, | ||
| 62 | pgprot_t vma_prot); | ||
| 56 | 63 | ||
| 57 | extern unsigned long max_pfn_mapped; | 64 | extern unsigned long max_pfn_mapped; |
| 58 | 65 | ||
| @@ -74,9 +81,6 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr, | |||
| 74 | alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) | 81 | alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr) |
| 75 | #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE | 82 | #define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE |
| 76 | 83 | ||
| 77 | typedef struct { pgdval_t pgd; } pgd_t; | ||
| 78 | typedef struct { pgprotval_t pgprot; } pgprot_t; | ||
| 79 | |||
| 80 | static inline pgd_t native_make_pgd(pgdval_t val) | 84 | static inline pgd_t native_make_pgd(pgdval_t val) |
| 81 | { | 85 | { |
| 82 | return (pgd_t) { val }; | 86 | return (pgd_t) { val }; |
| @@ -160,6 +164,7 @@ static inline pteval_t native_pte_val(pte_t pte) | |||
| 160 | #endif | 164 | #endif |
| 161 | 165 | ||
| 162 | #define pte_val(x) native_pte_val(x) | 166 | #define pte_val(x) native_pte_val(x) |
| 167 | #define pte_flags(x) native_pte_val(x) | ||
| 163 | #define __pte(x) native_make_pte(x) | 168 | #define __pte(x) native_make_pte(x) |
| 164 | 169 | ||
| 165 | #endif /* CONFIG_PARAVIRT */ | 170 | #endif /* CONFIG_PARAVIRT */ |
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index ccf0ba3c3aba..73ed2e4ebf95 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
| @@ -13,6 +13,14 @@ | |||
| 13 | */ | 13 | */ |
| 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) | 14 | #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) |
| 15 | 15 | ||
| 16 | #ifdef CONFIG_4KSTACKS | ||
| 17 | #define THREAD_ORDER 0 | ||
| 18 | #else | ||
| 19 | #define THREAD_ORDER 1 | ||
| 20 | #endif | ||
| 21 | #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) | ||
| 22 | |||
| 23 | |||
| 16 | #ifdef CONFIG_X86_PAE | 24 | #ifdef CONFIG_X86_PAE |
| 17 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ | 25 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ |
| 18 | #define __PHYSICAL_MASK_SHIFT 44 | 26 | #define __PHYSICAL_MASK_SHIFT 44 |
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index 0f13b945e240..e9ada314dfc1 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
| @@ -238,7 +238,13 @@ struct pv_mmu_ops { | |||
| 238 | void (*pte_update_defer)(struct mm_struct *mm, | 238 | void (*pte_update_defer)(struct mm_struct *mm, |
| 239 | unsigned long addr, pte_t *ptep); | 239 | unsigned long addr, pte_t *ptep); |
| 240 | 240 | ||
| 241 | pte_t (*ptep_modify_prot_start)(struct mm_struct *mm, unsigned long addr, | ||
| 242 | pte_t *ptep); | ||
| 243 | void (*ptep_modify_prot_commit)(struct mm_struct *mm, unsigned long addr, | ||
| 244 | pte_t *ptep, pte_t pte); | ||
| 245 | |||
| 241 | pteval_t (*pte_val)(pte_t); | 246 | pteval_t (*pte_val)(pte_t); |
| 247 | pteval_t (*pte_flags)(pte_t); | ||
| 242 | pte_t (*make_pte)(pteval_t pte); | 248 | pte_t (*make_pte)(pteval_t pte); |
| 243 | 249 | ||
| 244 | pgdval_t (*pgd_val)(pgd_t); | 250 | pgdval_t (*pgd_val)(pgd_t); |
| @@ -996,6 +1002,20 @@ static inline pteval_t pte_val(pte_t pte) | |||
| 996 | return ret; | 1002 | return ret; |
| 997 | } | 1003 | } |
| 998 | 1004 | ||
| 1005 | static inline pteval_t pte_flags(pte_t pte) | ||
| 1006 | { | ||
| 1007 | pteval_t ret; | ||
| 1008 | |||
| 1009 | if (sizeof(pteval_t) > sizeof(long)) | ||
| 1010 | ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_flags, | ||
| 1011 | pte.pte, (u64)pte.pte >> 32); | ||
| 1012 | else | ||
| 1013 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags, | ||
| 1014 | pte.pte); | ||
| 1015 | |||
| 1016 | return ret; | ||
| 1017 | } | ||
| 1018 | |||
| 999 | static inline pgd_t __pgd(pgdval_t val) | 1019 | static inline pgd_t __pgd(pgdval_t val) |
| 1000 | { | 1020 | { |
| 1001 | pgdval_t ret; | 1021 | pgdval_t ret; |
| @@ -1024,6 +1044,29 @@ static inline pgdval_t pgd_val(pgd_t pgd) | |||
| 1024 | return ret; | 1044 | return ret; |
| 1025 | } | 1045 | } |
| 1026 | 1046 | ||
| 1047 | #define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION | ||
| 1048 | static inline pte_t ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, | ||
| 1049 | pte_t *ptep) | ||
| 1050 | { | ||
| 1051 | pteval_t ret; | ||
| 1052 | |||
| 1053 | ret = PVOP_CALL3(pteval_t, pv_mmu_ops.ptep_modify_prot_start, | ||
| 1054 | mm, addr, ptep); | ||
| 1055 | |||
| 1056 | return (pte_t) { .pte = ret }; | ||
| 1057 | } | ||
| 1058 | |||
| 1059 | static inline void ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | ||
| 1060 | pte_t *ptep, pte_t pte) | ||
| 1061 | { | ||
| 1062 | if (sizeof(pteval_t) > sizeof(long)) | ||
| 1063 | /* 5 arg words */ | ||
| 1064 | pv_mmu_ops.ptep_modify_prot_commit(mm, addr, ptep, pte); | ||
| 1065 | else | ||
| 1066 | PVOP_VCALL4(pv_mmu_ops.ptep_modify_prot_commit, | ||
| 1067 | mm, addr, ptep, pte.pte); | ||
| 1068 | } | ||
| 1069 | |||
| 1027 | static inline void set_pte(pte_t *ptep, pte_t pte) | 1070 | static inline void set_pte(pte_t *ptep, pte_t pte) |
| 1028 | { | 1071 | { |
| 1029 | if (sizeof(pteval_t) > sizeof(long)) | 1072 | if (sizeof(pteval_t) > sizeof(long)) |
diff --git a/include/asm-x86/pat.h b/include/asm-x86/pat.h index 88f60cc6a227..7edc47307217 100644 --- a/include/asm-x86/pat.h +++ b/include/asm-x86/pat.h | |||
| @@ -1,14 +1,13 @@ | |||
| 1 | |||
| 2 | #ifndef _ASM_PAT_H | 1 | #ifndef _ASM_PAT_H |
| 3 | #define _ASM_PAT_H 1 | 2 | #define _ASM_PAT_H |
| 4 | 3 | ||
| 5 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 6 | 5 | ||
| 7 | #ifdef CONFIG_X86_PAT | 6 | #ifdef CONFIG_X86_PAT |
| 8 | extern int pat_wc_enabled; | 7 | extern int pat_enabled; |
| 9 | extern void validate_pat_support(struct cpuinfo_x86 *c); | 8 | extern void validate_pat_support(struct cpuinfo_x86 *c); |
| 10 | #else | 9 | #else |
| 11 | static const int pat_wc_enabled = 0; | 10 | static const int pat_enabled; |
| 12 | static inline void validate_pat_support(struct cpuinfo_x86 *c) { } | 11 | static inline void validate_pat_support(struct cpuinfo_x86 *c) { } |
| 13 | #endif | 12 | #endif |
| 14 | 13 | ||
| @@ -21,4 +20,3 @@ extern int free_memtype(u64 start, u64 end); | |||
| 21 | extern void pat_disable(char *reason); | 20 | extern void pat_disable(char *reason); |
| 22 | 21 | ||
| 23 | #endif | 22 | #endif |
| 24 | |||
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h index 30bbde0cb34b..2db14cf17db8 100644 --- a/include/asm-x86/pci.h +++ b/include/asm-x86/pci.h | |||
| @@ -18,6 +18,8 @@ struct pci_sysdata { | |||
| 18 | #endif | 18 | #endif |
| 19 | }; | 19 | }; |
| 20 | 20 | ||
| 21 | extern int pci_routeirq; | ||
| 22 | |||
| 21 | /* scan a bus after allocating a pci_sysdata for it */ | 23 | /* scan a bus after allocating a pci_sysdata for it */ |
| 22 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, | 24 | extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, |
| 23 | int node); | 25 | int node); |
diff --git a/include/asm-x86/pci_32.h b/include/asm-x86/pci_32.h index 8c4c3a0368e2..a50d46851285 100644 --- a/include/asm-x86/pci_32.h +++ b/include/asm-x86/pci_32.h | |||
| @@ -18,12 +18,14 @@ struct pci_dev; | |||
| 18 | #define PCI_DMA_BUS_IS_PHYS (1) | 18 | #define PCI_DMA_BUS_IS_PHYS (1) |
| 19 | 19 | ||
| 20 | /* pci_unmap_{page,single} is a nop so... */ | 20 | /* pci_unmap_{page,single} is a nop so... */ |
| 21 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) | 21 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME[0]; |
| 22 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) | 22 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0]; |
| 23 | #define pci_unmap_addr(PTR, ADDR_NAME) (0) | 23 | #define pci_unmap_addr(PTR, ADDR_NAME) sizeof((PTR)->ADDR_NAME) |
| 24 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) | 24 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ |
| 25 | #define pci_unmap_len(PTR, LEN_NAME) (0) | 25 | do { break; } while (pci_unmap_addr(PTR, ADDR_NAME)) |
| 26 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) | 26 | #define pci_unmap_len(PTR, LEN_NAME) sizeof((PTR)->LEN_NAME) |
| 27 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ | ||
| 28 | do { break; } while (pci_unmap_len(PTR, LEN_NAME)) | ||
| 27 | 29 | ||
| 28 | 30 | ||
| 29 | #endif /* __KERNEL__ */ | 31 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 97c271b2910b..bcb5446a08d1 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
| @@ -20,30 +20,25 @@ | |||
| 20 | #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ | 20 | #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ |
| 21 | #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ | 21 | #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ |
| 22 | 22 | ||
| 23 | /* | 23 | #define _PAGE_PRESENT (_AT(pteval_t, 1) << _PAGE_BIT_PRESENT) |
| 24 | * Note: we use _AC(1, L) instead of _AC(1, UL) so that we get a | 24 | #define _PAGE_RW (_AT(pteval_t, 1) << _PAGE_BIT_RW) |
| 25 | * sign-extended value on 32-bit with all 1's in the upper word, | 25 | #define _PAGE_USER (_AT(pteval_t, 1) << _PAGE_BIT_USER) |
| 26 | * which preserves the upper pte values on 64-bit ptes: | 26 | #define _PAGE_PWT (_AT(pteval_t, 1) << _PAGE_BIT_PWT) |
| 27 | */ | 27 | #define _PAGE_PCD (_AT(pteval_t, 1) << _PAGE_BIT_PCD) |
| 28 | #define _PAGE_PRESENT (_AC(1, L)<<_PAGE_BIT_PRESENT) | 28 | #define _PAGE_ACCESSED (_AT(pteval_t, 1) << _PAGE_BIT_ACCESSED) |
| 29 | #define _PAGE_RW (_AC(1, L)<<_PAGE_BIT_RW) | 29 | #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY) |
| 30 | #define _PAGE_USER (_AC(1, L)<<_PAGE_BIT_USER) | 30 | #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE) |
| 31 | #define _PAGE_PWT (_AC(1, L)<<_PAGE_BIT_PWT) | 31 | #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL) |
| 32 | #define _PAGE_PCD (_AC(1, L)<<_PAGE_BIT_PCD) | 32 | #define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1) |
| 33 | #define _PAGE_ACCESSED (_AC(1, L)<<_PAGE_BIT_ACCESSED) | 33 | #define _PAGE_UNUSED2 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED2) |
| 34 | #define _PAGE_DIRTY (_AC(1, L)<<_PAGE_BIT_DIRTY) | 34 | #define _PAGE_UNUSED3 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED3) |
| 35 | #define _PAGE_PSE (_AC(1, L)<<_PAGE_BIT_PSE) /* 2MB page */ | 35 | #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) |
| 36 | #define _PAGE_GLOBAL (_AC(1, L)<<_PAGE_BIT_GLOBAL) /* Global TLB entry */ | 36 | #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE) |
| 37 | #define _PAGE_UNUSED1 (_AC(1, L)<<_PAGE_BIT_UNUSED1) | ||
| 38 | #define _PAGE_UNUSED2 (_AC(1, L)<<_PAGE_BIT_UNUSED2) | ||
| 39 | #define _PAGE_UNUSED3 (_AC(1, L)<<_PAGE_BIT_UNUSED3) | ||
| 40 | #define _PAGE_PAT (_AC(1, L)<<_PAGE_BIT_PAT) | ||
| 41 | #define _PAGE_PAT_LARGE (_AC(1, L)<<_PAGE_BIT_PAT_LARGE) | ||
| 42 | 37 | ||
| 43 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) | 38 | #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) |
| 44 | #define _PAGE_NX (_AC(1, ULL) << _PAGE_BIT_NX) | 39 | #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) |
| 45 | #else | 40 | #else |
| 46 | #define _PAGE_NX 0 | 41 | #define _PAGE_NX (_AT(pteval_t, 0)) |
| 47 | #endif | 42 | #endif |
| 48 | 43 | ||
| 49 | /* If _PAGE_PRESENT is clear, we use these: */ | 44 | /* If _PAGE_PRESENT is clear, we use these: */ |
| @@ -164,37 +159,37 @@ extern struct list_head pgd_list; | |||
| 164 | */ | 159 | */ |
| 165 | static inline int pte_dirty(pte_t pte) | 160 | static inline int pte_dirty(pte_t pte) |
| 166 | { | 161 | { |
| 167 | return pte_val(pte) & _PAGE_DIRTY; | 162 | return pte_flags(pte) & _PAGE_DIRTY; |
| 168 | } | 163 | } |
| 169 | 164 | ||
| 170 | static inline int pte_young(pte_t pte) | 165 | static inline int pte_young(pte_t pte) |
| 171 | { | 166 | { |
| 172 | return pte_val(pte) & _PAGE_ACCESSED; | 167 | return pte_flags(pte) & _PAGE_ACCESSED; |
| 173 | } | 168 | } |
| 174 | 169 | ||
| 175 | static inline int pte_write(pte_t pte) | 170 | static inline int pte_write(pte_t pte) |
| 176 | { | 171 | { |
| 177 | return pte_val(pte) & _PAGE_RW; | 172 | return pte_flags(pte) & _PAGE_RW; |
| 178 | } | 173 | } |
| 179 | 174 | ||
| 180 | static inline int pte_file(pte_t pte) | 175 | static inline int pte_file(pte_t pte) |
| 181 | { | 176 | { |
| 182 | return pte_val(pte) & _PAGE_FILE; | 177 | return pte_flags(pte) & _PAGE_FILE; |
| 183 | } | 178 | } |
| 184 | 179 | ||
| 185 | static inline int pte_huge(pte_t pte) | 180 | static inline int pte_huge(pte_t pte) |
| 186 | { | 181 | { |
| 187 | return pte_val(pte) & _PAGE_PSE; | 182 | return pte_flags(pte) & _PAGE_PSE; |
| 188 | } | 183 | } |
| 189 | 184 | ||
| 190 | static inline int pte_global(pte_t pte) | 185 | static inline int pte_global(pte_t pte) |
| 191 | { | 186 | { |
| 192 | return pte_val(pte) & _PAGE_GLOBAL; | 187 | return pte_flags(pte) & _PAGE_GLOBAL; |
| 193 | } | 188 | } |
| 194 | 189 | ||
| 195 | static inline int pte_exec(pte_t pte) | 190 | static inline int pte_exec(pte_t pte) |
| 196 | { | 191 | { |
| 197 | return !(pte_val(pte) & _PAGE_NX); | 192 | return !(pte_flags(pte) & _PAGE_NX); |
| 198 | } | 193 | } |
| 199 | 194 | ||
| 200 | static inline int pte_special(pte_t pte) | 195 | static inline int pte_special(pte_t pte) |
| @@ -210,22 +205,22 @@ static inline int pmd_large(pmd_t pte) | |||
| 210 | 205 | ||
| 211 | static inline pte_t pte_mkclean(pte_t pte) | 206 | static inline pte_t pte_mkclean(pte_t pte) |
| 212 | { | 207 | { |
| 213 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_DIRTY); | 208 | return __pte(pte_val(pte) & ~_PAGE_DIRTY); |
| 214 | } | 209 | } |
| 215 | 210 | ||
| 216 | static inline pte_t pte_mkold(pte_t pte) | 211 | static inline pte_t pte_mkold(pte_t pte) |
| 217 | { | 212 | { |
| 218 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_ACCESSED); | 213 | return __pte(pte_val(pte) & ~_PAGE_ACCESSED); |
| 219 | } | 214 | } |
| 220 | 215 | ||
| 221 | static inline pte_t pte_wrprotect(pte_t pte) | 216 | static inline pte_t pte_wrprotect(pte_t pte) |
| 222 | { | 217 | { |
| 223 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_RW); | 218 | return __pte(pte_val(pte) & ~_PAGE_RW); |
| 224 | } | 219 | } |
| 225 | 220 | ||
| 226 | static inline pte_t pte_mkexec(pte_t pte) | 221 | static inline pte_t pte_mkexec(pte_t pte) |
| 227 | { | 222 | { |
| 228 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_NX); | 223 | return __pte(pte_val(pte) & ~_PAGE_NX); |
| 229 | } | 224 | } |
| 230 | 225 | ||
| 231 | static inline pte_t pte_mkdirty(pte_t pte) | 226 | static inline pte_t pte_mkdirty(pte_t pte) |
| @@ -250,7 +245,7 @@ static inline pte_t pte_mkhuge(pte_t pte) | |||
| 250 | 245 | ||
| 251 | static inline pte_t pte_clrhuge(pte_t pte) | 246 | static inline pte_t pte_clrhuge(pte_t pte) |
| 252 | { | 247 | { |
| 253 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_PSE); | 248 | return __pte(pte_val(pte) & ~_PAGE_PSE); |
| 254 | } | 249 | } |
| 255 | 250 | ||
| 256 | static inline pte_t pte_mkglobal(pte_t pte) | 251 | static inline pte_t pte_mkglobal(pte_t pte) |
| @@ -260,7 +255,7 @@ static inline pte_t pte_mkglobal(pte_t pte) | |||
| 260 | 255 | ||
| 261 | static inline pte_t pte_clrglobal(pte_t pte) | 256 | static inline pte_t pte_clrglobal(pte_t pte) |
| 262 | { | 257 | { |
| 263 | return __pte(pte_val(pte) & ~(pteval_t)_PAGE_GLOBAL); | 258 | return __pte(pte_val(pte) & ~_PAGE_GLOBAL); |
| 264 | } | 259 | } |
| 265 | 260 | ||
| 266 | static inline pte_t pte_mkspecial(pte_t pte) | 261 | static inline pte_t pte_mkspecial(pte_t pte) |
| @@ -305,7 +300,7 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot) | |||
| 305 | return __pgprot(preservebits | addbits); | 300 | return __pgprot(preservebits | addbits); |
| 306 | } | 301 | } |
| 307 | 302 | ||
| 308 | #define pte_pgprot(x) __pgprot(pte_val(x) & ~PTE_MASK) | 303 | #define pte_pgprot(x) __pgprot(pte_flags(x) & ~PTE_MASK) |
| 309 | 304 | ||
| 310 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) | 305 | #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask) |
| 311 | 306 | ||
| @@ -369,8 +364,15 @@ enum { | |||
| 369 | PG_LEVEL_4K, | 364 | PG_LEVEL_4K, |
| 370 | PG_LEVEL_2M, | 365 | PG_LEVEL_2M, |
| 371 | PG_LEVEL_1G, | 366 | PG_LEVEL_1G, |
| 367 | PG_LEVEL_NUM | ||
| 372 | }; | 368 | }; |
| 373 | 369 | ||
| 370 | #ifdef CONFIG_PROC_FS | ||
| 371 | extern void update_page_count(int level, unsigned long pages); | ||
| 372 | #else | ||
| 373 | static inline void update_page_count(int level, unsigned long pages) { } | ||
| 374 | #endif | ||
| 375 | |||
| 374 | /* | 376 | /* |
| 375 | * Helper function that returns the kernel pagetable entry controlling | 377 | * Helper function that returns the kernel pagetable entry controlling |
| 376 | * the virtual address 'address'. NULL means no pagetable entry present. | 378 | * the virtual address 'address'. NULL means no pagetable entry present. |
diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h index 199cab107d85..092b39b3a7e6 100644 --- a/include/asm-x86/processor-flags.h +++ b/include/asm-x86/processor-flags.h | |||
| @@ -88,4 +88,10 @@ | |||
| 88 | #define CX86_ARR_BASE 0xc4 | 88 | #define CX86_ARR_BASE 0xc4 |
| 89 | #define CX86_RCR_BASE 0xdc | 89 | #define CX86_RCR_BASE 0xdc |
| 90 | 90 | ||
| 91 | #ifdef CONFIG_VM86 | ||
| 92 | #define X86_VM_MASK X86_EFLAGS_VM | ||
| 93 | #else | ||
| 94 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
| 95 | #endif | ||
| 96 | |||
| 91 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ | 97 | #endif /* __ASM_I386_PROCESSOR_FLAGS_H */ |
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index 559105220a47..4ab2ede6f4b9 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h | |||
| @@ -263,15 +263,11 @@ struct tss_struct { | |||
| 263 | struct thread_struct *io_bitmap_owner; | 263 | struct thread_struct *io_bitmap_owner; |
| 264 | 264 | ||
| 265 | /* | 265 | /* |
| 266 | * Pad the TSS to be cacheline-aligned (size is 0x100): | ||
| 267 | */ | ||
| 268 | unsigned long __cacheline_filler[35]; | ||
| 269 | /* | ||
| 270 | * .. and then another 0x100 bytes for the emergency kernel stack: | 266 | * .. and then another 0x100 bytes for the emergency kernel stack: |
| 271 | */ | 267 | */ |
| 272 | unsigned long stack[64]; | 268 | unsigned long stack[64]; |
| 273 | 269 | ||
| 274 | } __attribute__((packed)); | 270 | } ____cacheline_aligned; |
| 275 | 271 | ||
| 276 | DECLARE_PER_CPU(struct tss_struct, init_tss); | 272 | DECLARE_PER_CPU(struct tss_struct, init_tss); |
| 277 | 273 | ||
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 9f922b0b95d6..8a71db803da6 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h | |||
| @@ -3,7 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/compiler.h> /* For __user */ | 4 | #include <linux/compiler.h> /* For __user */ |
| 5 | #include <asm/ptrace-abi.h> | 5 | #include <asm/ptrace-abi.h> |
| 6 | #include <asm/processor-flags.h> | ||
| 6 | 7 | ||
| 8 | #ifdef __KERNEL__ | ||
| 9 | #include <asm/ds.h> /* the DS BTS struct is used for ptrace too */ | ||
| 10 | #include <asm/segment.h> | ||
| 11 | #endif | ||
| 7 | 12 | ||
| 8 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
| 9 | 14 | ||
| @@ -55,9 +60,6 @@ struct pt_regs { | |||
| 55 | unsigned long ss; | 60 | unsigned long ss; |
| 56 | }; | 61 | }; |
| 57 | 62 | ||
| 58 | #include <asm/vm86.h> | ||
| 59 | #include <asm/segment.h> | ||
| 60 | |||
| 61 | #endif /* __KERNEL__ */ | 63 | #endif /* __KERNEL__ */ |
| 62 | 64 | ||
| 63 | #else /* __i386__ */ | 65 | #else /* __i386__ */ |
diff --git a/include/asm-x86/reboot.h b/include/asm-x86/reboot.h index e63741f19392..206f355786dc 100644 --- a/include/asm-x86/reboot.h +++ b/include/asm-x86/reboot.h | |||
| @@ -14,8 +14,8 @@ struct machine_ops { | |||
| 14 | 14 | ||
| 15 | extern struct machine_ops machine_ops; | 15 | extern struct machine_ops machine_ops; |
| 16 | 16 | ||
| 17 | void machine_real_restart(unsigned char *code, int length); | ||
| 18 | void native_machine_crash_shutdown(struct pt_regs *regs); | 17 | void native_machine_crash_shutdown(struct pt_regs *regs); |
| 19 | void native_machine_shutdown(void); | 18 | void native_machine_shutdown(void); |
| 19 | void machine_real_restart(const unsigned char *code, int length); | ||
| 20 | 20 | ||
| 21 | #endif /* _ASM_REBOOT_H */ | 21 | #endif /* _ASM_REBOOT_H */ |
diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h index 7400d3ad75c6..8c387198ca88 100644 --- a/include/asm-x86/required-features.h +++ b/include/asm-x86/required-features.h | |||
| @@ -19,9 +19,13 @@ | |||
| 19 | 19 | ||
| 20 | #if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) | 20 | #if defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64) |
| 21 | # define NEED_PAE (1<<(X86_FEATURE_PAE & 31)) | 21 | # define NEED_PAE (1<<(X86_FEATURE_PAE & 31)) |
| 22 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) | ||
| 23 | #else | 22 | #else |
| 24 | # define NEED_PAE 0 | 23 | # define NEED_PAE 0 |
| 24 | #endif | ||
| 25 | |||
| 26 | #ifdef CONFIG_X86_CMPXCHG64 | ||
| 27 | # define NEED_CX8 (1<<(X86_FEATURE_CX8 & 31)) | ||
| 28 | #else | ||
| 25 | # define NEED_CX8 0 | 29 | # define NEED_CX8 0 |
| 26 | #endif | 30 | #endif |
| 27 | 31 | ||
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h index 2557514d7ef6..8d9f0b41ee86 100644 --- a/include/asm-x86/resume-trace.h +++ b/include/asm-x86/resume-trace.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #define TRACE_RESUME(user) \ | 6 | #define TRACE_RESUME(user) \ |
| 7 | do { \ | 7 | do { \ |
| 8 | if (pm_trace_enabled) { \ | 8 | if (pm_trace_enabled) { \ |
| 9 | void *tracedata; \ | 9 | const void *tracedata; \ |
| 10 | asm volatile(_ASM_MOV_UL " $1f,%0\n" \ | 10 | asm volatile(_ASM_MOV_UL " $1f,%0\n" \ |
| 11 | ".section .tracedata,\"a\"\n" \ | 11 | ".section .tracedata,\"a\"\n" \ |
| 12 | "1:\t.word %c1\n\t" \ | 12 | "1:\t.word %c1\n\t" \ |
diff --git a/include/asm-x86/seccomp_32.h b/include/asm-x86/seccomp_32.h index 18da19e89bff..36e71c5f306f 100644 --- a/include/asm-x86/seccomp_32.h +++ b/include/asm-x86/seccomp_32.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef _ASM_SECCOMP_H | 1 | #ifndef _ASM_SECCOMP_H |
| 2 | #define _ASM_SECCOMP_H | ||
| 2 | 3 | ||
| 3 | #include <linux/thread_info.h> | 4 | #include <linux/thread_info.h> |
| 4 | 5 | ||
diff --git a/include/asm-x86/seccomp_64.h b/include/asm-x86/seccomp_64.h index 553af65a2287..76cfe69aa63c 100644 --- a/include/asm-x86/seccomp_64.h +++ b/include/asm-x86/seccomp_64.h | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #ifndef _ASM_SECCOMP_H | 1 | #ifndef _ASM_SECCOMP_H |
| 2 | #define _ASM_SECCOMP_H | ||
| 2 | 3 | ||
| 3 | #include <linux/thread_info.h> | 4 | #include <linux/thread_info.h> |
| 4 | 5 | ||
diff --git a/include/asm-x86/string_32.h b/include/asm-x86/string_32.h index b49369ad9a61..193578cd1fd9 100644 --- a/include/asm-x86/string_32.h +++ b/include/asm-x86/string_32.h | |||
| @@ -29,81 +29,116 @@ extern char *strchr(const char *s, int c); | |||
| 29 | #define __HAVE_ARCH_STRLEN | 29 | #define __HAVE_ARCH_STRLEN |
| 30 | extern size_t strlen(const char *s); | 30 | extern size_t strlen(const char *s); |
| 31 | 31 | ||
| 32 | static __always_inline void * __memcpy(void * to, const void * from, size_t n) | 32 | static __always_inline void *__memcpy(void *to, const void *from, size_t n) |
| 33 | { | 33 | { |
| 34 | int d0, d1, d2; | 34 | int d0, d1, d2; |
| 35 | __asm__ __volatile__( | 35 | asm volatile("rep ; movsl\n\t" |
| 36 | "rep ; movsl\n\t" | 36 | "movl %4,%%ecx\n\t" |
| 37 | "movl %4,%%ecx\n\t" | 37 | "andl $3,%%ecx\n\t" |
| 38 | "andl $3,%%ecx\n\t" | 38 | "jz 1f\n\t" |
| 39 | "jz 1f\n\t" | 39 | "rep ; movsb\n\t" |
| 40 | "rep ; movsb\n\t" | 40 | "1:" |
| 41 | "1:" | 41 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) |
| 42 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) | 42 | : "0" (n / 4), "g" (n), "1" ((long)to), "2" ((long)from) |
| 43 | : "0" (n/4), "g" (n), "1" ((long) to), "2" ((long) from) | 43 | : "memory"); |
| 44 | : "memory"); | 44 | return to; |
| 45 | return (to); | ||
| 46 | } | 45 | } |
| 47 | 46 | ||
| 48 | /* | 47 | /* |
| 49 | * This looks ugly, but the compiler can optimize it totally, | 48 | * This looks ugly, but the compiler can optimize it totally, |
| 50 | * as the count is constant. | 49 | * as the count is constant. |
| 51 | */ | 50 | */ |
| 52 | static __always_inline void * __constant_memcpy(void * to, const void * from, size_t n) | 51 | static __always_inline void *__constant_memcpy(void *to, const void *from, |
| 52 | size_t n) | ||
| 53 | { | 53 | { |
| 54 | long esi, edi; | 54 | long esi, edi; |
| 55 | if (!n) return to; | 55 | if (!n) |
| 56 | #if 1 /* want to do small copies with non-string ops? */ | 56 | return to; |
| 57 | |||
| 57 | switch (n) { | 58 | switch (n) { |
| 58 | case 1: *(char*)to = *(char*)from; return to; | 59 | case 1: |
| 59 | case 2: *(short*)to = *(short*)from; return to; | 60 | *(char *)to = *(char *)from; |
| 60 | case 4: *(int*)to = *(int*)from; return to; | 61 | return to; |
| 61 | #if 1 /* including those doable with two moves? */ | 62 | case 2: |
| 62 | case 3: *(short*)to = *(short*)from; | 63 | *(short *)to = *(short *)from; |
| 63 | *((char*)to+2) = *((char*)from+2); return to; | 64 | return to; |
| 64 | case 5: *(int*)to = *(int*)from; | 65 | case 4: |
| 65 | *((char*)to+4) = *((char*)from+4); return to; | 66 | *(int *)to = *(int *)from; |
| 66 | case 6: *(int*)to = *(int*)from; | 67 | return to; |
| 67 | *((short*)to+2) = *((short*)from+2); return to; | 68 | |
| 68 | case 8: *(int*)to = *(int*)from; | 69 | case 3: |
| 69 | *((int*)to+1) = *((int*)from+1); return to; | 70 | *(short *)to = *(short *)from; |
| 70 | #endif | 71 | *((char *)to + 2) = *((char *)from + 2); |
| 72 | return to; | ||
| 73 | case 5: | ||
| 74 | *(int *)to = *(int *)from; | ||
| 75 | *((char *)to + 4) = *((char *)from + 4); | ||
| 76 | return to; | ||
| 77 | case 6: | ||
| 78 | *(int *)to = *(int *)from; | ||
| 79 | *((short *)to + 2) = *((short *)from + 2); | ||
| 80 | return to; | ||
| 81 | case 8: | ||
| 82 | *(int *)to = *(int *)from; | ||
| 83 | *((int *)to + 1) = *((int *)from + 1); | ||
| 84 | return to; | ||
| 71 | } | 85 | } |
| 72 | #endif | 86 | |
| 73 | esi = (long) from; | 87 | esi = (long)from; |
| 74 | edi = (long) to; | 88 | edi = (long)to; |
| 75 | if (n >= 5*4) { | 89 | if (n >= 5 * 4) { |
| 76 | /* large block: use rep prefix */ | 90 | /* large block: use rep prefix */ |
| 77 | int ecx; | 91 | int ecx; |
| 78 | __asm__ __volatile__( | 92 | asm volatile("rep ; movsl" |
| 79 | "rep ; movsl" | 93 | : "=&c" (ecx), "=&D" (edi), "=&S" (esi) |
| 80 | : "=&c" (ecx), "=&D" (edi), "=&S" (esi) | 94 | : "0" (n / 4), "1" (edi), "2" (esi) |
| 81 | : "0" (n/4), "1" (edi),"2" (esi) | 95 | : "memory" |
| 82 | : "memory" | ||
| 83 | ); | 96 | ); |
| 84 | } else { | 97 | } else { |
| 85 | /* small block: don't clobber ecx + smaller code */ | 98 | /* small block: don't clobber ecx + smaller code */ |
| 86 | if (n >= 4*4) __asm__ __volatile__("movsl" | 99 | if (n >= 4 * 4) |
| 87 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 100 | asm volatile("movsl" |
| 88 | if (n >= 3*4) __asm__ __volatile__("movsl" | 101 | : "=&D"(edi), "=&S"(esi) |
| 89 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 102 | : "0"(edi), "1"(esi) |
| 90 | if (n >= 2*4) __asm__ __volatile__("movsl" | 103 | : "memory"); |
| 91 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 104 | if (n >= 3 * 4) |
| 92 | if (n >= 1*4) __asm__ __volatile__("movsl" | 105 | asm volatile("movsl" |
| 93 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 106 | : "=&D"(edi), "=&S"(esi) |
| 107 | : "0"(edi), "1"(esi) | ||
| 108 | : "memory"); | ||
| 109 | if (n >= 2 * 4) | ||
| 110 | asm volatile("movsl" | ||
| 111 | : "=&D"(edi), "=&S"(esi) | ||
| 112 | : "0"(edi), "1"(esi) | ||
| 113 | : "memory"); | ||
| 114 | if (n >= 1 * 4) | ||
| 115 | asm volatile("movsl" | ||
| 116 | : "=&D"(edi), "=&S"(esi) | ||
| 117 | : "0"(edi), "1"(esi) | ||
| 118 | : "memory"); | ||
| 94 | } | 119 | } |
| 95 | switch (n % 4) { | 120 | switch (n % 4) { |
| 96 | /* tail */ | 121 | /* tail */ |
| 97 | case 0: return to; | 122 | case 0: |
| 98 | case 1: __asm__ __volatile__("movsb" | 123 | return to; |
| 99 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 124 | case 1: |
| 100 | return to; | 125 | asm volatile("movsb" |
| 101 | case 2: __asm__ __volatile__("movsw" | 126 | : "=&D"(edi), "=&S"(esi) |
| 102 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 127 | : "0"(edi), "1"(esi) |
| 103 | return to; | 128 | : "memory"); |
| 104 | default: __asm__ __volatile__("movsw\n\tmovsb" | 129 | return to; |
| 105 | :"=&D"(edi),"=&S"(esi):"0"(edi),"1"(esi):"memory"); | 130 | case 2: |
| 106 | return to; | 131 | asm volatile("movsw" |
| 132 | : "=&D"(edi), "=&S"(esi) | ||
| 133 | : "0"(edi), "1"(esi) | ||
| 134 | : "memory"); | ||
| 135 | return to; | ||
| 136 | default: | ||
| 137 | asm volatile("movsw\n\tmovsb" | ||
| 138 | : "=&D"(edi), "=&S"(esi) | ||
| 139 | : "0"(edi), "1"(esi) | ||
| 140 | : "memory"); | ||
| 141 | return to; | ||
| 107 | } | 142 | } |
| 108 | } | 143 | } |
| 109 | 144 | ||
| @@ -117,87 +152,86 @@ static __always_inline void * __constant_memcpy(void * to, const void * from, si | |||
| 117 | * This CPU favours 3DNow strongly (eg AMD Athlon) | 152 | * This CPU favours 3DNow strongly (eg AMD Athlon) |
| 118 | */ | 153 | */ |
| 119 | 154 | ||
| 120 | static inline void * __constant_memcpy3d(void * to, const void * from, size_t len) | 155 | static inline void *__constant_memcpy3d(void *to, const void *from, size_t len) |
| 121 | { | 156 | { |
| 122 | if (len < 512) | 157 | if (len < 512) |
| 123 | return __constant_memcpy(to, from, len); | 158 | return __constant_memcpy(to, from, len); |
| 124 | return _mmx_memcpy(to, from, len); | 159 | return _mmx_memcpy(to, from, len); |
| 125 | } | 160 | } |
| 126 | 161 | ||
| 127 | static __inline__ void *__memcpy3d(void *to, const void *from, size_t len) | 162 | static inline void *__memcpy3d(void *to, const void *from, size_t len) |
| 128 | { | 163 | { |
| 129 | if (len < 512) | 164 | if (len < 512) |
| 130 | return __memcpy(to, from, len); | 165 | return __memcpy(to, from, len); |
| 131 | return _mmx_memcpy(to, from, len); | 166 | return _mmx_memcpy(to, from, len); |
| 132 | } | 167 | } |
| 133 | 168 | ||
| 134 | #define memcpy(t, f, n) \ | 169 | #define memcpy(t, f, n) \ |
| 135 | (__builtin_constant_p(n) ? \ | 170 | (__builtin_constant_p((n)) \ |
| 136 | __constant_memcpy3d((t),(f),(n)) : \ | 171 | ? __constant_memcpy3d((t), (f), (n)) \ |
| 137 | __memcpy3d((t),(f),(n))) | 172 | : __memcpy3d((t), (f), (n))) |
| 138 | 173 | ||
| 139 | #else | 174 | #else |
| 140 | 175 | ||
| 141 | /* | 176 | /* |
| 142 | * No 3D Now! | 177 | * No 3D Now! |
| 143 | */ | 178 | */ |
| 144 | 179 | ||
| 145 | #define memcpy(t, f, n) \ | 180 | #define memcpy(t, f, n) \ |
| 146 | (__builtin_constant_p(n) ? \ | 181 | (__builtin_constant_p((n)) \ |
| 147 | __constant_memcpy((t),(f),(n)) : \ | 182 | ? __constant_memcpy((t), (f), (n)) \ |
| 148 | __memcpy((t),(f),(n))) | 183 | : __memcpy((t), (f), (n))) |
| 149 | 184 | ||
| 150 | #endif | 185 | #endif |
| 151 | 186 | ||
| 152 | #define __HAVE_ARCH_MEMMOVE | 187 | #define __HAVE_ARCH_MEMMOVE |
| 153 | void *memmove(void * dest,const void * src, size_t n); | 188 | void *memmove(void *dest, const void *src, size_t n); |
| 154 | 189 | ||
| 155 | #define memcmp __builtin_memcmp | 190 | #define memcmp __builtin_memcmp |
| 156 | 191 | ||
| 157 | #define __HAVE_ARCH_MEMCHR | 192 | #define __HAVE_ARCH_MEMCHR |
| 158 | extern void *memchr(const void * cs,int c,size_t count); | 193 | extern void *memchr(const void *cs, int c, size_t count); |
| 159 | 194 | ||
| 160 | static inline void * __memset_generic(void * s, char c,size_t count) | 195 | static inline void *__memset_generic(void *s, char c, size_t count) |
| 161 | { | 196 | { |
| 162 | int d0, d1; | 197 | int d0, d1; |
| 163 | __asm__ __volatile__( | 198 | asm volatile("rep\n\t" |
| 164 | "rep\n\t" | 199 | "stosb" |
| 165 | "stosb" | 200 | : "=&c" (d0), "=&D" (d1) |
| 166 | : "=&c" (d0), "=&D" (d1) | 201 | : "a" (c), "1" (s), "0" (count) |
| 167 | :"a" (c),"1" (s),"0" (count) | 202 | : "memory"); |
| 168 | :"memory"); | 203 | return s; |
| 169 | return s; | ||
| 170 | } | 204 | } |
| 171 | 205 | ||
| 172 | /* we might want to write optimized versions of these later */ | 206 | /* we might want to write optimized versions of these later */ |
| 173 | #define __constant_count_memset(s,c,count) __memset_generic((s),(c),(count)) | 207 | #define __constant_count_memset(s, c, count) __memset_generic((s), (c), (count)) |
| 174 | 208 | ||
| 175 | /* | 209 | /* |
| 176 | * memset(x,0,y) is a reasonably common thing to do, so we want to fill | 210 | * memset(x, 0, y) is a reasonably common thing to do, so we want to fill |
| 177 | * things 32 bits at a time even when we don't know the size of the | 211 | * things 32 bits at a time even when we don't know the size of the |
| 178 | * area at compile-time.. | 212 | * area at compile-time.. |
| 179 | */ | 213 | */ |
| 180 | static __always_inline void * __constant_c_memset(void * s, unsigned long c, size_t count) | 214 | static __always_inline |
| 215 | void *__constant_c_memset(void *s, unsigned long c, size_t count) | ||
| 181 | { | 216 | { |
| 182 | int d0, d1; | 217 | int d0, d1; |
| 183 | __asm__ __volatile__( | 218 | asm volatile("rep ; stosl\n\t" |
| 184 | "rep ; stosl\n\t" | 219 | "testb $2,%b3\n\t" |
| 185 | "testb $2,%b3\n\t" | 220 | "je 1f\n\t" |
| 186 | "je 1f\n\t" | 221 | "stosw\n" |
| 187 | "stosw\n" | 222 | "1:\ttestb $1,%b3\n\t" |
| 188 | "1:\ttestb $1,%b3\n\t" | 223 | "je 2f\n\t" |
| 189 | "je 2f\n\t" | 224 | "stosb\n" |
| 190 | "stosb\n" | 225 | "2:" |
| 191 | "2:" | 226 | : "=&c" (d0), "=&D" (d1) |
| 192 | :"=&c" (d0), "=&D" (d1) | 227 | : "a" (c), "q" (count), "0" (count/4), "1" ((long)s) |
| 193 | :"a" (c), "q" (count), "0" (count/4), "1" ((long) s) | 228 | : "memory"); |
| 194 | :"memory"); | 229 | return s; |
| 195 | return (s); | ||
| 196 | } | 230 | } |
| 197 | 231 | ||
| 198 | /* Added by Gertjan van Wingerde to make minix and sysv module work */ | 232 | /* Added by Gertjan van Wingerde to make minix and sysv module work */ |
| 199 | #define __HAVE_ARCH_STRNLEN | 233 | #define __HAVE_ARCH_STRNLEN |
| 200 | extern size_t strnlen(const char * s, size_t count); | 234 | extern size_t strnlen(const char *s, size_t count); |
| 201 | /* end of additional stuff */ | 235 | /* end of additional stuff */ |
| 202 | 236 | ||
| 203 | #define __HAVE_ARCH_STRSTR | 237 | #define __HAVE_ARCH_STRSTR |
| @@ -207,66 +241,85 @@ extern char *strstr(const char *cs, const char *ct); | |||
| 207 | * This looks horribly ugly, but the compiler can optimize it totally, | 241 | * This looks horribly ugly, but the compiler can optimize it totally, |
| 208 | * as we by now know that both pattern and count is constant.. | 242 | * as we by now know that both pattern and count is constant.. |
| 209 | */ | 243 | */ |
| 210 | static __always_inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count) | 244 | static __always_inline |
| 245 | void *__constant_c_and_count_memset(void *s, unsigned long pattern, | ||
| 246 | size_t count) | ||
| 211 | { | 247 | { |
| 212 | switch (count) { | 248 | switch (count) { |
| 249 | case 0: | ||
| 250 | return s; | ||
| 251 | case 1: | ||
| 252 | *(unsigned char *)s = pattern & 0xff; | ||
| 253 | return s; | ||
| 254 | case 2: | ||
| 255 | *(unsigned short *)s = pattern & 0xffff; | ||
| 256 | return s; | ||
| 257 | case 3: | ||
| 258 | *(unsigned short *)s = pattern & 0xffff; | ||
| 259 | *((unsigned char *)s + 2) = pattern & 0xff; | ||
| 260 | return s; | ||
| 261 | case 4: | ||
| 262 | *(unsigned long *)s = pattern; | ||
| 263 | return s; | ||
| 264 | } | ||
| 265 | |||
| 266 | #define COMMON(x) \ | ||
| 267 | asm volatile("rep ; stosl" \ | ||
| 268 | x \ | ||
| 269 | : "=&c" (d0), "=&D" (d1) \ | ||
| 270 | : "a" (eax), "0" (count/4), "1" ((long)s) \ | ||
| 271 | : "memory") | ||
| 272 | |||
| 273 | { | ||
| 274 | int d0, d1; | ||
| 275 | #if __GNUC__ == 4 && __GNUC_MINOR__ == 0 | ||
| 276 | /* Workaround for broken gcc 4.0 */ | ||
| 277 | register unsigned long eax asm("%eax") = pattern; | ||
| 278 | #else | ||
| 279 | unsigned long eax = pattern; | ||
| 280 | #endif | ||
| 281 | |||
| 282 | switch (count % 4) { | ||
| 213 | case 0: | 283 | case 0: |
| 284 | COMMON(""); | ||
| 214 | return s; | 285 | return s; |
| 215 | case 1: | 286 | case 1: |
| 216 | *(unsigned char *)s = pattern & 0xff; | 287 | COMMON("\n\tstosb"); |
| 217 | return s; | 288 | return s; |
| 218 | case 2: | 289 | case 2: |
| 219 | *(unsigned short *)s = pattern & 0xffff; | 290 | COMMON("\n\tstosw"); |
| 220 | return s; | 291 | return s; |
| 221 | case 3: | 292 | default: |
| 222 | *(unsigned short *)s = pattern & 0xffff; | 293 | COMMON("\n\tstosw\n\tstosb"); |
| 223 | *(2+(unsigned char *)s) = pattern & 0xff; | ||
| 224 | return s; | ||
| 225 | case 4: | ||
| 226 | *(unsigned long *)s = pattern; | ||
| 227 | return s; | 294 | return s; |
| 295 | } | ||
| 228 | } | 296 | } |
| 229 | #define COMMON(x) \ | 297 | |
| 230 | __asm__ __volatile__( \ | ||
| 231 | "rep ; stosl" \ | ||
| 232 | x \ | ||
| 233 | : "=&c" (d0), "=&D" (d1) \ | ||
| 234 | : "a" (pattern),"0" (count/4),"1" ((long) s) \ | ||
| 235 | : "memory") | ||
| 236 | { | ||
| 237 | int d0, d1; | ||
| 238 | switch (count % 4) { | ||
| 239 | case 0: COMMON(""); return s; | ||
| 240 | case 1: COMMON("\n\tstosb"); return s; | ||
| 241 | case 2: COMMON("\n\tstosw"); return s; | ||
| 242 | default: COMMON("\n\tstosw\n\tstosb"); return s; | ||
| 243 | } | ||
| 244 | } | ||
| 245 | |||
| 246 | #undef COMMON | 298 | #undef COMMON |
| 247 | } | 299 | } |
| 248 | 300 | ||
| 249 | #define __constant_c_x_memset(s, c, count) \ | 301 | #define __constant_c_x_memset(s, c, count) \ |
| 250 | (__builtin_constant_p(count) ? \ | 302 | (__builtin_constant_p(count) \ |
| 251 | __constant_c_and_count_memset((s),(c),(count)) : \ | 303 | ? __constant_c_and_count_memset((s), (c), (count)) \ |
| 252 | __constant_c_memset((s),(c),(count))) | 304 | : __constant_c_memset((s), (c), (count))) |
| 253 | 305 | ||
| 254 | #define __memset(s, c, count) \ | 306 | #define __memset(s, c, count) \ |
| 255 | (__builtin_constant_p(count) ? \ | 307 | (__builtin_constant_p(count) \ |
| 256 | __constant_count_memset((s),(c),(count)) : \ | 308 | ? __constant_count_memset((s), (c), (count)) \ |
| 257 | __memset_generic((s),(c),(count))) | 309 | : __memset_generic((s), (c), (count))) |
| 258 | 310 | ||
| 259 | #define __HAVE_ARCH_MEMSET | 311 | #define __HAVE_ARCH_MEMSET |
| 260 | #define memset(s, c, count) \ | 312 | #define memset(s, c, count) \ |
| 261 | (__builtin_constant_p(c) ? \ | 313 | (__builtin_constant_p(c) \ |
| 262 | __constant_c_x_memset((s),(0x01010101UL*(unsigned char)(c)),(count)) : \ | 314 | ? __constant_c_x_memset((s), (0x01010101UL * (unsigned char)(c)), \ |
| 263 | __memset((s),(c),(count))) | 315 | (count)) \ |
| 316 | : __memset((s), (c), (count))) | ||
| 264 | 317 | ||
| 265 | /* | 318 | /* |
| 266 | * find the first occurrence of byte 'c', or 1 past the area if none | 319 | * find the first occurrence of byte 'c', or 1 past the area if none |
| 267 | */ | 320 | */ |
| 268 | #define __HAVE_ARCH_MEMSCAN | 321 | #define __HAVE_ARCH_MEMSCAN |
| 269 | extern void *memscan(void * addr, int c, size_t size); | 322 | extern void *memscan(void *addr, int c, size_t size); |
| 270 | 323 | ||
| 271 | #endif /* __KERNEL__ */ | 324 | #endif /* __KERNEL__ */ |
| 272 | 325 | ||
diff --git a/include/asm-x86/suspend_32.h b/include/asm-x86/suspend_32.h index 24e1c080aa8a..8675c6782a7d 100644 --- a/include/asm-x86/suspend_32.h +++ b/include/asm-x86/suspend_32.h | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | * Based on code | 3 | * Based on code |
| 4 | * Copyright 2001 Patrick Mochel <mochel@osdl.org> | 4 | * Copyright 2001 Patrick Mochel <mochel@osdl.org> |
| 5 | */ | 5 | */ |
| 6 | #ifndef __ASM_X86_32_SUSPEND_H | ||
| 7 | #define __ASM_X86_32_SUSPEND_H | ||
| 8 | |||
| 6 | #include <asm/desc.h> | 9 | #include <asm/desc.h> |
| 7 | #include <asm/i387.h> | 10 | #include <asm/i387.h> |
| 8 | 11 | ||
| @@ -44,3 +47,5 @@ static inline void acpi_save_register_state(unsigned long return_point) | |||
| 44 | /* routines for saving/restoring kernel state */ | 47 | /* routines for saving/restoring kernel state */ |
| 45 | extern int acpi_save_state_mem(void); | 48 | extern int acpi_save_state_mem(void); |
| 46 | #endif | 49 | #endif |
| 50 | |||
| 51 | #endif /* __ASM_X86_32_SUSPEND_H */ | ||
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h index a2f04cd79b29..7e4c133795a1 100644 --- a/include/asm-x86/system.h +++ b/include/asm-x86/system.h | |||
| @@ -289,7 +289,7 @@ static inline void native_wbinvd(void) | |||
| 289 | 289 | ||
| 290 | #endif/* CONFIG_PARAVIRT */ | 290 | #endif/* CONFIG_PARAVIRT */ |
| 291 | 291 | ||
| 292 | #define stts() write_cr0(8 | read_cr0()) | 292 | #define stts() write_cr0(read_cr0() | X86_CR0_TS) |
| 293 | 293 | ||
| 294 | #endif /* __KERNEL__ */ | 294 | #endif /* __KERNEL__ */ |
| 295 | 295 | ||
diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h index 77244f17993f..895339d2bc0b 100644 --- a/include/asm-x86/thread_info.h +++ b/include/asm-x86/thread_info.h | |||
| @@ -1,9 +1,253 @@ | |||
| 1 | /* thread_info.h: low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 1 | #ifndef _ASM_X86_THREAD_INFO_H | 7 | #ifndef _ASM_X86_THREAD_INFO_H |
| 8 | #define _ASM_X86_THREAD_INFO_H | ||
| 9 | |||
| 10 | #include <linux/compiler.h> | ||
| 11 | #include <asm/page.h> | ||
| 12 | #include <asm/types.h> | ||
| 13 | |||
| 14 | /* | ||
| 15 | * low level task data that entry.S needs immediate access to | ||
| 16 | * - this struct should fit entirely inside of one cache line | ||
| 17 | * - this struct shares the supervisor stack pages | ||
| 18 | */ | ||
| 19 | #ifndef __ASSEMBLY__ | ||
| 20 | struct task_struct; | ||
| 21 | struct exec_domain; | ||
| 22 | #include <asm/processor.h> | ||
| 23 | |||
| 24 | struct thread_info { | ||
| 25 | struct task_struct *task; /* main task structure */ | ||
| 26 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 27 | unsigned long flags; /* low level flags */ | ||
| 28 | __u32 status; /* thread synchronous flags */ | ||
| 29 | __u32 cpu; /* current CPU */ | ||
| 30 | int preempt_count; /* 0 => preemptable, | ||
| 31 | <0 => BUG */ | ||
| 32 | mm_segment_t addr_limit; | ||
| 33 | struct restart_block restart_block; | ||
| 34 | void __user *sysenter_return; | ||
| 35 | #ifdef CONFIG_X86_32 | ||
| 36 | unsigned long previous_esp; /* ESP of the previous stack in | ||
| 37 | case of nested (IRQ) stacks | ||
| 38 | */ | ||
| 39 | __u8 supervisor_stack[0]; | ||
| 40 | #endif | ||
| 41 | }; | ||
| 42 | |||
| 43 | #define INIT_THREAD_INFO(tsk) \ | ||
| 44 | { \ | ||
| 45 | .task = &tsk, \ | ||
| 46 | .exec_domain = &default_exec_domain, \ | ||
| 47 | .flags = 0, \ | ||
| 48 | .cpu = 0, \ | ||
| 49 | .preempt_count = 1, \ | ||
| 50 | .addr_limit = KERNEL_DS, \ | ||
| 51 | .restart_block = { \ | ||
| 52 | .fn = do_no_restart_syscall, \ | ||
| 53 | }, \ | ||
| 54 | } | ||
| 55 | |||
| 56 | #define init_thread_info (init_thread_union.thread_info) | ||
| 57 | #define init_stack (init_thread_union.stack) | ||
| 58 | |||
| 59 | #else /* !__ASSEMBLY__ */ | ||
| 60 | |||
| 61 | #include <asm/asm-offsets.h> | ||
| 62 | |||
| 63 | #endif | ||
| 64 | |||
| 65 | /* | ||
| 66 | * thread information flags | ||
| 67 | * - these are process state flags that various assembly files | ||
| 68 | * may need to access | ||
| 69 | * - pending work-to-be-done flags are in LSW | ||
| 70 | * - other flags in MSW | ||
| 71 | * Warning: layout of LSW is hardcoded in entry.S | ||
| 72 | */ | ||
| 73 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 74 | #define TIF_SIGPENDING 2 /* signal pending */ | ||
| 75 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | ||
| 76 | #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ | ||
| 77 | #define TIF_IRET 5 /* force IRET */ | ||
| 2 | #ifdef CONFIG_X86_32 | 78 | #ifdef CONFIG_X86_32 |
| 3 | # include "thread_info_32.h" | 79 | #define TIF_SYSCALL_EMU 6 /* syscall emulation active */ |
| 80 | #endif | ||
| 81 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | ||
| 82 | #define TIF_SECCOMP 8 /* secure computing */ | ||
| 83 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | ||
| 84 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | ||
| 85 | #define TIF_NOTSC 16 /* TSC is not accessible in userland */ | ||
| 86 | #define TIF_IA32 17 /* 32bit process */ | ||
| 87 | #define TIF_FORK 18 /* ret_from_fork */ | ||
| 88 | #define TIF_ABI_PENDING 19 | ||
| 89 | #define TIF_MEMDIE 20 | ||
| 90 | #define TIF_DEBUG 21 /* uses debug registers */ | ||
| 91 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ | ||
| 92 | #define TIF_FREEZE 23 /* is freezing for suspend */ | ||
| 93 | #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ | ||
| 94 | #define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ | ||
| 95 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ | ||
| 96 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ | ||
| 97 | |||
| 98 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 99 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 100 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 101 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 102 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 103 | #ifdef CONFIG_X86_32 | ||
| 104 | #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) | ||
| 4 | #else | 105 | #else |
| 5 | # include "thread_info_64.h" | 106 | #define _TIF_SYSCALL_EMU 0 |
| 6 | #endif | 107 | #endif |
| 108 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 109 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 110 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) | ||
| 111 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 112 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 113 | #define _TIF_IA32 (1 << TIF_IA32) | ||
| 114 | #define _TIF_FORK (1 << TIF_FORK) | ||
| 115 | #define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING) | ||
| 116 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 117 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 118 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 119 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 120 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 121 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 122 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 123 | |||
| 124 | /* work to do on interrupt/exception return */ | ||
| 125 | #define _TIF_WORK_MASK \ | ||
| 126 | (0x0000FFFF & \ | ||
| 127 | ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP| \ | ||
| 128 | _TIF_SECCOMP|_TIF_SYSCALL_EMU)) | ||
| 129 | |||
| 130 | /* work to do on any return to user space */ | ||
| 131 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 132 | |||
| 133 | /* Only used for 64 bit */ | ||
| 134 | #define _TIF_DO_NOTIFY_MASK \ | ||
| 135 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | ||
| 136 | |||
| 137 | /* flags to check in __switch_to() */ | ||
| 138 | #define _TIF_WORK_CTXSW \ | ||
| 139 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS| \ | ||
| 140 | _TIF_NOTSC) | ||
| 141 | |||
| 142 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 143 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) | ||
| 144 | |||
| 145 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 146 | |||
| 147 | /* thread information allocation */ | ||
| 148 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 149 | #define THREAD_FLAGS (GFP_KERNEL | __GFP_ZERO) | ||
| 150 | #else | ||
| 151 | #define THREAD_FLAGS GFP_KERNEL | ||
| 152 | #endif | ||
| 153 | |||
| 154 | #define alloc_thread_info(tsk) \ | ||
| 155 | ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) | ||
| 156 | |||
| 157 | #ifdef CONFIG_X86_32 | ||
| 158 | |||
| 159 | #define STACK_WARN (THREAD_SIZE/8) | ||
| 160 | /* | ||
| 161 | * macros/functions for gaining access to the thread information structure | ||
| 162 | * | ||
| 163 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 164 | */ | ||
| 165 | #ifndef __ASSEMBLY__ | ||
| 166 | |||
| 167 | |||
| 168 | /* how to get the current stack pointer from C */ | ||
| 169 | register unsigned long current_stack_pointer asm("esp") __used; | ||
| 170 | |||
| 171 | /* how to get the thread information struct from C */ | ||
| 172 | static inline struct thread_info *current_thread_info(void) | ||
| 173 | { | ||
| 174 | return (struct thread_info *) | ||
| 175 | (current_stack_pointer & ~(THREAD_SIZE - 1)); | ||
| 176 | } | ||
| 177 | |||
| 178 | #else /* !__ASSEMBLY__ */ | ||
| 179 | |||
| 180 | /* how to get the thread information struct from ASM */ | ||
| 181 | #define GET_THREAD_INFO(reg) \ | ||
| 182 | movl $-THREAD_SIZE, reg; \ | ||
| 183 | andl %esp, reg | ||
| 184 | |||
| 185 | /* use this one if reg already contains %esp */ | ||
| 186 | #define GET_THREAD_INFO_WITH_ESP(reg) \ | ||
| 187 | andl $-THREAD_SIZE, reg | ||
| 188 | |||
| 189 | #endif | ||
| 190 | |||
| 191 | #else /* X86_32 */ | ||
| 192 | |||
| 193 | #include <asm/pda.h> | ||
| 194 | |||
| 195 | /* | ||
| 196 | * macros/functions for gaining access to the thread information structure | ||
| 197 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 198 | */ | ||
| 199 | #ifndef __ASSEMBLY__ | ||
| 200 | static inline struct thread_info *current_thread_info(void) | ||
| 201 | { | ||
| 202 | struct thread_info *ti; | ||
| 203 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); | ||
| 204 | return ti; | ||
| 205 | } | ||
| 206 | |||
| 207 | /* do not use in interrupt context */ | ||
| 208 | static inline struct thread_info *stack_thread_info(void) | ||
| 209 | { | ||
| 210 | struct thread_info *ti; | ||
| 211 | asm("andq %%rsp,%0; " : "=r" (ti) : "0" (~(THREAD_SIZE - 1))); | ||
| 212 | return ti; | ||
| 213 | } | ||
| 214 | |||
| 215 | #else /* !__ASSEMBLY__ */ | ||
| 216 | |||
| 217 | /* how to get the thread information struct from ASM */ | ||
| 218 | #define GET_THREAD_INFO(reg) \ | ||
| 219 | movq %gs:pda_kernelstack,reg ; \ | ||
| 220 | subq $(THREAD_SIZE-PDA_STACKOFFSET),reg | ||
| 221 | |||
| 222 | #endif | ||
| 223 | |||
| 224 | #endif /* !X86_32 */ | ||
| 225 | |||
| 226 | /* | ||
| 227 | * Thread-synchronous status. | ||
| 228 | * | ||
| 229 | * This is different from the flags in that nobody else | ||
| 230 | * ever touches our thread-synchronous status, so we don't | ||
| 231 | * have to worry about atomic accesses. | ||
| 232 | */ | ||
| 233 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 234 | this quantum (SMP) */ | ||
| 235 | #define TS_COMPAT 0x0002 /* 32bit syscall active (64BIT)*/ | ||
| 236 | #define TS_POLLING 0x0004 /* true if in idle loop | ||
| 237 | and not sleeping */ | ||
| 238 | #define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */ | ||
| 239 | |||
| 240 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 241 | |||
| 242 | #ifndef __ASSEMBLY__ | ||
| 243 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 244 | static inline void set_restore_sigmask(void) | ||
| 245 | { | ||
| 246 | struct thread_info *ti = current_thread_info(); | ||
| 247 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 248 | set_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags); | ||
| 249 | } | ||
| 250 | #endif /* !__ASSEMBLY__ */ | ||
| 7 | 251 | ||
| 8 | #ifndef __ASSEMBLY__ | 252 | #ifndef __ASSEMBLY__ |
| 9 | extern void arch_task_cache_init(void); | 253 | extern void arch_task_cache_init(void); |
diff --git a/include/asm-x86/thread_info_32.h b/include/asm-x86/thread_info_32.h deleted file mode 100644 index b6338829d1a8..000000000000 --- a/include/asm-x86/thread_info_32.h +++ /dev/null | |||
| @@ -1,205 +0,0 @@ | |||
| 1 | /* thread_info.h: i386 low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ASM_THREAD_INFO_H | ||
| 8 | #define _ASM_THREAD_INFO_H | ||
| 9 | |||
| 10 | #ifdef __KERNEL__ | ||
| 11 | |||
| 12 | #include <linux/compiler.h> | ||
| 13 | #include <asm/page.h> | ||
| 14 | |||
| 15 | #ifndef __ASSEMBLY__ | ||
| 16 | #include <asm/processor.h> | ||
| 17 | #endif | ||
| 18 | |||
| 19 | /* | ||
| 20 | * low level task data that entry.S needs immediate access to | ||
| 21 | * - this struct should fit entirely inside of one cache line | ||
| 22 | * - this struct shares the supervisor stack pages | ||
| 23 | * - if the contents of this structure are changed, | ||
| 24 | * the assembly constants must also be changed | ||
| 25 | */ | ||
| 26 | #ifndef __ASSEMBLY__ | ||
| 27 | |||
| 28 | struct thread_info { | ||
| 29 | struct task_struct *task; /* main task structure */ | ||
| 30 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 31 | unsigned long flags; /* low level flags */ | ||
| 32 | unsigned long status; /* thread-synchronous flags */ | ||
| 33 | __u32 cpu; /* current CPU */ | ||
| 34 | int preempt_count; /* 0 => preemptable, | ||
| 35 | <0 => BUG */ | ||
| 36 | mm_segment_t addr_limit; /* thread address space: | ||
| 37 | 0-0xBFFFFFFF user-thread | ||
| 38 | 0-0xFFFFFFFF kernel-thread | ||
| 39 | */ | ||
| 40 | void *sysenter_return; | ||
| 41 | struct restart_block restart_block; | ||
| 42 | unsigned long previous_esp; /* ESP of the previous stack in | ||
| 43 | case of nested (IRQ) stacks | ||
| 44 | */ | ||
| 45 | __u8 supervisor_stack[0]; | ||
| 46 | }; | ||
| 47 | |||
| 48 | #else /* !__ASSEMBLY__ */ | ||
| 49 | |||
| 50 | #include <asm/asm-offsets.h> | ||
| 51 | |||
| 52 | #endif | ||
| 53 | |||
| 54 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 55 | #ifdef CONFIG_4KSTACKS | ||
| 56 | #define THREAD_SIZE (4096) | ||
| 57 | #else | ||
| 58 | #define THREAD_SIZE (8192) | ||
| 59 | #endif | ||
| 60 | |||
| 61 | #define STACK_WARN (THREAD_SIZE/8) | ||
| 62 | /* | ||
| 63 | * macros/functions for gaining access to the thread information structure | ||
| 64 | * | ||
| 65 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 66 | */ | ||
| 67 | #ifndef __ASSEMBLY__ | ||
| 68 | |||
| 69 | #define INIT_THREAD_INFO(tsk) \ | ||
| 70 | { \ | ||
| 71 | .task = &tsk, \ | ||
| 72 | .exec_domain = &default_exec_domain, \ | ||
| 73 | .flags = 0, \ | ||
| 74 | .cpu = 0, \ | ||
| 75 | .preempt_count = 1, \ | ||
| 76 | .addr_limit = KERNEL_DS, \ | ||
| 77 | .restart_block = { \ | ||
| 78 | .fn = do_no_restart_syscall, \ | ||
| 79 | }, \ | ||
| 80 | } | ||
| 81 | |||
| 82 | #define init_thread_info (init_thread_union.thread_info) | ||
| 83 | #define init_stack (init_thread_union.stack) | ||
| 84 | |||
| 85 | |||
| 86 | /* how to get the current stack pointer from C */ | ||
| 87 | register unsigned long current_stack_pointer asm("esp") __used; | ||
| 88 | |||
| 89 | /* how to get the thread information struct from C */ | ||
| 90 | static inline struct thread_info *current_thread_info(void) | ||
| 91 | { | ||
| 92 | return (struct thread_info *) | ||
| 93 | (current_stack_pointer & ~(THREAD_SIZE - 1)); | ||
| 94 | } | ||
| 95 | |||
| 96 | /* thread information allocation */ | ||
| 97 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 98 | #define alloc_thread_info(tsk) ((struct thread_info *) \ | ||
| 99 | __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(THREAD_SIZE))) | ||
| 100 | #else | ||
| 101 | #define alloc_thread_info(tsk) ((struct thread_info *) \ | ||
| 102 | __get_free_pages(GFP_KERNEL, get_order(THREAD_SIZE))) | ||
| 103 | #endif | ||
| 104 | |||
| 105 | #else /* !__ASSEMBLY__ */ | ||
| 106 | |||
| 107 | /* how to get the thread information struct from ASM */ | ||
| 108 | #define GET_THREAD_INFO(reg) \ | ||
| 109 | movl $-THREAD_SIZE, reg; \ | ||
| 110 | andl %esp, reg | ||
| 111 | |||
| 112 | /* use this one if reg already contains %esp */ | ||
| 113 | #define GET_THREAD_INFO_WITH_ESP(reg) \ | ||
| 114 | andl $-THREAD_SIZE, reg | ||
| 115 | |||
| 116 | #endif | ||
| 117 | |||
| 118 | /* | ||
| 119 | * thread information flags | ||
| 120 | * - these are process state flags that various | ||
| 121 | * assembly files may need to access | ||
| 122 | * - pending work-to-be-done flags are in LSW | ||
| 123 | * - other flags in MSW | ||
| 124 | */ | ||
| 125 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 126 | #define TIF_SIGPENDING 1 /* signal pending */ | ||
| 127 | #define TIF_NEED_RESCHED 2 /* rescheduling necessary */ | ||
| 128 | #define TIF_SINGLESTEP 3 /* restore singlestep on return to | ||
| 129 | user mode */ | ||
| 130 | #define TIF_IRET 4 /* return with iret */ | ||
| 131 | #define TIF_SYSCALL_EMU 5 /* syscall emulation active */ | ||
| 132 | #define TIF_SYSCALL_AUDIT 6 /* syscall auditing active */ | ||
| 133 | #define TIF_SECCOMP 7 /* secure computing */ | ||
| 134 | #define TIF_HRTICK_RESCHED 9 /* reprogram hrtick timer */ | ||
| 135 | #define TIF_MEMDIE 16 | ||
| 136 | #define TIF_DEBUG 17 /* uses debug registers */ | ||
| 137 | #define TIF_IO_BITMAP 18 /* uses I/O bitmap */ | ||
| 138 | #define TIF_FREEZE 19 /* is freezing for suspend */ | ||
| 139 | #define TIF_NOTSC 20 /* TSC is not accessible in userland */ | ||
| 140 | #define TIF_FORCED_TF 21 /* true if TF in eflags artificially */ | ||
| 141 | #define TIF_DEBUGCTLMSR 22 /* uses thread_struct.debugctlmsr */ | ||
| 142 | #define TIF_DS_AREA_MSR 23 /* uses thread_struct.ds_area_msr */ | ||
| 143 | #define TIF_BTS_TRACE_TS 24 /* record scheduling event timestamps */ | ||
| 144 | |||
| 145 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 146 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 147 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 148 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 149 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 150 | #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU) | ||
| 151 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 152 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 153 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 154 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 155 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 156 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 157 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 158 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 159 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 160 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 161 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 162 | |||
| 163 | /* work to do on interrupt/exception return */ | ||
| 164 | #define _TIF_WORK_MASK \ | ||
| 165 | (0x0000FFFF & ~(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \ | ||
| 166 | _TIF_SECCOMP | _TIF_SYSCALL_EMU)) | ||
| 167 | /* work to do on any return to u-space */ | ||
| 168 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 169 | |||
| 170 | /* flags to check in __switch_to() */ | ||
| 171 | #define _TIF_WORK_CTXSW \ | ||
| 172 | (_TIF_IO_BITMAP | _TIF_NOTSC | _TIF_DEBUGCTLMSR | \ | ||
| 173 | _TIF_DS_AREA_MSR | _TIF_BTS_TRACE_TS) | ||
| 174 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 175 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW | _TIF_DEBUG) | ||
| 176 | |||
| 177 | |||
| 178 | /* | ||
| 179 | * Thread-synchronous status. | ||
| 180 | * | ||
| 181 | * This is different from the flags in that nobody else | ||
| 182 | * ever touches our thread-synchronous status, so we don't | ||
| 183 | * have to worry about atomic accesses. | ||
| 184 | */ | ||
| 185 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 186 | this quantum (SMP) */ | ||
| 187 | #define TS_POLLING 0x0002 /* True if in idle loop | ||
| 188 | and not sleeping */ | ||
| 189 | #define TS_RESTORE_SIGMASK 0x0004 /* restore signal mask in do_signal() */ | ||
| 190 | |||
| 191 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 192 | |||
| 193 | #ifndef __ASSEMBLY__ | ||
| 194 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 195 | static inline void set_restore_sigmask(void) | ||
| 196 | { | ||
| 197 | struct thread_info *ti = current_thread_info(); | ||
| 198 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 199 | set_bit(TIF_SIGPENDING, &ti->flags); | ||
| 200 | } | ||
| 201 | #endif /* !__ASSEMBLY__ */ | ||
| 202 | |||
| 203 | #endif /* __KERNEL__ */ | ||
| 204 | |||
| 205 | #endif /* _ASM_THREAD_INFO_H */ | ||
diff --git a/include/asm-x86/thread_info_64.h b/include/asm-x86/thread_info_64.h deleted file mode 100644 index cb69f70abba1..000000000000 --- a/include/asm-x86/thread_info_64.h +++ /dev/null | |||
| @@ -1,195 +0,0 @@ | |||
| 1 | /* thread_info.h: x86_64 low-level thread information | ||
| 2 | * | ||
| 3 | * Copyright (C) 2002 David Howells (dhowells@redhat.com) | ||
| 4 | * - Incorporating suggestions made by Linus Torvalds and Dave Miller | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef _ASM_THREAD_INFO_H | ||
| 8 | #define _ASM_THREAD_INFO_H | ||
| 9 | |||
| 10 | #ifdef __KERNEL__ | ||
| 11 | |||
| 12 | #include <asm/page.h> | ||
| 13 | #include <asm/types.h> | ||
| 14 | #include <asm/pda.h> | ||
| 15 | |||
| 16 | /* | ||
| 17 | * low level task data that entry.S needs immediate access to | ||
| 18 | * - this struct should fit entirely inside of one cache line | ||
| 19 | * - this struct shares the supervisor stack pages | ||
| 20 | */ | ||
| 21 | #ifndef __ASSEMBLY__ | ||
| 22 | struct task_struct; | ||
| 23 | struct exec_domain; | ||
| 24 | #include <asm/processor.h> | ||
| 25 | |||
| 26 | struct thread_info { | ||
| 27 | struct task_struct *task; /* main task structure */ | ||
| 28 | struct exec_domain *exec_domain; /* execution domain */ | ||
| 29 | __u32 flags; /* low level flags */ | ||
| 30 | __u32 status; /* thread synchronous flags */ | ||
| 31 | __u32 cpu; /* current CPU */ | ||
| 32 | int preempt_count; /* 0 => preemptable, | ||
| 33 | <0 => BUG */ | ||
| 34 | mm_segment_t addr_limit; | ||
| 35 | struct restart_block restart_block; | ||
| 36 | #ifdef CONFIG_IA32_EMULATION | ||
| 37 | void __user *sysenter_return; | ||
| 38 | #endif | ||
| 39 | }; | ||
| 40 | #endif | ||
| 41 | |||
| 42 | /* | ||
| 43 | * macros/functions for gaining access to the thread information structure | ||
| 44 | * preempt_count needs to be 1 initially, until the scheduler is functional. | ||
| 45 | */ | ||
| 46 | #ifndef __ASSEMBLY__ | ||
| 47 | #define INIT_THREAD_INFO(tsk) \ | ||
| 48 | { \ | ||
| 49 | .task = &tsk, \ | ||
| 50 | .exec_domain = &default_exec_domain, \ | ||
| 51 | .flags = 0, \ | ||
| 52 | .cpu = 0, \ | ||
| 53 | .preempt_count = 1, \ | ||
| 54 | .addr_limit = KERNEL_DS, \ | ||
| 55 | .restart_block = { \ | ||
| 56 | .fn = do_no_restart_syscall, \ | ||
| 57 | }, \ | ||
| 58 | } | ||
| 59 | |||
| 60 | #define init_thread_info (init_thread_union.thread_info) | ||
| 61 | #define init_stack (init_thread_union.stack) | ||
| 62 | |||
| 63 | static inline struct thread_info *current_thread_info(void) | ||
| 64 | { | ||
| 65 | struct thread_info *ti; | ||
| 66 | ti = (void *)(read_pda(kernelstack) + PDA_STACKOFFSET - THREAD_SIZE); | ||
| 67 | return ti; | ||
| 68 | } | ||
| 69 | |||
| 70 | /* do not use in interrupt context */ | ||
| 71 | static inline struct thread_info *stack_thread_info(void) | ||
| 72 | { | ||
| 73 | struct thread_info *ti; | ||
| 74 | asm("andq %%rsp,%0; " : "=r" (ti) : "0" (~(THREAD_SIZE - 1))); | ||
| 75 | return ti; | ||
| 76 | } | ||
| 77 | |||
| 78 | /* thread information allocation */ | ||
| 79 | #ifdef CONFIG_DEBUG_STACK_USAGE | ||
| 80 | #define THREAD_FLAGS (GFP_KERNEL | __GFP_ZERO) | ||
| 81 | #else | ||
| 82 | #define THREAD_FLAGS GFP_KERNEL | ||
| 83 | #endif | ||
| 84 | |||
| 85 | #define alloc_thread_info(tsk) \ | ||
| 86 | ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) | ||
| 87 | |||
| 88 | #else /* !__ASSEMBLY__ */ | ||
| 89 | |||
| 90 | /* how to get the thread information struct from ASM */ | ||
| 91 | #define GET_THREAD_INFO(reg) \ | ||
| 92 | movq %gs:pda_kernelstack,reg ; \ | ||
| 93 | subq $(THREAD_SIZE-PDA_STACKOFFSET),reg | ||
| 94 | |||
| 95 | #endif | ||
| 96 | |||
| 97 | /* | ||
| 98 | * thread information flags | ||
| 99 | * - these are process state flags that various assembly files | ||
| 100 | * may need to access | ||
| 101 | * - pending work-to-be-done flags are in LSW | ||
| 102 | * - other flags in MSW | ||
| 103 | * Warning: layout of LSW is hardcoded in entry.S | ||
| 104 | */ | ||
| 105 | #define TIF_SYSCALL_TRACE 0 /* syscall trace active */ | ||
| 106 | #define TIF_SIGPENDING 2 /* signal pending */ | ||
| 107 | #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ | ||
| 108 | #define TIF_SINGLESTEP 4 /* reenable singlestep on user return*/ | ||
| 109 | #define TIF_IRET 5 /* force IRET */ | ||
| 110 | #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ | ||
| 111 | #define TIF_SECCOMP 8 /* secure computing */ | ||
| 112 | #define TIF_MCE_NOTIFY 10 /* notify userspace of an MCE */ | ||
| 113 | #define TIF_HRTICK_RESCHED 11 /* reprogram hrtick timer */ | ||
| 114 | /* 16 free */ | ||
| 115 | #define TIF_IA32 17 /* 32bit process */ | ||
| 116 | #define TIF_FORK 18 /* ret_from_fork */ | ||
| 117 | #define TIF_ABI_PENDING 19 | ||
| 118 | #define TIF_MEMDIE 20 | ||
| 119 | #define TIF_DEBUG 21 /* uses debug registers */ | ||
| 120 | #define TIF_IO_BITMAP 22 /* uses I/O bitmap */ | ||
| 121 | #define TIF_FREEZE 23 /* is freezing for suspend */ | ||
| 122 | #define TIF_FORCED_TF 24 /* true if TF in eflags artificially */ | ||
| 123 | #define TIF_DEBUGCTLMSR 25 /* uses thread_struct.debugctlmsr */ | ||
| 124 | #define TIF_DS_AREA_MSR 26 /* uses thread_struct.ds_area_msr */ | ||
| 125 | #define TIF_BTS_TRACE_TS 27 /* record scheduling event timestamps */ | ||
| 126 | #define TIF_NOTSC 28 /* TSC is not accessible in userland */ | ||
| 127 | |||
| 128 | #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) | ||
| 129 | #define _TIF_SIGPENDING (1 << TIF_SIGPENDING) | ||
| 130 | #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) | ||
| 131 | #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) | ||
| 132 | #define _TIF_IRET (1 << TIF_IRET) | ||
| 133 | #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT) | ||
| 134 | #define _TIF_SECCOMP (1 << TIF_SECCOMP) | ||
| 135 | #define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY) | ||
| 136 | #define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED) | ||
| 137 | #define _TIF_IA32 (1 << TIF_IA32) | ||
| 138 | #define _TIF_FORK (1 << TIF_FORK) | ||
| 139 | #define _TIF_ABI_PENDING (1 << TIF_ABI_PENDING) | ||
| 140 | #define _TIF_DEBUG (1 << TIF_DEBUG) | ||
| 141 | #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) | ||
| 142 | #define _TIF_FREEZE (1 << TIF_FREEZE) | ||
| 143 | #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) | ||
| 144 | #define _TIF_DEBUGCTLMSR (1 << TIF_DEBUGCTLMSR) | ||
| 145 | #define _TIF_DS_AREA_MSR (1 << TIF_DS_AREA_MSR) | ||
| 146 | #define _TIF_BTS_TRACE_TS (1 << TIF_BTS_TRACE_TS) | ||
| 147 | #define _TIF_NOTSC (1 << TIF_NOTSC) | ||
| 148 | |||
| 149 | /* work to do on interrupt/exception return */ | ||
| 150 | #define _TIF_WORK_MASK \ | ||
| 151 | (0x0000FFFF & \ | ||
| 152 | ~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP|_TIF_SECCOMP)) | ||
| 153 | /* work to do on any return to user space */ | ||
| 154 | #define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP) | ||
| 155 | |||
| 156 | #define _TIF_DO_NOTIFY_MASK \ | ||
| 157 | (_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY|_TIF_HRTICK_RESCHED) | ||
| 158 | |||
| 159 | /* flags to check in __switch_to() */ | ||
| 160 | #define _TIF_WORK_CTXSW \ | ||
| 161 | (_TIF_IO_BITMAP|_TIF_DEBUGCTLMSR|_TIF_DS_AREA_MSR|_TIF_BTS_TRACE_TS|_TIF_NOTSC) | ||
| 162 | #define _TIF_WORK_CTXSW_PREV _TIF_WORK_CTXSW | ||
| 163 | #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) | ||
| 164 | |||
| 165 | #define PREEMPT_ACTIVE 0x10000000 | ||
| 166 | |||
| 167 | /* | ||
| 168 | * Thread-synchronous status. | ||
| 169 | * | ||
| 170 | * This is different from the flags in that nobody else | ||
| 171 | * ever touches our thread-synchronous status, so we don't | ||
| 172 | * have to worry about atomic accesses. | ||
| 173 | */ | ||
| 174 | #define TS_USEDFPU 0x0001 /* FPU was used by this task | ||
| 175 | this quantum (SMP) */ | ||
| 176 | #define TS_COMPAT 0x0002 /* 32bit syscall active */ | ||
| 177 | #define TS_POLLING 0x0004 /* true if in idle loop | ||
| 178 | and not sleeping */ | ||
| 179 | #define TS_RESTORE_SIGMASK 0x0008 /* restore signal mask in do_signal() */ | ||
| 180 | |||
| 181 | #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) | ||
| 182 | |||
| 183 | #ifndef __ASSEMBLY__ | ||
| 184 | #define HAVE_SET_RESTORE_SIGMASK 1 | ||
| 185 | static inline void set_restore_sigmask(void) | ||
| 186 | { | ||
| 187 | struct thread_info *ti = current_thread_info(); | ||
| 188 | ti->status |= TS_RESTORE_SIGMASK; | ||
| 189 | set_bit(TIF_SIGPENDING, &ti->flags); | ||
| 190 | } | ||
| 191 | #endif /* !__ASSEMBLY__ */ | ||
| 192 | |||
| 193 | #endif /* __KERNEL__ */ | ||
| 194 | |||
| 195 | #endif /* _ASM_THREAD_INFO_H */ | ||
diff --git a/include/asm-x86/unistd_64.h b/include/asm-x86/unistd_64.h index fe26e36d0f51..9c1a4a3470d9 100644 --- a/include/asm-x86/unistd_64.h +++ b/include/asm-x86/unistd_64.h | |||
| @@ -290,7 +290,7 @@ __SYSCALL(__NR_rt_sigtimedwait, sys_rt_sigtimedwait) | |||
| 290 | #define __NR_rt_sigqueueinfo 129 | 290 | #define __NR_rt_sigqueueinfo 129 |
| 291 | __SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo) | 291 | __SYSCALL(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo) |
| 292 | #define __NR_rt_sigsuspend 130 | 292 | #define __NR_rt_sigsuspend 130 |
| 293 | __SYSCALL(__NR_rt_sigsuspend, stub_rt_sigsuspend) | 293 | __SYSCALL(__NR_rt_sigsuspend, sys_rt_sigsuspend) |
| 294 | #define __NR_sigaltstack 131 | 294 | #define __NR_sigaltstack 131 |
| 295 | __SYSCALL(__NR_sigaltstack, stub_sigaltstack) | 295 | __SYSCALL(__NR_sigaltstack, stub_sigaltstack) |
| 296 | #define __NR_utime 132 | 296 | #define __NR_utime 132 |
diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h index 074b357146df..5ce351325e01 100644 --- a/include/asm-x86/vm86.h +++ b/include/asm-x86/vm86.h | |||
| @@ -14,12 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm/processor-flags.h> | 15 | #include <asm/processor-flags.h> |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_VM86 | ||
| 18 | #define X86_VM_MASK X86_EFLAGS_VM | ||
| 19 | #else | ||
| 20 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define BIOSSEG 0x0f000 | 17 | #define BIOSSEG 0x0f000 |
| 24 | 18 | ||
| 25 | #define CPU_086 0 | 19 | #define CPU_086 0 |
| @@ -121,7 +115,6 @@ struct vm86plus_info_struct { | |||
| 121 | unsigned long is_vm86pus:1; /* for vm86 internal use */ | 115 | unsigned long is_vm86pus:1; /* for vm86 internal use */ |
| 122 | unsigned char vm86dbg_intxxtab[32]; /* for debugger */ | 116 | unsigned char vm86dbg_intxxtab[32]; /* for debugger */ |
| 123 | }; | 117 | }; |
| 124 | |||
| 125 | struct vm86plus_struct { | 118 | struct vm86plus_struct { |
| 126 | struct vm86_regs regs; | 119 | struct vm86_regs regs; |
| 127 | unsigned long flags; | 120 | unsigned long flags; |
| @@ -133,6 +126,9 @@ struct vm86plus_struct { | |||
| 133 | }; | 126 | }; |
| 134 | 127 | ||
| 135 | #ifdef __KERNEL__ | 128 | #ifdef __KERNEL__ |
| 129 | |||
| 130 | #include <asm/ptrace.h> | ||
| 131 | |||
| 136 | /* | 132 | /* |
| 137 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 | 133 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 |
| 138 | * mode - the main change is that the old segment descriptors aren't | 134 | * mode - the main change is that the old segment descriptors aren't |
| @@ -141,7 +137,6 @@ struct vm86plus_struct { | |||
| 141 | * at the end of the structure. Look at ptrace.h to see the "normal" | 137 | * at the end of the structure. Look at ptrace.h to see the "normal" |
| 142 | * setup. For user space layout see 'struct vm86_regs' above. | 138 | * setup. For user space layout see 'struct vm86_regs' above. |
| 143 | */ | 139 | */ |
| 144 | #include <asm/ptrace.h> | ||
| 145 | 140 | ||
| 146 | struct kernel_vm86_regs { | 141 | struct kernel_vm86_regs { |
| 147 | /* | 142 | /* |
diff --git a/include/asm-x86/xen/hypercall.h b/include/asm-x86/xen/hypercall.h index c2ccd997ed35..2a4f9b41d684 100644 --- a/include/asm-x86/xen/hypercall.h +++ b/include/asm-x86/xen/hypercall.h | |||
| @@ -176,9 +176,9 @@ HYPERVISOR_fpu_taskswitch(int set) | |||
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | static inline int | 178 | static inline int |
| 179 | HYPERVISOR_sched_op(int cmd, unsigned long arg) | 179 | HYPERVISOR_sched_op(int cmd, void *arg) |
| 180 | { | 180 | { |
| 181 | return _hypercall2(int, sched_op, cmd, arg); | 181 | return _hypercall2(int, sched_op_new, cmd, arg); |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | static inline long | 184 | static inline long |
| @@ -315,6 +315,13 @@ HYPERVISOR_nmi_op(unsigned long op, unsigned long arg) | |||
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | static inline void | 317 | static inline void |
| 318 | MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set) | ||
| 319 | { | ||
| 320 | mcl->op = __HYPERVISOR_fpu_taskswitch; | ||
| 321 | mcl->args[0] = set; | ||
| 322 | } | ||
| 323 | |||
| 324 | static inline void | ||
| 318 | MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, | 325 | MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, |
| 319 | pte_t new_val, unsigned long flags) | 326 | pte_t new_val, unsigned long flags) |
| 320 | { | 327 | { |
diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index e11f24038b1d..377c04591c15 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h | |||
| @@ -26,15 +26,20 @@ typedef struct xpaddr { | |||
| 26 | #define FOREIGN_FRAME_BIT (1UL<<31) | 26 | #define FOREIGN_FRAME_BIT (1UL<<31) |
| 27 | #define FOREIGN_FRAME(m) ((m) | FOREIGN_FRAME_BIT) | 27 | #define FOREIGN_FRAME(m) ((m) | FOREIGN_FRAME_BIT) |
| 28 | 28 | ||
| 29 | extern unsigned long *phys_to_machine_mapping; | 29 | /* Maximum amount of memory we can handle in a domain in pages */ |
| 30 | #define MAX_DOMAIN_PAGES \ | ||
| 31 | ((unsigned long)((u64)CONFIG_XEN_MAX_DOMAIN_MEMORY * 1024 * 1024 * 1024 / PAGE_SIZE)) | ||
| 32 | |||
| 33 | |||
| 34 | extern unsigned long get_phys_to_machine(unsigned long pfn); | ||
| 35 | extern void set_phys_to_machine(unsigned long pfn, unsigned long mfn); | ||
| 30 | 36 | ||
| 31 | static inline unsigned long pfn_to_mfn(unsigned long pfn) | 37 | static inline unsigned long pfn_to_mfn(unsigned long pfn) |
| 32 | { | 38 | { |
| 33 | if (xen_feature(XENFEAT_auto_translated_physmap)) | 39 | if (xen_feature(XENFEAT_auto_translated_physmap)) |
| 34 | return pfn; | 40 | return pfn; |
| 35 | 41 | ||
| 36 | return phys_to_machine_mapping[(unsigned int)(pfn)] & | 42 | return get_phys_to_machine(pfn) & ~FOREIGN_FRAME_BIT; |
| 37 | ~FOREIGN_FRAME_BIT; | ||
| 38 | } | 43 | } |
| 39 | 44 | ||
| 40 | static inline int phys_to_machine_mapping_valid(unsigned long pfn) | 45 | static inline int phys_to_machine_mapping_valid(unsigned long pfn) |
| @@ -42,7 +47,7 @@ static inline int phys_to_machine_mapping_valid(unsigned long pfn) | |||
| 42 | if (xen_feature(XENFEAT_auto_translated_physmap)) | 47 | if (xen_feature(XENFEAT_auto_translated_physmap)) |
| 43 | return 1; | 48 | return 1; |
| 44 | 49 | ||
| 45 | return (phys_to_machine_mapping[pfn] != INVALID_P2M_ENTRY); | 50 | return get_phys_to_machine(pfn) != INVALID_P2M_ENTRY; |
| 46 | } | 51 | } |
| 47 | 52 | ||
| 48 | static inline unsigned long mfn_to_pfn(unsigned long mfn) | 53 | static inline unsigned long mfn_to_pfn(unsigned long mfn) |
| @@ -106,20 +111,12 @@ static inline unsigned long mfn_to_local_pfn(unsigned long mfn) | |||
| 106 | unsigned long pfn = mfn_to_pfn(mfn); | 111 | unsigned long pfn = mfn_to_pfn(mfn); |
| 107 | if ((pfn < max_mapnr) | 112 | if ((pfn < max_mapnr) |
| 108 | && !xen_feature(XENFEAT_auto_translated_physmap) | 113 | && !xen_feature(XENFEAT_auto_translated_physmap) |
| 109 | && (phys_to_machine_mapping[pfn] != mfn)) | 114 | && (get_phys_to_machine(pfn) != mfn)) |
| 110 | return max_mapnr; /* force !pfn_valid() */ | 115 | return max_mapnr; /* force !pfn_valid() */ |
| 116 | /* XXX fixme; not true with sparsemem */ | ||
| 111 | return pfn; | 117 | return pfn; |
| 112 | } | 118 | } |
| 113 | 119 | ||
| 114 | static inline void set_phys_to_machine(unsigned long pfn, unsigned long mfn) | ||
| 115 | { | ||
| 116 | if (xen_feature(XENFEAT_auto_translated_physmap)) { | ||
| 117 | BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY); | ||
| 118 | return; | ||
| 119 | } | ||
| 120 | phys_to_machine_mapping[pfn] = mfn; | ||
| 121 | } | ||
| 122 | |||
| 123 | /* VIRT <-> MACHINE conversion */ | 120 | /* VIRT <-> MACHINE conversion */ |
| 124 | #define virt_to_machine(v) (phys_to_machine(XPADDR(__pa(v)))) | 121 | #define virt_to_machine(v) (phys_to_machine(XPADDR(__pa(v)))) |
| 125 | #define virt_to_mfn(v) (pfn_to_mfn(PFN_DOWN(__pa(v)))) | 122 | #define virt_to_mfn(v) (pfn_to_mfn(PFN_DOWN(__pa(v)))) |
diff --git a/include/asm-x86/xor_32.h b/include/asm-x86/xor_32.h index 067b5c1835a3..921b45840449 100644 --- a/include/asm-x86/xor_32.h +++ b/include/asm-x86/xor_32.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef ASM_X86__XOR_32_H | ||
| 2 | #define ASM_X86__XOR_32_H | ||
| 3 | |||
| 1 | /* | 4 | /* |
| 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 5 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
| 3 | * | 6 | * |
| @@ -881,3 +884,5 @@ do { \ | |||
| 881 | deals with a load to a line that is being prefetched. */ | 884 | deals with a load to a line that is being prefetched. */ |
| 882 | #define XOR_SELECT_TEMPLATE(FASTEST) \ | 885 | #define XOR_SELECT_TEMPLATE(FASTEST) \ |
| 883 | (cpu_has_xmm ? &xor_block_pIII_sse : FASTEST) | 886 | (cpu_has_xmm ? &xor_block_pIII_sse : FASTEST) |
| 887 | |||
| 888 | #endif /* ASM_X86__XOR_32_H */ | ||
diff --git a/include/asm-x86/xor_64.h b/include/asm-x86/xor_64.h index 24957e39ac8a..2d3a18de295b 100644 --- a/include/asm-x86/xor_64.h +++ b/include/asm-x86/xor_64.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | #ifndef ASM_X86__XOR_64_H | ||
| 2 | #define ASM_X86__XOR_64_H | ||
| 3 | |||
| 1 | /* | 4 | /* |
| 2 | * Optimized RAID-5 checksumming functions for MMX and SSE. | 5 | * Optimized RAID-5 checksumming functions for MMX and SSE. |
| 3 | * | 6 | * |
| @@ -354,3 +357,5 @@ do { \ | |||
| 354 | We may also be able to load into the L1 only depending on how the cpu | 357 | We may also be able to load into the L1 only depending on how the cpu |
| 355 | deals with a load to a line that is being prefetched. */ | 358 | deals with a load to a line that is being prefetched. */ |
| 356 | #define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) | 359 | #define XOR_SELECT_TEMPLATE(FASTEST) (&xor_block_sse) |
| 360 | |||
| 361 | #endif /* ASM_X86__XOR_64_H */ | ||
diff --git a/include/linux/console.h b/include/linux/console.h index a4f27fbdf549..248e6e3b9b73 100644 --- a/include/linux/console.h +++ b/include/linux/console.h | |||
| @@ -108,6 +108,8 @@ struct console { | |||
| 108 | struct console *next; | 108 | struct console *next; |
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | extern int console_set_on_cmdline; | ||
| 112 | |||
| 111 | extern int add_preferred_console(char *name, int idx, char *options); | 113 | extern int add_preferred_console(char *name, int idx, char *options); |
| 112 | extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options); | 114 | extern int update_console_cmdline(char *name, int idx, char *name_new, int idx_new, char *options); |
| 113 | extern void register_console(struct console *); | 115 | extern void register_console(struct console *); |
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index f31debfac926..0d2a4e7012aa 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h | |||
| @@ -157,6 +157,7 @@ PAGEFLAG(Active, active) __CLEARPAGEFLAG(Active, active) | |||
| 157 | __PAGEFLAG(Slab, slab) | 157 | __PAGEFLAG(Slab, slab) |
| 158 | PAGEFLAG(Checked, owner_priv_1) /* Used by some filesystems */ | 158 | PAGEFLAG(Checked, owner_priv_1) /* Used by some filesystems */ |
| 159 | PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */ | 159 | PAGEFLAG(Pinned, owner_priv_1) TESTSCFLAG(Pinned, owner_priv_1) /* Xen */ |
| 160 | PAGEFLAG(SavePinned, dirty); /* Xen */ | ||
| 160 | PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) | 161 | PAGEFLAG(Reserved, reserved) __CLEARPAGEFLAG(Reserved, reserved) |
| 161 | PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) | 162 | PAGEFLAG(Private, private) __CLEARPAGEFLAG(Private, private) |
| 162 | __SETPAGEFLAG(Private, private) | 163 | __SETPAGEFLAG(Private, private) |
diff --git a/include/linux/resume-trace.h b/include/linux/resume-trace.h index f3f4f28c6960..c9ba2fdf807d 100644 --- a/include/linux/resume-trace.h +++ b/include/linux/resume-trace.h | |||
| @@ -8,7 +8,7 @@ extern int pm_trace_enabled; | |||
| 8 | 8 | ||
| 9 | struct device; | 9 | struct device; |
| 10 | extern void set_trace_device(struct device *); | 10 | extern void set_trace_device(struct device *); |
| 11 | extern void generate_resume_trace(void *tracedata, unsigned int user); | 11 | extern void generate_resume_trace(const void *tracedata, unsigned int user); |
| 12 | 12 | ||
| 13 | #define TRACE_DEVICE(dev) do { \ | 13 | #define TRACE_DEVICE(dev) do { \ |
| 14 | if (pm_trace_enabled) \ | 14 | if (pm_trace_enabled) \ |
diff --git a/include/xen/events.h b/include/xen/events.h index acd8e062c85f..67c4436554a9 100644 --- a/include/xen/events.h +++ b/include/xen/events.h | |||
| @@ -32,6 +32,7 @@ void unbind_from_irqhandler(unsigned int irq, void *dev_id); | |||
| 32 | 32 | ||
| 33 | void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector); | 33 | void xen_send_IPI_one(unsigned int cpu, enum ipi_vector vector); |
| 34 | int resend_irq_on_evtchn(unsigned int irq); | 34 | int resend_irq_on_evtchn(unsigned int irq); |
| 35 | void rebind_evtchn_irq(int evtchn, int irq); | ||
| 35 | 36 | ||
| 36 | static inline void notify_remote_via_evtchn(int port) | 37 | static inline void notify_remote_via_evtchn(int port) |
| 37 | { | 38 | { |
| @@ -40,4 +41,7 @@ static inline void notify_remote_via_evtchn(int port) | |||
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | extern void notify_remote_via_irq(int irq); | 43 | extern void notify_remote_via_irq(int irq); |
| 44 | |||
| 45 | extern void xen_irq_resume(void); | ||
| 46 | |||
| 43 | #endif /* _XEN_EVENTS_H */ | 47 | #endif /* _XEN_EVENTS_H */ |
diff --git a/include/xen/grant_table.h b/include/xen/grant_table.h index 466204846121..a40f1cd91be1 100644 --- a/include/xen/grant_table.h +++ b/include/xen/grant_table.h | |||
| @@ -51,6 +51,9 @@ struct gnttab_free_callback { | |||
| 51 | u16 count; | 51 | u16 count; |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | int gnttab_suspend(void); | ||
| 55 | int gnttab_resume(void); | ||
| 56 | |||
| 54 | int gnttab_grant_foreign_access(domid_t domid, unsigned long frame, | 57 | int gnttab_grant_foreign_access(domid_t domid, unsigned long frame, |
| 55 | int readonly); | 58 | int readonly); |
| 56 | 59 | ||
diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h index 21c0ecfd786d..98b79bc404dd 100644 --- a/include/xen/hvc-console.h +++ b/include/xen/hvc-console.h | |||
| @@ -3,4 +3,13 @@ | |||
| 3 | 3 | ||
| 4 | extern struct console xenboot_console; | 4 | extern struct console xenboot_console; |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_HVC_XEN | ||
| 7 | void xen_console_resume(void); | ||
| 8 | #else | ||
| 9 | static inline void xen_console_resume(void) { } | ||
| 10 | #endif | ||
| 11 | |||
| 12 | void xen_raw_console_write(const char *str); | ||
| 13 | void xen_raw_printk(const char *fmt, ...); | ||
| 14 | |||
| 6 | #endif /* XEN_HVC_CONSOLE_H */ | 15 | #endif /* XEN_HVC_CONSOLE_H */ |
diff --git a/include/xen/interface/elfnote.h b/include/xen/interface/elfnote.h index a64d3df5bd95..7a8262c375cc 100644 --- a/include/xen/interface/elfnote.h +++ b/include/xen/interface/elfnote.h | |||
| @@ -120,6 +120,26 @@ | |||
| 120 | */ | 120 | */ |
| 121 | #define XEN_ELFNOTE_BSD_SYMTAB 11 | 121 | #define XEN_ELFNOTE_BSD_SYMTAB 11 |
| 122 | 122 | ||
| 123 | /* | ||
| 124 | * The lowest address the hypervisor hole can begin at (numeric). | ||
| 125 | * | ||
| 126 | * This must not be set higher than HYPERVISOR_VIRT_START. Its presence | ||
| 127 | * also indicates to the hypervisor that the kernel can deal with the | ||
| 128 | * hole starting at a higher address. | ||
| 129 | */ | ||
| 130 | #define XEN_ELFNOTE_HV_START_LOW 12 | ||
| 131 | |||
| 132 | /* | ||
| 133 | * List of maddr_t-sized mask/value pairs describing how to recognize | ||
| 134 | * (non-present) L1 page table entries carrying valid MFNs (numeric). | ||
| 135 | */ | ||
| 136 | #define XEN_ELFNOTE_L1_MFN_VALID 13 | ||
| 137 | |||
| 138 | /* | ||
| 139 | * Whether or not the guest supports cooperative suspend cancellation. | ||
| 140 | */ | ||
| 141 | #define XEN_ELFNOTE_SUSPEND_CANCEL 14 | ||
| 142 | |||
| 123 | #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ | 143 | #endif /* __XEN_PUBLIC_ELFNOTE_H__ */ |
| 124 | 144 | ||
| 125 | /* | 145 | /* |
diff --git a/include/xen/interface/features.h b/include/xen/interface/features.h index d73228d16488..f51b6413b054 100644 --- a/include/xen/interface/features.h +++ b/include/xen/interface/features.h | |||
| @@ -38,6 +38,9 @@ | |||
| 38 | */ | 38 | */ |
| 39 | #define XENFEAT_pae_pgdir_above_4gb 4 | 39 | #define XENFEAT_pae_pgdir_above_4gb 4 |
| 40 | 40 | ||
| 41 | /* x86: Does this Xen host support the MMU_PT_UPDATE_PRESERVE_AD hypercall? */ | ||
| 42 | #define XENFEAT_mmu_pt_update_preserve_ad 5 | ||
| 43 | |||
| 41 | #define XENFEAT_NR_SUBMAPS 1 | 44 | #define XENFEAT_NR_SUBMAPS 1 |
| 42 | 45 | ||
| 43 | #endif /* __XEN_PUBLIC_FEATURES_H__ */ | 46 | #endif /* __XEN_PUBLIC_FEATURES_H__ */ |
diff --git a/include/xen/interface/io/fbif.h b/include/xen/interface/io/fbif.h index 5a934dd7796d..974a51ed9165 100644 --- a/include/xen/interface/io/fbif.h +++ b/include/xen/interface/io/fbif.h | |||
| @@ -49,11 +49,27 @@ struct xenfb_update { | |||
| 49 | int32_t height; /* rect height */ | 49 | int32_t height; /* rect height */ |
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /* | ||
| 53 | * Framebuffer resize notification event | ||
| 54 | * Capable backend sets feature-resize in xenstore. | ||
| 55 | */ | ||
| 56 | #define XENFB_TYPE_RESIZE 3 | ||
| 57 | |||
| 58 | struct xenfb_resize { | ||
| 59 | uint8_t type; /* XENFB_TYPE_RESIZE */ | ||
| 60 | int32_t width; /* width in pixels */ | ||
| 61 | int32_t height; /* height in pixels */ | ||
| 62 | int32_t stride; /* stride in bytes */ | ||
| 63 | int32_t depth; /* depth in bits */ | ||
| 64 | int32_t offset; /* start offset within framebuffer */ | ||
| 65 | }; | ||
| 66 | |||
| 52 | #define XENFB_OUT_EVENT_SIZE 40 | 67 | #define XENFB_OUT_EVENT_SIZE 40 |
| 53 | 68 | ||
| 54 | union xenfb_out_event { | 69 | union xenfb_out_event { |
| 55 | uint8_t type; | 70 | uint8_t type; |
| 56 | struct xenfb_update update; | 71 | struct xenfb_update update; |
| 72 | struct xenfb_resize resize; | ||
| 57 | char pad[XENFB_OUT_EVENT_SIZE]; | 73 | char pad[XENFB_OUT_EVENT_SIZE]; |
| 58 | }; | 74 | }; |
| 59 | 75 | ||
| @@ -105,15 +121,18 @@ struct xenfb_page { | |||
| 105 | * Each directory page holds PAGE_SIZE / sizeof(*pd) | 121 | * Each directory page holds PAGE_SIZE / sizeof(*pd) |
| 106 | * framebuffer pages, and can thus map up to PAGE_SIZE * | 122 | * framebuffer pages, and can thus map up to PAGE_SIZE * |
| 107 | * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE == 4096 and | 123 | * PAGE_SIZE / sizeof(*pd) bytes. With PAGE_SIZE == 4096 and |
| 108 | * sizeof(unsigned long) == 4, that's 4 Megs. Two directory | 124 | * sizeof(unsigned long) == 4/8, that's 4 Megs 32 bit and 2 |
| 109 | * pages should be enough for a while. | 125 | * Megs 64 bit. 256 directories give enough room for a 512 |
| 126 | * Meg framebuffer with a max resolution of 12,800x10,240. | ||
| 127 | * Should be enough for a while with room leftover for | ||
| 128 | * expansion. | ||
| 110 | */ | 129 | */ |
| 111 | unsigned long pd[2]; | 130 | unsigned long pd[256]; |
| 112 | }; | 131 | }; |
| 113 | 132 | ||
| 114 | /* | 133 | /* |
| 115 | * Wart: xenkbd needs to know resolution. Put it here until a better | 134 | * Wart: xenkbd needs to know default resolution. Put it here until a |
| 116 | * solution is found, but don't leak it to the backend. | 135 | * better solution is found, but don't leak it to the backend. |
| 117 | */ | 136 | */ |
| 118 | #ifdef __KERNEL__ | 137 | #ifdef __KERNEL__ |
| 119 | #define XENFB_WIDTH 800 | 138 | #define XENFB_WIDTH 800 |
diff --git a/include/xen/interface/io/kbdif.h b/include/xen/interface/io/kbdif.h index fb97f4284ffd..8066c7849fbe 100644 --- a/include/xen/interface/io/kbdif.h +++ b/include/xen/interface/io/kbdif.h | |||
| @@ -49,6 +49,7 @@ struct xenkbd_motion { | |||
| 49 | uint8_t type; /* XENKBD_TYPE_MOTION */ | 49 | uint8_t type; /* XENKBD_TYPE_MOTION */ |
| 50 | int32_t rel_x; /* relative X motion */ | 50 | int32_t rel_x; /* relative X motion */ |
| 51 | int32_t rel_y; /* relative Y motion */ | 51 | int32_t rel_y; /* relative Y motion */ |
| 52 | int32_t rel_z; /* relative Z motion (wheel) */ | ||
| 52 | }; | 53 | }; |
| 53 | 54 | ||
| 54 | struct xenkbd_key { | 55 | struct xenkbd_key { |
| @@ -61,6 +62,7 @@ struct xenkbd_position { | |||
| 61 | uint8_t type; /* XENKBD_TYPE_POS */ | 62 | uint8_t type; /* XENKBD_TYPE_POS */ |
| 62 | int32_t abs_x; /* absolute X position (in FB pixels) */ | 63 | int32_t abs_x; /* absolute X position (in FB pixels) */ |
| 63 | int32_t abs_y; /* absolute Y position (in FB pixels) */ | 64 | int32_t abs_y; /* absolute Y position (in FB pixels) */ |
| 65 | int32_t rel_z; /* relative Z motion (wheel) */ | ||
| 64 | }; | 66 | }; |
| 65 | 67 | ||
| 66 | #define XENKBD_IN_EVENT_SIZE 40 | 68 | #define XENKBD_IN_EVENT_SIZE 40 |
diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h index da768469aa92..af36ead16817 100644 --- a/include/xen/interface/memory.h +++ b/include/xen/interface/memory.h | |||
| @@ -29,7 +29,7 @@ struct xen_memory_reservation { | |||
| 29 | * OUT: GMFN bases of extents that were allocated | 29 | * OUT: GMFN bases of extents that were allocated |
| 30 | * (NB. This command also updates the mach_to_phys translation table) | 30 | * (NB. This command also updates the mach_to_phys translation table) |
| 31 | */ | 31 | */ |
| 32 | ulong extent_start; | 32 | GUEST_HANDLE(ulong) extent_start; |
| 33 | 33 | ||
| 34 | /* Number of extents, and size/alignment of each (2^extent_order pages). */ | 34 | /* Number of extents, and size/alignment of each (2^extent_order pages). */ |
| 35 | unsigned long nr_extents; | 35 | unsigned long nr_extents; |
| @@ -50,6 +50,7 @@ struct xen_memory_reservation { | |||
| 50 | domid_t domid; | 50 | domid_t domid; |
| 51 | 51 | ||
| 52 | }; | 52 | }; |
| 53 | DEFINE_GUEST_HANDLE_STRUCT(xen_memory_reservation); | ||
| 53 | 54 | ||
| 54 | /* | 55 | /* |
| 55 | * Returns the maximum machine frame number of mapped RAM in this system. | 56 | * Returns the maximum machine frame number of mapped RAM in this system. |
| @@ -85,7 +86,7 @@ struct xen_machphys_mfn_list { | |||
| 85 | * any large discontiguities in the machine address space, 2MB gaps in | 86 | * any large discontiguities in the machine address space, 2MB gaps in |
| 86 | * the machphys table will be represented by an MFN base of zero. | 87 | * the machphys table will be represented by an MFN base of zero. |
| 87 | */ | 88 | */ |
| 88 | ulong extent_start; | 89 | GUEST_HANDLE(ulong) extent_start; |
| 89 | 90 | ||
| 90 | /* | 91 | /* |
| 91 | * Number of extents written to the above array. This will be smaller | 92 | * Number of extents written to the above array. This will be smaller |
| @@ -93,6 +94,7 @@ struct xen_machphys_mfn_list { | |||
| 93 | */ | 94 | */ |
| 94 | unsigned int nr_extents; | 95 | unsigned int nr_extents; |
| 95 | }; | 96 | }; |
| 97 | DEFINE_GUEST_HANDLE_STRUCT(xen_machphys_mfn_list); | ||
| 96 | 98 | ||
| 97 | /* | 99 | /* |
| 98 | * Sets the GPFN at which a particular page appears in the specified guest's | 100 | * Sets the GPFN at which a particular page appears in the specified guest's |
| @@ -115,6 +117,7 @@ struct xen_add_to_physmap { | |||
| 115 | /* GPFN where the source mapping page should appear. */ | 117 | /* GPFN where the source mapping page should appear. */ |
| 116 | unsigned long gpfn; | 118 | unsigned long gpfn; |
| 117 | }; | 119 | }; |
| 120 | DEFINE_GUEST_HANDLE_STRUCT(xen_add_to_physmap); | ||
| 118 | 121 | ||
| 119 | /* | 122 | /* |
| 120 | * Translates a list of domain-specific GPFNs into MFNs. Returns a -ve error | 123 | * Translates a list of domain-specific GPFNs into MFNs. Returns a -ve error |
| @@ -129,13 +132,14 @@ struct xen_translate_gpfn_list { | |||
| 129 | unsigned long nr_gpfns; | 132 | unsigned long nr_gpfns; |
| 130 | 133 | ||
| 131 | /* List of GPFNs to translate. */ | 134 | /* List of GPFNs to translate. */ |
| 132 | ulong gpfn_list; | 135 | GUEST_HANDLE(ulong) gpfn_list; |
| 133 | 136 | ||
| 134 | /* | 137 | /* |
| 135 | * Output list to contain MFN translations. May be the same as the input | 138 | * Output list to contain MFN translations. May be the same as the input |
| 136 | * list (in which case each input GPFN is overwritten with the output MFN). | 139 | * list (in which case each input GPFN is overwritten with the output MFN). |
| 137 | */ | 140 | */ |
| 138 | ulong mfn_list; | 141 | GUEST_HANDLE(ulong) mfn_list; |
| 139 | }; | 142 | }; |
| 143 | DEFINE_GUEST_HANDLE_STRUCT(xen_translate_gpfn_list); | ||
| 140 | 144 | ||
| 141 | #endif /* __XEN_PUBLIC_MEMORY_H__ */ | 145 | #endif /* __XEN_PUBLIC_MEMORY_H__ */ |
diff --git a/include/xen/interface/xen.h b/include/xen/interface/xen.h index 819a0331cda9..2befa3e2f1bc 100644 --- a/include/xen/interface/xen.h +++ b/include/xen/interface/xen.h | |||
| @@ -114,9 +114,14 @@ | |||
| 114 | * ptr[:2] -- Machine address within the frame whose mapping to modify. | 114 | * ptr[:2] -- Machine address within the frame whose mapping to modify. |
| 115 | * The frame must belong to the FD, if one is specified. | 115 | * The frame must belong to the FD, if one is specified. |
| 116 | * val -- Value to write into the mapping entry. | 116 | * val -- Value to write into the mapping entry. |
| 117 | * | ||
| 118 | * ptr[1:0] == MMU_PT_UPDATE_PRESERVE_AD: | ||
| 119 | * As MMU_NORMAL_PT_UPDATE above, but A/D bits currently in the PTE are ORed | ||
| 120 | * with those in @val. | ||
| 117 | */ | 121 | */ |
| 118 | #define MMU_NORMAL_PT_UPDATE 0 /* checked '*ptr = val'. ptr is MA. */ | 122 | #define MMU_NORMAL_PT_UPDATE 0 /* checked '*ptr = val'. ptr is MA. */ |
| 119 | #define MMU_MACHPHYS_UPDATE 1 /* ptr = MA of frame to modify entry for */ | 123 | #define MMU_MACHPHYS_UPDATE 1 /* ptr = MA of frame to modify entry for */ |
| 124 | #define MMU_PT_UPDATE_PRESERVE_AD 2 /* atomically: *ptr = val | (*ptr&(A|D)) */ | ||
| 120 | 125 | ||
| 121 | /* | 126 | /* |
| 122 | * MMU EXTENDED OPERATIONS | 127 | * MMU EXTENDED OPERATIONS |
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 10ddfe0142d0..a706d6a78960 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h | |||
| @@ -5,4 +5,10 @@ | |||
| 5 | 5 | ||
| 6 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); | 6 | DECLARE_PER_CPU(struct vcpu_info *, xen_vcpu); |
| 7 | 7 | ||
| 8 | void xen_pre_suspend(void); | ||
| 9 | void xen_post_suspend(int suspend_cancelled); | ||
| 10 | |||
| 11 | void xen_mm_pin_all(void); | ||
| 12 | void xen_mm_unpin_all(void); | ||
| 13 | |||
| 8 | #endif /* INCLUDE_XEN_OPS_H */ | 14 | #endif /* INCLUDE_XEN_OPS_H */ |
diff --git a/kernel/printk.c b/kernel/printk.c index 8fb01c32aa3b..028ed75d4864 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -121,6 +121,8 @@ struct console_cmdline | |||
| 121 | static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; | 121 | static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES]; |
| 122 | static int selected_console = -1; | 122 | static int selected_console = -1; |
| 123 | static int preferred_console = -1; | 123 | static int preferred_console = -1; |
| 124 | int console_set_on_cmdline; | ||
| 125 | EXPORT_SYMBOL(console_set_on_cmdline); | ||
| 124 | 126 | ||
| 125 | /* Flag: console code may call schedule() */ | 127 | /* Flag: console code may call schedule() */ |
| 126 | static int console_may_schedule; | 128 | static int console_may_schedule; |
| @@ -890,6 +892,7 @@ static int __init console_setup(char *str) | |||
| 890 | *s = 0; | 892 | *s = 0; |
| 891 | 893 | ||
| 892 | __add_preferred_console(buf, idx, options, brl_options); | 894 | __add_preferred_console(buf, idx, options, brl_options); |
| 895 | console_set_on_cmdline = 1; | ||
| 893 | return 1; | 896 | return 1; |
| 894 | } | 897 | } |
| 895 | __setup("console=", console_setup); | 898 | __setup("console=", console_setup); |
diff --git a/mm/mprotect.c b/mm/mprotect.c index a5bf31c27375..acfe7c8d72fc 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c | |||
| @@ -47,19 +47,17 @@ static void change_pte_range(struct mm_struct *mm, pmd_t *pmd, | |||
| 47 | if (pte_present(oldpte)) { | 47 | if (pte_present(oldpte)) { |
| 48 | pte_t ptent; | 48 | pte_t ptent; |
| 49 | 49 | ||
| 50 | /* Avoid an SMP race with hardware updated dirty/clean | 50 | ptent = ptep_modify_prot_start(mm, addr, pte); |
| 51 | * bits by wiping the pte and then setting the new pte | ||
| 52 | * into place. | ||
| 53 | */ | ||
| 54 | ptent = ptep_get_and_clear(mm, addr, pte); | ||
| 55 | ptent = pte_modify(ptent, newprot); | 51 | ptent = pte_modify(ptent, newprot); |
| 52 | |||
| 56 | /* | 53 | /* |
| 57 | * Avoid taking write faults for pages we know to be | 54 | * Avoid taking write faults for pages we know to be |
| 58 | * dirty. | 55 | * dirty. |
| 59 | */ | 56 | */ |
| 60 | if (dirty_accountable && pte_dirty(ptent)) | 57 | if (dirty_accountable && pte_dirty(ptent)) |
| 61 | ptent = pte_mkwrite(ptent); | 58 | ptent = pte_mkwrite(ptent); |
| 62 | set_pte_at(mm, addr, pte, ptent); | 59 | |
| 60 | ptep_modify_prot_commit(mm, addr, pte, ptent); | ||
| 63 | #ifdef CONFIG_MIGRATION | 61 | #ifdef CONFIG_MIGRATION |
| 64 | } else if (!pte_file(oldpte)) { | 62 | } else if (!pte_file(oldpte)) { |
| 65 | swp_entry_t entry = pte_to_swp_entry(oldpte); | 63 | swp_entry_t entry = pte_to_swp_entry(oldpte); |
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index 1dcf9f3d1107..44589088941f 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c | |||
| @@ -278,7 +278,7 @@ static void __kvm_ioapic_update_eoi(struct kvm_ioapic *ioapic, int gsi) | |||
| 278 | 278 | ||
| 279 | ent->fields.remote_irr = 0; | 279 | ent->fields.remote_irr = 0; |
| 280 | if (!ent->fields.mask && (ioapic->irr & (1 << gsi))) | 280 | if (!ent->fields.mask && (ioapic->irr & (1 << gsi))) |
| 281 | ioapic_deliver(ioapic, gsi); | 281 | ioapic_service(ioapic, gsi); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) | 284 | void kvm_ioapic_update_eoi(struct kvm *kvm, int vector) |