1. 23 Feb, 2012 1 commit
    • Arnd Bergmann's avatar
      Merge tag 'rpmsg-for-3.4' of... · ab646a24
      Arnd Bergmann authored
      Merge tag 'rpmsg-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc into next/rpmsg
      
      * tag 'rpmsg-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: s/big switch/lookup table/
        remoteproc: bail out if firmware has different endianess
        remoteproc: don't use virtio's weak barriers
        rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
        rpmsg: depend on EXPERIMENTAL
        remoteproc: depend on EXPERIMENTAL
        rpmsg: add Kconfig menu
        remoteproc: add Kconfig menu
        remoteproc: look for truncated firmware images
        remoteproc/omap: utilize module_platform_driver
        remoteproc: remove unused resource type
        remoteproc: avoid registering a virtio device if not supported
        remoteproc: do not require an iommu
        samples/rpmsg: add an rpmsg driver sample
        rpmsg: add virtio-based remote processor messaging bus
        remoteproc/omap: add a remoteproc driver for OMAP4
        remoteproc: create rpmsg virtio device
        remoteproc: add debugfs entries
        remoteproc: add framework for controlling remote processors
      ab646a24
  2. 22 Feb, 2012 6 commits
    • Ohad Ben-Cohen's avatar
      remoteproc: s/big switch/lookup table/ · e12bc14b
      Ohad Ben-Cohen authored
      A lookup table would be easier to extend, and the resulting
      code is a bit cleaner.
      Reported-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      e12bc14b
    • Ohad Ben-Cohen's avatar
      remoteproc: bail out if firmware has different endianess · cf59d3e9
      Ohad Ben-Cohen authored
      At this point we don't support remote processors that have
      a different endianess than the host.
      
      Look out for these unsupported scenarios, and bail out if
      encountered.
      Reported-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Cc: Mark Grosen <mgrosen@ti.com>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      cf59d3e9
    • Ohad Ben-Cohen's avatar
      remoteproc: don't use virtio's weak barriers · dd6da1c5
      Ohad Ben-Cohen authored
      When creating a virtqueue for rpmsg, tell virtio we're not interested
      in "weak" smp barriers, since we're talking to a real device.
      
      On ARM, this means using a DSB instead of a DMB, which is needed
      for platforms that kick the remote processor using some kind of
      a mailbox device mapped to Device memory (otherwise the kick can
      jump ahead and wake the remote processor before it has observed
      the changes to the vrings).
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      dd6da1c5
    • Axel Lin's avatar
      rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf · b719587e
      Axel Lin authored
      Since commit 7bb7aef2 "virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf",
      virtqueue_add_buf_gfp is already rename to virtqueue_add_buf now.
      
      This patch fixes below build error:
       CC [M]  drivers/rpmsg/virtio_rpmsg_bus.o
      drivers/rpmsg/virtio_rpmsg_bus.c: In function 'rpmsg_send_offchannel_raw':
      drivers/rpmsg/virtio_rpmsg_bus.c:723: error: implicit declaration of function 'virtqueue_add_buf_gfp'
      make[2]: *** [drivers/rpmsg/virtio_rpmsg_bus.o] Error 1
      make[1]: *** [drivers/rpmsg] Error 2
      make: *** [drivers] Error 2
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      b719587e
    • Ohad Ben-Cohen's avatar
      rpmsg: depend on EXPERIMENTAL · 4ba60295
      Ohad Ben-Cohen authored
      There isn't any binary change in sight or evidence of any stability
      issue, but as we just begin to get traction we can't rule them out
      completely.
      
      To be on the safe side, let's mark rpmsg as EXPERIMENTAL, and remove
      it later on after we have several happy users.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      Cc: Rob Clark <rob@ti.com>
      Cc: Mark Grosen <mgrosen@ti.com>
      Cc: Ludovic BARRE <ludovic.barre@stericsson.com>
      4ba60295
    • Ohad Ben-Cohen's avatar
      remoteproc: depend on EXPERIMENTAL · 489d129a
      Ohad Ben-Cohen authored
      Remoteproc is still under development and as it gets traction we
      definitely expect to do some changes in the binary format (most probably
      only in the resource table, e.g. the upcoming move to TLV-based entries).
      
      Active testing and use of remoteproc is most welcome, but we don't want
      users to expect backward binary compatibility with the preliminary
      images we have today.
      
      Therefore mark remoteproc as EXPERIMENTAL, and explicitly inform the user
      about this when a new remote processor is registered.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      Cc: Rob Clark <rob@ti.com>
      Cc: Mark Grosen <mgrosen@ti.com>
      Cc: Ludovic BARRE <ludovic.barre@stericsson.com>
      489d129a
  3. 09 Feb, 2012 11 commits
    • Linus Torvalds's avatar
      Linux 3.3-rc3 · d65b4e98
      Linus Torvalds authored
      d65b4e98
    • Linus Torvalds's avatar
      Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 63082402
      Linus Torvalds authored
      One patch fixes an bug in the ARM/MSM IOMMU code which returned sucess
      in the unmap function even when an error occured and the other patch
      adds a workaround into the AMD IOMMU driver to better handle broken IVRS
      ACPI tables (this patch fixes the case when a device is not listed in
      the table but actually translated by the iommu).
      
      * 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/msm: Fix error handling in msm_iommu_unmap()
        iommu/amd: Work around broken IVRS tables
      63082402
    • Linus Torvalds's avatar
      Merge branch '3.3-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 19e75ed4
      Linus Torvalds authored
      This series contains pending target bug-fixes and cleanups for v3.3-rc3
      that have been addressed the past weeks in lio-core.git.
      
      Some of the highlights include:
      
       - Fix handling for control CDBs with data greater than PAGE_SIZE (andy)
       - Use IP_FREEBIND for iscsi-target to address network portal creation
         issues with systemd (dax)
       - Allow PERSISTENT RESERVE IN for non-reservation holder (marco)
       - Fix iblock se_dev_attrib.unmap_granularity (marco)
       - Fix unsupported WRITE_SAME sense payload handling (martin)
       - Add workaround for zero-length control CDB handling (nab)
       - Fix discovery with INADDR_ANY and IN6ADDR_ANY_INIT (nab)
       - Fix target_submit_cmd() exception handling (nab)
       - Return correct ASC for unimplemented VPD pages (roland)
       - Don't zero pages used for data buffers (roland)
       - Fix return code of core_tpg_.*_lun (sebastian)
      
      * '3.3-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)
        target: Fix unsupported WRITE_SAME sense payload
        iscsi: use IP_FREEBIND socket option
        iblock: fix handling of large requests
        target: handle empty string writes in sysfs
        iscsi_target: in_aton needs linux/inet.h
        target: Fix iblock se_dev_attrib.unmap_granularity
        target: Fix target_submit_cmd() exception handling
        target: Change target_submit_cmd() to return void
        target: accept REQUEST_SENSE with 18bytes
        target: Fail INQUIRY commands with EVPD==0 but PAGE CODE!=0
        target: Return correct ASC for unimplemented VPD pages
        iscsi-target: Fix discovery with INADDR_ANY and IN6ADDR_ANY_INIT
        target: Allow control CDBs with data > 1 page
        iscsi-target: Fix up a few assignments
        iscsi-target: make one-bit bitfields unsigned
        iscsi-target: Fix double list_add with iscsit_alloc_buffs reject
        iscsi-target: Fix reject release handling in iscsit_free_cmd()
        target: fix return code of core_tpg_.*_lun
        target: use save/restore lock primitive in core_dec_lacl_count()
        target: avoid multiple outputs in scsi_dump_inquiry()
        ...
      19e75ed4
    • Linus Torvalds's avatar
      Merge tag 'md-3.3-fixes' of git://neil.brown.name/md · 4d39aa1b
      Linus Torvalds authored
      Some simple md-related fixes.
      
      1/ two small fixes to ensure we handle an interrupted resync properly.
      2/ avoid loading the bitmap multiple times in dm-raid
      
      * tag 'md-3.3-fixes' of git://neil.brown.name/md:
        md: two small fixes to handling interrupt resync.
        Prevent DM RAID from loading bitmap twice.
      4d39aa1b
    • Linus Torvalds's avatar
      Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6 · 4a68d54c
      Linus Torvalds authored
      SPI bug fixes for v3.3-rc2
      
      Minor SPI device driver changes.  A rename of the pch_spi_pcidev symbol
      that merely eliminates a modpost warning, and a Kconfig change to allow
      the Samsung spi driver to build on EXYNOS.
      
      * tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
        spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver
        spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4
      4a68d54c
    • Linus Torvalds's avatar
      Merge branch 'akpm' (Andrew's tree) · 15a46353
      Linus Torvalds authored
      Five fixes
      
      * branch 'akpm':
        pcmcia: fix socket refcount decrementing on each resume
        mm: fix UP THP spin_is_locked BUGs
        drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax
        mm: compaction: check for overlapping nodes during isolation for migration
        nilfs2: avoid overflowing segment numbers in nilfs_ioctl_clean_segments()
      15a46353
    • Russell King's avatar
      pcmcia: fix socket refcount decrementing on each resume · 025e4ab3
      Russell King authored
      This fixes a memory-corrupting bug: not only does it cause the warning,
      but as a result of dropping the refcount to zero, it causes the
      pcmcia_socket0 device structure to be freed while it still has
      references, causing slab caches corruption.  A fatal oops quickly
      follows this warning - often even just a 'dmesg' following the warning
      causes the kernel to oops.
      
      While testing suspend/resume on an ARM device with PCMCIA support, and a
      CF card inserted, I found that after five suspend and resumes, the
      kernel would complain, and shortly die after with slab corruption.
      
        WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()
      
      As the message doesn't give a clue about which kobject, and the built-in
      debugging in drivers/base/power/main.c happens too late, this was added
      right before each get_device():
      
        printk("%s: %p [%s] %u\n", __func__, dev, kobject_name(&dev->kobj), atomic_read(&dev->kobj.kref.refcount));
      
      and on the 3rd s2ram cycle, the following behaviour observed:
      
      On the 3rd suspend/resume cycle:
      
        dpm_prepare: c1a0d998 [pcmcia_socket0] 3
        dpm_suspend: c1a0d998 [pcmcia_socket0] 3
        dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 3
        dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 3
        dpm_resume: c1a0d998 [pcmcia_socket0] 3
        dpm_complete: c1a0d998 [pcmcia_socket0] 2
      
      4th:
      
        dpm_prepare: c1a0d998 [pcmcia_socket0] 2
        dpm_suspend: c1a0d998 [pcmcia_socket0] 2
        dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 2
        dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 2
        dpm_resume: c1a0d998 [pcmcia_socket0] 2
        dpm_complete: c1a0d998 [pcmcia_socket0] 1
      
      5th:
      
        dpm_prepare: c1a0d998 [pcmcia_socket0] 1
        dpm_suspend: c1a0d998 [pcmcia_socket0] 1
        dpm_suspend_noirq: c1a0d998 [pcmcia_socket0] 1
        dpm_resume_noirq: c1a0d998 [pcmcia_socket0] 1
        dpm_resume: c1a0d998 [pcmcia_socket0] 1
        dpm_complete: c1a0d998 [pcmcia_socket0] 0
        ------------[ cut here ]------------
        WARNING: at include/linux/kref.h:41 kobject_get+0x28/0x50()
        Modules linked in: ucb1x00_core
        Backtrace:
        [<c0212090>] (dump_backtrace+0x0/0x110) from [<c04799dc>] (dump_stack+0x18/0x1c)
        [<c04799c4>] (dump_stack+0x0/0x1c) from [<c021cba0>] (warn_slowpath_common+0x50/0x68)
        [<c021cb50>] (warn_slowpath_common+0x0/0x68) from [<c021cbdc>] (warn_slowpath_null+0x24/0x28)
        [<c021cbb8>] (warn_slowpath_null+0x0/0x28) from [<c0335374>] (kobject_get+0x28/0x50)
        [<c033534c>] (kobject_get+0x0/0x50) from [<c03804f4>] (get_device+0x1c/0x24)
        [<c0388c90>] (dpm_complete+0x0/0x1a0) from [<c0389cc0>] (dpm_resume_end+0x1c/0x20)
        ...
      
      Looking at commit 7b24e798 ("pcmcia: split up central event handler"),
      the following change was made to cs.c:
      
                      return 0;
              }
       #endif
      -
      -       send_event(skt, CS_EVENT_PM_RESUME, CS_EVENT_PRI_LOW);
      +       if (!(skt->state & SOCKET_CARDBUS) && (skt->callback))
      +               skt->callback->early_resume(skt);
              return 0;
       }
      
      And the corresponding change in ds.c is from:
      
      -static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
      -{
      -       struct pcmcia_socket *s = pcmcia_get_socket(skt);
      ...
      -       switch (event) {
      ...
      -       case CS_EVENT_PM_RESUME:
      -               if (verify_cis_cache(skt) != 0) {
      -                       dev_dbg(&skt->dev, "cis mismatch - different card\n");
      -                       /* first, remove the card */
      -                       ds_event(skt, CS_EVENT_CARD_REMOVAL, CS_EVENT_PRI_HIGH);
      -                       mutex_lock(&s->ops_mutex);
      -                       destroy_cis_cache(skt);
      -                       kfree(skt->fake_cis);
      -                       skt->fake_cis = NULL;
      -                       s->functions = 0;
      -                       mutex_unlock(&s->ops_mutex);
      -                       /* now, add the new card */
      -                       ds_event(skt, CS_EVENT_CARD_INSERTION,
      -                                CS_EVENT_PRI_LOW);
      -               }
      -               break;
      ...
      -    }
      
      -    pcmcia_put_socket(s);
      
      -    return 0;
      -} /* ds_event */
      
      to:
      
      +static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
      +{
      +       if (!verify_cis_cache(skt)) {
      +               pcmcia_put_socket(skt);
      +               return 0;
      +       }
      
      +       dev_dbg(&skt->dev, "cis mismatch - different card\n");
      
      +       /* first, remove the card */
      +       pcmcia_bus_remove(skt);
      +       mutex_lock(&skt->ops_mutex);
      +       destroy_cis_cache(skt);
      +       kfree(skt->fake_cis);
      +       skt->fake_cis = NULL;
      +       skt->functions = 0;
      +       mutex_unlock(&skt->ops_mutex);
      
      +       /* now, add the new card */
      +       pcmcia_bus_add(skt);
      +       return 0;
      +}
      
      As can be seen, the original function called pcmcia_get_socket() and
      pcmcia_put_socket() around the guts, whereas the replacement code
      calls pcmcia_put_socket() only in one path.  This creates an imbalance
      in the refcounting.
      
      Testing with pcmcia_put_socket() put removed shows that the bug is gone:
      
        dpm_suspend: c1a10998 [pcmcia_socket0] 5
        dpm_suspend_noirq: c1a10998 [pcmcia_socket0] 5
        dpm_resume_noirq: c1a10998 [pcmcia_socket0] 5
        dpm_resume: c1a10998 [pcmcia_socket0] 5
        dpm_complete: c1a10998 [pcmcia_socket0] 5
      Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Cc: Dominik Brodowski <linux@dominikbrodowski.net>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      025e4ab3
    • Hugh Dickins's avatar
      mm: fix UP THP spin_is_locked BUGs · b9980cdc
      Hugh Dickins authored
      Fix CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_SMP=n CONFIG_DEBUG_VM=y
      CONFIG_DEBUG_SPINLOCK=n kernel: spin_is_locked() is then always false,
      and so triggers some BUGs in Transparent HugePage codepaths.
      
      asm-generic/bug.h mentions this problem, and provides a WARN_ON_SMP(x);
      but being too lazy to add VM_BUG_ON_SMP, BUG_ON_SMP, WARN_ON_SMP_ONCE,
      VM_WARN_ON_SMP_ONCE, just test NR_CPUS != 1 in the existing VM_BUG_ONs.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b9980cdc
    • Axel Lin's avatar
      drivers/leds/leds-lm3530.c: fix setting pltfm->als_vmax · ec44fd42
      Axel Lin authored
      In current code, pltfm->als_vmin is set to LM3530_ALS_WINDOW_mV and
      pltfm->als_vmax is 0.  This does not make sense.  I think what we want
      here is setting pltfm->als_vmax to LM3530_ALS_WINDOW_mV.
      
      Both als_vmin and als_vmax local variables will be set to
      pltfm->als_vmin and pltfm->als_vmax by a few lines latter.  Thus also
      remove a redundant assignment for als_vmin and als_vmax in this patch.
      Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
      Cc: Shreshtha Kumar Sahu <shreshthakumar.sahu@stericsson.com>
      Acked-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
      Tested-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
      Cc: Richard Purdie <rpurdie@rpsys.net>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ec44fd42
    • Mel Gorman's avatar
      mm: compaction: check for overlapping nodes during isolation for migration · dc908600
      Mel Gorman authored
      When isolating pages for migration, migration starts at the start of a
      zone while the free scanner starts at the end of the zone.  Migration
      avoids entering a new zone by never going beyond the free scanned.
      
      Unfortunately, in very rare cases nodes can overlap.  When this happens,
      migration isolates pages without the LRU lock held, corrupting lists
      which will trigger errors in reclaim or during page free such as in the
      following oops
      
        BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
        IP: [<ffffffff810f795c>] free_pcppages_bulk+0xcc/0x450
        PGD 1dda554067 PUD 1e1cb58067 PMD 0
        Oops: 0000 [#1] SMP
        CPU 37
        Pid: 17088, comm: memcg_process_s Tainted: G            X
        RIP: free_pcppages_bulk+0xcc/0x450
        Process memcg_process_s (pid: 17088, threadinfo ffff881c2926e000, task ffff881c2926c0c0)
        Call Trace:
          free_hot_cold_page+0x17e/0x1f0
          __pagevec_free+0x90/0xb0
          release_pages+0x22a/0x260
          pagevec_lru_move_fn+0xf3/0x110
          putback_lru_page+0x66/0xe0
          unmap_and_move+0x156/0x180
          migrate_pages+0x9e/0x1b0
          compact_zone+0x1f3/0x2f0
          compact_zone_order+0xa2/0xe0
          try_to_compact_pages+0xdf/0x110
          __alloc_pages_direct_compact+0xee/0x1c0
          __alloc_pages_slowpath+0x370/0x830
          __alloc_pages_nodemask+0x1b1/0x1c0
          alloc_pages_vma+0x9b/0x160
          do_huge_pmd_anonymous_page+0x160/0x270
          do_page_fault+0x207/0x4c0
          page_fault+0x25/0x30
      
      The "X" in the taint flag means that external modules were loaded but but
      is unrelated to the bug triggering.  The real problem was because the PFN
      layout looks like this
      
        Zone PFN ranges:
          DMA      0x00000010 -> 0x00001000
          DMA32    0x00001000 -> 0x00100000
          Normal   0x00100000 -> 0x01e80000
        Movable zone start PFN for each node
        early_node_map[14] active PFN ranges
            0: 0x00000010 -> 0x0000009b
            0: 0x00000100 -> 0x0007a1ec
            0: 0x0007a354 -> 0x0007a379
            0: 0x0007f7ff -> 0x0007f800
            0: 0x00100000 -> 0x00680000
            1: 0x00680000 -> 0x00e80000
            0: 0x00e80000 -> 0x01080000
            1: 0x01080000 -> 0x01280000
            0: 0x01280000 -> 0x01480000
            1: 0x01480000 -> 0x01680000
            0: 0x01680000 -> 0x01880000
            1: 0x01880000 -> 0x01a80000
            0: 0x01a80000 -> 0x01c80000
            1: 0x01c80000 -> 0x01e80000
      
      The fix is straight-forward.  isolate_migratepages() has to make a
      similar check to isolate_freepage to ensure that it never isolates pages
      from a zone it does not hold the LRU lock for.
      
      This was discovered in a 3.0-based kernel but it affects 3.1.x, 3.2.x
      and current mainline.
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Acked-by: default avatarMichal Nazarewicz <mina86@mina86.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dc908600
    • Xi Wang's avatar
      nilfs2: avoid overflowing segment numbers in nilfs_ioctl_clean_segments() · 1ecd3c7e
      Xi Wang authored
      nsegs is read from userspace.  Limit its value and avoid overflowing nsegs
      * sizeof(__u64) in the subsequent call to memdup_user().
      
      This patch complements 481fe17e ("nilfs2: potential integer overflow
      in nilfs_ioctl_clean_segments()").
      Signed-off-by: default avatarXi Wang <xi.wang@gmail.com>
      Cc: Haogang Chen <haogangchen@gmail.com>
      Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1ecd3c7e
  4. 08 Feb, 2012 19 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · e862f2e4
      Linus Torvalds authored
      sound fixes #2 for 3.3-rc3
      
      A collection of small fixes, mostly for regressions.
      In addition, a few ASoC wm8994 updates are included, too.
      
      * tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: wm8994: Disable line output discharge prior to ramping VMID
        ASoC: wm8994: Fix typo in VMID ramp setting
        ALSA: oxygen, virtuoso: fix exchanged L/R volumes of aux and CD inputs
        ALSA: usb-audio: add Edirol UM-3G support
        ALSA: hda - add support for Uniwill ECS M31EI notebook
        ALSA: hda - Fix error handling in patch_ca0132.c
        ASoC: wm8994: Enabling VMID should take a runtime PM reference
        ALSA: hda/realtek - Fix a wrong condition
        ALSA: emu8000: Remove duplicate linux/moduleparam.h include from emu8000_patch.c
        ALSA: hda/realtek - Add missing Bass and CLFE as vmaster slaves
        ASoC: wm_hubs: Correct line input to line output 2 paths
        ASoC: cs42l73: Fix Output [X|A|V]SP_SCLK Sourcing Mode setting for master mode
        ASoC: wm8962: Fix word length configuration
        ASoC: core: Better support for idle_bias_off suspend ignores
        ASoC: wm8994: Remove ASoC level register cache sync
        ASoC: wm_hubs: Fix routing of input PGAs to line output mixer
      e862f2e4
    • Ohad Ben-Cohen's avatar
      rpmsg: add Kconfig menu · f8289eda
      Ohad Ben-Cohen authored
      Add a dedicated Kconfig menu for the rpmsg drivers, so they
      don't show up in the main driver menu.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      f8289eda
    • Ohad Ben-Cohen's avatar
      remoteproc: add Kconfig menu · 650d6561
      Ohad Ben-Cohen authored
      Add a dedicated Kconfig menu for the remoteproc drivers, so they
      don't show up in the main driver menu.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      650d6561
    • Ohad Ben-Cohen's avatar
      remoteproc: look for truncated firmware images · 9bc91231
      Ohad Ben-Cohen authored
      Make sure firmware isn't truncated before accessing its data.
      Reported-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      9bc91231
    • Ohad Ben-Cohen's avatar
      remoteproc/omap: utilize module_platform_driver · 63d667bf
      Ohad Ben-Cohen authored
      Ditch some boilerplate code by employing the module_platform_driver
      helper.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      63d667bf
    • Ohad Ben-Cohen's avatar
      remoteproc: remove unused resource type · 2fd51811
      Ohad Ben-Cohen authored
      RSC_VIRTIO_CFG isn't being used, so remove it.
      
      Originally it was introduced to overcome a resource table limitation
      that prevented describing a virtio device in a single resource table
      entry.
      
      The plan though is to describe resource table entries in a TLV fashion,
      where each entry will consume the amount of space it requires,
      so the original limitation is anyway temporary.
      Reported-by: default avatarStephen Boyd <sboyd@codeaurora.org>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      2fd51811
    • Mark Grosen's avatar
      remoteproc: avoid registering a virtio device if not supported · 7d2d3956
      Mark Grosen authored
      Let remoteproc know when the firmware doesn't support any virtio
      functionality, so registering a virtio device can be avoided.
      
      This is needed for remote processors that doesn't require any
      virtio-based communications, but are still controlled via remoteproc.
      
      [ohad@wizery.com: write commit log]
      Signed-off-by: default avatarMark Grosen <mgrosen@ti.com>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      7d2d3956
    • Mark Grosen's avatar
      remoteproc: do not require an iommu · 0798e1da
      Mark Grosen authored
      Not all remote processors employ an IOMMU, so do not error out
      on !iommu_present().
      
      Note: we currently still use iommu_present() to tell whether we need
      to configure an IOMMU or not. That works for simple cases, but will
      easily fail with more complicated ones (e.g. where an IOMMU exists,
      but not all remote processors use it). When those use cases show up,
      we will solve them by introducing something like remoteproc hw
      capabilities.
      
      [ohad@wizery.com: write commit log]
      Signed-off-by: default avatarMark Grosen <mgrosen@ti.com>
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      0798e1da
    • Ohad Ben-Cohen's avatar
      samples/rpmsg: add an rpmsg driver sample · 779b96d2
      Ohad Ben-Cohen authored
      Add an rpmsg driver sample, which demonstrates how to communicate with
      an AMP-configured remote processor over the rpmsg bus.
      
      Note how once probed, the driver can immediately start sending messages
      using the rpmsg_send() API, without having to worry about creating endpoints
      or allocating rpmsg addresses: all that work is done by the rpmsg bus,
      and the required information is already embedded in the rpmsg channel
      that the driver is probed with.
      
      In this sample, the driver simply sends a "Hello World!" message to the remote
      processor repeatedly.
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      779b96d2
    • Ohad Ben-Cohen's avatar
      rpmsg: add virtio-based remote processor messaging bus · bcabbcca
      Ohad Ben-Cohen authored
      Add a virtio-based inter-processor communication bus, which enables
      kernel drivers to communicate with entities, running on remote
      processors, over shared memory using a simple messaging protocol.
      
      Every pair of AMP processors share two vrings, which are used to send
      and receive the messages over shared memory.
      
      The header of every message sent on the rpmsg bus contains src and dst
      addresses, which make it possible to multiplex several rpmsg channels on
      the same vring.
      
      Every rpmsg channel is a device on this bus. When a channel is added,
      and an appropriate rpmsg driver is found and probed, it is also assigned
      a local rpmsg address, which is then bound to the driver's callback.
      
      When inbound messages carry the local address of a bound driver,
      its callback is invoked by the bus.
      
      This patch provides a kernel interface only; user space interfaces
      will be later exposed by kernel users of this rpmsg bus.
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Acked-by: Rusty Russell <rusty@rustcorp.com.au> (virtio_ids.h)
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      bcabbcca
    • Ohad Ben-Cohen's avatar
      remoteproc/omap: add a remoteproc driver for OMAP4 · 34ed5a33
      Ohad Ben-Cohen authored
      Add a remoteproc driver for OMAP4, so we can boot the dual-M3 and
      and DSP subsystems.
      
      Use the omap_device_* API to control the hardware state, and utilize
      the OMAP mailbox to interrupt the remote processor when a new message
      is pending (the mailbox payload is used to tell it which virtqueue was
      the message placed in).
      
      Conversely, when an inbound mailbox message arrives, tell the remoteproc
      core which virtqueue is triggered.
      
      Later we will also use the mailbox payload to signal omap-specific
      events like remote crashes (which will be used to trigger remoteproc
      recovery) and power management transitions. At that point we will also
      extend the remoteproc core to support this.
      
      Based on (but now quite far from) work done by Fernando Guzman Lugo
      <fernando.lugo@ti.com> and Hari Kanigeri <h-kanigeri2@ti.com>.
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Acked-by: default avatarTony Lindgren <tony@atomide.com>
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      34ed5a33
    • Ohad Ben-Cohen's avatar
      remoteproc: create rpmsg virtio device · ac8954a4
      Ohad Ben-Cohen authored
      Create an rpmsg virtio device to allow message-based communication
      with the remote processor (but only if supported by its firmware).
      
      There are several advantages to provide this functionality at
      the remoteproc-level:
      - to support it, platforms only have to provide their own ->kick()
        handler; no need to duplicate the rest of the code.
      - the virtio device is created only when the remote processor is
        registered and ready to go. No need to depend on initcall magic.
        moreover, we only add the virtio device if the firmware really
        supports it, and only after we know the supported virtio device features.
      - correct device model hierarchy can be set, and that is useful
        for natural power management and DMA API behavior.
      - when the remote processor crashes (or removed) we only need
        to remove the virtio device, and the driver core will take care of
        the rest. No need to implement any out-of-bound notifiers.
      - we can now easily bind the virtio device to its rproc handle, and
        this way we don't need any name-based remoteproc ->get() API.
      
      Currently we only support creating a single rpmsg virtio device per
      remote processor, but later this is going to be extended to support
      creating numerous virtio devices of other types too (block, net,
      console...).
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      ac8954a4
    • Ohad Ben-Cohen's avatar
      remoteproc: add debugfs entries · 6391a706
      Ohad Ben-Cohen authored
      Expose several remote processor properties (name, state, trace buffer)
      that are helpful for debugging.
      
      This part is extracted to a separate patch just to keep the review load
      down.
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      6391a706
    • Ohad Ben-Cohen's avatar
      remoteproc: add framework for controlling remote processors · 400e64df
      Ohad Ben-Cohen authored
      Modern SoCs typically employ a central symmetric multiprocessing (SMP)
      application processor running Linux, with several other asymmetric
      multiprocessing (AMP) heterogeneous processors running different instances
      of operating system, whether Linux or any other flavor of real-time OS.
      
      Booting a remote processor in an AMP configuration typically involves:
      - Loading a firmware which contains the OS image
      - Allocating and providing it required system resources (e.g. memory)
      - Programming an IOMMU (when relevant)
      - Powering on the device
      
      This patch introduces a generic framework that allows drivers to do
      that. In the future, this framework will also include runtime power
      management and error recovery.
      
      Based on (but now quite far from) work done by Fernando Guzman Lugo
      <fernando.lugo@ti.com>.
      
      ELF loader was written by Mark Grosen <mgrosen@ti.com>, based on
      msm's Peripheral Image Loader (PIL) by Stephen Boyd <sboyd@codeaurora.org>.
      
      Designed with Brian Swetland <swetland@google.com>.
      Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
      Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      Cc: Brian Swetland <swetland@google.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Tony Lindgren <tony@atomide.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Greg KH <greg@kroah.com>
      Cc: Stephen Boyd <sboyd@codeaurora.org>
      400e64df
    • Takashi Iwai's avatar
      Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus · 982d411c
      Takashi Iwai authored
      A few small WM8994 updates to go on top of the previous lot of things
      that were sent.  They collide with some -next work so I'd really like to
      get them into 3.3-rc3 if possible to merge back up into the -next code.
      All driver specific and unexciting in the grand scheme of things.
      982d411c
    • Mark Brown's avatar
    • Mark Brown's avatar
      ASoC: wm8994: Fix typo in VMID ramp setting · f647e152
      Mark Brown authored
      The VMID ramp rate is supposed to be 0x3, not 11b. Fix that.
      Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
      Cc: stable@vger.kernel.org
      f647e152
    • Clemens Ladisch's avatar
      ALSA: oxygen, virtuoso: fix exchanged L/R volumes of aux and CD inputs · 2492250e
      Clemens Ladisch authored
      The driver accidentally exchanged the left/right fields for stereo AC'97
      mixer registers.  This affected only the aux and CD inputs because the
      line input bypasses the AC'97 codec and the mic input is mono; cards
      without AC'97 (Xonar DS/DG/HDAV Slim, HG2PCI, HiFier) were not affected.
      Reported-and-tested-by: default avatarAbby Cedar <abbycedar@yahoo.com.au>
      Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
      Cc: 2.6.31+ <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      2492250e
    • Clemens Ladisch's avatar
      927c9423
  5. 07 Feb, 2012 3 commits
    • Linus Torvalds's avatar
      Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6 · 98e96852
      Linus Torvalds authored
      fbdev fixes for 3.3
      
      It includes:
       - compile fix for fsl-diu-fb
       - fix for a suspend/resume issue in atmel_lcdfb
       - fix for a suspend/resume issue in OMAP
       - workaround for a hardware bug to avoid physical damage in OMAP
       - really trivial dead code removal in intelfb
      
      * tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6:
        atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
        intelfb: remove some dead code
        drivers/video: compile fixes for fsl-diu-fb.c
        OMAPDSS: HDMI: PHY burnout fix
        OMAP: 4430SDP/Panda: add HDMI HPD gpio
        OMAP: 4430SDP/Panda: setup HDMI GPIO muxes
        OMAPDSS: remove wrong HDMI HPD muxing
        OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD
        OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios
        OMAPDSS: use sync versions of pm_runtime_put
      98e96852
    • Joe Perches's avatar
      checkpatch: Warn on code with 6+ tab indentation · 8eef05dd
      Joe Perches authored
      Overly indented code should be refactored.
      
      Suggest refactoring excessive indentation of of
      if/else/for/do/while/switch statements.
      
      For example:
      
      $ cat t.c
      #include <stdio.h>
      #include <stdlib.h>
      
      int main(int argc, char **argv)
      {
      
      	if (1)
      		if (2)
      			if (3)
      				if (4)
      					if (5)
      						if (6)
      							if (7)
      								if (8)
      									;
      	return 0;
      }
      
      $ ./scripts/checkpatch.pl -f t.c
      WARNING: Too many leading tabs - consider code refactoring
      #12: FILE: t.c:12:
      +						if (6)
      
      WARNING: Too many leading tabs - consider code refactoring
      #13: FILE: t.c:13:
      +							if (7)
      
      WARNING: Too many leading tabs - consider code refactoring
      #14: FILE: t.c:14:
      +								if (8)
      
      total: 0 errors, 3 warnings, 17 lines checked
      
      t.c has style problems, please review.
      
      If any of these errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8eef05dd
    • Linus Torvalds's avatar
      Merge tag 'ib-srpt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 6bd113f1
      Linus Torvalds authored
      Cleanups and error path fixes for the new SRP (SCSI RDMA protocol) target.
      
      * tag 'ib-srpt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/srpt: Don't return freed pointer from srpt_alloc_ioctx_ring()
        IB/srpt: Fix ERR_PTR() vs. NULL checking confusion
        IB/srpt: Remove unneeded <linux/version.h> include
        IB/srpt: Use ARRAY_SIZE() instead of open-coding
        IB/srpt: Use DEFINE_SPINLOCK()/LIST_HEAD()
      6bd113f1