1. 08 Apr, 2013 9 commits
  2. 02 Apr, 2013 20 commits
  3. 01 Apr, 2013 5 commits
    • Rajendra Nayak's avatar
      ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass · 469d633d
      Rajendra Nayak authored
      omap3_noncore_dpll_set_rate() attempts an enable of bypass clk as well
      as ref clk for every .set_rate attempt on a noncore DPLL, regardless of
      whether the .set_rate results in the DPLL being locked or put in bypass.
      Early at boot, while some of these DPLLs are programmed and locked
      (using .set_rate for the DPLL), this causes an ordering issue.
      
      For instance, on OMAP5, the USB DPLL derives its bypass clk from ABE DPLL.
      If a .set_rate of USB DPLL which programmes the M,N and locks it is called
      before the one for ABE, the enable of USB bypass clk (derived from ABE DPLL)
      then attempts to lock the ABE DPLL and fails as the M,N values for ABE
      are yet to be programmed.
      
      To get rid of this ordering needs, enable bypass clk for a DPLL as part
      of its .set_rate only when its being put in bypass, and only enable the
      ref clk when its locked.
      Reported-by: default avatarRoger Quadros <rogerq@ti.com>
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      469d633d
    • Paul Walmsley's avatar
      ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0 · bd70f6eb
      Paul Walmsley authored
      _pwrdm_save_clkdm_state_and_activate() tried to test one of its
      unsigned arguments to determine whether it was less than zero.  Fix by
      moving the error test to the caller.
      Reported-by: default avatarChen Gang <gang.chen@asianux.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      bd70f6eb
    • Rajendra Nayak's avatar
      ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag · 4280943b
      Rajendra Nayak authored
      _HWMOD_WAKEUP_ENABLED is currently unused across the hwmod
      framework. Just get rid of it, so we have one less flag to
      worry about.
      Tested-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      4280943b
    • Vaibhav Hiremath's avatar
      ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk · da91b89e
      Vaibhav Hiremath authored
      WDT1 module can take one of the below clocks as input functional
      clock -
           - On-Chip 32K RC Osc [default/reset]
           - 32K from PRCM
      
      The On-Chip 32K RC Osc clock is not an accurate clock-source as per
      the design/spec, so as a result, for example, timer which supposed
      to get expired @60Sec, but will expire somewhere ~@40Sec, which is
      not expected by any use-case.
      
      The solution here is to switch the input clock-source to PRCM
      generated 32K clock-source during boot-time itself.
      Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
      Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
      Cc: Benoit Cousson <benoit.cousson@linaro.org>
      Cc: Paul Walmsley <paul@pwsan.com>
      da91b89e
    • Vaibhav Hiremath's avatar
      ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry · 05cf03b6
      Vaibhav Hiremath authored
      This patch adds sysc definitions to the wdt1 hwmod entry, which in-turn
      makes sure that sysc idle bit-fields are configured to valid state on
      enable/disable callbacks.
      
      With the recent submitted patch from Santosh Shilimkar,
      "ARM: OMAP2+: hwmod: Don't call _init_mpu_rt_base if no sysc"
      (commit: 4a98c2d89), it is required to add sysconf
      information to each valid hwmod entry, else device will not be
      come out from idle state properly and leads to below kernel
      crash  -
      
      [2.190237] Unhandled fault: external abort on non-linefetch (0x1028) at
      0xf9e35034
      [2.198325] Internal error: : 1028 [#1] SMP ARM
      [2.203101] Modules linked in:
      [2.206334] CPU: 0    Not tainted  (3.9.0-rc3-00059-gd114294#1)
      [2.212679] PC is at omap_wdt_disable.clone.5+0xc/0x60
      [2.218090] LR is at omap_wdt_probe+0x184/0x1fc
      Signed-off-by: default avatarVaibhav Hiremath <hvaibhav@ti.com>
      Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
      Cc: Benoit Cousson <benoit.cousson@linaro.org>
      Cc: Paul Walmsley <paul@pwsan.com>
      05cf03b6
  4. 31 Mar, 2013 5 commits
    • Linus Torvalds's avatar
      Linux 3.9-rc5 · 07961ac7
      Linus Torvalds authored
      07961ac7
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 0bb44280
      Linus Torvalds authored
      Pull slave-dmaengine fixes from Vinod Koul:
       "Two fixes for slave-dmaengine.
      
        The first one is for making slave_id value correct for dw_dmac and
        the other one fixes the endieness in DT parsing"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dw_dmac: adjust slave_id accordingly to request line base
        dmaengine: dw_dma: fix endianess for DT xlate function
      0bb44280
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · a7b436d3
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "For a some fixes for Kernel 3.9:
         - subsystem build fix when VIDEO_DEV=y, VIDEO_V4L2=m and I2C=m
         - compilation fix for arm multiarch preventing IR_RX51 to be selected
         - regression fix at bttv crop logic
         - s5p-mfc/m5mols/exynos: a few fixes for cameras on exynos hardware"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] [REGRESSION] bt8xx: Fix too large height in cropcap
        [media] fix compilation with both V4L2 and I2C as 'm'
        [media] m5mols: Fix bug in stream on handler
        [media] s5p-fimc: Do not attempt to disable not enabled media pipeline
        [media] s5p-mfc: Fix encoder control 15 issue
        [media] s5p-mfc: Fix frame skip bug
        [media] s5p-fimc: send valid m2m ctx to fimc_m2m_job_finish
        [media] exynos-gsc: send valid m2m ctx to gsc_m2m_job_finish
        [media] fimc-lite: Fix the variable type to avoid possible crash
        [media] fimc-lite: Initialize 'step' field in fimc_lite_ctrl structure
        [media] ir: IR_RX51 only works on OMAP2
      a7b436d3
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20130331' of git://git.kernel.dk/linux-block · d299c290
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "Alright, this time from 10K up in the air.
      
        Collection of fixes that have been queued up since the merge window
        opened, hence postponed until later in the cycle.  The pull request
        contains:
      
         - A bunch of fixes for the xen blk front/back driver.
      
         - A round of fixes for the new IBM RamSan driver, fixing various
           nasty issues.
      
         - Fixes for multiple drives from Wei Yongjun, bad handling of return
           values and wrong pointer math.
      
         - A fix for loop properly killing partitions when being detached."
      
      * tag 'for-linus-20130331' of git://git.kernel.dk/linux-block: (25 commits)
        mg_disk: fix error return code in mg_probe()
        rsxx: remove unused variable
        rsxx: enable error return of rsxx_eeh_save_issued_dmas()
        block: removes dynamic allocation on stack
        Block: blk-flush: Fixed indent code style
        cciss: fix invalid use of sizeof in cciss_find_cfgtables()
        loop: cleanup partitions when detaching loop device
        loop: fix error return code in loop_add()
        mtip32xx: fix error return code in mtip_pci_probe()
        xen-blkfront: remove frame list from blk_shadow
        xen-blkfront: pre-allocate pages for requests
        xen-blkback: don't store dev_bus_addr
        xen-blkfront: switch from llist to list
        xen-blkback: fix foreach_grant_safe to handle empty lists
        xen-blkfront: replace kmalloc and then memcpy with kmemdup
        xen-blkback: fix dispatch_rw_block_io() error path
        rsxx: fix missing unlock on error return in rsxx_eeh_remap_dmas()
        Adding in EEH support to the IBM FlashSystem 70/80 device driver
        block: IBM RamSan 70/80 error message bug fix.
        block: IBM RamSan 70/80 branding changes.
        ...
      d299c290
    • Paul Walmsley's avatar
      Revert "lockdep: check that no locks held at freeze time" · dbf520a9
      Paul Walmsley authored
      This reverts commit 6aa97070.
      
      Commit 6aa97070 ("lockdep: check that no locks held at freeze time")
      causes problems with NFS root filesystems.  The failures were noticed on
      OMAP2 and 3 boards during kernel init:
      
        [ BUG: swapper/0/1 still has locks held! ]
        3.9.0-rc3-00344-ga937536b #1 Not tainted
        -------------------------------------
        1 lock held by swapper/0/1:
         #0:  (&type->s_umount_key#13/1){+.+.+.}, at: [<c011e84c>] sget+0x248/0x574
      
        stack backtrace:
          rpc_wait_bit_killable
          __wait_on_bit
          out_of_line_wait_on_bit
          __rpc_execute
          rpc_run_task
          rpc_call_sync
          nfs_proc_get_root
          nfs_get_root
          nfs_fs_mount_common
          nfs_try_mount
          nfs_fs_mount
          mount_fs
          vfs_kern_mount
          do_mount
          sys_mount
          do_mount_root
          mount_root
          prepare_namespace
          kernel_init_freeable
          kernel_init
      
      Although the rootfs mounts, the system is unstable.  Here's a transcript
      from a PM test:
      
        http://www.pwsan.com/omap/testlogs/test_v3.9-rc3/20130317194234/pm/37xxevm/37xxevm_log.txt
      
      Here's what the test log should look like:
      
        http://www.pwsan.com/omap/testlogs/test_v3.8/20130218214403/pm/37xxevm/37xxevm_log.txt
      
      Mailing list discussion is here:
      
        http://lkml.org/lkml/2013/3/4/221
      
      Deal with this for v3.9 by reverting the problem commit, until folks can
      figure out the right long-term course of action.
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      Cc: Mandeep Singh Baines <msb@chromium.org>
      Cc: Jeff Layton <jlayton@redhat.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Cc: <maciej.rutecki@gmail.com>
      Cc: Fengguang Wu <fengguang.wu@intel.com>
      Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Ben Chan <benchan@chromium.org>
      Cc: Oleg Nesterov <oleg@redhat.com>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Rafael J. Wysocki <rjw@sisk.pl>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      dbf520a9
  5. 30 Mar, 2013 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 13d2080d
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "This includes the bug-fix for a >= v3.8-rc1 regression specific to
        iscsi-target persistent reservation conflict handling (CC'ed to
        stable), and a tcm_vhost patch to drop VIRTIO_RING_F_EVENT_IDX usage
        so that in-flight qemu vhost-scsi-pci device code can detect the
        proper vhost feature bits.
      
        Also, there are two more tcm_vhost patches still being discussed by
        MST and Asias for v3.9 that will be required for the in-flight qemu
        vhost-scsi-pci device patch to function properly, and that should
        (hopefully) be the last target fixes for this round."
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
        tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
      13d2080d