1. 11 9月, 2012 3 次提交
  2. 31 8月, 2012 1 次提交
  3. 20 8月, 2012 2 次提交
  4. 14 8月, 2012 1 次提交
  5. 09 8月, 2012 5 次提交
  6. 07 8月, 2012 4 次提交
    • R
      usb: musb: use DMA mode 1 whenever possible · 4f3e8d26
      Roger Quadros 提交于
      Do not rely on any hints from gadget drivers and use DMA mode 1
      whenever we expect data of at least the endpoint's packet size and
      have not yet received a short packet.
      
      The last packet if short is always transferred using DMA mode 0.
      
      This patch fixes USB throughput issues in mass storage mode for
      host to device transfers.
      Signed-off-by: NRoger Quadros <rogerq@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      4f3e8d26
    • V
      usb: musb: host: Handle highmem in PIO mode · 8e8a5516
      Virupax Sadashivpetimath 提交于
      In case of USB bulk transfer, when himem page
      is received, the usb_sg_init function sets the
      urb transfer buffer to NULL. When such URB
      transfer is handled, kernel crashes in PIO mode.
      Handle this by mapping the highmem buffer in PIO mode.
      Signed-off-by: NVirupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com>
      Signed-off-by: NPraveena NADAHALLY <praveen.nadahally@stericsson.com>
      Acked-by: NLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      8e8a5516
    • B
      usb: musb: Fix bad call to kfree() in musb_free · decadacb
      Brian Downing 提交于
      Commit 62285963 (usb: musb: drop a
      gigantic amount of ifdeferry) included this change:
      
          @@ -1901,11 +1844,7 @@ static void musb_free(struct musb *musb)
                          dma_controller_destroy(c);
                  }
      
          -#ifdef CONFIG_USB_MUSB_HDRC_HCD
          -       usb_put_hcd(musb_to_hcd(musb));
          -#else
                  kfree(musb);
          -#endif
           }
      
           /*
      
      Since musb comes from struct usb_hcd's hcd_priv, which is allocated on
      the end of that struct, kfree'ing it is not going to work.  Replace
      kfree(musb) with usb_put_hcd(musb_to_hcd(musb)), which appears to be
      the right thing to do here.
      Signed-off-by: NBrian Downing <bdowning@lavos.net>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      decadacb
    • F
      usb: musb: fix sparse warnings · a156544b
      Felipe Balbi 提交于
      The following warnings are fixed:
      
      drivers/usb/musb/musb_core.c:357:6: warning: symbol 'musb_otg_timer_func' was not declared. Should it be static?
      drivers/usb/musb/musb_core.c:1339:27: warning: incorrect type in initializer (different address spaces)
      drivers/usb/musb/musb_core.c:1339:27:    expected void *mbase
      drivers/usb/musb/musb_core.c:1339:27:    got void [noderef] <asn:2>*mregs
      drivers/usb/musb/musb_core.c:1347:17: warning: incorrect type in argument 1 (different address spaces)
      drivers/usb/musb/musb_core.c:1347:17:    expected void [noderef] <asn:2>*addr
      drivers/usb/musb/musb_core.c:1347:17:    got void *mbase
      drivers/usb/musb/musb_core.h:487:27: warning: incorrect type in initializer (different address spaces)
      drivers/usb/musb/musb_core.h:487:27:    expected void *mbase
      drivers/usb/musb/musb_core.h:487:27:    got void [noderef] <asn:2>*mregs
      drivers/usb/musb/musb_core.h:491:26: warning: incorrect type in argument 1 (different address spaces)
      drivers/usb/musb/musb_core.h:491:26:    expected void const [noderef] <asn:2>*addr
      drivers/usb/musb/musb_core.h:491:26:    got void *mbase
      drivers/usb/musb/tusb6010.c:270:48: warning: incorrect type in argument 2 (different address spaces)
      drivers/usb/musb/tusb6010.c:270:48:    expected void [noderef] <asn:2>*buf
      drivers/usb/musb/tusb6010.c:270:48:    got unsigned char [usertype] *[assigned] buf
      drivers/usb/musb/tusb6010.c:164:32: warning: incorrect type in argument 1 (different address spaces)
      drivers/usb/musb/tusb6010.c:164:32:    expected void *to
      drivers/usb/musb/tusb6010.c:164:32:    got void [noderef] <asn:2>*buf
      drivers/usb/musb/tusb6010.c:172:24: warning: incorrect type in argument 1 (different address spaces)
      drivers/usb/musb/tusb6010.c:172:24:    expected void *to
      drivers/usb/musb/tusb6010.c:172:24:    got void [noderef] <asn:2>*[assigned] buf
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      a156544b
  7. 03 8月, 2012 22 次提交
    • K
      usb: musb: cleanup while removing musb omap glue driver · f039df58
      Kishon Vijay Abraham I 提交于
      No functional change. Just replaced the call to platform_device_del and
      platform_device_put with platform_device_unregister.
      Signed-off-by: NKishon Vijay Abraham I <kishon@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      f039df58
    • A
      usb: musb: NAK timeout scheme on bulk TX endpoint · f283862f
      Ajay Kumar Gupta 提交于
      Fixes endpoint starvation issue when more than one bulk QH is
      multiplexed on the reserved bulk TX endpoint.
      
      This patch sets the NAK timeout interval for such QHs, and when
      a timeout triggers the next QH will be scheduled.
      
      This scheme doesn't work for devices which are connected to a
      high to full speed tree (transaction translator) as there is
      no NAK timeout interrupt from the musb controller from such
      devices.
      Signed-off-by: NAjay Kumar Gupta <ajay.gupta@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      f283862f
    • A
      usb: musb: check for zero byte in musb_read/write_fifo · 603fe2b2
      Ajay Kumar Gupta 提交于
      Added a check in musb_{read | write}_fifo for zero byte length.
      Signed-off-by: NAjay Kumar Gupta <ajay.gupta@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      603fe2b2
    • A
      usb: musb: gadget: don't program dma for zero byte tx · d17d535f
      Ajay Kumar Gupta 提交于
      This is to reduce the overhead of dma programming for zero byte
      transmit as same can be done using pio mode.
      Signed-off-by: NAjay Kumar Gupta <ajay.gupta@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      d17d535f
    • A
      usb: musb: host: don't program dma for zero byte tx · 3132122c
      Ajay Kumar Gupta 提交于
      This is to reduce the overhead of dma programming for zero byte
      transmit as same can be done using pio mode.
      Signed-off-by: NAjay Kumar Gupta <ajay.gupta@ti.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      3132122c
    • S
      usb: musb: gadget: use variables according to their names in rxstate() · f0443afd
      Sergei Shtylyov 提交于
      In rxstate(), improper types are given to 'fifo_count' and 'len' variables, and
      these variables are not used in accordance to their names (up to the certain
      point), i.e. 'len' to hold the size of a packet in the RX FIFO, and 'fifo_count'
      to hold a difference between 'request->length' and 'request->actual'...
      Interchange the variables up to the point where their use starts to make sense
      again.
      Signed-off-by: NSergei Shtylyov <sshtylyov@ru.mvista.com>
      Signed-off-by: NFelipe Balbi <balbi@ti.com>
      f0443afd
    • L
      Linux 3.6-rc1 · 0d7614f0
      Linus Torvalds 提交于
      0d7614f0
    • L
      Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc · fc6bdb59
      Linus Torvalds 提交于
      Pull OLPC platform updates from Andres Salomon:
       "These move the OLPC Embedded Controller driver out of
        arch/x86/platform and into drivers/platform/olpc.
      
        OLPC machines are now ARM-based (which means lots of x86 and ARM
        changes), but are typically pretty self-contained..  so it makes more
        sense to go through a separate OLPC tree after getting the appropriate
        review/ACKs."
      
      * 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpc:
        x86: OLPC: move s/r-related EC cmds to EC driver
        Platform: OLPC: move global variables into priv struct
        Platform: OLPC: move debugfs support from x86 EC driver
        x86: OLPC: switch over to using new EC driver on x86
        Platform: OLPC: add a suspended flag to the EC driver
        Platform: OLPC: turn EC driver into a platform_driver
        Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call it
        drivers: OLPC: update various drivers to include olpc-ec.h
        Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driver
      fc6bdb59
    • L
      Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 44d82e29
      Linus Torvalds 提交于
      Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
       "This contains a set of device-tree conversions for Marvell Orion
        platforms that were staged early but took a few tries to get the
        branch into a format where it was suitable for us to pick up.
      
        Given that most people working on these platforms are hobbyists with
        limited time, we were a bit more flexible with merging it even though
        it came in late."
      
      * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        ARM: Kirkwood: Replace mrvl with marvell
        ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
        ARM: Kirkwood: Describe Dreamplug LEDs in DT.
        ARM: Kirkwood: Describe iConnects LEDs in DT.
        ARM: Kirkwood: Describe iConnects temperature sensor in DT.
        ARM: Kirkwood: Describe IB62x0 LEDs in DT.
        ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
        ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
        ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
        ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
        ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
        ARM: Kirkwood: Use DT to configure SATA device.
        ARM: kirkwood: use devicetree for SPI on dreamplug
        ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
        ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
        ARM: Kirkwood: Add basic device tree support for QNAP TS219.
        ATA: sata_mv: Add device tree support
        ARM: Orion: DTify the watchdog timer.
        ARM: Orion: Add arch support needed for I2C via DT.
        ARM: kirkwood: use devicetree for orion-spi
        ...
      
      Conflicts:
      	drivers/watchdog/orion_wdt.c
      44d82e29
    • L
      Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · bfdf85df
      Linus Torvalds 提交于
      Pull arm-soc cpuidle enablement for OMAP from Olof Johansson:
       "Coupled cpuidle was meant to merge for 3.5 through Len Brown's tree,
        but didn't go in because the pull request ended up rejected.  So it
        just got merged, and we got this staged branch that enables the
        coupled cpuidle code on OMAP.
      
        With a stable git workflow from the other maintainer we could have
        staged this earlier, but that wasn't the case so we have had to merge
        it late.
      
        The alternative is to hold it off until 3.7 but given that the code is
        well-isolated to OMAP and they are eager to see it go in, I didn't
        push back hard in that direction."
      
      * tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: OMAP4: CPUidle: Open broadcast clock-event device.
        ARM: OMAP4: CPUidle: add synchronization for coupled idle states
        ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.
        ARM: OMAP: timer: allow gp timer clock-event to be used on both cpus
      bfdf85df
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d1494ba8
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "A few fixes for merge window fallout, and a bugfix for timer resume on
        PRIMA2."
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: mmp: add missing irqs.h
        arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs
        ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
        ARM: mxc: Include missing irqs.h header
      d1494ba8
    • L
      Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh · 0a276d16
      Linus Torvalds 提交于
      Pull SuperH fixes from Paul Mundt.
      
      * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (24 commits)
        sh: explicitly include sh_dma.h in setup-sh7722.c
        sh: ecovec: care CN5 VBUS if USB host mode
        sh: sh7724: fixup renesas_usbhs clock settings
        sh: intc: initial irqdomain support.
        sh: pfc: Fix up init ordering mess.
        serial: sh-sci: fix compilation breakage, when DMA is enabled
        dmaengine: shdma: restore partial transfer calculation
        sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
        sh: Fix up recursive fault in oops with unset TTB.
        sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
        sh: select the fixed regulator driver on several boards
        sh: ecovec: switch MMC power control to regulators
        sh: add fixed voltage regulators to se7724
        sh: add fixed voltage regulators to sdk7786
        sh: add fixed voltage regulators to rsk
        sh: add fixed voltage regulators to migor
        sh: add fixed voltage regulators to kfr2r09
        sh: add fixed voltage regulators to ap325rxa
        sh: add fixed voltage regulators to sh7757lcr
        sh: add fixed voltage regulators to sh2007
        ...
      0a276d16
    • L
      Merge tag 'md-3.6' of git://neil.brown.name/md · 25aa6a7a
      Linus Torvalds 提交于
      Pull additional md update from NeilBrown:
       "This contains a few patches that depend on plugging changes in the
        block layer so needed to wait for those.
      
        It also contains a Kconfig fix for the new RAID10 support in dm-raid."
      
      * tag 'md-3.6' of git://neil.brown.name/md:
        md/dm-raid: DM_RAID should select MD_RAID10
        md/raid1: submit IO from originating thread instead of md thread.
        raid5: raid5d handle stripe in batch way
        raid5: make_request use batch stripe release
      25aa6a7a
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · c8924234
      Linus Torvalds 提交于
      Pull two ceph fixes from Sage Weil:
       "The first patch fixes up the old crufty open intent code to use the
        atomic_open stuff properly, and the second fixes a possible null deref
        and memory leak with the crypto keys."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: fix crypto key null deref, memory leak
        ceph: simplify+fix atomic_open
      c8924234
    • L
      Merge tag 'ecryptfs-3.6-rc1-fixes' of... · 410fc4ce
      Linus Torvalds 提交于
      Merge tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
      
      Pull ecryptfs fixes from Tyler Hicks:
       - Fixes a bug when the lower filesystem mount options include 'acl',
         but the eCryptfs mount options do not
       - Cleanups in the messaging code
       - Better handling of empty files in the lower filesystem to improve
         usability.  Failed file creations are now cleaned up and empty lower
         files are converted into eCryptfs during open().
       - The write-through cache changes are being reverted due to bugs that
         are not easy to fix.  Stability outweighs the performance
         enhancements here.
       - Improvement to the mount code to catch unsupported ciphers specified
         in the mount options
      
      * tag 'ecryptfs-3.6-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
        eCryptfs: check for eCryptfs cipher support at mount
        eCryptfs: Revert to a writethrough cache model
        eCryptfs: Initialize empty lower files when opening them
        eCryptfs: Unlink lower inode when ecryptfs_create() fails
        eCryptfs: Make all miscdev functions use daemon ptr in file private_data
        eCryptfs: Remove unused messaging declarations and function
        eCryptfs: Copy up POSIX ACL and read-only flags from lower mount
      410fc4ce
    • L
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 630103ea
      Linus Torvalds 提交于
      Pull CIFS update from Steve French:
       "Adds SMB2 rmdir/mkdir capability to the SMB2/SMB2.1 support in cifs.
      
        I am holding up a few more days on merging the remainder of the
        SMB2/SMB2.1 enablement although it is nearing review completion, in
        order to address some review comments from Jeff Layton on a few of the
        subsequent SMB2 patches, and also to debug an unrelated cifs problem
        that Pavel discovered."
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Add SMB2 support for rmdir
        CIFS: Move rmdir code to ops struct
        CIFS: Add SMB2 support for mkdir operation
        CIFS: Separate protocol specific part from mkdir
        CIFS: Simplify cifs_mkdir call
      630103ea
    • L
      mm: remove node_start_pfn checking in new WARN_ON for now · 8783b6e2
      Linus Torvalds 提交于
      Borislav Petkov reports that the new warning added in commit
      88fdf75d ("mm: warn if pg_data_t isn't initialized with zero")
      triggers for him, and it is the node_start_pfn field that has already
      been initialized once.
      
      The call trace looks like this:
      
        x86_64_start_kernel ->
          x86_64_start_reservations ->
          start_kernel ->
          setup_arch ->
          paging_init ->
          zone_sizes_init ->
          free_area_init_nodes ->
          free_area_init_node
      
      and (with the warning replaced by debug output), Borislav sees
      
        On node 0 totalpages: 4193848
          DMA zone: 64 pages used for memmap
          DMA zone: 6 pages reserved
          DMA zone: 3890 pages, LIFO batch:0
          DMA32 zone: 16320 pages used for memmap
          DMA32 zone: 798464 pages, LIFO batch:31
          Normal zone: 52736 pages used for memmap
          Normal zone: 3322368 pages, LIFO batch:31
        free_area_init_node: pgdat->node_start_pfn: 4423680      <----
        On node 1 totalpages: 4194304
          Normal zone: 65536 pages used for memmap
          Normal zone: 4128768 pages, LIFO batch:31
        free_area_init_node: pgdat->node_start_pfn: 8617984      <----
        On node 2 totalpages: 4194304
          Normal zone: 65536 pages used for memmap
          Normal zone: 4128768 pages, LIFO batch:31
        free_area_init_node: pgdat->node_start_pfn: 12812288     <----
        On node 3 totalpages: 4194304
          Normal zone: 65536 pages used for memmap
          Normal zone: 4128768 pages, LIFO batch:31
      
      so remove the bogus warning for now to avoid annoying people.  Minchan
      Kim is looking at it.
      Reported-by: NBorislav Petkov <bp@amd64.org>
      Cc: Minchan Kim <minchan@kernel.org>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8783b6e2
    • H
      ARM: mmp: add missing irqs.h · bac6f615
      Haojian Zhuang 提交于
      arch/arm/mach-mmp/gplugd.c:195:13: error: ‘MMP_NR_IRQS’ undeclared here
      (not in a function)
      make[1]: *** [arch/arm/mach-mmp/gplugd.o] Error 1
      
      Include <mach/irqs.h> to fix this issue.
      Signed-off-by: NHaojian Zhuang <haojian.zhuang@gmail.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      bac6f615
    • T
      arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs · 10b683cb
      Thomas Petazzoni 提交于
      The comment was wrongly referring to Armada 370 while the file is
      related to Armada XP.
      Signed-off-by: NThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      10b683cb
    • B
      ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes · debeaf6c
      Barry Song 提交于
      The only way to write LATCHED registers to write LATCH_BIT to LATCH register,
      that will latch COUNTER into LATCHED.e.g.
      writel_relaxed(SIRFSOC_TIMER_LATCH_BIT, sirfsoc_timer_base +
      	SIRFSOC_TIMER_LATCH);
      
      Writing values to LATCHED registers directly is useless at all.
      Signed-off-by: NBarry Song <Baohua.Song@csr.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      debeaf6c
    • S
      libceph: fix crypto key null deref, memory leak · f0666b1a
      Sylvain Munaut 提交于
      Avoid crashing if the crypto key payload was NULL, as when it was not correctly
      allocated and initialized.  Also, avoid leaking it.
      Signed-off-by: NSylvain Munaut <tnt@246tNt.com>
      Signed-off-by: NSage Weil <sage@inktank.com>
      Reviewed-by: NAlex Elder <elder@inktank.com>
      f0666b1a
    • S
      ceph: simplify+fix atomic_open · 5ef50c3b
      Sage Weil 提交于
      The initial ->atomic_open op was carried over from the old intent code,
      which was incomplete and didn't really work.  Replace it with a fresh
      method.  In particular:
      
       * always attempt to do an atomic open+lookup, both for the create case
         and for lookups of existing files.
       * fix symlink handling by returning 1 to the VFS so that we can follow
         the link to its destination. This fixes a longstanding ceph bug (#2392).
      Signed-off-by: NSage Weil <sage@inktank.com>
      5ef50c3b
  8. 02 8月, 2012 2 次提交