1. 27 Jul, 2015 4 commits
    • Olof Johansson's avatar
      Merge tag 'pxa-for-4.3-v2' of https://github.com/rjarzmik/linux into next/soc · a9a7f260
      Olof Johansson authored
      This is the pxa changes for v4.3 cycle.
      
      There is mostly one evolution on the dma side, to enable cooperation
      of the legacy pxa DMA API, and the new dmaengine API.
      Once all drivers using DMA are converted, the legacy DMA API should
      be removed.
      
      * tag 'pxa-for-4.3-v2' of https://github.com/rjarzmik/linux:
        ARM: pxa: Use setup_timer
        ARM: pxa: Use module_platform_driver
        ARM: pxa: transition to dmaengine phase 1
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a9a7f260
    • Olof Johansson's avatar
      Merge tag 'omap-for-v4.3/soc-signed' of... · d7018b15
      Olof Johansson authored
      Merge tag 'omap-for-v4.3/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      SoC changes for omaps for v4.3 merge window:
      
      - Clean-up omap4_local_timer_init to drop deal legacy code
      
      - Provide proper IO map table for dra7
      
      - Clean-up IOMMU layer init code as it now uses IOMMU framework
      
      - A series of changes to fix up dm814x support that's been in a broken
        half-merged state for quite some time
      
      - A series of PRCM and hwmod changes via Paul Walmsley <paul@pwsan.com>:
      
        - I/O wakeup support for AM43xx
        - register lock and unlock support to the hwmod code (needed for the RTC
          IP blocks on some chips)
        - several fixes for sparse warnings and an unnecessary null pointer test
        - a DRA7xx clockdomain configuration workaround, to deal with some hardware
          bugs
      
      * tag 'omap-for-v4.3/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
        ARM: OMAP2: Add minimal dm814x hwmod support
        ARM: OMAP2+: Prepare dm81xx hwmod code for adding minimal dm814x support
        ARM: PRM: AM437x: Enable IO wakeup feature
        ARM: OMAP4+: PRM: Add AM437x specific data
        ARM: OMAP: PRM: Remove hardcoding of IRQENABLE_MPU_2 and IRQSTATUS_MPU_2 register offsets
        ARM: dts: AM4372: Add PRCM IRQ entry
        ARM: AM43xx: Add the PRM IRQ register offsets
        ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
        ARM: OMAP2+: Add support for initializing dm814x clocks
        ARM: OMAP2+: Add custom prwdm_operations for 81xx to support dm814x
        ARM: OMAP2+: Add minimal clockdomains for dm814x
        ARM: OMAP2+: Fix scm compatible for dm814x
        ARM: OMAP2+: Fix dm814x DT_MACHINE_START
        ARM: OMAP2+: Remove module references from IOMMU machine layer
        ARM: DRA7: Provide proper IO map table
        ARM: OMAP2+: Clean up omap4_local_timer_init
        ARM: OMAP2: Delete an unnecessary check
        ARM: OMAP2+: sparse: add missing function declarations
        ARM: OMAP2+: sparse: add missing static declaration
        ARM: OMAP2+: hwmod: add support for lock and unlock hooks
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d7018b15
    • Olof Johansson's avatar
      Merge tag 'renesas-soc-for-v4.3' of... · c3d3dbdd
      Olof Johansson authored
      Merge tag 'renesas-soc-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      Renesas ARM Based SoC Updates for v4.3
      
      * Add basic support for gose/r8a7793
      
      * tag 'renesas-soc-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: gose: enable R-Car Gen2 regulator quirk
        ARM: shmobile: Basic r8a7793 SoC support
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c3d3dbdd
    • Olof Johansson's avatar
      Merge tag 'sti-soc-for-v4.3-1' of... · 7bd1584b
      Olof Johansson authored
      Merge tag 'sti-soc-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/soc
      
      STi SoC updates for v4.3, round 1.
      
      Highlights:
      -----------
       - Add code to release secondary cores from holding pen.
       - Remove useless call to trace_hardirqs_off() in secondary core init function.
      
      * tag 'sti-soc-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
        ARM: STi: Remove platform call to trace_hardirqs_off()
        ARM: STi: Add code to release secondary cores from holding pen.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      7bd1584b
  2. 24 Jul, 2015 4 commits
  3. 23 Jul, 2015 7 commits
  4. 22 Jul, 2015 2 commits
    • Peter Griffin's avatar
      ARM: STi: Remove platform call to trace_hardirqs_off() · 50de4dd4
      Peter Griffin authored
      Calling trace_hardirqs_off() from the platform specific
      secondary startup code as not been necessary since Dec 2010
      when Russell King consolidated the call into the common SMP
      code.
      
      2c0136db ARM: SMP: consolidate trace_hardirqs_off() into common SMP code
      Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
      Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
      50de4dd4
    • Peter Griffin's avatar
      ARM: STi: Add code to release secondary cores from holding pen. · 94a8cfce
      Peter Griffin authored
      Most upstream devs boot STi platform via JTAG which abuses the
      boot process by setting the PC of secondary cores directly. As
      a consquence, booting STi platforms via u-boot results in only
      the primary core being brought up as the code to manage the
      holding pen is not upstream.
      
      This patch adds the necessary code to bring the secondary cores
      out of the holding pen. It uses the cpu-release-addr DT property
      to get the address of the holding pen from the bootloader.
      
      With this patch booting upstream kernels via u-boot works
      correctly:
      
      [    0.045456] CPU: Testing write buffer coherency: ok
      [    0.045597] CPU0: thread -1, cpu 0, socket 0, mpidr 80000000
      [    0.045734] Setting up static identity map for 0x40209000 - 0x40209098
      [    0.065047] CPU1: thread -1, cpu 1, socket 0, mpidr 80000001
      [    0.065081] Brought up 2 CPUs
      [    0.065089] SMP: Total of 2 processors activated (5983.43 BogoMIPS).
      [    0.065092] CPU: All CPU(s) started in SVC mode.
      Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
      Acked-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
      Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
      94a8cfce
  5. 18 Jul, 2015 3 commits
    • Vaishali Thakkar's avatar
      ARM: pxa: Use setup_timer · 6d6db340
      Vaishali Thakkar authored
      Use the timer API function setup_timer instead of structure field
      assignments to initialize a timer.
      
      A simplified version of the Coccinelle semantic patch that performs
      this transformation is as follows:
      
      @change@
      expression e1, e2, a;
      @@
      
      -init_timer(&e1);
      +setup_timer(&e1, a, 0UL);
      ... when != a = e2
      -e1.function = a;
      Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
      Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      6d6db340
    • Vaishali Thakkar's avatar
      ARM: pxa: Use module_platform_driver · 9754c8ef
      Vaishali Thakkar authored
      Use module_platform_driver for drivers whose init and exit functions
      only register and unregister, respectively.
      
      A simplified version of the Coccinelle semantic patch that performs
      this transformation is as follows:
      
      @A@
      identifier f, x;
      @@
      -static f(...) { return platform_driver_register(&x); }
      
      @b depends on a@
      identifier e, a.x;
      @@
      -static e(...) { platform_driver_unregister(&x); }
      
      @c depends on a && b@
      identifier a.f;
      declarer name module_init;
      @@
      -module_init(f);
      
      @d depends on a && b && c@
      identifier b.e, a.x;
      declarer name module_exit;
      declarer name module_platform_driver;
      @@
      -module_exit(e);
      +module_platform_driver(x);
      Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
      Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      9754c8ef
    • Robert Jarzmik's avatar
      ARM: pxa: transition to dmaengine phase 1 · 4be0856f
      Robert Jarzmik authored
      In order to slowly transition pxa to dmaengine, the legacy code will now
      rely on dmaengine to request a channel.
      
      This implies that PXA architecture selects DMADEVICES and PXA_DMA,
      which is not pretty. Yet it enables PXA drivers to be ported one by one,
      with part of them using dmaengine, and the other part using the legacy
      code.
      Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
      4be0856f
  6. 17 Jul, 2015 1 commit
  7. 16 Jul, 2015 12 commits
  8. 15 Jul, 2015 1 commit
  9. 12 Jul, 2015 6 commits
    • Linus Torvalds's avatar
      Linux 4.2-rc2 · bc0195aa
      Linus Torvalds authored
      bc0195aa
    • Linus Torvalds's avatar
      Revert "drm/i915: Use crtc_state->active in primary check_plane func" · 01e2d062
      Linus Torvalds authored
      This reverts commit dec4f799.
      
      Jörg Otte reports a NULL pointder dereference due to this commit, as
      'crtc_state' very much can be NULL:
      
              crtc_state = state->base.state ?
                      intel_atomic_get_crtc_state(state->base.state, intel_crtc) : NULL;
      
      So the change to test 'crtc_state->base.active' cannot possibly be
      correct as-is.
      
      There may be some other minimal fix (like just checking crtc_state for
      NULL), but I'm just reverting it now for the rc2 release, and people
      like Daniel Vetter who actually know this code will figure out what the
      right solution is in the longer term.
      Reported-and-bisected-by: default avatarJörg Otte <jrg.otte@gmail.com>
      Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
      Cc: Jani Nikula <jani.nikula@linux.intel.com>
      Cc: Daniel Vetter <daniel.vetter@intel.com>
      CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      01e2d062
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · c83727a6
      Linus Torvalds authored
      Pull VFS fixes from Al Viro:
       "Fixes for this cycle regression in overlayfs and a couple of
        long-standing (== all the way back to 2.6.12, at least) bugs"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        freeing unlinked file indefinitely delayed
        fix a braino in ovl_d_select_inode()
        9p: don't leave a half-initialized inode sitting around
      c83727a6
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 7fbb58a0
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "A fair number of 4.2 fixes also because Markos opened the flood gates.
      
         - Patch up the math used calculate the location for the page bitmap.
      
         - The FDC (Not what you think, FDC stands for Fast Debug Channel) IRQ
           around was causing issues on non-Malta platforms, so move the code
           to a Malta specific location.
      
         - A spelling fix replicated through several files.
      
         - Fix to the emulation of an R2 instruction for R6 cores.
      
         - Fix the JR emulation for R6.
      
         - Further patching of mindless 64 bit issues.
      
         - Ensure the kernel won't crash on CPUs with L2 caches with >= 8
           ways.
      
         - Use compat_sys_getsockopt for O32 ABI on 64 bit kernels.
      
         - Fix cache flushing for multithreaded cores.
      
         - A build fix"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: O32: Use compat_sys_getsockopt.
        MIPS: c-r4k: Extend way_string array
        MIPS: Pistachio: Support CDMM & Fast Debug Channel
        MIPS: Malta: Make GIC FDC IRQ workaround Malta specific
        MIPS: c-r4k: Fix cache flushing for MT cores
        Revert "MIPS: Kconfig: Disable SMP/CPS for 64-bit"
        MIPS: cps-vec: Use macros for various arithmetics and memory operations
        MIPS: kernel: cps-vec: Replace KSEG0 with CKSEG0
        MIPS: kernel: cps-vec: Use ta0-ta3 pseudo-registers for 64-bit
        MIPS: kernel: cps-vec: Replace mips32r2 ISA level with mips64r2
        MIPS: kernel: cps-vec: Replace 'la' macro with PTR_LA
        MIPS: kernel: smp-cps: Fix 64-bit compatibility errors due to pointer casting
        MIPS: Fix erroneous JR emulation for MIPS R6
        MIPS: Fix branch emulation for BLTC and BGEC instructions
        MIPS: kernel: traps: Fix broken indentation
        MIPS: bootmem: Don't use memory holes for page bitmap
        MIPS: O32: Do not handle require 32 bytes from the stack to be readable.
        MIPS, CPUFREQ: Fix spelling of Institute.
        MIPS: Lemote 2F: Fix build caused by recent mass rename.
      7fbb58a0
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1daa1cfb
      Linus Torvalds authored
      Pull x86 fixes from Thomas Gleixner:
      
       - the high latency PIT detection fix, which slipped through the cracks
         for rc1
      
       - a regression fix for the early printk mechanism
      
       - the x86 part to plug irq/vector related hotplug races
      
       - move the allocation of the espfix pages on cpu hotplug to non atomic
         context.  The current code triggers a might_sleep() warning.
      
       - a series of KASAN fixes addressing boot crashes and usability
      
       - a trivial typo fix for Kconfig help text
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/kconfig: Fix typo in the CONFIG_CMDLINE_BOOL help text
        x86/irq: Retrieve irq data after locking irq_desc
        x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
        x86/irq: Plug irq vector hotplug race
        x86/earlyprintk: Allow early_printk() to use console style parameters like '115200n8'
        x86/espfix: Init espfix on the boot CPU side
        x86/espfix: Add 'cpu' parameter to init_espfix_ap()
        x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
        x86/kasan: Add message about KASAN being initialized
        x86/kasan: Fix boot crash on AMD processors
        x86/kasan: Flush TLBs after switching CR3
        x86/kasan: Fix KASAN shadow region page tables
        x86/init: Clear 'init_level4_pgt' earlier
        x86/tsc: Let high latency PIT fail fast in quick_pit_calibrate()
      1daa1cfb
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7b732169
      Linus Torvalds authored
      Pull timer fixes from Thomas Gleixner:
       "This update from the timer departement contains:
      
         - A series of patches which address a shortcoming in the tick
           broadcast code.
      
           If the broadcast device is not available or an hrtimer emulated
           broadcast device, some of the original assumptions lead to boot
           failures.  I rather plugged all of the corner cases instead of only
           addressing the issue reported, so the change got a little larger.
      
           Has been extensivly tested on x86 and arm.
      
         - Get rid of the last holdouts using do_posix_clock_monotonic_gettime()
      
         - A regression fix for the imx clocksource driver
      
         - An update to the new state callbacks mechanism for clockevents.
           This is required to simplify the conversion, which will take place
           in 4.3"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tick/broadcast: Prevent NULL pointer dereference
        time: Get rid of do_posix_clock_monotonic_gettime
        cris: Replace do_posix_clock_monotonic_gettime()
        tick/broadcast: Unbreak CONFIG_GENERIC_CLOCKEVENTS=n build
        tick/broadcast: Handle spurious interrupts gracefully
        tick/broadcast: Check for hrtimer broadcast active early
        tick/broadcast: Return busy when IPI is pending
        tick/broadcast: Return busy if periodic mode and hrtimer broadcast
        tick/broadcast: Move the check for periodic mode inside state handling
        tick/broadcast: Prevent deep idle if no broadcast device available
        tick/broadcast: Make idle check independent from mode and config
        tick/broadcast: Sanity check the shutdown of the local clock_event
        tick/broadcast: Prevent hrtimer recursion
        clockevents: Allow set-state callbacks to be optional
        clocksource/imx: Define clocksource for mx27
      7b732169