Skip to content
Commits on Aug 19, 2012
  1. mmc: Make sure host is disabled on suspend

    Dmitry Shmidt committed with Aug 16, 2012
    Change-Id: Ie0bf2004e173cef8dad66722a152658d7727ab65
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
  2. USB: gadget: f_audio_source: Fix compilation error

    Mike Lockwood committed with Aug 16, 2012
    Change-Id: I1b785c47bda03208d396473a9d1c94631f5624d9
    Signed-off-by: Mike Lockwood <lockwood@google.com>
  3. USB: gadget: f_audio_source: Fix use after free in audio_unbind

    Mike Lockwood committed with Aug 15, 2012
    When USB was disconnected, we were freeing our audio_dev struct in audio_unbind
    before the audio system had cleaned up, resulting in a hang in audio_pcm_close.
    We now statically allocate the audio_dev struct to avoid this problem.
    
    Change-Id: I58ad21eaa20dcf4aa74ee614ef3b6ed2c91d52a1
    Signed-off-by: Mike Lockwood <lockwood@google.com>
Commits on Aug 15, 2012
  1. @ashish-s-sharma

    netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notific…

    ashish-s-sharma committed with Aug 13, 2012
    …ation.
    
    Signed-off-by: Ashish Sharma <ashishsharma@google.com>
  2. net: wireless: bcmdhd: Use correct time from boot for TSF

    Dmitry Shmidt committed with Aug 13, 2012
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
  3. @johnstultz-work

    time: Introduce get_monotonic_boottime and ktime_get_boottime

    johnstultz-work committed with Feb 14, 2011
    This adds new functions that return the monotonic time since boot
    (in other words, CLOCK_MONOTONIC + suspend time).
    
    CC: Jamie Lokier <jamie@shareable.org>
    CC: Thomas Gleixner <tglx@linutronix.de>
    CC: Alexander Shishkin <virtuoso@slind.org>
    CC: Arve Hjønnevåg <arve@android.com>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
Commits on Aug 13, 2012
  1. kstrto*: converting strings to integers done (hopefully) right

    Alexey Dobriyan committed with Mar 22, 2011
    commit 33ee3b2e2eb9b4b6c64dcf9ed66e2ac3124e748c upstream.
    
    1. simple_strto*() do not contain overflow checks and crufty,
       libc way to indicate failure.
    2. strict_strto*() also do not have overflow checks but the name and
       comments pretend they do.
    3. Both families have only "long long" and "long" variants,
       but users want strtou8()
    4. Both "simple" and "strict" prefixes are wrong:
       Simple doesn't exactly say what's so simple, strict should not exist
       because conversion should be strict by default.
    
    The solution is to use "k" prefix and add convertors for more types.
    Enter
    	kstrtoull()
    	kstrtoll()
    	kstrtoul()
    	kstrtol()
    	kstrtouint()
    	kstrtoint()
    
    	kstrtou64()
    	kstrtos64()
    	kstrtou32()
    	kstrtos32()
    	kstrtou16()
    	kstrtos16()
    	kstrtou8()
    	kstrtos8()
    
    Include runtime testsuite (somewhat incomplete) as well.
    
    strict_strto*() become deprecated, stubbed to kstrto*() and
    eventually will be removed altogether.
    
    Use kstrto*() in code today!
    
    Note: on some archs _kstrtoul() and _kstrtol() are left in tree, even if
          they'll be unused at runtime. This is temporarily solution,
          because I don't want to hardcode list of archs where these
          functions aren't needed. Current solution with sizeof() and
          __alignof__ at least always works.
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    
    Conflicts:
    
    	include/linux/kernel.h
    	lib/Makefile
    	lib/vsprintf.c
    
    Conflicts:
    
    	include/linux/kernel.h
    	lib/vsprintf.c
    
    -merged from:
     arco/samsung-kernel-msm7x30@2ae7e36#include/linux/kernel.h
Commits on Aug 11, 2012
  1. defconfig: ics: regen

    committed Aug 10, 2012
  2. Revert "video: tegra3: dc: remove hard coded HDMI rates"

    committed Aug 10, 2012
    This reverts commit 69c42c1.
  3. Revert "video: tegra: dc: add tracing information"

    committed Aug 10, 2012
    This reverts commit e512479.
Commits on Aug 10, 2012
  1. Revert "video: tegra: host: Fix error case memory leaks"

    committed Aug 10, 2012
    This reverts commit 0e53f08.
Commits on Aug 9, 2012
Commits on Aug 7, 2012
  1. @ezterry
  2. Revert "video: tegra: dc: remove bandwidth efficiency"

    committed Aug 6, 2012
    This reverts commit 24b28f0.
  3. @terjebergstrom

    video: tegra: host: Do not panic on hardware timeout

    terjebergstrom committed with Apr 12, 2012
    nvhost panics if hardware does not respond within 30 seconds. Remove
    this behavior, as it causes problems in emulation and simulation.
    Panic should be used only to prevent corruption.
    
    Submits are now given a default timeout of 30 seconds. The clients
    can still override with their own timeout value.
    
    MPE doesn't provide the number of slots for context save/restore.
    This information is needed to be able to use the submit timeout for
    MPE.
    
    Bug 982946
    
    Change-Id: I0f54d639df0fb726cc3163b317bf9c90bf56798b
    Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
    Reviewed-on: http://git-master/r/100246
    Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
    Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
    
    -apply to dev.c
    -carry over MAX_STUCK_CHECK_COUNT of 17
  4. @terjebergstrom

    video: tegra: host: Fix error case memory leaks

    terjebergstrom committed with May 29, 2012
    When a submit fails, the related nvhost_job is not freed. Add an
    explicit free. Also, 3D is mapping the save buffer, but it is not
    unmapped.
    
    Bug 991972
    
    Change-Id: Ie335adb5e64f54557e76d12dfb6a9a1557781e8d
    Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
    Reviewed-on: http://git-master/r/106871
    Reviewed-by: Automatic_Commit_Validation_User
    Reviewed-by: Ryan Wong <ryanw@nvidia.com>
    Tested-by: Ryan Wong <ryanw@nvidia.com>
    
    -apply to dev.c
Commits on Aug 5, 2012
  1. @paolo-github

    block: introduce the BFQ-v4 I/O sched for 2.6.38

    paolo-github committed with Dec 22, 2010
    Add the BFQ-v4 I/O scheduler to 2.6.38.
    The general structure is borrowed from CFQ, as much code. A (bfq_)queue is
    associated to each task doing I/O on a device, and each time a scheduling
    decision has to be taken a queue is selected and it is served until it expires.
    
        - Slices are given in the service domain: tasks are assigned budgets,
          measured in number of sectors. Once got the disk, a task must
          however consume its assigned budget within a configurable maximum time
          (by default, the maximum possible value of the budgets is automatically
          computed to comply with this timeout). This allows the desired latency
          vs "throughput boosting" tradeoff to be set.
    
        - Budgets are scheduled according to a variant of WF2Q+, implemented
          using an augmented rb-tree to take eligibility into account while
          preserving an O(log N) overall complexity.
    
        - A low-latency tunable is provided; if enabled, both interactive and soft
          real-time applications are guaranteed very low latency.
    
        - Latency guarantees are preserved also in presence of NCQ.
    
        - High throughput with flash-based devices, while still preserving
          latency guarantees.
    
        - Useful features borrowed from CFQ: cooperating-queues merging (with
          some additional optimizations with respect to the original CFQ version),
          static fallback queue for OOM.
    
        - BFQ supports full hierarchical scheduling, exporting a cgroups
          interface.  Each node has a full scheduler, so each group can
          be assigned its own ioprio and an ioprio_class.
    
        - If the cgroups interface is used, weights can be explictly assigned,
          otherwise ioprio values are mapped to weights using the relation
          weight = IOPRIO_BE_NR - ioprio.
    
        - ioprio classes are served in strict priority order, i.e., lower
          priority queues are not served as long as there are higher priority
          queues.  Among queues in the same class the bandwidth is distributed
          in proportion to the weights of each queue. A very thin extra bandwidth
          is however guaranteed to the Idle class, to prevent it from starving.
    
    Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
    Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
    
    -patched from:
     26-Jul-2012 16:32
     http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.38-v4/
    
    -bfq-iosched:
         remove second parameter in __blk_run_queue
Commits on Aug 4, 2012
  1. USB: gadget: f_audio_source: Fix error handling and increase packet size

    Mike Lockwood committed with Aug 2, 2012
    Fixes watchdog reset on USB disconnect
    Larger packet size fixes performance in fullspeed mode
    
    Signed-off-by: Mike Lockwood <lockwood@google.com>
Commits on Aug 2, 2012
  1. cpufreq: interactive: take idle notifications only when active

    Sam Leffler committed with Jun 27, 2012
    Register an idle notifier only when the governor is active.  Also
    short-circuit work of idle end if the governor is not enabled.
    
    Signed-off-by: Sam Leffler <sleffler@chromium.org>
    Change-Id: I4cae36dd2e7389540d337d74745ffbaa0131870f
Commits on Jul 30, 2012
  1. defconfig: ics: unset CPA

    committed Jul 30, 2012
  2. Revert "ARM: tegra: Enable CPA."

    committed Jul 30, 2012
    This reverts commit 8a24bf5.
Commits on Jul 28, 2012
  1. net: wireless: bcmdhd: Fill station_info packet fields

    Dmitry Shmidt committed with Jul 26, 2012
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
  2. Revert "wireless: bcmdhd: remove __wl_band_5ghz_a.n/2ghz.n_channel in…

    committed Jul 28, 2012
    … bandlist conditional"
    
    This reverts commit 123aaa7.
Commits on Jul 26, 2012
  1. Revert "cpufreq: Allow adjust_jiffies for Tegra 2 SMP"

    committed Jul 25, 2012
    -causes strange behavior with shutdown (hangs, delays, etc.)
    
    This reverts commit 116a447.
  2. USB: gadget: f_audio_source: Adjust packet timing to reduce glitches

    Mike Lockwood committed with May 27, 2012
    Increase max packet size and clean up timing logic so we can better
    recover from not getting an interrupt in time for a SOF.
    
    Signed-off-by: Mike Lockwood <lockwood@google.com>
  3. USB: gadget: f_audio_source: New gadget driver for audio output

    Mike Lockwood committed with May 11, 2012
    This driver presents a standard USB audio class interface to the host
    and an ALSA PCM device to userspace
    
    Signed-off-by: Mike Lockwood <lockwood@google.com>
  4. USB: gadget: f_accessory: Add support for HID input devices

    Mike Lockwood committed with Mar 26, 2012
    Signed-off-by: Mike Lockwood <lockwood@google.com>
  5. Add ACCESSORY_SET_AUDIO_MODE control request and ioctl

    Mike Lockwood committed with May 11, 2012
    The control request will be used by the host to enable/disable USB audio
    and the ioctl will be used by userspace to read the audio mode
    
    Signed-off-by: Mike Lockwood <lockwood@google.com>
  6. usb: gadget-ics: sleep after gadget disconnect for VARIATION_TEGRA

    committed Jul 25, 2012
    -prevents device hard lockup
    -will investigate root cause at a later date
Commits on Jul 25, 2012
  1. @benoitgoby

    usb: gadget: adb: Only enable the gadget when adbd is ready

    benoitgoby committed with Mar 19, 2012
    When adb is enabled, only connect the gadget when adbd is ready. If adbd
    dies or is restarted (e.g. "adb root"), the gadget is disconnected when
    the adb device is close, and it is re-connected once adb re-open the
    device.
    
    - Add callbacks to adb, similar to FunctionFs callbacks, to notify the
      gadget when the daemon is ready or closed.
    - Refcount calls to android_enable/android_disable to enable the gadget
      only once all the function daemons are ready.
    - Add enable/disble to android_usb_function to notify the function when
      it is added/removed from the list of enabled functions.
    
    Change-Id: Id54ff85aec9cf8715c94b4f9bd6137a79ad58bfc
    Signed-off-by: Benoit Goby <benoit@android.com>
  2. usb: gadget: android: follow proper order on disconnect

    Dima Zavin committed with Sep 14, 2011
    We should composite_disconnect *before* updating our internal
    state and sending uevent to userspace.
    Also, hold cdev->lock while updating internal state.
    
    Change-Id: If66a5a4f7d4a102a44aefc3ce4a154a5a1517dcf
    Signed-off-by: Dima Zavin <dima@android.com>
Something went wrong with that request. Please try again.