1. 21 Nov, 2015 3 commits
  2. 20 Nov, 2015 18 commits
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 81051f91
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "A few bugfixes and one PCI ID addition from I2C"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: i801: add Intel Lewisburg device IDs
        i2c: fix wakeup irq parsing
        i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer()
        i2c: Revert "i2c: xiic: Do not reset controller before every transfer"
        i2c: imx: fix a compiling error
      81051f91
    • Linus Torvalds's avatar
      Merge tag '4.4-fix' of git://git.lwn.net/linux · 116dfe5e
      Linus Torvalds authored
      Pull documentation fix from Jon Corbet:
       "A single fix from Mauro for a 4.4 regression that would cause the docs
        build to fail on systems with ancient Perl installations"
      
      * tag '4.4-fix' of git://git.lwn.net/linux:
        kernel-doc: Make it compatible with Perl versions below 5.12 again
      116dfe5e
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 95803066
      Linus Torvalds authored
      Pull libnvdimm fixes from Dan Williams:
      
       - A collection of crash and deadlock fixes for DAX that are also tagged
         for -stable.  We will look to re-enable DAX pmd mappings in 4.5, but
         for now 4.4 and -stable should disable it by default.
      
       - A fixup to ext2 and ext4 to mirror the same warning emitted by XFS
         when mounting with "-o dax"
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        block: protect rw_page against device teardown
        mm, dax: fix DAX deadlocks (COW fault)
        dax: disable pmd mappings
        ext2, ext4: warn when mounting with dax enabled
      95803066
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 400f3f25
      Linus Torvalds authored
      Pull more power management and ACPI updates from Rafael Wysocki:
       "These are mostly fixes and cleanups (ACPI core, PM core, cpufreq, ACPI
        EC driver, device properties) including three reverts of recent
        intel_pstate driver commits due to a regression introduced by one of
        them plus support for Atom Airmont cores in intel_pstate (which really
        boils down to adding new frequency tables for Airmont) and additional
        turbostat updates.
      
        Specifics:
      
         - Revert three recent intel_pstate driver commits one of which
           introduced a regression and the remaining two depend on the
           problematic one (Rafael Wysocki).
      
         - Fix breakage related to the recently introduced ACPI _CCA object
           support in the PCI DMA setup code (Suravee Suthikulpanit).
      
         - Fix up the recently introduced ACPI CPPC support to only use the
           hardware-reduced version of the PCCT structure as the only
           architecture to support it (ARM64) will only use hardware-reduced
           ACPI anyway (Ashwin Chaugule).
      
         - Fix a cpufreq mediatek driver build problem (Arnd Bergmann).
      
         - Fix the SMBus transaction handling implementation in the ACPI core
           to avoid re-entrant calls to wait_event_timeout() which makes
           intermittent boot stalls related to the Smart Battery Subsystem
           initialization go away and revert a workaround of another problem
           with the same underlying root cause (Chris Bainbridge).
      
         - Fix the generic wakeup interrupts framework to avoid using invalid
           IRQ numbers (Dmitry Torokhov).
      
         - Remove a redundant check from the ACPI EC driver (Markus Elfring).
      
         - Modify the intel_pstate driver so it can support more Atom flavors
           than just one (Baytrail) and add support for Atom Airmont cores
           (which require new freqnency tables) to it (Philippe Longepe).
      
         - Clean up MSR-related symbols in turbostat (Len Brown)"
      
      * tag 'pm+acpi-4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PCI: Fix OF logic in pci_dma_configure()
        Revert "Documentation: kernel_parameters for Intel P state driver"
        cpufreq: mediatek: fix build error
        cpufreq: intel_pstate: Add separate support for Airmont cores
        cpufreq: intel_pstate: Replace BYT with ATOM
        Revert "cpufreq: intel_pstate: Use ACPI perf configuration"
        Revert "cpufreq: intel_pstate: Avoid calculation for max/min"
        ACPI-EC: Drop unnecessary check made before calling acpi_ec_delete_query()
        Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"
        ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code
        PM / wakeirq: check that wake IRQ is valid before accepting it
        ACPI / CPPC: Use h/w reduced version of the PCCT structure
        x86: remove unused definition of MSR_NHM_PLATFORM_INFO
        tools/power turbostat: use new name for MSR_PLATFORM_INFO
      400f3f25
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 2f255351
      Linus Torvalds authored
      Pull powerpc fixlet from Michael Ellerman:
       "Wire up sys_mlock2()"
      
      * tag 'powerpc-4.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc: Wire up sys_mlock2()
      2f255351
    • Alexandra Yates's avatar
      i2c: i801: add Intel Lewisburg device IDs · cdc5a311
      Alexandra Yates authored
      
      
      Adding Intel codename Lewisburg platform device IDs for SMBus.
      Signed-off-by: default avatarAlexandra Yates <alexandra.yates@linux.intel.com>
      Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      cdc5a311
    • Grygorii Strashko's avatar
      i2c: fix wakeup irq parsing · c18fba23
      Grygorii Strashko authored
      This patch fixes obvious copy-past error in wake up irq parsing
      code which leads to the fact that dev_pm_set_wake_irq() will
      be called with wrong IRQ number when "wakeup" IRQ is not
      defined in DT.
      
      Fixes: 3fffd128
      
       ("i2c: allow specifying separate wakeup interrupt in device tree")
      Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
      Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      Cc: <stable@vger.kernel.org> # v4.3
      c18fba23
    • Lars-Peter Clausen's avatar
      i2c: xiic: Prevent concurrent running of the IRQ handler and __xiic_start_xfer() · d0fe5258
      Lars-Peter Clausen authored
      Prior to commit e6c9a037 ("i2c: xiic: Remove the disabling of
      interrupts") IRQs where disabled when the initial __xiic_start_xfer() was
      called. After the commit the interrupt is enabled while the function is
      running, this means it is possible for the interrupt to be triggered while
      the function is still running. When this happens the internal data
      structures get corrupted and undefined behavior can occur like the
      following crash:
      
      	Internal error: Oops: 17 [#1] PREEMPT SMP ARM
      	Modules linked in:
      	CPU: 0 PID: 2040 Comm: i2cdetect Not tainted 4.0.0-02856-g047a308 #10956
      	Hardware name: Xilinx Zynq Platform
      	task: ee0c9500 ti: e99a2000 task.ti: e99a2000
      	PC is at __xiic_start_xfer+0x6c4/0x7c8
      	LR is at __xiic_start_xfer+0x690/0x7c8
      	pc : [<c02bbffc>]    lr : [<c02bbfc8>]    psr: 800f0013
      	sp : e99a3da8  ip : 00000000  fp : 00000000
      	r10: 00000001  r9 : 600f0013  r8 : f0180000
      	r7 : f0180000  r6 : c064e444  r5 : 00000017  r4 : ee031010
      	r3 : 00000000  r2 : 00000000  r1 : 600f0013  r0 : 0000000f
      	Flags: Nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment user
      	Control: 18c5387d  Table: 29a5404a  DAC: 00000015
      	Process i2cdetect (pid: 2040, stack limit = 0xe99a2210)
      	Stack: (0xe99a3da8 to 0xe99a4000)
      	3da0:                   ee031010 00000000 00000001 ee031020 ee031224 c02bc5ec
      	3dc0: ee34c604 00000000 ee0c9500 e99a3dcc e99a3dd0 e99a3dd0 e99a3dd8 c069f0e8
      	3de0: 00000000 ee031020 c064e100 ffff90bb e99a3e48 c02b6590 ee031020 00000001
      	3e00: e99a3e48 ee031020 00000000 e99a3e63 00000001 c02b6ec4 00000000 00000000
      	3e20: 00000000 c02b7320 e99a3ef0 00000000 00000000 e99e3df0 00000000 00000000
      	3e40: 00000103 2814575f 0000003e c00a0000 e99a3e85 0001003e ee0c0000 e99a3e63
      	3e60: eefd3578 c064e61c ee0c9500 c0041e04 0000056c e9a56db8 00006e5a b6f5c000
      	3e80: ee0c9548 eefd0040 00000001 eefd3540 ee0c9500 eefd39a0 c064b540 ee0c9500
      	3ea0: 00000000 ee92b000 00000000 bef4862c ee34c600 e99ecdc0 00000720 00000003
      	3ec0: e99a2000 00000000 00000000 c02b8b30 00000000 00000000 00000000 e99a3f24
      	3ee0: b6e80000 00000000 00000000 c04257e8 00000000 e99a3f24 c02b8f08 00000703
      	3f00: 00000003 c02116bc ee935300 00000000 bef4862c ee34c600 e99ecdc0 c02b91f0
      	3f20: e99ecdc0 00000720 bef4862c eeb725f8 e99ecdc0 c00c9e2c 00000003 00000003
      	3f40: ee248dc0 00000000 ee248dc8 00000002 eeb7c1a8 00000000 00000000 c00bb360
      	3f60: 00000000 00000000 00000003 ee248dc0 bef4862c e99ecdc0 e99ecdc0 00000720
      	3f80: 00000003 e99a2000 00000000 c00c9f68 00000000 00000000 b6f22000 00000036
      	3fa0: c000dfa4 c000de20 00000000 00000000 00000003 00000720 bef4862c bef4862c
      	3fc0: 00000000 00000000 b6f22000 00000036 00000000 00000000 b6f60000 00000000
      	3fe0: 00013040 bef48614 00008cab b6ecdbe6 400f0030 00000003 2f7fd821 2f7fdc21
      	[<c02bbffc>] (__xiic_start_xfer) from [<c02bc5ec>] (xiic_xfer+0x94/0x168)
      	[<c02bc5ec>] (xiic_xfer) from [<c02b6590>] (__i2c_transfer+0x4c/0x7c)
      	[<c02b6590>] (__i2c_transfer) from [<c02b6ec4>] (i2c_transfer+0x9c/0xc4)
      	[<c02b6ec4>] (i2c_transfer) from [<c02b7320>] (i2c_smbus_xfer+0x3a0/0x4ec)
      	[<c02b7320>] (i2c_smbus_xfer) from [<c02b8b30>] (i2cdev_ioctl_smbus+0xb0/0x214)
      	[<c02b8b30>] (i2cdev_ioctl_smbus) from [<c02b91f0>] (i2cdev_ioctl+0xa0/0x1d4)
      	[<c02b91f0>] (i2cdev_ioctl) from [<c00c9e2c>] (do_vfs_ioctl+0x4b0/0x5b8)
      	[<c00c9e2c>] (do_vfs_ioctl) from [<c00c9f68>] (SyS_ioctl+0x34/0x5c)
      	[<c00c9f68>] (SyS_ioctl) from [<c000de20>] (ret_fast_syscall+0x0/0x34)
      	Code: e283300c e5843210 eafffe64 e5943210 (e1d320b4)
      
      The issue can easily be reproduced by performing I2C access under high
      system load or IO load.
      
      To fix the issue protect the invocation to __xiic_start_xfer() form
      xiic_start_xfer() with the same lock that is used to protect the interrupt
      handler.
      
      Fixes: e6c9a037
      
       ("i2c: xiic: Remove the disabling of interrupts")
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Reviewed-by: default avatarShubhrajyoti Datta <shubhraj@xilinx.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      d0fe5258
    • Lars-Peter Clausen's avatar
      i2c: Revert "i2c: xiic: Do not reset controller before every transfer" · 9656eeeb
      Lars-Peter Clausen authored
      Commit d701667b ("i2c: xiic: Do not reset controller before every
      transfer") removed the reinitialization of the controller before the start
      of each transfer. Apparently this change is not safe to make and the commit
      results in random I2C bus failures.
      
      An easy way to trigger the issue is to run i2cdetect.
      
      Without the patch applied:
           0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
      	 00:          -- -- -- -- -- -- -- -- -- -- -- -- --
      	 10: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 20: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 30: -- -- -- -- -- -- -- -- UU UU -- UU 3c -- -- UU
      	 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 70: -- -- -- -- -- -- -- --
      
      With the patch applied every other or so invocation:
           0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
      	 00:          03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
      	 10: 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
      	 20: 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f
      	 30: -- -- -- -- -- -- -- -- UU UU -- UU 3c -- -- UU
      	 40: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 50: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 60: -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
      	 70: -- -- -- -- -- -- -- --
      
      So revert the commit for now.
      
      Fixes: d701667b
      
       ("i2c: xiic: Do not reset controller before every transfer")
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Acked-by: default avatarShubhrajyoti Datta <shubhraj@xilinx.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      9656eeeb
    • Hou Zhiqiang's avatar
      i2c: imx: fix a compiling error · 8bb6fd58
      Hou Zhiqiang authored
      
      
      drivers/i2c/busses/i2c-imx.c:978:2: error: implicit declaration of
      function ‘pinctrl_select_state’ [-Werror=implicit-function-declaration]
        pinctrl_select_state(i2c_imx->pinctrl, i2c_imx->pinctrl_pins_gpio);
        ^
      Signed-off-by: default avatarHou Zhiqiang <Zhiqiang.Hou@freescale.com>
      Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
      8bb6fd58
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma · 86eaf54d
      Linus Torvalds authored
      Pull dmaengine fixes from Vinod Koul:
       "This has odd fixes spreadout drivers, not major here
      
         - usbdmac fixes for pm
         - edma build and logic fixes
         - build warn fixes for few drivers"
      
      * tag 'dmaengine-fix-4.4-rc2' of git://git.infradead.org/users/vkoul/slave-dma:
        dmaengine: at_hdmac: use %pad format string for dma_addr_t
        dmaengine: at_xdmac: use %pad format string for dma_addr_t
        dmaengine: imx-sdma: remove __init annotation on sdma_event_remap
        dmaengine: edma: predecence bug in GET_NUM_QDMACH()
        dmaengine: edma: fix build without CONFIG_OF
        dmaengine: of_dma: Correct return code for of_dma_request_slave_channel in case !CONFIG_OF
        dmaengine: sh: usb-dmac: Fix pm_runtime_{enable,disable}() imbalance
        dmaengine: sh: usb-dmac: Fix crash on runtime suspend
      86eaf54d
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · c69bde78
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "A varied bunch of fixes, the radeon pull is probably a bit larger than
        I'd like, but it contains 2 weeks of stuff, and the Fiji fixes are a
        bit large, but they are Fiji specific.
      
        Otherwise:
      
         - mgag200: One cursor regression oops fix.
         - vc4: A few small fixes and cleanups.
         - core: Atomic fixes and Atomic helper fixes
         - i915: Revert for the backlight regression along with a bunch of
           fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (58 commits)
        drm/atomic-helper: Check encoder/crtc constraints
        Revert "drm/i915: skip modeset if compatible for everyone."
        drm/mgag200: fix kernel hang in cursor code.
        drm/amdgpu: reserve/unreserve objects out of map/unmap operations
        drm/amdgpu: move bo_reserve out of amdgpu_vm_clear_bo
        drm/amdgpu: add lock for interval tree in vm
        drm/amdgpu: keep the owner for VMIDs
        drm/amdgpu: move VM manager clean into the VM code again
        drm/amdgpu: cleanup VM coding style
        drm/amdgpu: remove unused VM manager field
        drm/amdgpu: cleanup scheduler command submission
        drm/amdgpu: fix typo in firmware name
        drm/i915: Consider SPLL as another shared pll, v2.
        drm/i915: Fix gpu frequency change tracing
        drm/vc4: Make sure that planes aren't scaled.
        drm/vc4: Fix some failure to track __iomem decorations on pointers.
        drm/vc4: checking for NULL instead of IS_ERR
        drm/vc4: fix itnull.cocci warnings
        drm/vc4: fix platform_no_drv_owner.cocci warnings
        drm/vc4: vc4_plane_duplicate_state() can be static
        ...
      c69bde78
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi · cd6caf55
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "Some fixes for small IPMI problems.
      
        The most significant is that the driver wasn't starting the timer for
        some messages, which would result in problems if that message failed
        for some reason.
      
        The others are small optimizations or making things a little neater"
      
      * tag 'for-linus-4.4' of git://git.code.sf.net/p/openipmi/linux-ipmi:
        ipmi watchdog : add panic_wdt_timeout parameter
        char: ipmi: Move MODULE_DEVICE_TABLE() to follow struct
        ipmi: Stop the timer immediately if idle
        ipmi: Start the timer and thread on internal msgs
      cd6caf55
    • Linus Torvalds's avatar
      Merge tag 'renesas-sh-drivers-for-v4.4' of... · 8bdddfae
      Linus Torvalds authored
      Merge tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      Pull SH driver fixlet from Simon Horman:
       "I am sending this change after v4.4-rc1 has been released as it
        depends on SoC changes which are present in that rc:
      
         = Remove now unnecessary reference to CONFIG_ARCH_SHMOBILE_MULTI"
      
      * tag 'renesas-sh-drivers-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: Get rid of CONFIG_ARCH_SHMOBILE_MULTI
      8bdddfae
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci' · a3767e3c
      Rafael J. Wysocki authored
      * acpi-smbus:
        Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"
        ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code
      
      * acpi-ec:
        ACPI-EC: Drop unnecessary check made before calling acpi_ec_delete_query()
      
      * acpi-pci:
        PCI: Fix OF logic in pci_dma_configure()
      a3767e3c
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-sleep' · 0aba0ab8
      Rafael J. Wysocki authored
      * pm-sleep:
        PM / wakeirq: check that wake IRQ is valid before accepting it
      0aba0ab8
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq' and 'acpi-cppc' · 9832bf3a
      Rafael J. Wysocki authored
      * pm-cpufreq:
        Revert "Documentation: kernel_parameters for Intel P state driver"
        cpufreq: mediatek: fix build error
        cpufreq: intel_pstate: Add separate support for Airmont cores
        cpufreq: intel_pstate: Replace BYT with ATOM
        Revert "cpufreq: intel_pstate: Use ACPI perf configuration"
        Revert "cpufreq: intel_pstate: Avoid calculation for max/min"
      
      * acpi-cppc:
        ACPI / CPPC: Use h/w reduced version of the PCCT structure
      9832bf3a
    • Suravee Suthikulpanit's avatar
      PCI: Fix OF logic in pci_dma_configure() · 768acd64
      Suravee Suthikulpanit authored
      This patch fixes a bug introduced by previous commit,
      which incorrectly checkes the of_node of the end-point device.
      Instead, it should check the of_node of the host bridge.
      
      Fixes: 50230713
      
       ("PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()")
      Reported-by: default avatarRobin Murphy <robin.murphy@arm.com>
      Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      768acd64
  3. 19 Nov, 2015 14 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 2d591ab1
      Dave Airlie authored
      i915 fixes for 4.4, including the revert for the backlight regression
      Olof reported. Otherwise fixes all around.
      
      * tag 'drm-intel-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel:
        Revert "drm/i915: skip modeset if compatible for everyone."
        drm/i915: Consider SPLL as another shared pll, v2.
        drm/i915: Fix gpu frequency change tracing
        drm/i915: Don't clobber the addfb2 ioctl params
        drm/i915: Clear intel_crtc->atomic before updating it.
        drm/i915: get runtime PM reference around GEM set_caching IOCTL
        drm/i915: Fix GT frequency rounding
        drm/i915: quirk backlight present on Macbook 4, 1
        drm/i915: Fix crtc_y assignment in intel_find_initial_plane_obj()
      2d591ab1
    • Dave Airlie's avatar
      Merge tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel into drm-fixes · db395637
      Dave Airlie authored
      Here are some drm core fixes for v4.4 that I've picked up. Atomic fixes
      from Maarten, and atomic helper fixes from Ville and Daniel.
      
      Admittedly the topmost commit didn't sit in our tree for very long, but
      does come with reviews and testing from trustworthy people.
      
      * tag 'topic/drm-fixes-2015-11-19' of git://anongit.freedesktop.org/drm-intel:
        drm/atomic-helper: Check encoder/crtc constraints
        drm: Fix primary plane size for stereo doubled modes for legacy setcrtc
        drm/core: Fix old_fb handling in pan_display_atomic.
        drm/core: Fix old_fb handling in restore_fbdev_mode_atomic.
        drm/atomic: add a drm_atomic_clean_old_fb helper.
        drm/core: Fix old_fb handling in drm_mode_atomic_ioctl.
        drm/core: Set legacy_cursor_update in drm_atomic_helper_disable_plane.
      db395637
    • Dan Williams's avatar
      block: protect rw_page against device teardown · 2e6edc95
      Dan Williams authored
      
      
      Fix use after free crashes like the following:
      
       general protection fault: 0000 [#1] SMP
       Call Trace:
        [<ffffffffa0050216>] ? pmem_do_bvec.isra.12+0xa6/0xf0 [nd_pmem]
        [<ffffffffa0050ba2>] pmem_rw_page+0x42/0x80 [nd_pmem]
        [<ffffffff8128fd90>] bdev_read_page+0x50/0x60
        [<ffffffff812972f0>] do_mpage_readpage+0x510/0x770
        [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20
        [<ffffffff811d86dc>] ? lru_cache_add+0x1c/0x50
        [<ffffffff81297657>] mpage_readpages+0x107/0x170
        [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20
        [<ffffffff8128fd20>] ? I_BDEV+0x20/0x20
        [<ffffffff8129058d>] blkdev_readpages+0x1d/0x20
        [<ffffffff811d615f>] __do_page_cache_readahead+0x28f/0x310
        [<ffffffff811d6039>] ? __do_page_cache_readahead+0x169/0x310
        [<ffffffff811c5abd>] ? pagecache_get_page+0x2d/0x1d0
        [<ffffffff811c76f6>] filemap_fault+0x396/0x530
        [<ffffffff811f816e>] __do_fault+0x4e/0xf0
        [<ffffffff811fce7d>] handle_mm_fault+0x11bd/0x1b50
      
      Cc: <stable@vger.kernel.org>
      Cc: Jens Axboe <axboe@fb.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Reported-by: default avatarkbuild test robot <lkp@intel.com>
      Acked-by: default avatarMatthew Wilcox <willy@linux.intel.com>
      [willy: symmetry fixups]
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      2e6edc95
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · b4ba1f0f
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
      
       - Fix size alignment in __iommu_{alloc,free}_attrs
      
       - Kernel memory mapping fix with CONFIG_DEBUG_RODATA for page sizes
         other than 4KB and a fix of the mark_rodata_ro permissions
      
       - dma_get_ops() simplification and behaviour alignment between DT and
         ACPI
      
       - function_graph trace fix for cpu_suspend() (CPUs returning from deep
         sleep via a different path and confusing the tracer)
      
       - Use of non-global mappings for UEFI run-time services to avoid a
         (potentially theoretical) TLB conflict
      
       - Crypto priority reduction of core AES cipher (the accelerated
         asynchronous implementation is preferred when available)
      
       - Reverting an old commit that removed BogoMIPS from /proc/cpuinfo on
         arm64.  Apparently, we had it for a relatively short time and libvirt
         started checking for its presence
      
       - Compiler warnings fixed (ptrace.h inclusion from compat.h,
         smp_load_acquire with const argument)
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: restore bogomips information in /proc/cpuinfo
        arm64: barriers: fix smp_load_acquire to work with const arguments
        arm64: Fix R/O permissions in mark_rodata_ro
        arm64: crypto: reduce priority of core AES cipher
        arm64: use non-global mappings for UEFI runtime regions
        arm64: kernel: pause/unpause function graph tracer in cpu_suspend()
        arm64: do not include ptrace.h from compat.h
        arm64: simplify dma_get_ops
        arm64: mm: use correct mapping granularity under DEBUG_RODATA
        arm64/dma-mapping: Fix sizes in __iommu_{alloc,free}_attrs
      b4ba1f0f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · a3d66b5a
      Linus Torvalds authored
      Pull livepatching fix from Jiri Kosina:
       "A fix for module handling in case kASLR has been enabled, from Zhou
        Chengming"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: x86: fix relocation computation with kASLR
      a3d66b5a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 319645ca
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
       "Two functional fixes for wacom HID driver from Ping Cheng and Jiri
        Kosina"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: fixup quirks setup for WACOM_DEVICETYPE_PAD
        HID: wacom: Add outbounding area for DTU1141
      319645ca
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc · 1282ac40
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are some mmc fixes intended for v4.4 rc2.  It's based on a commit
        prior rc1 as I wanted to get them a bit more tested in next before
        sending you the pull request.
      
        MMC core:
         - Improve reliability when selecting HS200 mode
         - Improve reliability when selecting HS400 mode
         - mmc: remove bondage between REQ_META and reliable write
      
        MMC host:
         - pxamci: Fix read-only gpio detection polarity
         - mtk-sd: Preinitialize delay_phase to fix the case when delay is zero
         - android-goldfish: Fix build dependency by adding HAS_DMA
         - dw_mmc: Remove Seungwon Jeon from MAINTAINERS"
      
      * tag 'mmc-v4.4-rc1' of git://git.linaro.org/people/ulf.hansson/mmc:
        mmc: remove bondage between REQ_META and reliable write
        mmc: MMC_GOLDFISH should depend on HAS_DMA
        mmc: mediatek: Preinitialize delay_phase in get_best_delay()
        MAINTAINERS: mmc: Remove Seungwon Jeon from dw_mmc
        mmc: mmc: Improve reliability of mmc_select_hs400()
        mmc: mmc: Move mmc_switch_status()
        mmc: mmc: Fix HS setting in mmc_select_hs400()
        mmc: mmc: Improve reliability of mmc_select_hs200()
        mmc: pxamci: fix read-only gpio detection polarity
      1282ac40
    • Yang Shi's avatar
      arm64: restore bogomips information in /proc/cpuinfo · 92e788b7
      Yang Shi authored
      As previously reported, some userspace applications depend on bogomips
      showed by /proc/cpuinfo. Although there is much less legacy impact on
      aarch64 than arm, it does break libvirt.
      
      This patch reverts commit 326b16db ("arm64: delay: don't bother
      reporting bogomips in /proc/cpuinfo"), but with some tweak due to
      context change and without the pr_info().
      
      Fixes: 326b16db
      
       ("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo")
      Signed-off-by: default avatarYang Shi <yang.shi@linaro.org>
      Acked-by: default avatarWill Deacon <will.deacon@arm.com>
      Cc: <stable@vger.kernel.org> # 3.12+
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      92e788b7
    • Daniel Vetter's avatar
      drm/atomic-helper: Check encoder/crtc constraints · 5481c8fb
      Daniel Vetter authored
      
      
      This was totally lost when I originally created the atomic helpers.
      
      We probably should also check possible_clones in the helpers, but
      since the legacy ones didn't do that this is for a separate patch.
      Reported-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Daniel Stone <daniels@collabora.com>
      Reviewed-by: default avatarDaniel Stone <daniels@collabora.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Tested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1447868808-10266-1-git-send-email-daniel.vetter@ffwll.ch
      5481c8fb
    • Jani Nikula's avatar
      Revert "drm/i915: skip modeset if compatible for everyone." · 73831236
      Jani Nikula authored
      This reverts
      
      commit 6764e9f8
      
      
      Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Date:   Thu Aug 27 15:44:06 2015 +0200
      
          drm/i915: skip modeset if compatible for everyone.
      
      Bring back the i915.fastboot module parameter, disabled by default, due
      to backlight regression on Chromebook Pixel 2015.
      
      Apparently the firmware of the Chromebook in question enables the panel
      but disables backlight to avoid a brief garbage scanout upon loading the
      kernel/module. With fastboot, we leave the backlight untouched, in this
      case disabled. The user would have to do a modeset (i.e. not just crank
      up the brightness) to enable the backlight.
      
      There is no clean fix readily available, so get back to the drawing
      board by reverting.
      
      [N.B. The reference below is for when the thread was included on public
      lists, and some of the context had already been dropped by then.]
      Reported-and-tested-by: default avatarOlof Johansson <olof@lixom.net>
      Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      References: http://marc.info/?i=CAKMK7uES7xk05ki92oeX6gmvZWAh9f2vL7yz=6T+fGK9J3X7cQ@mail.gmail.com
      Fixes: 6764e9f8
      
       ("drm/i915: skip modeset if compatible for everyone.")
      Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      Link: http://patchwork.freedesktop.org/patch/msgid/1447921590-3785-1-git-send-email-jani.nikula@intel.com
      73831236
    • Wang, Rui Y's avatar
      drm/mgag200: fix kernel hang in cursor code. · f6619ef7
      Wang, Rui Y authored
      The machine hang completely with the following message on the console:
      
      [  487.777538] BUG: unable to handle kernel NULL pointer dereference at 0000000000000060
      [  487.777554] IP: [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777557] PGD 42e9f7067 PUD 42f2fa067 PMD 0
      [  487.777560] Oops: 0002 [#1] SMP
      ...
      [  487.777618] CPU: 21 PID: 3190 Comm: Xorg Tainted: G            E   4.4.0-rc1-3-default+ #6
      [  487.777620] Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS BRHSXSD1.86B.0059.R00.1501081238 01/08/2015
      [  487.777621] task: ffff880853ae4680 ti: ffff8808696d4000 task.ti: ffff8808696d4000
      [  487.777625] RIP: 0010:[<ffffffff8158aaee>]  [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777627] RSP: 0018:ffff8808696d79c0  EFLAGS: 00010246
      [  487.777628] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
      [  487.777629] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000060
      [  487.777630] RBP: ffff8808696d79e0 R08: 0000000000000000 R09: ffff88086924a780
      [  487.777631] R10: 000000000001bb40 R11: 0000000000003246 R12: 0000000000000000
      [  487.777632] R13: ffff880463a27360 R14: ffff88046ca50218 R15: 0000000000000080
      [  487.777634] FS:  00007f3f81c5a8c0(0000) GS:ffff88086f060000(0000) knlGS:0000000000000000
      [  487.777635] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [  487.777636] CR2: 0000000000000060 CR3: 000000042e678000 CR4: 00000000001406e0
      [  487.777638] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
      [  487.777639] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
      [  487.777639] Stack:
      [  487.777642]  ffffffffa00eb5fa ffff8808696d7b60 ffff88086b87d800 0000000000000000
      [  487.777644]  ffff8808696d7ac8 ffffffffa01694b6 ffff8808696d7ae8 ffffffff8109c8d5
      [  487.777647]  ffff880469158740 ffff880463a27000 ffff88086b87d800 ffff88086b87d800
      [  487.777647] Call Trace:
      [  487.777674]  [<ffffffffa00eb5fa>] ? drm_gem_object_lookup+0x1a/0xa0 [drm]
      [  487.777681]  [<ffffffffa01694b6>] mga_crtc_cursor_set+0xc6/0xb60 [mgag200]
      [  487.777691]  [<ffffffff8109c8d5>] ? find_busiest_group+0x35/0x4a0
      [  487.777696]  [<ffffffff81086294>] ? __might_sleep+0x44/0x80
      [  487.777699]  [<ffffffff815888c2>] ? __ww_mutex_lock+0x22/0x9c
      [  487.777722]  [<ffffffffa0104f64>] ? drm_modeset_lock+0x34/0xf0 [drm]
      [  487.777733]  [<ffffffffa0148d9e>] restore_fbdev_mode+0xee/0x2a0 [drm_kms_helper]
      [  487.777742]  [<ffffffffa014afce>] drm_fb_helper_restore_fbdev_mode_unlocked+0x2e/0x70 [drm_kms_helper]
      [  487.777748]  [<ffffffffa014b037>] drm_fb_helper_set_par+0x27/0x50 [drm_kms_helper]
      [  487.777752]  [<ffffffff8134560c>] fb_set_var+0x18c/0x3f0
      [  487.777777]  [<ffffffffa02a9b0a>] ? __ext4_handle_dirty_metadata+0x8a/0x210 [ext4]
      [  487.777783]  [<ffffffff8133cb97>] fbcon_blank+0x1b7/0x2b0
      [  487.777790]  [<ffffffff813be2a3>] do_unblank_screen+0xb3/0x1c0
      [  487.777795]  [<ffffffff813b5aba>] vt_ioctl+0x118a/0x1210
      [  487.777801]  [<ffffffff813a8fe0>] tty_ioctl+0x3f0/0xc90
      [  487.777808]  [<ffffffff81172018>] ? kzfree+0x28/0x30
      [  487.777813]  [<ffffffff811e053f>] ? mntput+0x1f/0x30
      [  487.777817]  [<ffffffff811d3f5d>] do_vfs_ioctl+0x30d/0x570
      [  487.777822]  [<ffffffff8107ed3a>] ? task_work_run+0x8a/0xa0
      [  487.777825]  [<ffffffff811d4234>] SyS_ioctl+0x74/0x80
      [  487.777829]  [<ffffffff8158aeae>] entry_SYSCALL_64_fastpath+0x12/0x71
      [  487.777851] Code: 65 ff 0d ce 02 a8 7e 5d c3 ba 01 00 00 00 f0 0f b1 17 85 c0 75 e8 b0 01 5d c3 0f 1f 00 65 ff 05 b1 02 a8 7e 31 c0 ba 01 00 00 00 <f0> 0f b1 17 85 c0 75 01 c3 55 89 c6 48 89 e5 e8 4e f5 b1 ff 5d
      [  487.777854] RIP  [<ffffffff8158aaee>] _raw_spin_lock+0xe/0x30
      [  487.777855]  RSP <ffff8808696d79c0>
      [  487.777856] CR2: 0000000000000060
      [  487.777860] ---[ end trace 672a2cd555e0ebd3 ]---
      
      The cursor code may be entered with file_priv == NULL && handle == NULL.
      The problem was introduced by:
      
      "bf89209a
      
       drm/mga200g: Hold a proper reference for cursor_set"
      
      which calls drm_gem_object_lookup(dev, file_priv...). Previously this wasn't
      a problem because we checked the handle. Move the check early in the function
      can fix the problem.
      Signed-off-by: default avatarRui Wang <rui.y.wang@intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      f6619ef7
    • Dave Airlie's avatar
      Merge branch 'drm-vc4-fixes' of git://github.com/anholt/linux into drm-fixes · e6c84acb
      Dave Airlie authored
      Here are a few little VC4 fixes for 4.4 that I didn't get in to you
      before the -next pull request.  I dropped the feature-ish one I'd
      mentioned, and also droppped the one I saw you included in the last
      -fixes pull request.
      
      * 'drm-vc4-fixes' of git://github.com/anholt/linux:
        drm/vc4: Make sure that planes aren't scaled.
        drm/vc4: Fix some failure to track __iomem decorations on pointers.
        drm/vc4: checking for NULL instead of IS_ERR
        drm/vc4: fix itnull.cocci warnings
        drm/vc4: fix platform_no_drv_owner.cocci warnings
        drm/vc4: vc4_plane_duplicate_state() can be static
      e6c84acb
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 8ed59fd6
      Dave Airlie authored
      Radeon and amdgpu fixes for 4.4.  A bit more the usual since I missed
      last week.  Misc fixes all over the place.  The big changes are the
      tiling configuration fixes for Fiji.
      
      * 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux: (35 commits)
        drm/amdgpu: reserve/unreserve objects out of map/unmap operations
        drm/amdgpu: move bo_reserve out of amdgpu_vm_clear_bo
        drm/amdgpu: add lock for interval tree in vm
        drm/amdgpu: keep the owner for VMIDs
        drm/amdgpu: move VM manager clean into the VM code again
        drm/amdgpu: cleanup VM coding style
        drm/amdgpu: remove unused VM manager field
        drm/amdgpu: cleanup scheduler command submission
        drm/amdgpu: fix typo in firmware name
        drm/amdgpu: remove the unnecessary parameter adev for amdgpu_sa_bo_new()
        drm/amdgpu: wait interruptible when semaphores are disabled v2
        drm/amdgpu: update pd while updating vm as well
        drm/amdgpu: fix handling order in scheduler CS
        drm/amdgpu: fix incorrect mutex usage v3
        drm/amdgpu: cleanup scheduler fence get/put dance
        drm/amdgpu: add command submission workflow tracepoint
        drm/amdgpu: update Fiji's tiling mode table
        drm/amdgpu: fix bug that can't enter thermal interrupt for bonaire.
        drm/amdgpu: fix seq_printf format string
        drm/radeon: fix quirk for MSI R7 370 Armor 2X
        ...
      8ed59fd6
    • Yigal Korman's avatar
      mm, dax: fix DAX deadlocks (COW fault) · 0df9d41a
      Yigal Korman authored
      DAX handling of COW faults has wrong locking sequence:
      	dax_fault does i_mmap_lock_read
      	do_cow_fault does i_mmap_unlock_write
      
      Ross's commit[1] missed a fix[2] that Kirill added to Matthew's
      commit[3].
      
      Original COW locking logic was introduced by Matthew here[4].
      
      This should be applied to v4.3 as well.
      
      [1] 0f90cc66 mm, dax: fix DAX deadlocks
      [2] 52a2b53f mm, dax: use i_mmap_unlock_write() in do_cow_fault()
      [3] 84317297 dax: fix race between simultaneous faults
      [4] 2e4cdab0
      
       mm: allow page fault handlers to perform the COW
      
      Cc: <stable@vger.kernel.org>
      Cc: Boaz Harrosh <boaz@plexistor.com>
      Cc: Alexander Viro <viro@zeniv.linux.org.uk>
      Cc: Dave Chinner <dchinner@redhat.com>
      Cc: Jan Kara <jack@suse.com>
      Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
      Cc: Matthew Wilcox <matthew.r.wilcox@intel.com>
      Acked-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
      Signed-off-by: default avatarYigal Korman <yigal@plexistor.com>
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      0df9d41a
  4. 18 Nov, 2015 5 commits