--- /dev/null
+From bb148bdeb0ab16fc0ae8009799471e4d7180073b Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 13 Aug 2015 18:02:39 +0200
+Subject: ALSA: hda - Enable headphone jack detect on old Fujitsu laptops
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit bb148bdeb0ab16fc0ae8009799471e4d7180073b upstream.
+
+According to the bug report, FSC Amilo laptops with ALC880 can detect
+the headphone jack but currently the driver disables it. It's partly
+intentionally, as non-working jack detect was reported in the past.
+Let's enable now.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=102501
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -1137,7 +1137,7 @@ static const struct hda_fixup alc880_fix
+ /* override all pins as BIOS on old Amilo is broken */
+ .type = HDA_FIXUP_PINS,
+ .v.pins = (const struct hda_pintbl[]) {
+- { 0x14, 0x0121411f }, /* HP */
++ { 0x14, 0x0121401f }, /* HP */
+ { 0x15, 0x99030120 }, /* speaker */
+ { 0x16, 0x99030130 }, /* bass speaker */
+ { 0x17, 0x411111f0 }, /* N/A */
+@@ -1157,7 +1157,7 @@ static const struct hda_fixup alc880_fix
+ /* almost compatible with FUJITSU, but no bass and SPDIF */
+ .type = HDA_FIXUP_PINS,
+ .v.pins = (const struct hda_pintbl[]) {
+- { 0x14, 0x0121411f }, /* HP */
++ { 0x14, 0x0121401f }, /* HP */
+ { 0x15, 0x99030120 }, /* speaker */
+ { 0x16, 0x411111f0 }, /* N/A */
+ { 0x17, 0x411111f0 }, /* N/A */
--- /dev/null
+From a161574e200ae63a5042120e0d8c36830e81bde3 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Thu, 13 Aug 2015 18:05:06 +0200
+Subject: ALSA: hda - Use ALC880_FIXUP_FUJITSU for FSC Amilo M1437
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit a161574e200ae63a5042120e0d8c36830e81bde3 upstream.
+
+It turned out that the machine has a bass speaker, so take a correct
+fixup entry.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=102501
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_realtek.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -1365,7 +1365,7 @@ static const struct snd_pci_quirk alc880
+ SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_FIXUP_W810),
+ SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_FIXUP_MEDION_RIM),
+ SND_PCI_QUIRK(0x1631, 0xe011, "PB 13201056", ALC880_FIXUP_6ST_AUTOMUTE),
+- SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_FIXUP_F1734),
++ SND_PCI_QUIRK(0x1734, 0x107c, "FSC Amilo M1437", ALC880_FIXUP_FUJITSU),
+ SND_PCI_QUIRK(0x1734, 0x1094, "FSC Amilo M1451G", ALC880_FIXUP_FUJITSU),
+ SND_PCI_QUIRK(0x1734, 0x10ac, "FSC AMILO Xi 1526", ALC880_FIXUP_F1734),
+ SND_PCI_QUIRK(0x1734, 0x10b0, "FSC Amilo Pi1556", ALC880_FIXUP_FUJITSU),
--- /dev/null
+From bdec97a855ef1e239f130f7a11584721c9a1bf04 Mon Sep 17 00:00:00 2001
+From: Will Deacon <will.deacon@arm.com>
+Date: Tue, 15 Sep 2015 12:07:06 +0100
+Subject: arm64: compat: fix vfp save/restore across signal handlers in big-endian
+
+From: Will Deacon <will.deacon@arm.com>
+
+commit bdec97a855ef1e239f130f7a11584721c9a1bf04 upstream.
+
+When saving/restoring the VFP registers from a compat (AArch32)
+signal frame, we rely on the compat registers forming a prefix of the
+native register file and therefore make use of copy_{to,from}_user to
+transfer between the native fpsimd_state and the compat_vfp_sigframe.
+
+Unfortunately, this doesn't work so well in a big-endian environment.
+Our fpsimd save/restore code operates directly on 128-bit quantities
+(Q registers) whereas the compat_vfp_sigframe represents the registers
+as an array of 64-bit (D) registers. The architecture packs the compat D
+registers into the Q registers, with the least significant bytes holding
+the lower register. Consequently, we need to swap the 64-bit halves when
+converting between these two representations on a big-endian machine.
+
+This patch replaces the __copy_{to,from}_user invocations in our
+compat VFP signal handling code with explicit __put_user loops that
+operate on 64-bit values and swap them accordingly.
+
+Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kernel/signal32.c | 47 ++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 36 insertions(+), 11 deletions(-)
+
+--- a/arch/arm64/kernel/signal32.c
++++ b/arch/arm64/kernel/signal32.c
+@@ -231,14 +231,32 @@ int copy_siginfo_from_user32(siginfo_t *
+
+ /*
+ * VFP save/restore code.
++ *
++ * We have to be careful with endianness, since the fpsimd context-switch
++ * code operates on 128-bit (Q) register values whereas the compat ABI
++ * uses an array of 64-bit (D) registers. Consequently, we need to swap
++ * the two halves of each Q register when running on a big-endian CPU.
+ */
++union __fpsimd_vreg {
++ __uint128_t raw;
++ struct {
++#ifdef __AARCH64EB__
++ u64 hi;
++ u64 lo;
++#else
++ u64 lo;
++ u64 hi;
++#endif
++ };
++};
++
+ static int compat_preserve_vfp_context(struct compat_vfp_sigframe __user *frame)
+ {
+ struct fpsimd_state *fpsimd = ¤t->thread.fpsimd_state;
+ compat_ulong_t magic = VFP_MAGIC;
+ compat_ulong_t size = VFP_STORAGE_SIZE;
+ compat_ulong_t fpscr, fpexc;
+- int err = 0;
++ int i, err = 0;
+
+ /*
+ * Save the hardware registers to the fpsimd_state structure.
+@@ -254,10 +272,15 @@ static int compat_preserve_vfp_context(s
+ /*
+ * Now copy the FP registers. Since the registers are packed,
+ * we can copy the prefix we want (V0-V15) as it is.
+- * FIXME: Won't work if big endian.
+ */
+- err |= __copy_to_user(&frame->ufp.fpregs, fpsimd->vregs,
+- sizeof(frame->ufp.fpregs));
++ for (i = 0; i < ARRAY_SIZE(frame->ufp.fpregs); i += 2) {
++ union __fpsimd_vreg vreg = {
++ .raw = fpsimd->vregs[i >> 1],
++ };
++
++ __put_user_error(vreg.lo, &frame->ufp.fpregs[i], err);
++ __put_user_error(vreg.hi, &frame->ufp.fpregs[i + 1], err);
++ }
+
+ /* Create an AArch32 fpscr from the fpsr and the fpcr. */
+ fpscr = (fpsimd->fpsr & VFP_FPSCR_STAT_MASK) |
+@@ -282,7 +305,7 @@ static int compat_restore_vfp_context(st
+ compat_ulong_t magic = VFP_MAGIC;
+ compat_ulong_t size = VFP_STORAGE_SIZE;
+ compat_ulong_t fpscr;
+- int err = 0;
++ int i, err = 0;
+
+ __get_user_error(magic, &frame->magic, err);
+ __get_user_error(size, &frame->size, err);
+@@ -292,12 +315,14 @@ static int compat_restore_vfp_context(st
+ if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE)
+ return -EINVAL;
+
+- /*
+- * Copy the FP registers into the start of the fpsimd_state.
+- * FIXME: Won't work if big endian.
+- */
+- err |= __copy_from_user(fpsimd.vregs, frame->ufp.fpregs,
+- sizeof(frame->ufp.fpregs));
++ /* Copy the FP registers into the start of the fpsimd_state. */
++ for (i = 0; i < ARRAY_SIZE(frame->ufp.fpregs); i += 2) {
++ union __fpsimd_vreg vreg;
++
++ __get_user_error(vreg.lo, &frame->ufp.fpregs[i], err);
++ __get_user_error(vreg.hi, &frame->ufp.fpregs[i + 1], err);
++ fpsimd.vregs[i >> 1] = vreg.raw;
++ }
+
+ /* Extract the fpsr and the fpcr from the fpscr */
+ __get_user_error(fpscr, &frame->ufp.fpscr, err);
--- /dev/null
+From d10bcd473301888f957ec4b6b12aa3621be78d59 Mon Sep 17 00:00:00 2001
+From: Will Deacon <will.deacon@arm.com>
+Date: Wed, 2 Sep 2015 18:49:28 +0100
+Subject: arm64: head.S: initialise mdcr_el2 in el2_setup
+
+From: Will Deacon <will.deacon@arm.com>
+
+commit d10bcd473301888f957ec4b6b12aa3621be78d59 upstream.
+
+When entering the kernel at EL2, we fail to initialise the MDCR_EL2
+register which controls debug access and PMU capabilities at EL1.
+
+This patch ensures that the register is initialised so that all traps
+are disabled and all the PMU counters are available to the host. When a
+guest is scheduled, KVM takes care to configure trapping appropriately.
+
+Acked-by: Marc Zyngier <marc.zyngier@arm.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/kernel/head.S | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/arch/arm64/kernel/head.S
++++ b/arch/arm64/kernel/head.S
+@@ -184,6 +184,11 @@ ENTRY(el2_setup)
+ msr hstr_el2, xzr // Disable CP15 traps to EL2
+ #endif
+
++ /* EL2 debug */
++ mrs x0, pmcr_el0 // Disable debug access traps
++ ubfx x0, x0, #11, #5 // to EL2 and allow access to
++ msr mdcr_el2, x0 // all PMU counters from EL1
++
+ /* Stage-2 translation */
+ msr vttbr_el2, xzr
+
--- /dev/null
+From bf0c4e04732479f650ff59d1ee82de761c0071f0 Mon Sep 17 00:00:00 2001
+From: Jeff Vander Stoep <jeffv@google.com>
+Date: Tue, 18 Aug 2015 20:50:10 +0100
+Subject: arm64: kconfig: Move LIST_POISON to a safe value
+
+From: Jeff Vander Stoep <jeffv@google.com>
+
+commit bf0c4e04732479f650ff59d1ee82de761c0071f0 upstream.
+
+Move the poison pointer offset to 0xdead000000000000, a
+recognized value that is not mappable by user-space exploits.
+
+Acked-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Thierry Strudel <tstrudel@google.com>
+Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
+Signed-off-by: Will Deacon <will.deacon@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm64/Kconfig | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -56,6 +56,10 @@ config NO_IOPORT
+ config STACKTRACE_SUPPORT
+ def_bool y
+
++config ILLEGAL_POINTER_VALUE
++ hex
++ default 0xdead000000000000
++
+ config LOCKDEP_SUPPORT
+ def_bool y
+
--- /dev/null
+From e51e38494a8ecc18650efb0c840600637891de2c Mon Sep 17 00:00:00 2001
+From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Date: Thu, 20 Aug 2015 14:28:48 -0700
+Subject: Input: synaptics - fix handling of disabling gesture mode
+
+From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+
+commit e51e38494a8ecc18650efb0c840600637891de2c upstream.
+
+Bit 2 of the mode byte has dual meaning: it can disable reporting of
+gestures when touchpad works in Relative mode or normal Absolute mode,
+or it can enable so called Extended W-Mode when touchpad uses enhanced
+Absolute mode (W-mode). The extended W-Mode confuses our driver and
+causes missing button presses on some Thinkpads (x250, T450s), so let's
+make sure we do not enable it.
+
+Also, according to the spec W mode "... bit is defined only in Absolute
+mode on pads whose capExtended capability bit is set. In Relative mode and
+in TouchPads without this capability, the bit is reserved and should be
+left at 0.", so let's make sure we respect this requirement as well.
+
+Reported-by: Nick Bowler <nbowler@draconx.ca>
+Suggested-by: Gabor Balla <gaborwho@gmail.com>
+Tested-by: Gabor Balla <gaborwho@gmail.com>
+Tested-by: Nick Bowler <nbowler@draconx.ca>
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/mouse/synaptics.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- a/drivers/input/mouse/synaptics.c
++++ b/drivers/input/mouse/synaptics.c
+@@ -360,14 +360,18 @@ static int synaptics_set_mode(struct psm
+ struct synaptics_data *priv = psmouse->private;
+
+ priv->mode = 0;
+- if (priv->absolute_mode)
++
++ if (priv->absolute_mode) {
+ priv->mode |= SYN_BIT_ABSOLUTE_MODE;
+- if (priv->disable_gesture)
++ if (SYN_CAP_EXTENDED(priv->capabilities))
++ priv->mode |= SYN_BIT_W_MODE;
++ }
++
++ if (!SYN_MODE_WMODE(priv->mode) && priv->disable_gesture)
+ priv->mode |= SYN_BIT_DISABLE_GESTURE;
++
+ if (psmouse->rate >= 80)
+ priv->mode |= SYN_BIT_HIGH_RATE;
+- if (SYN_CAP_EXTENDED(priv->capabilities))
+- priv->mode |= SYN_BIT_W_MODE;
+
+ if (synaptics_mode_cmd(psmouse, priv->mode))
+ return -1;
rtlwifi-rtl8192cu-add-new-device-id.patch
tg3-fix-temperature-reporting.patch
mac80211-enable-assoc-check-for-mesh-interfaces.patch
+arm64-kconfig-move-list_poison-to-a-safe-value.patch
+arm64-compat-fix-vfp-save-restore-across-signal-handlers-in-big-endian.patch
+arm64-head.s-initialise-mdcr_el2-in-el2_setup.patch
+input-synaptics-fix-handling-of-disabling-gesture-mode.patch
+alsa-hda-enable-headphone-jack-detect-on-old-fujitsu-laptops.patch
+alsa-hda-use-alc880_fixup_fujitsu-for-fsc-amilo-m1437.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
