1. 09 Jul, 2013 22 commits
  2. 07 Jul, 2013 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma · d2b4a646
      Linus Torvalds authored
      Pull slave-dmaengine updates from Vinod Koul:
       "Once you have some time from extended weekend celebrations please
        consider pulling the following to get:
         - Various fixes and PCI driver for dw_dmac by Andy
         - DT binding for imx-dma by Markus & imx-sdma by Shawn
         - DT fixes for dmaengine by Lars
         - jz4740 dmac driver by Lars
         - and various fixes across the drivers"
      What "extended weekend celebrations"?  I'm in the merge window, who has
      time for extended celebrations..
      * 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (40 commits)
        DMA: shdma: add DT support
        DMA: shdma: shdma_chan_filter() has to be in shdma-base.h
        DMA: shdma: (cosmetic) don't re-calculate a pointer
        dmaengine: at_hdmac: prepare clk before calling enable
        dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions
        dmaengine: at_hdmac: remove unsuded atc_cleanup_descriptors()
        dmaengine: at_hdmac: add FIFO configuration parameter to DMA DT binding
        ARM: at91: dt: add header to define at_hdmac configuration
        MIPS: jz4740: Correct clock gate bit for DMA controller
        MIPS: jz4740: Remove custom DMA API
        MIPS: jz4740: Register jz4740 DMA device
        dma: Add a jz4740 dmaengine driver
        MIPS: jz4740: Acquire and enable DMA controller clock
        dma: mmp_tdma: disable irq when disabling dma channel
        dmaengine: PL08x: Avoid collisions with get_signal() macro
        dmaengine: dw: select DW_DMAC_BIG_ENDIAN_IO automagically
        dma: dw: add PCI part of the driver
        dma: dw: split driver to library part and platform code
        dma: move dw_dmac driver to an own directory
        dw_dmac: don't check resource with devm_ioremap_resource
    • Linus Torvalds's avatar
      Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux · 8dce5f3d
      Linus Torvalds authored
      Pull first stage of __cpuinit removal from Paul Gortmaker:
       "The two commits here 1) dummy out all the __cpuinit macros so that we
        no longer generate such sections, and then 2) remove all the section
        processing that we used to do for those sections.
        This makes all the __cpuinit and friends no-ops, so that we can remove
        the use cases of it at our leisure.  Expect stage 2, which does the
        tree wide removal sweep at the end of the merge window."
      * 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
        modpost: remove all traces of cpuinit/cpuexit sections
        init.h: remove __cpuinit sections from the kernel
  3. 06 Jul, 2013 6 commits
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 21884a83
      Linus Torvalds authored
      Pull timer core updates from Thomas Gleixner:
       "The timer changes contain:
         - posix timer code consolidation and fixes for odd corner cases
         - sched_clock implementation moved from ARM to core code to avoid
           duplication by other architectures
         - alarm timer updates
         - clocksource and clockevents unregistration facilities
         - clocksource/events support for new hardware
         - precise nanoseconds RTC readout (Xen feature)
         - generic support for Xen suspend/resume oddities
         - the usual lot of fixes and cleanups all over the place
        The parts which touch other areas (ARM/XEN) have been coordinated with
        the relevant maintainers.  Though this results in an handful of
        trivial to solve merge conflicts, which we preferred over nasty cross
        tree merge dependencies.
        The patches which have been committed in the last few days are bug
        fixes plus the posix timer lot.  The latter was in akpms queue and
        next for quite some time; they just got forgotten and Frederic
        collected them last minute."
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits)
        hrtimer: Remove unused variable
        hrtimers: Move SMP function call to thread context
        clocksource: Reselect clocksource when watchdog validated high-res capability
        posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting
        posix_timers: fix racy timer delta caching on task exit
        posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule()
        selftests: add basic posix timers selftests
        posix_cpu_timers: consolidate expired timers check
        posix_cpu_timers: consolidate timer list cleanups
        posix_cpu_timer: consolidate expiry time type
        tick: Sanitize broadcast control logic
        tick: Prevent uncontrolled switch to oneshot mode
        tick: Make oneshot broadcast robust vs. CPU offlining
        x86: xen: Sync the CMOS RTC as well as the Xen wallclock
        x86: xen: Sync the wallclock when the system time is set
        timekeeping: Indicate that clock was set in the pvclock gtod notifier
        timekeeping: Pass flags instead of multiple bools to timekeeping_update()
        xen: Remove clock_was_set() call in the resume path
        hrtimers: Support resuming with two or more CPUs online (but stopped)
        timer: Fix jiffies wrap behavior of round_jiffies_common()
    • Linus Torvalds's avatar
      Merge branch 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 8b70a90c
      Linus Torvalds authored
      Pull ARM DMA mapping updates from Marek Szyprowski:
       "This contains important bugfixes and an update for IOMMU integration
        support for ARM architecture"
      * 'for-v3.11' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma: Drop __GFP_COMP for iommu dma memory allocations
        ARM: DMA-mapping: mark all !DMA_TO_DEVICE pages in unmapping as clean
        ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
        ARM: dma-mapping: convert DMA direction into IOMMU protection attributes
        ARM: dma-mapping: Get pages if the cpu_addr is out of atomic_pool
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 7644a448
      Linus Torvalds authored
      Pull Metag architecture changes from James Hogan:
       - Infrastructure and DT files for TZ1090 SoC (pin control drivers
         already merged via pinctrl tree).
       - Panic on boot instead of just warning if cache aliasing possible.
       - Various SMP/hotplug fixes.
       - Various other randconfig/sparse fixes.
      * tag 'metag-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag: (24 commits)
        metag: move EXPORT_SYMBOL(csum_partial) to metag_ksyms.c
        metag: cpu hotplug: route_irq: preserve irq mask
        metag: kick: add missing irq_enter/exit to kick_handler()
        metag: smp: don't spin waiting for CPU to start
        metag: smp: enable irqs after set_cpu_online
        metag: use clear_tasks_mm_cpumask()
        metag: tz1090: select and instantiate pinctrl-tz1090-pdc
        metag: tz1090: select and instantiate pinctrl-tz1090
        metag: don't check for cache aliasing on smp cpu boot
        metag: panic if cache aliasing possible
        metag: *.dts: include using preprocessor
        metag: add <dt-bindings/> symlink
        metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files
        metag/traps: include setup.h for the per_cpu_trap_init declaration
        metag/traps: Mark die() as __noreturn to match the declaration.
        metag/processor.h: Add missing cpuinfo_op declaration.
        metag/setup: Restrict scope for the capabilities variable
        metag/mm/cache: Restrict scope for metag_lnkget_probe
        metag/asm/irq.h: Declare init_IRQ
        metag/kernel/irq.c: Declare root_domain as static
    • Linus Torvalds's avatar
      Merge tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen · 16984ce1
      Linus Torvalds authored
      Pull Xen ARM update rom Stefano Stabellini:
       "Just one commit this time: the implementation of the tmem hypercall
        for arm and arm64"
      * tag 'xenarm-for-3.11-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen:
        xen/arm and xen/arm64: implement HYPERVISOR_tmem_op
    • Linus Torvalds's avatar
      Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux · 2cb7b5a3
      Linus Torvalds authored
      Pull irqdomain refactoring from Grant Likely:
       "This is the long awaited simplification of irqdomain.  It gets rid of
        the different types of irq domains and instead both linear and tree
        mappings can be supported in a single domain.  Doing this removes a
        lot of special case code and makes irq domains simpler to understand
      * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux:
        irq: fix checkpatch error
        irqdomain: Include hwirq number in /proc/interrupts
        irqdomain: make irq_linear_revmap() a fast path again
        irqdomain: remove irq_domain_generate_simple()
        irqdomain: Refactor irq_domain_associate_many()
        irqdomain: Beef up debugfs output
        irqdomain: Clean up aftermath of irq_domain refactoring
        irqdomain: Eliminate revmap type
        irqdomain: merge linear and tree reverse mappings.
        irqdomain: Add a name field
        irqdomain: Replace LEGACY mapping with LINEAR
        irqdomain: Relax failure path on setting up mappings
    • Thomas Gleixner's avatar
      hrtimer: Remove unused variable · 73b0cd67
      Thomas Gleixner authored
      Sigh, should have noticed myself.
      Reported-by: fengguang.wu@intel.com
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
  4. 05 Jul, 2013 10 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b2c31107
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       - Do not idle omap device between crypto operations in one session.
       - Added sha224/sha384 shims for SSSE3.
       - More optimisations for camellia-aesni-avx2.
       - Removed defunct blowfish/twofish AVX2 implementations.
       - Added unaligned buffer self-tests.
       - Added PCLMULQDQ optimisation for CRCT10DIF.
       - Added support for Freescale's DCP co-processor
       - Misc fixes.
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (44 commits)
        crypto: testmgr - test hash implementations with unaligned buffers
        crypto: testmgr - test AEADs with unaligned buffers
        crypto: testmgr - test skciphers with unaligned buffers
        crypto: testmgr - check that entries in alg_test_descs are in correct order
        Revert "crypto: twofish - add AVX2/x86_64 assembler implementation of twofish cipher"
        Revert "crypto: blowfish - add AVX2/x86_64 implementation of blowfish cipher"
        crypto: camellia-aesni-avx2 - tune assembly code for more performance
        hwrng: bcm2835 - fix MODULE_LICENSE tag
        hwrng: nomadik - use clk_prepare_enable()
        crypto: picoxcell - replace strict_strtoul() with kstrtoul()
        crypto: dcp - Staticize local symbols
        crypto: dcp - Use NULL instead of 0
        crypto: dcp - Use devm_* APIs
        crypto: dcp - Remove redundant platform_set_drvdata()
        hwrng: use platform_{get,set}_drvdata()
        crypto: omap-aes - Don't idle/start AES device between Encrypt operations
        crypto: crct10dif - Use PTR_RET
        crypto: ux500 - Cocci spatch "resource_size.spatch"
        crypto: sha256_ssse3 - add sha224 support
        crypto: sha512_ssse3 - add sha384 support
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi · 45175476
      Linus Torvalds authored
      Pull ubi fixes from Artem Bityutskiy:
       "A couple of fixes and clean-ups, allow for assigning user-defined UBI
        device numbers when attaching MTD devices by using the "mtd=" module
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi:
        UBI: support ubi_num on mtd.ubi command line
        UBI: fastmap break out of used PEB search
        UBI: document UBI_IOCVOLUP better in user header
        UBI: do not abort init when ubi.mtd devices cannot be found
        UBI: drop redundant "UBI error" string
    • Linus Torvalds's avatar
      Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs · 2dd1cb5a
      Linus Torvalds authored
      Pull ubifs fix from Artem Bityutskiy:
       "Only a single patch which fixes a message"
      * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs:
        UBIFS: correct mount message
    • Thomas Gleixner's avatar
      hrtimers: Move SMP function call to thread context · 5ec2481b
      Thomas Gleixner authored
      smp_call_function_* must not be called from softirq context.
      But clock_was_set() which calls on_each_cpu() is called from softirq
      context to implement a delayed clock_was_set() for the timer interrupt
      handler. Though that almost never gets invoked. A recent change in the
      resume code uses the softirq based delayed clock_was_set to support
      Xens resume mechanism.
      linux-next contains a new warning which warns if smp_call_function_*
      is called from softirq context which gets triggered by that Xen
      Fix this by moving the delayed clock_was_set() call to a work context.
      Reported-and-tested-by: default avatarArtem Savkov <artem.savkov@gmail.com>
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Cc: David Vrabel <david.vrabel@citrix.com>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: H. Peter Anvin <hpa@zytor.com>,
      Cc: Konrad Wilk <konrad.wilk@oracle.com>
      Cc: John Stultz <john.stultz@linaro.org>
      Cc: xen-devel@lists.xen.org
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
    • Thomas Gleixner's avatar
      clocksource: Reselect clocksource when watchdog validated high-res capability · 332962f2
      Thomas Gleixner authored
      Up to commit 5d33b883 (clocksource: Always verify highres capability)
      we had no sanity check when selecting a clocksource, which prevented
      that a non highres capable clocksource is used when the system already
      switched to highres/nohz mode.
      The new sanity check works as Alex and Tim found out. It prevents the
      TSC from being used. This happens because on x86 the boot process
      looks like this:
      		Selects HPET which is valid for high-res
       	TSC is not selected, because it is not yet
      	flagged as VALID_HIGH_RES
      	Validates TSC for highres, but that does not make TSC
      	the current clocksource.
      Before the sanity check was added, we installed TSC unvalidated which
      worked most of the time. If the TSC was really detected as unstable,
      then the unstable logic removed it and installed HPET again.
      The sanity check is correct and needed. So the watchdog needs to kick
      a reselection of the clocksource, when it qualifies TSC as a valid
      high res clocksource.
      To solve this, we mark the clocksource which got the flag
      CLOCK_SOURCE_VALID_FOR_HRES set by the watchdog with an new flag
      CLOCK_SOURCE_RESELECT and trigger the watchdog thread. The watchdog
      thread evaluates the flag and invokes clocksource_select() when set.
      To avoid that the clocksource_done_booting() code, which is about to
      install the first real clocksource anyway, needs to go through
      clocksource_select and tick_oneshot_notify() pointlessly, split out
      the clocksource_watchdog_kthread() list walk code and invoke the
      select/notify only when called from clocksource_watchdog_kthread().
      So clocksource_done_booting() can utilize the same splitout code
      without the select/notify invocation and the clocksource_mutex
      unlock/relock dance.
      Reported-and-tested-by: default avatarAlex Shi <alex.shi@intel.com>
      Cc: Hans Peter Anvin <hpa@linux.intel.com>
      Cc: Tim Chen <tim.c.chen@linux.intel.com>
      Cc: Andi Kleen <andi.kleen@intel.com>
      Tested-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: Davidlohr Bueso <davidlohr.bueso@hp.com>
      Cc: John Stultz <john.stultz@linaro.org>
      Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1307042239150.11637@ionos.tec.linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
    • Guennadi Liakhovetski's avatar
      DMA: shdma: add DT support · 67eacc15
      Guennadi Liakhovetski authored
      This patch adds Device Tree support to the shdma driver. No special DT
      properties are used, only standard DMA DT bindings are implemented. Since
      shdma controllers reside on SoCs, their configuration is SoC-specific and
      shall be passed to the driver from the SoC platform data, using the
      auxdata procedure.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
    • Guennadi Liakhovetski's avatar
      DMA: shdma: shdma_chan_filter() has to be in shdma-base.h · d0951a23
      Guennadi Liakhovetski authored
      shdma_chan_filter() is a function, provided by the shdma-base.c module,
      move its declaration to the appropriate header.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
    • Guennadi Liakhovetski's avatar
      DMA: shdma: (cosmetic) don't re-calculate a pointer · fa74326c
      Guennadi Liakhovetski authored
      Use an existing pointer instead of retrieving it again.
      Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
    • Boris BREZILLON's avatar
      dmaengine: at_hdmac: prepare clk before calling enable · f784d9c9
      Boris BREZILLON authored
      Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to
      avoid common clk framework warnings.
      Signed-off-by: default avatarBoris BREZILLON <b.brezillon@overkiz.com>
      [nicolas.ferre@atmel.com: remove return code checking in at_dma_resume_noirq()]
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
    • Nicolas Ferre's avatar
      dmaengine/trivial: at_hdmac: add curly brackets to if/else expressions · c3dbc60c
      Nicolas Ferre authored
      Correct coding style following the patch:
      7c407d3e54dcc0c79119553c8d5ef176c1d5bc3a (DMA: AT91:
      Get residual bytes in dma buffer).
      Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>