17 Jan, 2016

2 commits

  • Helge reported that a relative timer can return a remaining time larger than
    the programmed relative time on parisc and other architectures which have
    CONFIG_TIME_LOW_RES set. This happens because we add a jiffie to the resulting
    expiry time to prevent short timeouts.

    Use the new function hrtimer_expires_remaining_adjusted() to calculate the
    remaining time. It takes that extra added time into account for relative
    timers.

    Reported-and-tested-by: Helge Deller
    Signed-off-by: Thomas Gleixner
    Cc: Peter Zijlstra
    Cc: John Stultz
    Cc: linux-m68k@lists.linux-m68k.org
    Cc: dhowells@redhat.com
    Cc: stable@vger.kernel.org
    Link: http://lkml.kernel.org/r/20160114164159.354500742@linutronix.de
    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • If CONFIG_TIME_LOW_RES is enabled we add a jiffie to the relative timeout to
    prevent short sleeps, but we do not account for that in interfaces which
    retrieve the remaining time.

    Helge observed that timerfd can return a remaining time larger than the
    relative timeout. That's not expected and breaks userland test programs.

    Store the information that the timer was armed relative and provide functions
    to adjust the remaining time. To avoid bloating the hrtimer struct make state
    a u8, which as a bonus results in better code on x86 at least.

    Reported-and-tested-by: Helge Deller
    Signed-off-by: Thomas Gleixner
    Cc: Peter Zijlstra
    Cc: John Stultz
    Cc: linux-m68k@lists.linux-m68k.org
    Cc: dhowells@redhat.com
    Cc: stable@vger.kernel.org
    Link: http://lkml.kernel.org/r/20160114164159.273328486@linutronix.de
    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     

15 Jan, 2016

1 commit

  • clockevents_exchange_device is calling clockevents_shutdown() on the new
    clockenvents device but it may have never been enabled in the first place.
    This results in the tcb clock being disabled without being enabled first:

    ------------[ cut here ]------------
    WARNING: CPU: 0 PID: 1 at drivers/clk/clk.c:680 clk_disable+0x28/0x34()
    Modules linked in:
    CPU: 0 PID: 1 Comm: swapper Not tainted 4.4.0+ #6
    Hardware name: Atmel AT91SAM9
    [] (unwind_backtrace) from [] (show_stack+0x10/0x14)
    [] (show_stack) from [] (warn_slowpath_common+0x78/0xa0)
    [] (warn_slowpath_common) from [] (warn_slowpath_null+0x18/0x20)
    [] (warn_slowpath_null) from [] (clk_disable+0x28/0x34)
    [] (clk_disable) from [] (tc_shutdown+0x38/0x4c)
    [] (tc_shutdown) from [] (clockevents_switch_state+0x38/0x6c)
    [] (clockevents_switch_state) from [] (clockevents_shutdown+0x10/0x24)
    [] (clockevents_shutdown) from [] (tick_check_new_device+0x84/0xac)
    [] (tick_check_new_device) from [] (clockevents_register_device+0x7c/0x108)
    [] (clockevents_register_device) from [] (tcb_clksrc_init+0x390/0x3e8)
    [] (tcb_clksrc_init) from [] (do_one_initcall+0x114/0x1d4)
    [] (do_one_initcall) from [] (kernel_init_freeable+0xfc/0x1b8)
    [] (kernel_init_freeable) from [] (kernel_init+0x8/0xe0)
    [] (kernel_init) from [] (ret_from_fork+0x14/0x24)
    ---[ end trace 0000000000000001 ]---

    Check what state we were in before trying to disable the clock.

    Fixes: cf4541c101ea ("clockevents/drivers/tcb_clksrc: Migrate to new 'set-state' interface")
    Signed-off-by: Alexandre Belloni
    Cc: Nicolas Ferre
    Cc: Boris Brezillon
    Cc: linux-arm-kernel@lists.infradead.org
    Cc: Daniel Lezcano
    Cc: stable@vger.kernel.org
    Link: http://lkml.kernel.org/r/1452854061-30370-1-git-send-email-alexandre.belloni@free-electrons.com
    Signed-off-by: Thomas Gleixner

    Alexandre Belloni
     

12 Jan, 2016

4 commits

  • ….linaro.org/people/daniel.lezcano/linux into timers/urgent

    Pull in fixes from Daniel Lezcano:

    - Fix the vt8500 timer leading to a system lock up when dealing with too
    small delta (Roman Volkov)

    - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
    (Daniel Lezcano)

    - Prevent to compile timers using the 'iomem' API when the architecture has
    not HAS_IOMEM set (Richard Weinberger)

    Thomas Gleixner
     
  • The vt8500 clocksource driver declares itself as capable to handle the
    minimum delay of 4 cycles by passing the value into
    clockevents_config_and_register(). The vt8500_timer_set_next_event()
    requires the passed cycles value to be at least 16. The impact is that
    userspace hangs in nanosleep() calls with small delay intervals.

    This problem is reproducible in Linux 4.2 starting from:
    c6eb3f70d448 ('hrtimer: Get rid of hrtimer softirq')

    From Russell King, more detailed explanation:

    "It's a speciality of the StrongARM/PXA hardware. It takes a certain
    number of OSCR cycles for the value written to hit the compare registers.
    So, if a very small delta is written (eg, the compare register is written
    with a value of OSCR + 1), the OSCR will have incremented past this value
    before it hits the underlying hardware. The result is, that you end up
    waiting a very long time for the OSCR to wrap before the event fires.

    So, we introduce a check in set_next_event() to detect this and return
    -ETIME if the calculated delta is too small, which causes the generic
    clockevents code to retry after adding the min_delta specified in
    clockevents_config_and_register() to the current time value.

    min_delta must be sufficient that we don't re-trip the -ETIME check - if
    we do, we will return -ETIME, forward the next event time, try to set it,
    return -ETIME again, and basically lock the system up. So, min_delta
    must be larger than the check inside set_next_event(). A factor of two
    was chosen to ensure that this situation would never occur.

    The PXA code worked on PXA systems for years, and I'd suggest no one
    changes this mechanism without access to a wide range of PXA systems,
    otherwise they're risking breakage."

    Cc: stable@vger.kernel.org
    Cc: Russell King
    Acked-by: Alexey Charkov
    Signed-off-by: Roman Volkov
    Signed-off-by: Daniel Lezcano

    Roman Volkov
     
  • Select CLKSRC_MMIO when FSL_FTM_TIMER is enabled. Otherwise it fails to
    compile on i386 with COMPILE_TEST=y.

    "
    on i386:
    when CLKSRC_MMIO is not enabled:

    drivers/built-in.o: In function `ftm_timer_init':
    fsl_ftm_timer.c:(.init.text+0x6842): undefined reference to `clocksource_mmio_readl_up'
    fsl_ftm_timer.c:(.init.text+0x6855): undefined reference to `clocksource_mmio_init'
    "

    Reported-by: Randy Dunlap
    Signed-off-by: Daniel Lezcano

    Daniel Lezcano
     
  • Not every arch has io memory.

    So, unbreak the build by fixing the dependencies.

    Signed-off-by: Richard Weinberger
    Signed-off-by: Daniel Lezcano

    Richard Weinberger
     

29 Dec, 2015

2 commits

  • Like it's already done in one place in the driver, convert the rest to use pr_*
    macros instead of printk(KERN_LEVEL) calls.

    While here, join strings to be one string for one line to make grep on them
    easier.

    There is no functional change.

    Signed-off-by: Andy Shevchenko
    Cc: Daniel Lezcano
    Link: http://lkml.kernel.org/r/1451310085-113182-1-git-send-email-andriy.shevchenko@linux.intel.com
    Signed-off-by: Thomas Gleixner

    Andy Shevchenko
     
  • The posix_clock_poll function is supposed to return a bit mask of
    POLLxxx values. However, in case the hardware has disappeared (due to
    hot plugging for example) this code returns -ENODEV in a futile
    attempt to throw an error at the file descriptor level. The kernel's
    file_operations interface does not accept such error codes from the
    poll method. Instead, this function aught to return POLLERR.

    The value -ENODEV does, in fact, contain the POLLERR bit (and almost
    all the other POLLxxx bits as well), but only by chance. This patch
    fixes code to return a proper bit mask.

    Credit goes to Markus Elfring for pointing out the suspicious
    signed/unsigned mismatch.

    Reported-by: Markus Elfring
    igned-off-by: Richard Cochran
    Cc: John Stultz
    Cc: Julia Lawall
    Link: http://lkml.kernel.org/r/1450819198-17420-1-git-send-email-richardcochran@gmail.com
    Cc: stable@vger.kernel.org
    Signed-off-by: Thomas Gleixner

    Richard Cochran
     

28 Dec, 2015

4 commits

  • Linus Torvalds
     
  • Pull MIPS fixes from Ralf Baechle:

    - Fix bitrot in __get_user_unaligned()
    - EVA userspace accessor bug fixes.
    - Fix for build issues with certain toolchains.
    - Fix build error for VDSO with particular toolchain versions.
    - Fix build error due to a variable that should have been removed by an
    earlier patch

    * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
    MIPS: Fix bitrot in __get_user_unaligned()
    MIPS: Fix build error due to unused variables.
    MIPS: VDSO: Fix build error
    MIPS: CPS: drop .set mips64r2 directives
    MIPS: uaccess: Take EVA into account in [__]clear_user
    MIPS: uaccess: Take EVA into account in __copy_from_user()
    MIPS: uaccess: Fix strlen_user with EVA

    Linus Torvalds
     
  • Pull ARM SoC fixes from Olof Johansson:
    "A smallish set of fixes that we've been sitting on for a while now,
    flushing the queue here so they go in. Summary:

    A handful of fixes for OMAP, i.MX, Allwinner and Tegra:

    - A clock rate and a PHY setup fix for i.MX6Q/DL
    - A couple of fixes for the reduced serial bus (sunxi-rsb) on
    Allwinner
    - UART wakeirq fix for an OMAP4 board, timer config fixes for AM43XX.
    - Suspend fix for Tegra124 Chromebooks
    - Fix for missing implicit include that's different between
    ARM/ARM64"

    * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: tegra: Fix suspend hang on Tegra124 Chromebooks
    bus: sunxi-rsb: Fix peripheral IC mapping runtime address
    bus: sunxi-rsb: Fix primary PMIC mapping hardware address
    ARM: dts: Fix UART wakeirq for omap4 duovero parlor
    ARM: OMAP2+: AM43xx: select ARM TWD timer
    ARM: OMAP2+: am43xx: enable GENERIC_CLOCKEVENTS_BROADCAST
    fsl-ifc: add missing include on ARM64
    ARM: dts: imx6: Fix Ethernet PHY mode on Ventana boards
    ARM: dts: imx: Fix the assigned-clock mismatch issue on imx6q/dl
    bus: sunxi-rsb: unlock on error in sunxi_rsb_read()
    ARM: dts: sunxi: sun6i-a31s-primo81.dts: add touchscreen axis swapping property

    Linus Torvalds
     
  • Signed-off-by: Al Viro
    Signed-off-by: Ralf Baechle

    Al Viro
     

27 Dec, 2015

6 commits

  • Pull power management and ACPI fixes from Rafael Wysocki:
    "These fix an ACPI processor driver regression introduced during the
    4.3 cycle and a mistake in the recently added SCPI support in the
    arm_big_little cpufreq driver.

    Specifics:

    - Fix a thermal management issue introduced by an ACPI processor
    driver change made during the 4.3 development cycle that failed to
    return 0 from a function on success which triggered an error
    cleanup path every time it had been called that deleted useful data
    structures created previously (Srinivas Pandruvada).

    - Fix a variable data type issue in the arm_big_little cpufreq
    driver's SCPI support code added recently that prevents error
    handling in there from working correctly (Dan Carpenter)"

    * tag 'pm+acpi-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
    cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()
    ACPI / processor: Fix thermal cooling device regression

    Linus Torvalds
     
  • Pull md bugfix from Neil Brown:
    "One more md fix for 4.4-rc

    Fix a regression which causes reshape to not start properly sometimes"

    * tag 'md/4.4-rc6-fix' of git://neil.brown.name/md:
    md: remove check for MD_RECOVERY_NEEDED in action_store.

    Linus Torvalds
     
  • Pull UBI bug fixes from Richard Weinberger:
    "This contains four bug fixes for UBI"

    * tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs:
    mtd: ubi: don't leak e if schedule_erase() fails
    mtd: ubi: fixup error correction in do_sync_erase()
    UBI: fix use of "VID" vs. "EC" in header self-check
    UBI: fix return error code

    Linus Torvalds
     
  • Pull ftrace/recordmcount fix from Steven Rostedt:
    "Russell King was reporting lots of warnings when he compiled his
    kernel with ftrace enabled. With some investigation it was discovered
    that it was his compile setup. He was using ccache with hard links,
    which allowed recordmcount to process the same .o twice. When this
    happens, recordmcount will detect that it was already done and give a
    warning about it.

    Russell fixed this by having recordmcount detect that the object file
    has more than one hard link, and if it does, it unlinks the object
    file after it maps it and processes then. This appears to fix the
    issue.

    As you did not like the fact that recordmcount modified the file in
    place and thought that it should do the modifications in memory and
    then write it out to disk and move it over the old file to prevent
    other more subtle issues like the one above, a second patch is added
    on top of Russell's to do just that. Luckily the original code had
    write and lseek wrappers that I was able to modify to not do inplace
    writes, but simply keep track of the changes made in memory. When a
    write is made, a "update" flag is set, and at the end of processing,
    if the update is set, then it writes the file with changes out to a
    new file, and then renames it over the original one.

    The file descriptor is still passed to the write and lseek wrappers
    because removing that would cause the change to be more intrusive.
    That can be removed in a follow up cleanup patch that can wait till
    the next merge window"

    * tag 'trace-v4.4-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
    ftrace/scripts: Have recordmcount copy the object file
    scripts: recordmcount: break hardlinks

    Linus Torvalds
     
  • Pull ARC fixes from Vineet Gupta:
    "Sorry for this late pull request, but these are all important fixes
    for code introduced/updated in this release which we will otherwise
    end up back porting.

    - Unwinder rework (A revert followed by better fix)
    - Build errors: MMUv2, modules with -Os
    - highmem section mismatch build splat"

    * tag 'arc-4.4-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
    ARC: dw2 unwind: Catch Dwarf SNAFUs early
    ARC: dw2 unwind: Don't bail for CIE.version != 1
    Revert "ARC: dw2 unwind: Ignore CIE version !=1 gracefully instead of bailing"
    ARC: Fix linking errors with CONFIG_MODULE + CONFIG_CC_OPTIMIZE_FOR_SIZE
    ARC: mm: fix building for MMU v2
    ARC: mm: HIGHMEM: Fix section mismatch splat

    Linus Torvalds
     
  • * acpi-processor:
    ACPI / processor: Fix thermal cooling device regression

    * pm-cpufreq:
    cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()

    Rafael J. Wysocki
     

26 Dec, 2015

2 commits

  • Pull parisc system call restart fix from Helge Deller:
    "The architectural design of parisc always uses two instructions to
    call kernel syscalls (delayed branch feature). This means that the
    instruction following the branch (located in the delay slot of the
    branch instruction) is executed before control passes to the branch
    destination.

    Depending on which assembler instruction and how it is used in
    usersapce in the delay slot, this sometimes made restarted syscalls
    like futex() and poll() failing with -ENOSYS"

    * 'parisc-4.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
    parisc: Fix syscall restarts

    Linus Torvalds
     
  • Pull sparc fixes from David Miller:

    1) Finally make perf stack backtraces stable on sparc, several problems
    (mostly due to the context in which the user copies from the stack
    are done) contributed to this.

    From Rob Gardner.

    2) Export ADI capability if the cpu supports it.

    3) Hook up userfaultfd system call.

    4) When faults happen during user copies we really have to clean up and
    restore the FPU state fully. Also from Rob Gardner

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    tty/serial: Skip 'NULL' char after console break when sysrq enabled
    sparc64: fix FP corruption in user copy functions
    sparc64: Perf should save/restore fault info
    sparc64: Ensure perf can access user stacks
    sparc64: Don't set %pil in rtrap_nmi too early
    sparc64: Add ADI capability to cpu capabilities
    tty: serial: constify sunhv_ops structs
    sparc: Hook up userfaultfd system call

    Linus Torvalds
     

25 Dec, 2015

7 commits

  • When sysrq is triggered from console, serial driver for SUN hypervisor
    console receives a console break and enables the sysrq. It expects a valid
    sysrq char following with break. Meanwhile if driver receives 'NULL'
    ASCII char then it disables sysrq and sysrq handler will never be invoked.

    This fix skips calling uart sysrq handler when 'NULL' is received while
    sysrq is enabled.

    Signed-off-by: Vijay Kumar
    Acked-by: Karl Volz
    Signed-off-by: David S. Miller

    Vijay Kumar
     
  • Short story: Exception handlers used by some copy_to_user() and
    copy_from_user() functions do not diligently clean up floating point
    register usage, and this can result in a user process seeing invalid
    values in floating point registers. This sometimes makes the process
    fail.

    Long story: Several cpu-specific (NG4, NG2, U1, U3) memcpy functions
    use floating point registers and VIS alignaddr/faligndata to
    accelerate data copying when source and dest addresses don't align
    well. Linux uses a lazy scheme for saving floating point registers; It
    is not done upon entering the kernel since it's a very expensive
    operation. Rather, it is done only when needed. If the kernel ends up
    not using FP regs during the course of some trap or system call, then
    it can return to user space without saving or restoring them.

    The various memcpy functions begin their FP code with VISEntry (or a
    variation thereof), which saves the FP regs. They conclude their FP
    code with VISExit (or a variation) which essentially marks the FP regs
    "clean", ie, they contain no unsaved values. fprs.FPRS_FEF is turned
    off so that a lazy restore will be triggered when/if the user process
    accesses floating point regs again.

    The bug is that the user copy variants of memcpy, copy_from_user() and
    copy_to_user(), employ an exception handling mechanism to detect faults
    when accessing user space addresses, and when this handler is invoked,
    an immediate return from the function is forced, and VISExit is not
    executed, thus leaving the fprs register in an indeterminate state,
    but often with fprs.FPRS_FEF set and one or more dirty bits. This
    results in a return to user space with invalid values in the FP regs,
    and since fprs.FPRS_FEF is on, no lazy restore occurs.

    This bug affects copy_to_user() and copy_from_user() for NG4, NG2,
    U3, and U1. All are fixed by using a new exception handler for those
    loads and stores that are done during the time between VISEnter and
    VISExit.

    n.b. In NG4memcpy, the problematic code can be triggered by a copy
    size greater than 128 bytes and an unaligned source address. This bug
    is known to be the cause of random user process memory corruptions
    while perf is running with the callgraph option (ie, perf record -g).
    This occurs because perf uses copy_from_user() to read user stacks,
    and may fault when it follows a stack frame pointer off to an
    invalid page. Validation checks on the stack address just obscure
    the underlying problem.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • There have been several reports of random processes being killed with
    a bus error or segfault during userspace stack walking in perf. One
    of the root causes of this problem is an asynchronous modification to
    thread_info fault_address and fault_code, which stems from a perf
    counter interrupt arriving during kernel processing of a "benign"
    fault, such as a TSB miss. Since perf_callchain_user() invokes
    copy_from_user() to read user stacks, a fault is not only possible,
    but probable. Validity checks on the stack address merely cover up the
    problem and reduce its frequency.

    The solution here is to save and restore fault_address and fault_code
    in perf_callchain_user() so that the benign fault handler is not
    disturbed by a perf interrupt.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • When an interrupt (such as a perf counter interrupt) is delivered
    while executing in user space, the trap entry code puts ASI_AIUS in
    %asi so that copy_from_user() and copy_to_user() will access the
    correct memory. But if a perf counter interrupt is delivered while the
    cpu is already executing in kernel space, then the trap entry code
    will put ASI_P in %asi, and this will prevent copy_from_user() from
    reading any useful stack data in either of the perf_callchain_user_X
    functions, and thus no user callgraph data will be collected for this
    sample period. An additional problem is that a fault is guaranteed
    to occur, and though it will be silently covered up, it wastes time
    and could perturb state.

    In perf_callchain_user(), we ensure that %asi contains ASI_AIUS
    because we know for a fact that the subsequent calls to
    copy_from_user() are intended to read the user's stack.

    [ Use get_fs()/set_fs() -DaveM ]

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • Commit 28a1f53 delays setting %pil to avoid potential
    hardirq stack overflow in the common rtrap_irq path.
    Setting %pil also needs to be delayed in the rtrap_nmi
    path for the same reason.

    Signed-off-by: Rob Gardner
    Signed-off-by: Dave Aldridge
    Signed-off-by: David S. Miller

    Rob Gardner
     
  • Add ADI (Application Data Integrity) capability to cpu capabilities list.
    ADI capability allows virtual addresses to be encoded with a tag in
    bits 63-60. This tag serves as an access control key for the regions
    of virtual address with ADI enabled and a key set on them. Hypervisor
    encodes this capability as "adp" in "hwcap-list" property in machine
    description.

    Signed-off-by: Khalid Aziz
    Signed-off-by: David S. Miller

    Khalid Aziz
     
  • Constifies sunhv_ops structures in tty's serial
    driver since they are not modified after their
    initialization.

    Detected and found using Coccinelle.

    Suggested-by: Julia Lawall
    Signed-off-by: Aya Mahfouz
    Signed-off-by: David S. Miller

    Aya Mahfouz
     

24 Dec, 2015

5 commits

  • The "domain" variable needs to be signed for the error handling to work.

    Fixes: 8def31034d03 (cpufreq: arm_big_little: add SCPI interface driver)
    Signed-off-by: Dan Carpenter
    Acked-by: Viresh Kumar
    Acked-by: Sudeep Holla
    Signed-off-by: Rafael J. Wysocki

    Dan Carpenter
     
  • After hooking up system call, userfaultfd selftest was successful for
    both 32 and 64 bit version of test.

    Signed-off-by: Mike Kravetz
    Signed-off-by: David S. Miller

    Mike Kravetz
     
  • Pull sound fixes from Takashi Iwai:
    "This shouldn't be a nightmare before Christmas: just a handful small
    device-specific fixes for various ASoC and HD-audio drivers. Most of
    them are stable fixes"

    * tag 'sound-4.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
    ALSA: hda/realtek - Fix silent headphone output on MacPro 4,1 (v2)
    ASoC: fsl_sai: fix no frame clk in master mode
    ALSA: hda - Set SKL+ hda controller power at freeze() and thaw()
    ASoC: sgtl5000: fix VAG power up timing
    ASoC: rockchip: spdif: Set transmit data level to 16 samples
    ASoC: wm8974: set cache type for regmap
    ASoC: es8328: Fix shifts for mixer switches
    ASoC: davinci-mcasp: Fix XDATA check in mcasp_start_tx
    ASoC: es8328: Fix deemphasis values

    Linus Torvalds
     
  • Pull i915 drm fixes from Jani Nikula:
    "Here's a batch of i915 fixes all around. It may be slightly bigger
    than one would hope for at this stage, but they've all been through
    testing in our -next before being picked up for v4.4. Also, I missed
    Dave's fixes pull earlier today just because I wanted an extra testing
    round on this. So I'm fairly confident.

    Wishing you all the things it is customary to wish this time of the
    year"

    * tag 'drm-intel-fixes-2015-12-23' of git://anongit.freedesktop.org/drm-intel:
    drm/i915: Correct max delay for HDMI hotplug live status checking
    drm/i915: mdelay(10) considered harmful
    drm/i915: Kill intel_crtc->cursor_bo
    drm/i915: Workaround CHV pipe C cursor fail
    drm/i915: Only spin whilst waiting on the current request
    drm/i915: Limit the busy wait on requests to 5us not 10ms!
    drm/i915: Break busywaiting for requests on pending signals
    drm/i915: Disable primary plane if we fail to reconstruct BIOS fb (v2)
    drm/i915: Set the map-and-fenceable flag for preallocated objects
    drm/i915: Drop the broken cursor base==0 special casing

    Linus Torvalds
     
  • Pull drm fixes from Dave Airlie:
    "Not much happening, should have dequeued this lot earlier.

    One amdgpu, one nouveau and one exynos fix"

    * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
    drm/exynos: atomic check only enabled crtc states
    drm/nouveau/bios/fan: hardcode the fan mode to linear
    drm/amdgpu: fix user fence handling

    Linus Torvalds
     

23 Dec, 2015

7 commits

  • …roonie/sound into for-linus

    ASoC: Fixes for v4.4

    A collection of small driver specific fixes here, nothing that'll affect
    users who don't have the devices concerned. At least the wm8974 bug
    indicates that there's not too many users of some of these devices.

    Takashi Iwai
     
  • …fsl-sai', 'asoc/fix/rockchip', 'asoc/fix/sgtl5000' and 'asoc/fix/wm8974' into asoc-linus

    Mark Brown
     
  • Pull block layer fixes from Jens Axboe:
    "Three small fixes for 4.4 final. Specifically:

    - The segment issue fix from Junichi, where the old IO path does a
    bio limit split before potentially bouncing the pages. We need to
    do that in the right order, to ensure that limitations are met.

    - A NVMe surprise removal IO hang fix from Keith.

    - A use-after-free in null_blk, introduced by a previous patch in
    this series. From Mike Krinkin"

    * 'for-linus' of git://git.kernel.dk/linux-block:
    null_blk: fix use-after-free error
    block: ensure to split after potentially bouncing a bio
    NVMe: IO ending fixes on surprise removal

    Linus Torvalds
     
  • Pull nfsd fix from Bruce Fields:
    "Just one fix for a NFSv4 callback bug introduced in 4.4"

    * tag 'nfsd-4.4-1' of git://linux-nfs.org/~bfields/linux:
    nfsd: don't hold ls_mutex across a layout recall

    Linus Torvalds
     
  • Pull kvm fixes from Paolo Bonzini:

    - A series of fixes to the MTRR emulation, tested in the BZ by several
    users so they should be safe this late

    - A fix for a division by zero

    - Two very simple ARM and PPC fixes

    * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: x86: Reload pit counters for all channels when restoring state
    KVM: MTRR: treat memory as writeback if MTRR is disabled in guest CPUID
    KVM: MTRR: observe maxphyaddr from guest CPUID, not host
    KVM: MTRR: fix fixed MTRR segment look up
    KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX
    KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check
    kvm: x86: move tracepoints outside extended quiescent state
    KVM: PPC: Book3S HV: Prohibit setting illegal transaction state in MSR

    Linus Torvalds
     
  • Pull s390 fixes from Martin Schwidefsky:
    "Two late bug fixes for kernel 4.4.

    Merry Christmas"

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/dis: Fix handling of format specifiers
    s390/zcrypt: Fix AP queue handling if queue is full

    Linus Torvalds
     
  • Enabling CPUFreq support for Tegra124 Chromebooks is causing the Tegra124
    to hang when resuming from suspend.

    When CPUFreq is enabled, the CPU clock is changed from the PLLX clock to
    the DFLL clock during kernel boot. When resuming from suspend the CPU
    clock is temporarily changed back to the PLLX clock before switching back
    to the DFLL. If the DFLL is operating at a much lower frequency than the
    PLLX when we enter suspend, and so the CPU voltage rail is at a voltage
    too low for the CPUs to operate at the PLLX frequency, then the device
    will hang.

    Please note that the PLLX is used in the resume sequence to switch the CPU
    clock from the very slow 32K clock to a faster clock during early resume
    to speed up the resume sequence before the DFLL is resumed.

    Ideally, we should fix this by setting the suspend frequency so that it
    matches the PLLX frequency, however, that would be a bigger change. For
    now simply disable CPUFreq support for Tegra124 Chromebooks to avoid the
    hang when resuming from suspend.

    Fixes: 9a0baee960a7 ("ARM: tegra: Enable CPUFreq support for Tegra124
    Chromebooks")

    Signed-off-by: Jon Hunter
    Signed-off-by: Olof Johansson

    Jon Hunter