x86 fixes
Subsystems (6)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
out-of-topic modifications in x86-urgent-for-linus:
---------------------------------------------------
drivers/iommu/intel-iommu.c # c8f369a: intel-iommu: Fix section mismatch drivers/iommu/intr_remapping.c # 61ed26e: intr_remapping: Fix section misma drivers/power/intel_mid_battery.c # a7a2804: x86/mrst: Battery fixes include/linux/pci_ids.h # f62ef5f: x86, amd: Fix up numa_node inform
Thanks,
Ingo
------------------>
Ajaykumar Hotchandani (1):
x86/mtrr: Resolve inconsistency with Intel processor manual
Andreas Herrmann (1):
x86, amd: Fix up numa_node information for AMD CPU family 15h model 0-0fh northbridge functions
Bjorn Helgaas (1):
x86/mpparse: Account for bus types other than ISA and PCI
Borislav Petkov (2):
x86: Document rdmsr_safe restrictions x86, AMD: Correct align_va_addr documentation
Feng Tang (1):
x86, mrst: Change the pmic_gpio device type to IPC
Jack Steiner (1):
x86, UV: Fix UV2 hub part number
Jacob Pan (1):
x86,mrst: Power control commands update
Jekyll Lai (1):
mrst: Added some platform data for the SFI translations
Konrad Rzeszutek Wilk (1):
x86/paravirt: PTE updates in k(un)map_atomic need to be synchronous, regardless of lazy_mmu mode
Major Lee (1):
x86/mrst: Battery fixes
Mathias Nyman (1):
x86/rtc, mrst: Don't register a platform RTC device for for Intel MID platforms
Mitsuo Hayasaka (1):
x86: Add user_mode_vm check in stack_overflow_check
Peter Chubb (1):
x86: Fix "Acer Aspire 1" reboot hang
Prarit Bhargava (1):
Add TAINT_FIRMWARE_WORKAROUND on MTRR fixup
Rafael J. Wysocki (1):
x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot
Sergey Senozhatsky (2):
intel-iommu: Fix section mismatch in dmar_parse_rmrr_atsr_dev()
intr_remapping: Fix section mismatch in ir_dev_scope_init()
Srivatsa S. Bhat (1):
x86, microcode: Fix the failure path of microcode update driver init code
Documentation/kernel-parameters.txt | 4 +- arch/x86/include/asm/intel_scu_ipc.h | 14 ++++-- arch/x86/include/asm/mrst.h | 9 ++++ arch/x86/include/asm/msr.h | 9 ++++- arch/x86/include/asm/uv/uv_mmrs.h | 1 + arch/x86/kernel/apic/x2apic_uv_x.c | 2 + arch/x86/kernel/cpu/mtrr/generic.c | 2 + arch/x86/kernel/irq_64.c | 3 + arch/x86/kernel/microcode_core.c | 28 +++++++++---- arch/x86/kernel/mpparse.c | 2 +- arch/x86/kernel/quirks.c | 13 ++++++ arch/x86/kernel/reboot.c | 21 +++++++++- arch/x86/kernel/rtc.c | 5 ++ arch/x86/mm/highmem_32.c | 2 + arch/x86/platform/mrst/mrst.c | 68 ++++++++++++++++++++++++++++----- drivers/iommu/intel-iommu.c | 2 +- drivers/iommu/intr_remapping.c | 2 +- drivers/power/intel_mid_battery.c | 12 +++--- include/linux/pci_ids.h | 4 ++ 19 files changed, 164 insertions(+), 39 deletions(-)
Documentation/kernel-parameters.txt +2 -2
@@ -315,8 +315,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. CPU-intensive style benchmark, and it can vary highly in a microbenchmark depending on workload and compiler. - 1: only for 32-bit processes - 2: only for 64-bit processes + 32: only for 32-bit processes + 64: only for 64-bit processes on: enable for both 32- and 64-bit processes off: disable for both 32- and 64-bit processes
arch/x86/include/asm/intel_scu_ipc.h +9 -5
@@ -3,11 +3,15 @@#include <linux/notifier.h> -#define IPCMSG_VRTC 0xFA/* Set vRTC device */ - -/* Command id associated with message IPCMSG_VRTC */ -#define IPC_CMD_VRTC_SETTIME 1/* Set time */ -#define IPC_CMD_VRTC_SETALARM 2/* Set alarm */ +#define IPCMSG_WARM_RESET 0xF0 +#define IPCMSG_COLD_RESET 0xF1 +#define IPCMSG_SOFT_RESET 0xF2 +#define IPCMSG_COLD_BOOT 0xF3 + +#define IPCMSG_VRTC 0xFA/* Set vRTC device */ +/* Command id associated with message IPCMSG_VRTC */ +#define IPC_CMD_VRTC_SETTIME 1/* Set time */ +#define IPC_CMD_VRTC_SETALARM 2/* Set alarm */ /* Read single register */ int intel_scu_ipc_ioread8 (u16 addr,u8 *data);
arch/x86/include/asm/mrst.h +9 -0
@@ -31,11 +31,20 @@ enum mrst_cpu_type { };extern enum mrst_cpu_type __mrst_cpu_chip; + +#ifdef CONFIG_X86_INTEL_MID +static inline enum mrst_cpu_type mrst_identify_cpu (void ) {return __mrst_cpu_chip; } +#else /* !CONFIG_X86_INTEL_MID */ + +#define mrst_identify_cpu () (0) + +#endif /* !CONFIG_X86_INTEL_MID */ +enum mrst_timer_options {MRST_TIMER_DEFAULT ,MRST_TIMER_APBT_ONLY ,
arch/x86/include/asm/msr.h +8 -1
@@ -169,7 +169,14 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)return native_write_msr_safe (msr, low, high); } -/* rdmsr with exception handling */ +/* +* rdmsr with exception handling. +* +* Please note that the exception handling works only after we've +* switched to the "smart" #GP handler in trap_init() which knows about +* exception tables - using this macro earlier than that causes machine +* hangs on boxes which do not implement the @msr in the first argument. +*/ #define rdmsr_safe (msr, p1, p2) \ ({ \ int __err; \
arch/x86/include/asm/uv/uv_mmrs.h +1 -0
@@ -57,6 +57,7 @@#define UV1_HUB_PART_NUMBER 0x88a5#define UV2_HUB_PART_NUMBER 0x8eb8 +#define UV2_HUB_PART_NUMBER_X 0x1111/* Compat: if this #define is present, UV headers support UV2 */ #define UV2_HUB_IS_SUPPORTED 1
arch/x86/kernel/apic/x2apic_uv_x.c +2 -0
@@ -93,6 +93,8 @@ static int __init early_get_pnodeid(void)if (node_id.s.part_number ==UV2_HUB_PART_NUMBER ) uv_min_hub_revision_id +=UV2_HUB_REVISION_BASE -1 ; +if (node_id.s.part_number ==UV2_HUB_PART_NUMBER_X ) + uv_min_hub_revision_id +=UV2_HUB_REVISION_BASE -1 ; uv_hub_info->hub_revision = uv_min_hub_revision_id; pnode = (node_id.s.node_id >>1 ) & ((1 << m_n_config.s.n_skt) -1 );
arch/x86/kernel/cpu/mtrr/generic.c +2 -0
@@ -547,6 +547,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,if (tmp != mask_lo) {printk (KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n" ); +add_taint (TAINT_FIRMWARE_WORKAROUND ); mask_lo = tmp; } }
@@ -693,6 +694,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)/* Disable MTRRs, and set the default type to uncached */ mtrr_wrmsr (MSR_MTRRdefType, deftype_lo & ~0xcff , deftype_hi); +wbinvd (); } static void post_set(void) __releases(set_atomicity_lock)
arch/x86/kernel/irq_64.c +3 -0
@@ -38,6 +38,9 @@ static inline void stack_overflow_check(struct pt_regs *regs)#ifdef CONFIG_DEBUG_STACKOVERFLOW u64 curbase = (u64 )task_stack_page (current); +if (user_mode_vm (regs)) +return ; + WARN_ONCE(regs->sp >= curbase && regs->sp <= curbase + THREAD_SIZE && regs->sp < curbase + sizeof(struct thread_info) +
arch/x86/kernel/microcode_core.c +19 -9
@@ -256,7 +256,7 @@ static int __init microcode_dev_init(void)return 0 ; } -static void microcode_dev_exit (void ) +static void __exit microcode_dev_exit(void) {misc_deregister (µcode_dev); }
@@ -519,10 +519,8 @@ static int __init microcode_init(void) microcode_pdev =platform_device_register_simple ("microcode" ,-1 ,NULL ,0 ); -if (IS_ERR (microcode_pdev)) { -microcode_dev_exit (); +if (IS_ERR (microcode_pdev))return PTR_ERR (microcode_pdev); - }get_online_cpus ();mutex_lock (µcode_mutex);
@@ -532,14 +530,12 @@ static int __init microcode_init(void)mutex_unlock (µcode_mutex);put_online_cpus (); -if (error) { -platform_device_unregister (microcode_pdev); -return error; - } +if (error) + goto out_pdev; error =microcode_dev_init ();if (error) -return error; + goto out_sysdev_driver;register_syscore_ops (&mc_syscore_ops);register_hotcpu_notifier (&mc_cpu_notifier);
@@ -548,6 +544,20 @@ static int __init microcode_init(void) " <[email protected]>, Peter Oruba\n");return 0 ; + +out_sysdev_driver: +get_online_cpus (); +mutex_lock (µcode_mutex); + +sysdev_driver_unregister (&cpu_sysdev_class, &mc_sysdev_driver); + +mutex_unlock (µcode_mutex); +put_online_cpus (); + +out_pdev: +platform_device_unregister (microcode_pdev); +return error; + }module_init (microcode_init);
arch/x86/kernel/mpparse.c +1 -1
@@ -95,8 +95,8 @@ static void __init MP_bus_info(struct mpc_bus *m) }#endif +set_bit (m->busid, mp_bus_not_pci);if (strncmp (str,BUSTYPE_ISA ,sizeof (BUSTYPE_ISA ) -1 ) ==0 ) { -set_bit (m->busid, mp_bus_not_pci);#if defined(CONFIG_EISA ) || defined(CONFIG_MCA ) mp_bus_id_to_type[m->busid] =MP_BUS_ISA ;#endif
arch/x86/kernel/quirks.c +13 -0
@@ -553,4 +553,17 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC, quirk_amd_nb_node);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_10H_NB_LINK , quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F0 , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F1 , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F2 , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F3 , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F4 , + quirk_amd_nb_node); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_15H_NB_F5 , + quirk_amd_nb_node); +#endif
arch/x86/kernel/reboot.c +19 -2
@@ -124,7 +124,7 @@ __setup("reboot=", reboot_setup);*/ /* -* Some machines require the "reboot=b" commandline option, +* Some machines require the "reboot=b" or "reboot=k" commandline options, * this quirk makes that automatic. */ static int __init set_bios_reboot (const struct dmi_system_id *d)
@@ -136,6 +136,15 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)return 0 ; } +static int __init set_kbd_reboot (const struct dmi_system_id *d) +{ +if (reboot_type !=BOOT_KBD ) { + reboot_type =BOOT_KBD ; +printk (KERN_INFO "%s series board detected. Selecting KBD-method for reboot.\n" , d->ident); + } +return 0 ; +} +static struct dmi_system_id __initdata reboot_dmi_table[] = { {/* Handle problems with rebooting on Dell E520's */ .callback = set_bios_reboot,
@@ -295,7 +304,7 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, }, {/* Handle reboot issue on Acer Aspire one */ - .callback = set_bios_reboot, + .callback = set_kbd_reboot, .ident = "Acer Aspire One A110", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -443,6 +452,14 @@ static struct dmi_system_id __initdata pci_reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6420"), }, }, + { /* Handle problems with rebooting on the OptiPlex 990. */ + .callback = set_pci_reboot, + .ident = "Dell OptiPlex 990", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + }, + }, { } };
arch/x86/kernel/rtc.c +5 -0
@@ -12,6 +12,7 @@#include <asm/vsyscall.h> #include <asm/x86_init.h> #include <asm/time.h> +#include <asm/mrst.h> #ifdef CONFIG_X86_32 /*
@@ -242,6 +243,10 @@ static __init int add_rtc_cmos(void)if (of_have_populated_dt ())return 0 ; +/* Intel MID platforms don't have ioport rtc */ +if (mrst_identify_cpu ()) +return -ENODEV ; +platform_device_register (&rtc_device);dev_info (&rtc_device.dev,"registered platform RTC device (no PNP device found)\n" );
arch/x86/mm/highmem_32.c +2 -0
@@ -45,6 +45,7 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot) vaddr =__fix_to_virt (FIX_KMAP_BEGIN + idx);BUG_ON (!pte_none (*(kmap_pte-idx)));set_pte (kmap_pte-idx,mk_pte (page, prot)); +arch_flush_lazy_mmu_mode ();return (void *)vaddr; }
@@ -88,6 +89,7 @@ void __kunmap_atomic(void *kvaddr)*/ kpte_clear_flush (kmap_pte-idx, vaddr);kmap_atomic_idx_pop (); +arch_flush_lazy_mmu_mode (); }#ifdef CONFIG_DEBUG_HIGHMEM else {
arch/x86/platform/mrst/mrst.c +57 -11
98 lines not on this page · raw message
drivers/iommu/intel-iommu.c +1 -1
@@ -3524,7 +3524,7 @@ found:return 0 ; } -int dmar_parse_rmrr_atsr_dev (void ) +int __init dmar_parse_rmrr_atsr_dev (void ) {struct dmar_rmrr_unit *rmrr, *rmrr_n;struct dmar_atsr_unit *atsr, *atsr_n;
drivers/iommu/intr_remapping.c +1 -1
@@ -773,7 +773,7 @@ int __init parse_ioapics_under_ir(void)return ir_supported; } -int ir_dev_scope_init (void ) +int __init ir_dev_scope_init (void ) {if (!intr_remapping_enabled)return 0 ;
drivers/power/intel_mid_battery.c +6 -6
@@ -61,7 +61,8 @@ MODULE_PARM_DESC(debug, "Flag to enable PMIC Battery debug messages.");#define PMIC_BATT_CHR_SBATDET_MASK (1 << 5)#define PMIC_BATT_CHR_SDCLMT_MASK (1 << 6)#define PMIC_BATT_CHR_SUSBOVP_MASK (1 << 7) -#define PMIC_BATT_CHR_EXCPT_MASK 0xC6 +#define PMIC_BATT_CHR_EXCPT_MASK 0x86 +#define PMIC_BATT_ADC_ACCCHRG_MASK (1 << 31)#define PMIC_BATT_ADC_ACCCHRGVAL_MASK 0x7FFFFFFF
@@ -304,11 +305,6 @@ static void pmic_battery_read_status(struct pmic_power_module_info *pbi) pbi->batt_status =POWER_SUPPLY_STATUS_NOT_CHARGING ;pmic_battery_log_event (BATT_EVENT_BATOVP_EXCPT ); batt_exception =1 ; - }else if (r8 &PMIC_BATT_CHR_SDCLMT_MASK ) { - pbi->batt_health =POWER_SUPPLY_HEALTH_OVERVOLTAGE ; - pbi->batt_status =POWER_SUPPLY_STATUS_NOT_CHARGING ; -pmic_battery_log_event (BATT_EVENT_DCLMT_EXCPT ); - batt_exception =1 ; }else if (r8 &PMIC_BATT_CHR_STEMP_MASK ) { pbi->batt_health =POWER_SUPPLY_HEALTH_OVERHEAT ; pbi->batt_status =POWER_SUPPLY_STATUS_NOT_CHARGING ;
@@ -316,6 +312,10 @@ static void pmic_battery_read_status(struct pmic_power_module_info *pbi) batt_exception =1 ; }else { pbi->batt_health =POWER_SUPPLY_HEALTH_GOOD ; +if (r8 &PMIC_BATT_CHR_SDCLMT_MASK ) { +/* PMIC will change charging current automatically */ +pmic_battery_log_event (BATT_EVENT_DCLMT_EXCPT ); + } } }
include/linux/pci_ids.h +4 -0
@@ -517,8 +517,12 @@#define PCI_DEVICE_ID_AMD_11H_NB_DRAM 0x1302#define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304 +#define PCI_DEVICE_ID_AMD_15H_NB_F0 0x1600 +#define PCI_DEVICE_ID_AMD_15H_NB_F1 0x1601 +#define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602#define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603#define PCI_DEVICE_ID_AMD_15H_NB_F4 0x1604 +#define PCI_DEVICE_ID_AMD_15H_NB_F5 0x1605#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703#define PCI_DEVICE_ID_AMD_LANCE 0x2000#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001