1. 04 Jan, 2017 6 commits
    • Arnd Bergmann's avatar
      Merge tag 'imx-fixes-4.10' of... · ad040d8d
      Arnd Bergmann authored
      Merge tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
      
      Pull "i.MX fixes for 4.10" from Shawn Guo:
      
       - A format fix for vf610-zii-dev-rev-b.dts, which has a very odd line
         due to misses a newline.
       - A fix to imx-weim bus error seen on board which doesn't actually use
         the bus.
       - A fix for imx6qdl-nitrogen6x board which has conflicting usage of
         pad NANDF_CS2.
       - A cleanup on i.MX1 machine to remove .map_io callback, which also
         fixes a compiling error for NOMMU build.
       - Fix AVIC base address in i.MX31 device tree source.  The problem was
         shadowed by the AVIC driver, which takes the correct base address
         from a SoC specific header file.
      
      * tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
        ARM: dts: imx6: Disable "weim" node in the dtsi files
        ARM: i.MX: remove map_io callback
        ARM: dts: vf610-zii-dev-rev-b: Add missing newline
        ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
        ARM: dts: imx31: fix AVIC base address
      ad040d8d
    • Arnd Bergmann's avatar
      Merge tag 'qcom-arm-fixes-for-4.10-rc2' of... · fcf14b88
      Arnd Bergmann authored
      Merge tag 'qcom-arm-fixes-for-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
      
      Pull "Qualcomm ARM DTS Fixes for v4.10-rc2" from Andy Gross:
      
      * Add SCM clock for APQ8064 to fix boot failures
      
      * tag 'qcom-arm-fixes-for-4.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
        ARM: dts: qcom: apq8064: Add missing scm clock
      fcf14b88
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v4.10/fixes-rc1' of... · 46a3bf80
      Arnd Bergmann authored
      Merge tag 'omap-for-v4.10/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Pull "omap fixes for v4.10-rc cycle" from Tony Lindgren:
      
      Fist set of fixes for omaps for v4.10-rc cycle, mostly
      to deal with various regressions noticed during the merge
      window and to fix various device tree configurations for
      boards. Also included is removal of mach-omap2/gpio.c that
      is now dead code with device tree based booting that should
      be OK for the early -rc cycle:
      
      - A series of fixes to add empty chosen node to fix regressions
        caused for bootloaders that don't create chosen node as the
        decompressor needs the chosen node to merge command line and
        ATAGs into it
      
      - Fix missing logicpd-som-lv-37xx-devkit.dtb entry in Makefile
      
      - Fix regression for am437x timers
      
      - Fix wrong strcat for non-NULL terminated string
      
      - A series of changes to fix tps65217 interrupts to not use
        defines as we don't do that for interrupts
      
      - Two patches to fix USB VBUS detection on am57xx-idk and force it
        to peripheral mode until dwc3 role detection is working
      
      - Add missing dra72-evm-tps65917 missing voltage supplies
        accidentally left out of an earlier patch
      
      - Fix n900 eMMC detection when booted on qemu
      
      - Remove unwanted pr_err on failed memory allocation for
        prm_common.c
      
      - Remove legacy mach-omap2/gpio.c that now is dead code
        since we boot mach-omap2 in device tree only mode
      
      - Fix am572x-idk pcie1 by adding the missing gpio reset pin
      
      * tag 'omap-for-v4.10/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (23 commits)
        ARM: dts: am572x-idk: Add gpios property to control PCIE_RESETn
        ARM: OMAP2+: PRM: Delete an error message for a failed memory allocation
        ARM: dts: n900: Mark eMMC slot with no-sdio and no-sd flags
        ARM: dts: dra72-evm-tps65917: Add voltage supplies to usb_phy, mmc, dss
        ARM: dts: am57xx-idk: Put USB2 port in peripheral mode
        ARM: dts: am57xx-idk: Support VBUS detection on USB2 port
        dt-bindings: input: Specify the interrupt number of TPS65217 power button
        dt-bindings: power/supply: Update TPS65217 properties
        dt-bindings: mfd: Remove TPS65217 interrupts
        ARM: dts: am335x: Fix the interrupt name of TPS65217
        ARM: omap2+: fixing wrong strcat for Non-NULL terminated string
        ARM: omap2+: am437x: rollback to use omap3_gptimer_timer_init()
        ARM: dts: omap3: Add DTS for Logic PD SOM-LV 37xx Dev Kit
        ARM: dts: dra7: Add an empty chosen node to top level DTSI
        ARM: dts: dm816x: Add an empty chosen node to top level DTSI
        ARM: dts: dm814x: Add an empty chosen node to top level DTSI
        ARM: dts: am4372: Add an empty chosen node to top level DTSI
        ARM: dts: am33xx: Add an empty chosen node to top level DTSI
        ARM: dts: omap5: Add an empty chosen node to top level DTSI
        ARM: dts: omap4: Add an empty chosen node to top level DTSI
        ...
      46a3bf80
    • Arnd Bergmann's avatar
      Merge tag 'samsung-soc-4.10-2' of... · d4032ccc
      Arnd Bergmann authored
      Merge tag 'samsung-soc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes
      
      Samsung mach/soc update for v4.10:
      
      1. Minor cleanup in smp_operations.
      2. Another step in switching s3c24xx to new DMA API.
      3. Drop fixed requirement for HZ=200 on Samsung platforms.
      
      * tag 'samsung-soc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
        ARM: Drop fixed 200 Hz timer requirement from Samsung platforms
        ARM: S3C24XX: Add DMA slave maps for remaining s3c24xx SoCs
        ARM: EXYNOS: Remove smp_init_cpus hook from platsmp.c
      d4032ccc
    • Arnd Bergmann's avatar
      Merge tag 'qcom-fixes-for-4.10-rc1' of... · cb2cc436
      Arnd Bergmann authored
      Merge tag 'qcom-fixes-for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into fixes
      
      Qualcomm ARM64 Fixes for v4.10-rc1
      
      * Fix instability in MSM8996 due to incorrect carveouts
      
      * tag 'qcom-fixes-for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
        arm64: dts: msm8996: Add required memory carveouts
      cb2cc436
    • Arnd Bergmann's avatar
      Merge tag 'renesas-fixes-for-v4.10' of... · 84cc8ca1
      Arnd Bergmann authored
      Merge tag 'renesas-fixes-for-v4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
      
      Renesas ARM Based SoC Fixes for v4.10
      
      * Provide sd0_uhs node
      
      * tag 'renesas-fixes-for-v4.10' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        arm64: dts: h3ulcb: Provide sd0_uhs node
      84cc8ca1
  2. 03 Jan, 2017 1 commit
    • Fabio Estevam's avatar
      ARM: dts: imx6: Disable "weim" node in the dtsi files · 116dad7d
      Fabio Estevam authored
      Commit 1be81ea5 ("ARM: dts: imx6: Add imx-weim parameters to
      dtsi's") causes the following probe error when the weim node is not
      present on the board dts (such as imx6q-sabresd):
      
      imx-weim 21b8000.weim: Invalid 'ranges' configuration
      imx-weim: probe of 21b8000.weim failed with error -22
      
      There is no need to always enable the "weim" node on mx6. Do the same
      as in the other i.MX dtsi files where "weim" is disabled and only gets
      enabled on a per dts basis.
      
      All the imx6 weim dts users explicitily provide 'status = "okay"', so
      this change has no impact on current imx6 weim users.
      
      If a board does not use the weim driver it will not describe its 'ranges'
      property, so simply disable the 'weim' node in the imx6 dtsi files to
      avoid such probe error message.
      
      Fixes: 1be81ea5 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's")
      Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
      Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
      116dad7d
  3. 02 Jan, 2017 5 commits
  4. 01 Jan, 2017 2 commits
    • Linus Torvalds's avatar
      Linux 4.10-rc2 · 0c744ea4
      Linus Torvalds authored
      0c744ea4
    • Linus Torvalds's avatar
      Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm · 4759d386
      Linus Torvalds authored
      Pull DAX updates from Dan Williams:
       "The completion of Jan's DAX work for 4.10.
      
        As I mentioned in the libnvdimm-for-4.10 pull request, these are some
        final fixes for the DAX dirty-cacheline-tracking invalidation work
        that was merged through the -mm, ext4, and xfs trees in -rc1. These
        patches were prepared prior to the merge window, but we waited for
        4.10-rc1 to have a stable merge base after all the prerequisites were
        merged.
      
        Quoting Jan on the overall changes in these patches:
      
           "So I'd like all these 6 patches to go for rc2. The first three
            patches fix invalidation of exceptional DAX entries (a bug which
            is there for a long time) - without these patches data loss can
            occur on power failure even though user called fsync(2). The other
            three patches change locking of DAX faults so that ->iomap_begin()
            is called in a more relaxed locking context and we are safe to
            start a transaction there for ext4"
      
        These have received a build success notification from the kbuild
        robot, and pass the latest libnvdimm unit tests. There have not been
        any -next releases since -rc1, so they have not appeared there"
      
      * 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
        ext4: Simplify DAX fault path
        dax: Call ->iomap_begin without entry lock during dax fault
        dax: Finish fault completely when loading holes
        dax: Avoid page invalidation races and unnecessary radix tree traversals
        mm: Invalidate DAX radix tree entries only if appropriate
        ext2: Return BH_New buffers for zeroed blocks
      4759d386
  5. 30 Dec, 2016 3 commits
  6. 29 Dec, 2016 2 commits
    • Olof Johansson's avatar
      mm/filemap: fix parameters to test_bit() · 98473f9f
      Olof Johansson authored
       mm/filemap.c: In function 'clear_bit_unlock_is_negative_byte':
        mm/filemap.c:933:9: error: too few arguments to function 'test_bit'
          return test_bit(PG_waiters);
               ^~~~~~~~
      
      Fixes: b91e1302 ('mm: optimize PageWaiters bit use for unlock_page()')
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      Brown-paper-bag-by: default avatarLinus Torvalds <dummy@duh.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      98473f9f
    • Linus Torvalds's avatar
      mm: optimize PageWaiters bit use for unlock_page() · b91e1302
      Linus Torvalds authored
      In commit 62906027 ("mm: add PageWaiters indicating tasks are
      waiting for a page bit") Nick Piggin made our page locking no longer
      unconditionally touch the hashed page waitqueue, which not only helps
      performance in general, but is particularly helpful on NUMA machines
      where the hashed wait queues can bounce around a lot.
      
      However, the "clear lock bit atomically and then test the waiters bit"
      sequence turns out to be much more expensive than it needs to be,
      because you get a nasty stall when trying to access the same word that
      just got updated atomically.
      
      On architectures where locking is done with LL/SC, this would be trivial
      to fix with a new primitive that clears one bit and tests another
      atomically, but that ends up not working on x86, where the only atomic
      operations that return the result end up being cmpxchg and xadd.  The
      atomic bit operations return the old value of the same bit we changed,
      not the value of an unrelated bit.
      
      On x86, we could put the lock bit in the high bit of the byte, and use
      "xadd" with that bit (where the overflow ends up not touching other
      bits), and look at the other bits of the result.  However, an even
      simpler model is to just use a regular atomic "and" to clear the lock
      bit, and then the sign bit in eflags will indicate the resulting state
      of the unrelated bit #7.
      
      So by moving the PageWaiters bit up to bit #7, we can atomically clear
      the lock bit and test the waiters bit on x86 too.  And architectures
      with LL/SC (which is all the usual RISC suspects), the particular bit
      doesn't matter, so they are fine with this approach too.
      
      This avoids the extra access to the same atomic word, and thus avoids
      the costly stall at page unlock time.
      
      The only downside is that the interface ends up being a bit odd and
      specialized: clear a bit in a byte, and test the sign bit.  Nick doesn't
      love the resulting name of the new primitive, but I'd rather make the
      name be descriptive and very clear about the limitation imposed by
      trying to work across all relevant architectures than make it be some
      generic thing that doesn't make the odd semantics explicit.
      
      So this introduces the new architecture primitive
      
          clear_bit_unlock_is_negative_byte();
      
      and adds the trivial implementation for x86.  We have a generic
      non-optimized fallback (that just does a "clear_bit()"+"test_bit(7)"
      combination) which can be overridden by any architecture that can do
      better.  According to Nick, Power has the same hickup x86 has, for
      example, but some other architectures may not even care.
      
      All these optimizations mean that my page locking stress-test (which is
      just executing a lot of small short-lived shell scripts: "make test" in
      the git source tree) no longer makes our page locking look horribly bad.
      Before all these optimizations, just the unlock_page() costs were just
      over 3% of all CPU overhead on "make test".  After this, it's down to
      0.66%, so just a quarter of the cost it used to be.
      
      (The difference on NUMA is bigger, but there this micro-optimization is
      likely less noticeable, since the big issue on NUMA was not the accesses
      to 'struct page', but the waitqueue accesses that were already removed
      by Nick's earlier commit).
      Acked-by: default avatarNick Piggin <npiggin@gmail.com>
      Cc: Dave Hansen <dave.hansen@linux.intel.com>
      Cc: Bob Peterson <rpeterso@redhat.com>
      Cc: Steven Whitehouse <swhiteho@redhat.com>
      Cc: Andrew Lutomirski <luto@kernel.org>
      Cc: Andreas Gruenbacher <agruenba@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Mel Gorman <mgorman@techsingularity.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b91e1302
  7. 28 Dec, 2016 3 commits
    • Stephen Boyd's avatar
      arm64: dts: msm8996: Add required memory carveouts · e9112936
      Stephen Boyd authored
      This patch adds required memory carveouts so that the kernel does not
      access memory that is in use or has been reserved for use by other remote
      processors.
      Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
      Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      e9112936
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 2d706e79
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "This fixes a hash corruption bug in the marvell driver"
      
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: marvell - Copy IVDIG before launching partial DMA ahash requests
      2d706e79
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8f18e4d0
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Various ipvlan fixes from Eric Dumazet and Mahesh Bandewar.
      
          The most important is to not assume the packet is RX just because
          the destination address matches that of the device. Such an
          assumption causes problems when an interface is put into loopback
          mode.
      
       2) If we retry when creating a new tc entry (because we dropped the
          RTNL mutex in order to load a module, for example) we end up with
          -EAGAIN and then loop trying to replay the request. But we didn't
          reset some state when looping back to the top like this, and if
          another thread meanwhile inserted the same tc entry we were trying
          to, we re-link it creating an enless loop in the tc chain. Fix from
          Daniel Borkmann.
      
       3) There are two different WRITE bits in the MDIO address register for
          the stmmac chip, depending upon the chip variant. Due to a bug we
          could set them both, fix from Hock Leong Kweh.
      
       4) Fix mlx4 bug in XDP_TX handling, from Tariq Toukan.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        net: stmmac: fix incorrect bit set in gmac4 mdio addr register
        r8169: add support for RTL8168 series add-on card.
        net: xdp: remove unused bfp_warn_invalid_xdp_buffer()
        openvswitch: upcall: Fix vlan handling.
        ipv4: Namespaceify tcp_tw_reuse knob
        net: korina: Fix NAPI versus resources freeing
        net, sched: fix soft lockup in tc_classify
        net/mlx4_en: Fix user prio field in XDP forward
        tipc: don't send FIN message from connectionless socket
        ipvlan: fix multicast processing
        ipvlan: fix various issues in ipvlan_process_multicast()
      8f18e4d0
  8. 27 Dec, 2016 18 commits