1. 21 12月, 2017 6 次提交
    • L
      Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm · 877631f3
      Linus Torvalds 提交于
      Pull ARM fix from Russell King:
       "Just one fix for a problem in the csum_partial_copy_from_user()
        implementation when software PAN is enabled"
      
      * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
        ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch
      877631f3
    • L
      Merge tag 'acpi-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 1362d628
      Linus Torvalds 提交于
      Pull ACPI fixes from Rafael Wysocki:
       "These fix a recently introduced issue in the ACPI CPPC driver and an
        obscure error hanling bug in the APEI code.
      
        Specifics:
      
         - Fix an error handling issue in the ACPI APEI implementation of the
           >read callback in struct pstore_info (Takashi Iwai).
      
         - Fix a possible out-of-bounds arrar read in the ACPI CPPC driver
           (Colin Ian King)"
      
      * tag 'acpi-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: APEI / ERST: Fix missing error handling in erst_reader()
        ACPI: CPPC: remove initial assignment of pcc_ss_data
      1362d628
    • L
      Merge tag 'pm-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 9cd238ab
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix a regression in the ondemand and conservative cpufreq
        governors that was introduced during the 4.13 cycle, a recent
        regression in the imx6q cpufreq driver and a regression in the PCI
        handling of hibernation from the 4.14 cycle.
      
        Specifics:
      
         - Fix an issue in the PCI handling of the "thaw" transition during
           hibernation (after creating an image), introduced by a bug fix from
           the 4.13 cycle and exposed by recent changes in the IRQ subsystem,
           that caused pci_restore_state() to be called for devices in
           low-power states in some cases which is incorrect and breaks MSI
           management on some systems (Rafael Wysocki).
      
         - Fix a recent regression in the imx6q cpufreq driver that broke
           speed grading on i.MX6 QuadPlus by omitting checks causing invalid
           operating performance points (OPPs) to be disabled on that SoC as
           appropriate (Lucas Stach).
      
         - Fix a regression introduced during the 4.14 cycle in the ondemand
           and conservative cpufreq governors that causes the sampling
           interval used by them to be shorter than the tick period in some
           cases which leads to incorrect decisions (Rafael Wysocki)"
      
      * tag 'pm-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: governor: Ensure sufficiently large sampling intervals
        cpufreq: imx6q: fix speed grading regression on i.MX6 QuadPlus
        PCI / PM: Force devices to D0 in pci_pm_thaw_noirq()
      9cd238ab
    • L
      Merge tag 'spi-fix-v4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 7887f470
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "A bunch of really small fixes here, all driver specific and mostly in
        error handling and remove paths.
      
        The most important fixes are for the a3700 clock configuration and a
        fix for a nasty stall which could potentially cause data corruption
        with the xilinx driver"
      
      * tag 'spi-fix-v4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: atmel: fixed spin_lock usage inside atmel_spi_remove
        spi: sun4i: disable clocks in the remove function
        spi: rspi: Do not set SPCR_SPE in qspi_set_config_register()
        spi: Fix double "when"
        spi: a3700: Fix clk prescaling for coefficient over 15
        spi: xilinx: Detect stall with Unknown commands
        spi: imx: Update device tree binding documentation
      7887f470
    • L
      Merge tag 'mfd-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · 444fec19
      Linus Torvalds 提交于
      Pull MDF bugfixes from Lee Jones:
      
        - Fix message timing issues and report correct state when an error
          occurs in cros_ec_spi
      
        - Reorder enums used for Power Management in rtsx_pci
      
        - Use correct OF helper for obtaining child nodes in twl4030-audio and
          twl6040
      
      * tag 'mfd-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: Fix RTS5227 (and others) powermanagement
        mfd: cros ec: spi: Fix "in progress" error signaling
        mfd: twl6040: Fix child-node lookup
        mfd: twl4030-audio: Fix sibling-node lookup
        mfd: cros ec: spi: Don't send first message too soon
      444fec19
    • L
      Merge tag 'sound-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a5f89a50
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "All stable fixes here:
      
         - a regression fix of USB-audio for the previous hardening patch
      
         - a potential UAF fix in rawmidi
      
         - HD-audio and USB-audio quirks, the missing new ID"
      
      * tag 'sound-4.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU
        ALSA: hda/realtek - Fix Dell AIO LineOut issue
        ALSA: rawmidi: Avoid racy info ioctl via ctl device
        ALSA: hda - Add vendor id for Cannonlake HDMI codec
        ALSA: usb-audio: Add native DSD support for Esoteric D-05X
      a5f89a50
  2. 20 12月, 2017 3 次提交
  3. 19 12月, 2017 6 次提交
    • M
      Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/atmel',... · 4d029763
      Mark Brown 提交于
      Merge remote-tracking branches 'spi/fix/armada', 'spi/fix/atmel', 'spi/fix/doc', 'spi/fix/imx', 'spi/fix/rspi', 'spi/fix/sun4i' and 'spi/fix/xilinx' into spi-linus
      4d029763
    • R
      spi: atmel: fixed spin_lock usage inside atmel_spi_remove · 66e900a3
      Radu Pirea 提交于
      The only part of atmel_spi_remove which needs to be atomic is hardware
      reset.
      
      atmel_spi_stop_dma calls dma_terminate_all and this needs interrupts
      enabled.
      atmel_spi_release_dma calls dma_release_channel and dma_release_channel
      locks a mutex inside of spin_lock.
      
      So the call of these functions can't be inside a spin_lock.
      Reported-by: NJia-Ju Bai <baijiaju1990@gmail.com>
      Signed-off-by: NRadu Pirea <radu.pirea@microchip.com>
      Signed-off-by: NMark Brown <broonie@kernel.org>
      66e900a3
    • T
      ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU · 5a15f289
      Takashi Iwai 提交于
      The commit 89b89d12 ("ALSA: usb-audio: Add check return value for
      usb_string()") added the check of the return value from
      snd_usb_copy_string_desc(), which is correct per se, but it introduced
      a regression.  In the original code, either the "Clock Source",
      "Playback Source" or "Capture Source" suffix is added after the
      terminal string, while the commit changed it to add the suffix only
      when get_term_name() is failing.  It ended up with an incorrect ctl
      name like "PCM" instead of "PCM Capture Source".
      
      Also, even the original code has a similar bug: when the ctl name is
      generated from snd_usb_copy_string_desc() for the given iSelector, it
      also doesn't put the suffix.
      
      This patch addresses these issues: the suffix is added always when no
      static mapping is found.  Also the patch tries to put more comments
      and cleans up the if/else block for better readability in order to
      avoid the same pitfall again.
      
      Fixes: 89b89d12 ("ALSA: usb-audio: Add check return value for usb_string()")
      Reported-and-tested-by: NMauro Santos <registo.mailling@gmail.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: NTakashi Iwai <tiwai@suse.de>
      5a15f289
    • L
      Merge tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd · ace52288
      Linus Torvalds 提交于
      Pull MTD fixes from Richard Weinberger:
       "This contains the following regression fixes:
      
         - fix bitflip handling in brcmnand and gpmi nand drivers
      
         - revert a bad device tree binding for spi-nor
      
         - fix a copy&paste error in gpio-nand driver
      
         - fix a too strict length check in mtd core"
      
      * tag 'for-linus-20171218' of git://git.infradead.org/linux-mtd:
        mtd: Fix mtd_check_oob_ops()
        mtd: nand: gpio: Fix ALE gpio configuration
        mtd: nand: brcmnand: Zero bitflip is not an error
        mtd: nand: gpmi: Fix failure when a erased page has a bitflip at BBM
        Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list"
      ace52288
    • L
      Merge branch 'parisc-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · cb81fc6a
      Linus Torvalds 提交于
      Pull parisc fixes from Helge Deller:
       "There are two important fixes here:
      
         - Add PCI quirks to disable built-in a serial AUX and a graphics
           cards from specific GSP (management board) PCI cards. This fixes
           boot via serial console on rp3410 and rp3440 machines.
      
         - Revert the "Re-enable interrups early" patch which was added to
           kernel v4.10. It can trigger stack overflows and thus silent data
           corruption. With this patch reverted we can lower our thread stack
           back to 16kb again.
      
        The other patches are minor cleanups: avoid duplicate includes,
        indenting fixes, correctly align variable in asm code"
      
      * 'parisc-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Reduce thread stack to 16 kb
        Revert "parisc: Re-enable interrupts early"
        parisc: remove duplicate includes
        parisc: Hide Diva-built-in serial aux and graphics card
        parisc: Align os_hpmc_size on word boundary
        parisc: Fix indenting in puts()
      cb81fc6a
    • L
      Merge branch 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 64a48099
      Linus Torvalds 提交于
      Pull x86 syscall entry code changes for PTI from Ingo Molnar:
       "The main changes here are Andy Lutomirski's changes to switch the
        x86-64 entry code to use the 'per CPU entry trampoline stack'. This,
        besides helping fix KASLR leaks (the pending Page Table Isolation
        (PTI) work), also robustifies the x86 entry code"
      
      * 'WIP.x86-pti.entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (26 commits)
        x86/cpufeatures: Make CPU bugs sticky
        x86/paravirt: Provide a way to check for hypervisors
        x86/paravirt: Dont patch flush_tlb_single
        x86/entry/64: Make cpu_entry_area.tss read-only
        x86/entry: Clean up the SYSENTER_stack code
        x86/entry/64: Remove the SYSENTER stack canary
        x86/entry/64: Move the IST stacks into struct cpu_entry_area
        x86/entry/64: Create a per-CPU SYSCALL entry trampoline
        x86/entry/64: Return to userspace from the trampoline stack
        x86/entry/64: Use a per-CPU trampoline stack for IDT entries
        x86/espfix/64: Stop assuming that pt_regs is on the entry stack
        x86/entry/64: Separate cpu_current_top_of_stack from TSS.sp0
        x86/entry: Remap the TSS into the CPU entry area
        x86/entry: Move SYSENTER_stack to the beginning of struct tss_struct
        x86/dumpstack: Handle stack overflow on all stacks
        x86/entry: Fix assumptions that the HW TSS is at the beginning of cpu_tss
        x86/kasan/64: Teach KASAN about the cpu_entry_area
        x86/mm/fixmap: Generalize the GDT fixmap mechanism, introduce struct cpu_entry_area
        x86/entry/gdt: Put per-CPU GDT remaps in ascending order
        x86/dumpstack: Add get_stack_info() support for the SYSENTER stack
        ...
      64a48099
  4. 18 12月, 2017 23 次提交
  5. 17 12月, 2017 2 次提交
    • T
      x86/cpufeatures: Make CPU bugs sticky · 6cbd2171
      Thomas Gleixner 提交于
      There is currently no way to force CPU bug bits like CPU feature bits. That
      makes it impossible to set a bug bit once at boot and have it stick for all
      upcoming CPUs.
      
      Extend the force set/clear arrays to handle bug bits as well.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: NBorislav Petkov <bp@suse.de>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Borislav Petkov <bpetkov@suse.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: David Laight <David.Laight@aculab.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: Eduardo Valentin <eduval@amazon.com>
      Cc: Greg KH <gregkh@linuxfoundation.org>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Juergen Gross <jgross@suse.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: aliguori@amazon.com
      Cc: daniel.gruss@iaik.tugraz.at
      Cc: hughd@google.com
      Cc: keescook@google.com
      Link: https://lkml.kernel.org/r/20171204150606.992156574@linutronix.deSigned-off-by: NIngo Molnar <mingo@kernel.org>
      6cbd2171
    • T
      x86/paravirt: Provide a way to check for hypervisors · 79cc7415
      Thomas Gleixner 提交于
      There is no generic way to test whether a kernel is running on a specific
      hypervisor. But that's required to prevent the upcoming user address space
      separation feature in certain guest modes.
      
      Make the hypervisor type enum unconditionally available and provide a
      helper function which allows to test for a specific type.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Reviewed-by: NJuergen Gross <jgross@suse.com>
      Cc: Andy Lutomirski <luto@kernel.org>
      Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
      Cc: Borislav Petkov <bp@alien8.de>
      Cc: Borislav Petkov <bpetkov@suse.de>
      Cc: Brian Gerst <brgerst@gmail.com>
      Cc: Dave Hansen <dave.hansen@intel.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: David Laight <David.Laight@aculab.com>
      Cc: Denys Vlasenko <dvlasenk@redhat.com>
      Cc: Eduardo Valentin <eduval@amazon.com>
      Cc: Greg KH <gregkh@linuxfoundation.org>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: aliguori@amazon.com
      Cc: daniel.gruss@iaik.tugraz.at
      Cc: hughd@google.com
      Cc: keescook@google.com
      Link: https://lkml.kernel.org/r/20171204150606.912938129@linutronix.deSigned-off-by: NIngo Molnar <mingo@kernel.org>
      79cc7415