x86 fixes for 2.6.33-rc6
H. Peter Anvin
maintainerThe following changes since commit b04da8bfdfbbd79544cab2fadfdc12e87eb01600:
Greg Kroah-Hartman (1):
fnctl: f_modown should call write_lock_irqsave/restore
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/x86/linux-2.6-tip.git x86-fixes-for-linus
Andreas Herrmann (1):
Revert "x86: ucode-amd: Load ucode-patches once ..."
David Rientjes (1):
x86: Set hotpluggable nodes in nodes_possible_map
H. Peter Anvin (1):
x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG)
Pallipadi, Venkatesh (1):
x86: Disable HPET MSI on ATI SB700/SB800
Russ Anderson (1):
x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
arch/x86/Kconfig | 6 - arch/x86/include/asm/cpu_debug.h | 127 ------- arch/x86/include/asm/hpet.h | 1 + arch/x86/include/asm/microcode.h | 2 - arch/x86/kernel/cpu/Makefile | 2 - arch/x86/kernel/cpu/cpu_debug.c | 688 -------------------------------------- arch/x86/kernel/cpuid.c | 2 +- arch/x86/kernel/hpet.c | 8 + arch/x86/kernel/microcode_amd.c | 44 +-- arch/x86/kernel/microcode_core.c | 6 - arch/x86/kernel/msr.c | 2 +- arch/x86/kernel/quirks.c | 13 + arch/x86/mm/srat_64.c | 4 +- 13 files changed, 40 insertions(+), 865 deletions(-) delete mode 100644 arch/x86/include/asm/cpu_debug.h delete mode 100644 arch/x86/kernel/cpu/cpu_debug.c
arch/x86/Kconfig +0 -6
@@ -989,12 +989,6 @@ config X86_CPUID with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to /dev/cpu/31/cpuid. -config X86_CPU_DEBUG - tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support" - ---help--- - If you select this option, this will provide various x86 CPUs - information through debugfs. - choice prompt "High Memory Support" default HIGHMEM4G if !X86_NUMAQ
arch/x86/include/asm/cpu_debug.h deleted +0 -127
127 lines not on this page · raw message
arch/x86/include/asm/hpet.h +1 -0
@@ -67,6 +67,7 @@ extern unsigned long hpet_address;extern unsigned long force_hpet_address;extern u8 hpet_blockid;extern int hpet_force_user; +extern u8 hpet_msi_disable;extern int is_hpet_enabled (void );extern int hpet_enable (void );extern void hpet_disable (void );
arch/x86/include/asm/microcode.h +0 -2
@@ -12,8 +12,6 @@ struct device;enum ucode_state {UCODE_ERROR ,UCODE_OK ,UCODE_NFOUND };struct microcode_ops { -void (*init)(struct device *device); -void (*fini)(void );enum ucode_state (*request_microcode_user) (int cpu,const void __user *buf,size_t size);
arch/x86/kernel/cpu/Makefile +0 -2
@@ -19,8 +19,6 @@ obj-y += vmware.o hypervisor.o sched.o obj-$(CONFIG_X86_32) += bugs.o cmpxchg.o obj-$(CONFIG_X86_64) += bugs_64.o -obj-$(CONFIG_X86_CPU_DEBUG) += cpu_debug.o - obj-$(CONFIG_CPU_SUP_INTEL) += intel.o obj-$(CONFIG_CPU_SUP_AMD) += amd.o obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o
arch/x86/kernel/cpu/cpu_debug.c deleted +0 -688
688 lines not on this page · raw message
arch/x86/kernel/cpuid.c +1 -1
@@ -229,7 +229,7 @@ static void __exit cpuid_exit(void)for_each_online_cpu (cpu)cpuid_device_destroy (cpu);class_destroy (cpuid_class); -unregister_chrdev (CPUID_MAJOR ,"cpu/cpuid" ); +__unregister_chrdev (CPUID_MAJOR ,0 ,NR_CPUS ,"cpu/cpuid" );unregister_hotcpu_notifier (&cpuid_class_cpu_notifier); }
arch/x86/kernel/hpet.c +8 -0
@@ -34,6 +34,8 @@*/ unsigned long hpet_address;u8 hpet_blockid;/* OS timer block num */ +u8 hpet_msi_disable; +#ifdef CONFIG_PCI_MSI static unsigned long hpet_num_timers;#endif
@@ -596,6 +598,9 @@ static void hpet_msi_capability_lookup(unsigned int start_timer)unsigned int num_timers_used =0 ;int i; +if (hpet_msi_disable) +return ; +if (boot_cpu_has (X86_FEATURE_ARAT ))return ; id =hpet_readl (HPET_ID );
@@ -928,6 +933,9 @@ static __init int hpet_late_init(void)hpet_reserve_platform_timers (hpet_readl (HPET_ID ));hpet_print_config (); +if (hpet_msi_disable) +return 0 ; +if (boot_cpu_has (X86_FEATURE_ARAT ))return 0 ;
arch/x86/kernel/microcode_amd.c +13 -31
81 lines not on this page · raw message
arch/x86/kernel/microcode_core.c +0 -6
@@ -521,9 +521,6 @@ static int __init microcode_init(void)return PTR_ERR (microcode_pdev); } -if (microcode_ops->init) - microcode_ops->init (µcode_pdev->dev); -get_online_cpus ();mutex_lock (µcode_mutex);
@@ -566,9 +563,6 @@ static void __exit microcode_exit(void)platform_device_unregister (microcode_pdev); -if (microcode_ops->fini) - microcode_ops->fini (); - microcode_ops =NULL ;pr_info ("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n" );
arch/x86/kernel/msr.c +1 -1
@@ -285,7 +285,7 @@ static void __exit msr_exit(void)for_each_online_cpu (cpu)msr_device_destroy (cpu);class_destroy (msr_class); -unregister_chrdev (MSR_MAJOR ,"cpu/msr" ); +__unregister_chrdev (MSR_MAJOR ,0 ,NR_CPUS ,"cpu/msr" );unregister_hotcpu_notifier (&msr_class_cpu_notifier); }
arch/x86/kernel/quirks.c +13 -0
@@ -491,6 +491,19 @@ void force_hpet_resume(void) break; } } + +/* +* HPET MSI on some boards (ATI SB700/SB800) has side effect on +* floppy DMA. Disable HPET MSI on such platforms. +*/ +static void force_disable_hpet_msi (struct pci_dev *unused) +{ + hpet_msi_disable =1 ; +} + +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_SBX00_SMBUS , + force_disable_hpet_msi); +#endif #if defined(CONFIG_PCI ) && defined(CONFIG_NUMA )
arch/x86/mm/srat_64.c +3 -1
@@ -229,9 +229,11 @@ update_nodes_add(int node, unsigned long start, unsigned long end)printk (KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n" ); } -if (changed) +if (changed) { +node_set (node, cpu_nodes_parsed);printk (KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n" , nd->start, nd->end); + } }/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
Quoted 2 lines · H. Peter Anvin
git://git.kernel.org/pub/scm/linux/kernel/x86/linux-2.6-tip.gitx86-fixes-for-linus
That doesn't work for me at all.
I assume you meant
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
(note the "git/tip" instead of "x86")
Linus
Quoted 5 lines · Linus Torvalds
Quoted 2 lines · H. Peter Anvin
git://git.kernel.org/pub/scm/linux/kernel/x86/linux-2.6-tip.gitx86-fixes-for-linusThat doesn't work for me at all.
i think Peter typoed it and the git/ portion went missing, it should have been:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git x86-fixes-for-linus
Quoted 5 lines
I assume you meant
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitx86-fixes-for-linus(note the "git/tip" instead of "x86")
Yes, that works too. The x86 repo is symlinked to the tip repo.
Ingo
H. Peter Anvin
maintainerQuoted 14 lines · Ingo Molnar
Quoted 5 lines · Linus Torvalds
Quoted 2 lines · H. Peter Anvin
git://git.kernel.org/pub/scm/linux/kernel/x86/linux-2.6-tip.gitx86-fixes-for-linusThat doesn't work for me at all.
i think Peter typoed it and the git/ portion went missing, it should have been:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git x86-fixes-for-linus
Quoted 8 lines
Quoted 5 lines
I assume you meant
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.gitx86-fixes-for-linus(note the "git/tip" instead of "x86")
Yes, that works too. The x86 repo is symlinked to the tip repo.
Sorry about that. Get it done before bed syndrome.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.