5 files changed, 60 insertions, 10 deletions

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 66ca906aa790..801ecd1c3fd5 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1226,7 +1226,7 @@ static ssize_t l1tf_show_state(char *buf)
 
 static ssize_t mds_show_state(char *buf)
 {
-        if (!hypervisor_is_type(X86_HYPER_NATIVE)) {
+        if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) {
                 return sprintf(buf, "%s; SMT Host state unknown\n",
                                mds_strings[mds_mitigation]);
         }
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index a6342c899be5..f3d3e9646a99 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -193,10 +193,10 @@ ENTRY(secondary_startup_64)
 
         /* Set up %gs.
          *
-         * The base of %gs always points to the bottom of the irqstack
-         * union.  If the stack protector canary is enabled, it is
-         * located at %gs:40.  Note that, on SMP, the boot cpu uses
-         * init data section till per cpu areas are set up.
+         * The base of %gs always points to fixed_percpu_data. If the
+         * stack protector canary is enabled, it is located at %gs:40.
+         * Note that, on SMP, the boot cpu uses init data section until
+         * the per cpu areas are set up.
          */
         movl    $MSR_GS_BASE,%ecx
         movl    initial_gs(%rip),%eax
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index c43e96a938d0..c6f791bc481e 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -827,10 +827,6 @@ int __init hpet_enable(void)
         if (!hpet_cfg_working())
                 goto out_nohpet;
 
-        /* Validate that the counter is counting */
-        if (!hpet_counting())
-                goto out_nohpet;
-
         /*
          * Read the period and check for a sane value:
          */
@@ -896,6 +892,14 @@ int __init hpet_enable(void)
         }
         hpet_print_config();
 
+        /*
+         * Validate that the counter is counting. This needs to be done
+         * after sanitizing the config registers to properly deal with
+         * force enabled HPETs.
+         */
+        if (!hpet_counting())
+                goto out_nohpet;
+
         clocksource_register_hz(&clocksource_hpet, (u32)hpet_freq);
 
         if (id & HPET_ID_LEGSUP) {
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 4f36d3241faf..2d6898c2cb64 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -100,7 +100,7 @@ copy_stack_frame(const void __user *fp, struct stack_frame_user *frame)
 {
         int ret;
 
-        if (!access_ok(fp, sizeof(*frame)))
+        if (__range_not_ok(fp, sizeof(*frame), TASK_SIZE))
                 return 0;
 
         ret = 1;
diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c
index 8eb67a670b10..653b7f617b61 100644
--- a/arch/x86/kernel/sysfb_efi.c
+++ b/arch/x86/kernel/sysfb_efi.c
@@ -230,9 +230,55 @@ static const struct dmi_system_id efifb_dmi_system_table[] __initconst = {
         {},
 };
 
+/*
+ * Some devices have a portrait LCD but advertise a landscape resolution (and
+ * pitch). We simply swap width and height for these devices so that we can
+ * correctly deal with some of them coming with multiple resolutions.
+ */
+static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = {
+        {
+                /*
+                 * Lenovo MIIX310-10ICR, only some batches have the troublesome
+                 * 800x1280 portrait screen. Luckily the portrait version has
+                 * its own BIOS version, so we match on that.
+                 */
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "MIIX 310-10ICR"),
+                        DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1HCN44WW"),
+                },
+        },
+        {
+                /* Lenovo MIIX 320-10ICR with 800x1280 portrait screen */
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_VERSION,
+                                        "Lenovo MIIX 320-10ICR"),
+                },
+        },
+        {
+                /* Lenovo D330 with 800x1280 or 1200x1920 portrait screen */
+                .matches = {
+                        DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_EXACT_MATCH(DMI_PRODUCT_VERSION,
+                                        "Lenovo ideapad D330-10IGM"),
+                },
+        },
+        {},
+};
+
 __init void sysfb_apply_efi_quirks(void)
 {
         if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||
             !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
                 dmi_check_system(efifb_dmi_system_table);
+
+        if (screen_info.orig_video_isVGA == VIDEO_TYPE_EFI &&
+            dmi_check_system(efifb_dmi_swap_width_height)) {
+                u16 temp = screen_info.lfb_width;
+
+                screen_info.lfb_width = screen_info.lfb_height;
+                screen_info.lfb_height = temp;
+                screen_info.lfb_linelength = 4 * screen_info.lfb_width;
+        }
 }