1. 12 12月, 2013 16 次提交
  2. 11 12月, 2013 2 次提交
  3. 10 12月, 2013 6 次提交
    • S
      dma: add dma_get_any_slave_channel(), for use in of_xlate() · 8010dad5
      Stephen Warren 提交于
      mmp_pdma.c implements a custom of_xlate() function that is 95% identical
      to what Tegra will need. Create a function to implement the common part,
      so everyone doesn't just cut/paste the implementation.
      
      Cc: Dan Williams <dan.j.williams@intel.com>
      Cc: Vinod Koul <vinod.koul@intel.com>
      Cc: Lars-Peter Clausen <lars@metafoo.de>
      Cc: dmaengine@vger.kernel.org
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      8010dad5
    • S
      dma: add channel request API that supports deferred probe · 0ad7c000
      Stephen Warren 提交于
      dma_request_slave_channel() simply returns NULL whenever DMA channel
      lookup fails. Lookup could fail for two distinct reasons:
      
      a) No DMA specification exists for the channel name.
         This includes situations where no DMA specifications exist at all, or
         other general lookup problems.
      
      b) A DMA specification does exist, yet the driver for that channel is not
         yet registered.
      
      Case (b) should trigger deferred probe in client drivers. However, since
      they have no way to differentiate the two situations, it cannot.
      
      Implement new function dma_request_slave_channel_reason(), which performs
      identically to dma_request_slave_channel(), except that it returns an
      error-pointer rather than NULL, which allows callers to detect when
      deferred probe should occur.
      
      Eventually, all drivers should be converted to this new API, the old API
      removed, and the new API renamed to the more desirable name. This patch
      doesn't convert the existing API and all drivers in one go, since some
      drivers call dma_request_slave_channel() then dma_request_channel() if
      that fails. That would require either modifying dma_request_channel() in
      the same way, or adding extra error-handling code to all affected
      drivers, and there are close to 100 drivers using the other API, rather
      than just the 15-20 or so that use dma_request_slave_channel(), which
      might be tenable in a single patch.
      
      acpi_dma_request_slave_chan_by_name() doesn't currently implement
      deferred probe. It should, but this will be addressed later.
      Acked-by: NDan Williams <dan.j.williams@intel.com>
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Signed-off-by: NVinod Koul <vinod.koul@intel.com>
      0ad7c000
    • S
      ASoC: dmaengine: add custom DMA config to snd_dmaengine_pcm_config · 194c7dea
      Stephen Warren 提交于
      Add fields to struct snd_dmaengine_pcm_config to allow custom:
      
      - DMA channel names.
      
        This is useful when the default "tx" and "rx" channel names don't
        apply, for example if a HW module supports multiple channels, each
        having different DMA channel names. This is the case with the FIFOs
        in Tegra's AHUB. This new facility can replace
        SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME.
      
      - DMA device
      
        This allows requesting DMA channels for a device other than the device
        which is registering the "PCM" driver. This is quite unusual, but is
        currently useful on Tegra. In much HW, and in Tegra20, each DAI HW
        module contains its own FIFOs which DMA writes to. However, in Tegra30,
        the DMA FIFOs were split out AHUB HW module, which then routes the data
        through a cross-bar, and into the DAI HW modules. However, the current
        ASoC driver structure does not expose this detail, and acts as if the
        FIFOs are still part of the DAI HW modules. Consequently, the "PCM"
        driver is registered with the DAI HW module, yet the DMA channels must
        be looked up in the AHUB HW module's device tree node. This new config
        field allows that to happen. Eventually, the Tegra drivers will be
        reworked to fully expose the AHUB, and this config field can be
        removed.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NMark Brown <broonie@linaro.org>
      194c7dea
    • M
      a715d01e
    • S
      ASoC: don't leak on error in snd_dmaengine_pcm_register · 6b9f3e65
      Stephen Warren 提交于
      If snd_dmaengine_pcm_register()'s call to snd_soc_add_platform() fails,
      all objects allocated during registration are leaked. Fix this by adding
      error-handling code.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NMark Brown <broonie@linaro.org>
      6b9f3e65
    • S
      ASoC: restructure dmaengine_pcm_request_chan_of() · 11b3a7ad
      Stephen Warren 提交于
      Restructure the internals of dmaengine_pcm_request_chan_of() as a loop
      over all channels to be allocated. This makes it easier to add logic
      that applies to all allocated channels, without having to duplicate that
      logic in each of the half-duplex/full-duplex paths.
      Signed-off-by: NStephen Warren <swarren@nvidia.com>
      Acked-by: NLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: NMark Brown <broonie@linaro.org>
      11b3a7ad
  4. 07 12月, 2013 6 次提交
    • L
      Linux 3.13-rc3 · 374b1057
      Linus Torvalds 提交于
      374b1057
    • L
      Merge tag 'trace-fixes-3.13-rc2' of... · 843f4f4b
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull tracing fix from Steven Rostedt:
       "A regression showed up that there's a large delay when enabling all
        events.  This was prevalent when FTRACE_SELFTEST was enabled which
        enables all events several times, and caused the system bootup to
        pause for over a minute.
      
        This was tracked down to an addition of a synchronize_sched()
        performed when system call tracepoints are unregistered.
      
        The synchronize_sched() is needed between the unregistering of the
        system call tracepoint and a deletion of a tracing instance buffer.
        But placing the synchronize_sched() in the unreg of *every* system
        call tracepoint is a bit overboard.  A single synchronize_sched()
        before the deletion of the instance is sufficient"
      
      * tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Only run synchronize_sched() at instance deletion time
      843f4f4b
    • L
      Merge git://git.kvack.org/~bcrl/aio-next · c537aba0
      Linus Torvalds 提交于
      Pull aio fix from Benjamin LaHaise:
       "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
        trinity"
      
      * git://git.kvack.org/~bcrl/aio-next:
        aio: clean up aio ring in the fail path
      c537aba0
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 7adfff58
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of nine fixes (and one author update).
      
        The libsas one should fix discovery in eSATA devices, the WRITE_SAME
        one is the largest, but it should fix a lot of problems we've been
        getting with the emulated RAID devices (they've been effectively lying
        about support and then firmware has been choking on the commands).
      
        The rest are various crash, hang or warn driver fixes"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        [SCSI] bfa: Fix crash when symb name set for offline vport
        [SCSI] enclosure: fix WARN_ON in dual path device removing
        [SCSI] pm80xx: Tasklets synchronization fix.
        [SCSI] pm80xx: Resetting the phy state.
        [SCSI] pm80xx: Fix for direct attached device.
        [SCSI] pm80xx: Module author addition
        [SCSI] hpsa: return 0 from driver probe function on success, not 1
        [SCSI] hpsa: do not discard scsi status on aborted commands
        [SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
        [SCSI] libsas: fix usage of ata_tf_to_fis
      7adfff58
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 470abdcf
      Linus Torvalds 提交于
      Pull IMA fixes from James Morris:
       "Here are two more fixes for IMA"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        ima: properly free ima_template_entry structures
        ima: Do not free 'entry' before it is initialized
      470abdcf
    • L
      Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · 24cb4120
      Linus Torvalds 提交于
      Pull devicetree fixes from Rob Herring:
       - Various DT binding documentation updates
       - Add Kumar Gala and remove Stephen Warren as DT binding maintainers
      
      * tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        dt: binding: reword PowerPC 8xxx GPIO documentation
        ARM: tegra: delete nvidia,tegra20-spi.txt binding
        hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
        of: add vendor prefix for GMT
        clk: exynos: Fix typos in DT bindings documentation
        of: Add vendor prefix for LG Corporation
        Documentation: net: fsl-fec.txt: Add phy-supply entry
        ARM: dts: doc: Document missing binding for omap5-mpu
        dt-bindings: add ARMv8 PMU binding
        MAINTAINERS: remove swarren from DT bindings
        MAINTAINERS: Add Kumar to Device Tree Binding maintainers group
      24cb4120
  5. 06 12月, 2013 10 次提交
    • G
      aio: clean up aio ring in the fail path · d1b94327
      Gu Zheng 提交于
      Clean up the aio ring file in the fail path of aio_setup_ring
      and ioctx_alloc. And maybe it can fix the GPF issue reported by
      Dave Jones:
      https://lkml.org/lkml/2013/11/25/898Signed-off-by: NGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
      d1b94327
    • J
      Merge branch 'free-memory' of... · bfb26328
      James Morris 提交于
      Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      bfb26328
    • L
      Merge tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 002acf1f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
      
       - cpufreq regression fix from Bjørn Mork restoring the pre-3.12
         behavior of the framework during system suspend/hibernation to avoid
         garbage sysfs files from being left behind in case of a suspend error
      
       - PNP regression fix to restore the correct states of devices after
         resume from hibernation broken in 3.12.  From Dmitry Torokhov.
      
       - cpuidle fix to prevent cpuidle device unregistration from crashing
         due to a NULL pointer dereference if cpuidle has been disabled from
         the kernel command line.  From Konrad Rzeszutek Wilk.
      
       - intel_idle fix for the C6 state definition on Intel Avoton/Rangeley
         processors from Arne Bockholdt.
      
       - Power capping framework fix to make the energy_uj sysfs attribute
         work in accordance with the documentation.  From Srinivas Pandruvada.
      
       - epoll fix to make it ignore the EPOLLWAKEUP flag if the kernel has
         been compiled with CONFIG_PM_SLEEP unset (in which case that flag
         should not have any effect).  From Amit Pundir.
      
       - cpufreq fix to prevent governor sysfs files from being lost over
         system suspend/resume in some (arguably unusual) situations.  From
         Viresh Kumar.
      
      * tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PowerCap: Fix mode for energy counter
        PNP: fix restoring devices after hibernation
        cpuidle: Check for dev before deregistering it.
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      002acf1f
    • R
      Merge branches 'pm-epoll', 'pnp' and 'powercap' · 8e703009
      Rafael J. Wysocki 提交于
      * pm-epoll:
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
      
      * pnp:
        PNP: fix restoring devices after hibernation
      
      * powercap:
        PowerCap: Fix mode for energy counter
      8e703009
    • R
      Merge branches 'pm-cpuidle' and 'pm-cpufreq' · 7cdcec99
      Rafael J. Wysocki 提交于
      * pm-cpuidle:
        cpuidle: Check for dev before deregistering it.
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      
      * pm-cpufreq:
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
      7cdcec99
    • L
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · b52b342d
      Linus Torvalds 提交于
      Pull arch/tile ftrace bug fix from Chris Metcalf:
       "This fixes a build failure with allyesconfig reported by Fengguang Wu
        and fixed by Tony Lu"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        ftrace: default to tilegx if ARCH=tile is specified
      b52b342d
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5ee54061
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "A small collection of fixes for the current series. It contains:
      
         - A fix for a use-after-free of a request in blk-mq.  From Ming Lei
      
         - A fix for a blk-mq bug that could attempt to dereference a NULL rq
           if allocation failed
      
         - Two xen-blkfront small fixes
      
         - Cleanup of submit_bio_wait() type uses in the kernel, unifying
           that.  From Kent
      
         - A fix for 32-bit blkg_rwstat reading.  I apologize for this one
           looking mangled in the shortlog, it's entirely my fault for missing
           an empty line between the description and body of the text"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix use-after-free of request
        blk-mq: fix dereference of rq->mq_ctx if allocation fails
        block: xen-blkfront: Fix possible NULL ptr dereference
        xen-blkfront: Silence pfn maybe-uninitialized warning
        block: submit_bio_wait() conversions
        Update of blkg_stat and blkg_rwstat may happen in bh context
      5ee54061
    • L
      Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 29be6345
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       - Stable fix for a NFSv4.1 delegation and state recovery deadlock
       - Stable fix for a loop on irrecoverable errors when returning
         delegations
       - Fix a 3-way deadlock between layoutreturn, open, and state recovery
       - Update the MAINTAINERS file with contact information for Trond
         Myklebust
       - Close needs to handle NFS4ERR_ADMIN_REVOKED
       - Enabling v4.2 should not recompile nfsd and lockd
       - Fix a couple of compile warnings
      
      * tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: fix do_div() warning by instead using sector_div()
        MAINTAINERS: Update contact information for Trond Myklebust
        NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
        SUNRPC: do not fail gss proc NULL calls with EACCES
        NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
        NFSv4: Update list of irrecoverable errors on DELEGRETURN
        NFSv4 wait on recovery for async session errors
        NFS: Fix a warning in nfs_setsecurity
        NFS: Enabling v4.2 should not recompile nfsd and lockd
      29be6345
    • T
      ftrace: default to tilegx if ARCH=tile is specified · 2d8eedad
      Tony Lu 提交于
      This matches the existing behavior in arch/tile/Makefile for defconfig.
      
      Reported-by: fengguang.wu@intel.com
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NTony Lu <zlu@tilera.com>
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      2d8eedad
    • S
      tracing: Only run synchronize_sched() at instance deletion time · 3ccb0123
      Steven Rostedt 提交于
      It has been reported that boot up with FTRACE_SELFTEST enabled can take a
      very long time. There can be stalls of over a minute.
      
      This was tracked down to the synchronize_sched() called when a system call
      event is disabled. As the self tests enable and disable thousands of events,
      this makes the synchronize_sched() get called thousands of times.
      
      The synchornize_sched() was added with d562aff9 "tracing: Add support
      for SOFT_DISABLE to syscall events" which caused this regression (added
      in 3.13-rc1).
      
      The synchronize_sched() is to protect against the events being accessed
      when a tracer instance is being deleted. When an instance is being deleted
      all the events associated to it are unregistered. The synchronize_sched()
      makes sure that no more users are running when it finishes.
      
      Instead of calling synchronize_sched() for all syscall events, we only
      need to call it once, after the events are unregistered and before the
      instance is deleted. The event_mutex is held during this action to
      prevent new users from enabling events.
      
      Link: http://lkml.kernel.org/r/20131203124120.427b9661@gandalf.local.homeReported-by: NPetr Mladek <pmladek@suse.cz>
      Acked-by: NTom Zanussi <tom.zanussi@linux.intel.com>
      Acked-by: NPetr Mladek <pmladek@suse.cz>
      Tested-by: NPetr Mladek <pmladek@suse.cz>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      3ccb0123