1. 19 4月, 2012 7 次提交
    • P
      ARM: OMAP2+: hwmod: provide a function to return the address space of the MPU RT · c9aafd23
      Paul Walmsley 提交于
      A subsequent patch will need to know the struct omap_hwmod_addr_space
      record corresponding to the module's register target, used by the MPU.
      So, convert _find_mpu_rt_base() into _find_mpu_rt_addr_space().  Then
      modify its sole current user, _populate_mpu_rt_base(), to extract the
      MPU RT base address itself from the struct omap_hwmod_addr_space record.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      c9aafd23
    • P
      ARM: OMAP2+: hwmod: revise hardreset behavior · 747834ab
      Paul Walmsley 提交于
      Change the way that hardreset lines are handled by the hwmod code.
      Hardreset lines are generally associated with initiator IP blocks.
      Prior to this change, the hwmod code expected to control hardreset
      lines itself, asserting them on shutdown and deasserting them upon
      enable.  But driver authors inside TI have commented to us that their
      drivers require direct control over these lines.  Unfortunately, these
      drivers haven't been posted publicly yet, so it's hard to determine
      exactly what is needed, a priori.  This change attempts to set forth
      some reasonable semantics that should be an improvement over the
      current code.
      
      The semantics implemented by this patch are as follows:
      
      - If the hwmod is not marked with HWMOD_INIT_NO_RESET, then assert all
        associated hardreset lines during IP block setup.  This is intended
        to place the IP blocks into a known state that will not interfere
        with other devices during kernel boot.
      
      - IP blocks with hardreset lines will not be automatically enabled or
        idled during setup.  Instead, they will be left in the INITIALIZED
        state.
      
      - When the hwmod code is asked to enable, idle, or shutdown an IP
        block with asserted hardreset lines, the hwmod code will do nothing.
        The driver integration code must do the remaining work needed to
        control these IP blocks.  Once this driver integration code is posted
        to the lists, hopefully we can consolidate it and move it inside the
        hwmod code.
      
      Custom reset functions for IP blocks with hardreset lines still should
      be supported and are strongly endorsed.  It is intended that every
      subsystem with hardreset lines should have a custom reset function
      that can place their subsystem into quiescent idle with the hardreset
      lines deasserted.
      
      This reverts most of commit 5365efbe
      ("OMAP: hwmod: Add hardreset management support").  Later code
      reorganizations caused the sequencing of the code from this patch to
      be changed, anyway.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      747834ab
    • P
      ARM: OMAP2+: hwmod: reorganize and document the reset and configuration process · 64813c3f
      Paul Walmsley 提交于
      Reorganize the code involved in resetting and configuring an IP block
      to make it easier to read and maintain.  This involves improving
      documentation, splitting some large functions up into smaller ones to
      better conform with Documentation/CodingStyle, and removing some
      unnecessary code.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      64813c3f
    • P
      ARM: OMAP2+: hwmod: reorganize and document the initialization process · 381d033a
      Paul Walmsley 提交于
      Reorganize the code involved in initializing the internal data for
      each hwmod to make it easier to read and maintain.  This involves
      improving documentation and removing some duplicated and unnecessary
      code.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      381d033a
    • P
      ARM: OMAP2+: hwmod: revise the IP block reset process · 30e105c0
      Paul Walmsley 提交于
      Revise the IP block reset process.  This patch ensures that the
      OCP_SYSCONFIG registers are reloaded after a custom reset.  Since
      OCP_SYSCONFIG bits are cleared during reset, they should be
      reprogrammed unless the IP block is being left in reset.  (The only IP
      blocks that are left in reset are IP blocks with hardreset lines and
      no custom reset function.)  If the IP block is left in reset, then it
      is inaccessible to the MPU, and an access to the OCP_SYSCONFIG
      register will cause an abort.
      
      This version incorporates comments from Omar Ramirez Luna
      <omar.ramirez@ti.com> to skip the OCP_SYSCONFIG access after asserting
      hardreset lines.  This allows the MMU (IOMMU) IP block, which has
      both hardreset lines and an OCP_SYSCONFIG register.
      
      Also, ignore _ocp_softreset() errors if the IP block doesn't include a
      softreset bit.  This is needed since a subsequent patch will start
      taking the return value of the _reset() function seriously.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
      30e105c0
    • P
      ARM: OMAP4: hwmod data: remove pseudo-hwmods associated with hardreset lines · f2f5736c
      Paul Walmsley 提交于
      Remove the pseudo-hwmods associated with hardreset lines from the
      OMAP4 data file.  Future patches will convert this data to register
      hwmods by interfaces, rather than registering hwmods directly.  The
      pseudo-hwmods aren't associated with any interfaces, so this will
      create a problem.
      
      After this change, the hwmod code will reset processor IPs at the
      hwmod level, rather than by individual hardreset lines.  So, for
      example, if the IVA device driver code wishes to place one of the
      sequencer cores into reset, while leaving the other active, it must do
      so itself by calling the appropriate PRM functions.
      
      This patch will cause a change in the initialization behavior of the
      DSP, IVA, and IPU.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      f2f5736c
    • P
      ARM: OMAP2+: hwmod: control all hardreset lines attached to a hwmod · 9c8b0ec7
      Paul Walmsley 提交于
      Parts of the hwmod code test to see if a module has one and only one
      hardreset line before taking an action.  It seems more appropriate
      to control all hardreset lines associated with a hwmod, not just one.
      
      It so happens that with the current hwmod data, this patch will not
      change any behavior, since hwmods with hardreset lines have only one
      hardreset line associated with them, and 'pseudo-hwmods' are used to
      handle the other hardreset lines.  But future hwmod data patches to
      remove the pseudo-hwmods will change this.
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      Cc: Benoît Cousson <b-cousson@ti.com>
      9c8b0ec7
  2. 13 4月, 2012 3 次提交
    • A
      ARM: OMAP2/3: VENC hwmods: Remove OCPIF_SWSUP_IDLE flag from VENC slave interface · 1f5e6247
      Archit Taneja 提交于
      The clocks for all DSS slave interfaces were recently changed to "dss_ick" on
      OMAP2 and OMAP3, this clock can be autoidled by PRCM. The VENC interface
      previously had "dss_54m_fck" as it's clock which couldn't be autoidled, and
      hence the OCPIF_SWSUP_IDLE flag was needed.
      
      Remove the OCPIF_SWSUP_IDLE flag from VENC interfaces as it's clock is
      now "dss_ick".  This allows the PRCM hardware to autoidle the VENC
      interface clocks when they are not active, rather than relying on the
      software to do it, which can keep the interface clocks active
      unnecessarily.
      Signed-off-by: NArchit Taneja <archit@ti.com>
      [paul@pwsan.com: add a short description of the fix to the commit log]
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      1f5e6247
    • P
      ARM: OMAP2+: hwmod: Revert "ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status" · 3c55c1ba
      Paul Walmsley 提交于
      This reverts commit f9a2f9c3.  This
      commit caused a regression in the I2C hwmod reset on OMAP2/3/4,
      logging messages similar to these during boot:
      
      [    0.200378] omap_hwmod: i2c1: softreset failed (waited 10000 usec)
      [    0.222076] omap_hwmod: i2c2: softreset failed (waited 10000 usec)
      
      While the original patch was intended to fix some reset-related timing
      issues, it's believed that these problems were actually fixed by
      commit 2800852a ("ARM: OMAP2+: hwmod:
      Restore sysc after a reset"):
      
          http://marc.info/?l=linux-arm-kernel&m=133410322617245&w=2
      
      Cc: Rajendra Nayak <rnayak@ti.com>
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      3c55c1ba
    • F
      ARM: OMAP2+: hwmod: add softreset delay field and OMAP4 data · d99de7f5
      Fernando Guzman Lugo 提交于
      Due to HW limitation, some IPs should not be accessed just after a
      softreset. Since the current hwmod sequence is accessing the sysconfig
      register just after the reset, it might lead to OCP bus error in
      that case.
      
      Add a new field in the sysconfig structure to specify a delay in usecs
      needed after doing a softreset.
      
      In the case of the ISS and FDIF modules, the L3 OCP port will be
      disconnected upon a SW reset. That issue was confirmed with HW simulation
      and an errata should be available soon. The HW recommendation to avoid
      that is to wait for 100 OCP clk cycles, before accessing the IP.
      
      Considering the worse case (OPP50), the L3 bus will run at 100 MHz,
      so a 1 usec delay is needed. Add an x2 margin to be safe.
      Acked-by: NBenoit Cousson <b-cousson@ti.com>
      Signed-off-by: NFernando Guzman Lugo <fernando.lugo@ti.com>
      [paul@pwsan.com: dropped FDIF change for now since the hwmod data is not
       yet upstream; the FDIF change will need to be added later once the FDIF
       data is merged]
      Signed-off-by: NPaul Walmsley <paul@pwsan.com>
      d99de7f5
  3. 05 4月, 2012 7 次提交
  4. 04 4月, 2012 11 次提交
  5. 31 3月, 2012 1 次提交
    • R
      ARM: fix more fallout from 9f97da78 (Disintegrate asm/system.h for ARM) · 6d008893
      Russell King 提交于
      arch/arm/kernel/io.c: In function '_memcpy_toio':
      arch/arm/kernel/io.c:29: error: implicit declaration of function 'outer_sync'
      arch/arm/mach-omap2/omap_l3_noc.c: In function 'l3_interrupt_handler':
      arch/arm/mach-omap2/omap_l3_noc.c:100: error: implicit declaration of function 'outer_sync'
      kernel/irq/generic-chip.c: In function 'irq_gc_mask_disable_reg':
      kernel/irq/generic-chip.c:45: error: implicit declaration of function 'outer_sync'
      kernel/sched/rt.c: In function 'rt_set_overload':
      kernel/sched/rt.c:248: error: implicit declaration of function 'outer_sync'
      ...
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      6d008893
  6. 30 3月, 2012 1 次提交
    • G
      ARM: OMAP: pm: fix compilation break · 335aece5
      Govindraj.R 提交于
      Fix the compilation break observed on latest mainline caused
      by 9f97da78 (Disintegrate asm/system.h for ARM):
      
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_prepare':
      arch/arm/mach-omap1/pm.c:587: error: implicit declaration of function 'disable_hlt'
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_finish':
      arch/arm/mach-omap1/pm.c:624: error: implicit declaration of function 'enable_hlt'
      arch/arm/mach-omap1/pm.c: In function 'omap_pm_init':
      arch/arm/mach-omap1/pm.c:681: error: 'arm_pm_idle' undeclared (first use in this function)
      ...
      
      arch/arm/mach-omap2/pm.c: In function 'omap_pm_begin':
      arch/arm/mach-omap2/pm.c:239: error: implicit declaration of function 'disable_hlt'
      arch/arm/mach-omap2/pm.c: In function 'omap_pm_end':
      arch/arm/mach-omap2/pm.c:247: error: implicit declaration of function 'enable_hlt'
      Signed-off-by: NGovindraj.R <govindraj.raja@ti.com>
      Acked-by: NKevin Hilman <khilman@ti.com>
      [tony@atomide.com: updated to fix omap1 too]
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      335aece5
  7. 29 3月, 2012 2 次提交
  8. 28 3月, 2012 1 次提交
  9. 23 3月, 2012 5 次提交
    • M
      ARM: OMAP3+: fix oops triggered in omap_prcm_register_chain_handler(v1) · 4ba7c3c3
      Ming Lei 提交于
      This patch fixes the oops below[1].
      
      Obviously, the count of "struct irq_chip_generic" instances to be
      allocated and setup should be irq_setup->nr_regs instead of
      irq_setup->nr_regs plus one, so just fix the iterator to avoid
      the oops.
      
      [1], oops log.
      
      [    1.790242] Unable to handle kernel NULL pointer dereference at virtual address 00000004
      [    1.798632] pgd = c0004000
      [    1.801638] [00000004] *pgd=00000000
      [    1.805400] Internal error: Oops: 805 [#1] PREEMPT SMP THUMB2
      [    1.811381] Modules linked in:
      [    1.814601] CPU: 1    Not tainted  (3.3.0-next-20120320+ #733)
      [    1.820683] PC is at irq_setup_generic_chip+0x6a/0x84
      [    1.825951] LR is at irq_get_irq_data+0x7/0x8
      [    1.830508] pc : [<c006465e>]    lr : [<c0063a03>]    psr: 20000133
      [    1.830512] sp : ee04ff58  ip : 00000000  fp : 00000000
      [    1.842461] r10: 00000000  r9 : 00000000  r8 : 00000800
      [    1.847905] r7 : c064e260  r6 : 000001dc  r5 : 00000001  r4 : ee0accc0
      [    1.854687] r3 : 00000002  r2 : 00000800  r1 : 000001dc  r0 : 00000000
      [    1.861472] Flags: nzCv  IRQs on  FIQs on  Mode SVC_32  ISA Thumb  Segment kernel
      [    1.869234] Control: 50c5387d  Table: 8000404a  DAC: 00000015
      [    1.875215] Process swapper/0 (pid: 1, stack limit = 0xee04e2f8)
      [    1.881463] Stack: (0xee04ff58 to 0xee050000)
      [    1.886017] ff40: c061b668 00000008
      [    1.894497] ff60: c0682090 ee0accc0 00000003 c001c637 00000000 00000000 00000201 00000000
      [    1.902976] ff80: 00000004 c0473820 c0473800 c0459e8d c0680ac0 c000866d 00000004 00000004
      [    1.911455] ffa0: ee04ffa8 00000004 c047381c 00000004 c0473820 c0473800 c0680ac0 00000082
      [    1.919934] ffc0: c0489694 c045265f 00000004 00000004 c0452135 c000d105 00000033 00000000
      [    1.928413] ffe0: c04525b5 c000d111 00000033 00000000 00000000 c000d111 aaaaaaaa aaaaaaaa
      [    1.936912] [<c006465e>] (irq_setup_generic_chip+0x6a/0x84) from [<c001c637>] (omap_prcm_register_chain_handler+0x147/0x1a0)
      [    1.948516] [<c001c637>] (omap_prcm_register_chain_handler+0x147/0x1a0) from [<c000866d>] (do_one_initcall+0x65/0xf4)
      [    1.959500] [<c000866d>] (do_one_initcall+0x65/0xf4) from [<c045265f>] (kernel_init+0xab/0x138)
      [    1.968529] [<c045265f>] (kernel_init+0xab/0x138) from [<c000d111>] (kernel_thread_exit+0x1/0x6)
      [    1.977632] Code: f7ff f9d1 6b23 1af3 (6043) 086d
      [    1.982684] ---[ end trace 1b75b31a2719ed1c ]---
      [    1.987526] Kernel panic - not syncing: Attempted to kill init!
      exitcode=0x0000000b
      Acked-by: NTero Kristo <t-kristo@ti.com>
      Signed-off-by: NMing Lei <tom.leiming@gmail.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      4ba7c3c3
    • N
      ARM: OMAP2+: OPP: allow OPP enumeration to continue if device is not present · 9fa2df6b
      Nishanth Menon 提交于
      On platforms such as OMAP3, certain variants may not have IVA, SGX
      or some specific component. We currently have a check to aid fixing
      wrong population of OPP entries for issues such as typos. This however
      causes a conflict with valid requirement where the SoC variant does
      not actually have the module present.
      
      So, reduce the severity of the print to a debug statement and skip
      registering that specific OPP, but continue down the list.
      Reported-by: NSteve Sakoman <steve@sakoman.com>
      Reported-by: NMaximilian Schwerin <mvs@tigris.de>
      Acked-by: NSteve Sakoman <steve@sakoman.com>
      Tested-by: NMaximilian Schwerin <mvs@tigris.de>
      Signed-off-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      9fa2df6b
    • M
      arm: omap3: pm34xx.c: Replace printk() with appropriate pr_*() · 98179856
      Mark A. Greer 提交于
      Currently, pm34xx.c has a mix of printk() and pr_*() statements
      so replace the printk() statements with the equivalent pr_*()
      statements.
      Signed-off-by: NMark A. Greer <mgreer@animalcreek.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      98179856
    • M
      arm: omap3: pm34xx.c: Fix omap3_pm_init() error out paths · ce229c5d
      Mark A. Greer 提交于
      It appears that the error paths were overlooked when the
      omap3_pm_init() routine had the prcm chain handler code
      added.  Fix this by adding a goto target and reordering
      the error handling code.  Also fix how the irq argument
      for free_irq() is determined.
      Signed-off-by: NMark A. Greer <mgreer@animalcreek.com>
      Acked-by: NTero Kristo <t-kristo@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      ce229c5d
    • S
      ARM: OMAP4: Workaround the OCP synchronisation issue with 32K synctimer. · 68523f42
      Santosh Shilimkar 提交于
      On OMAP4, recently a synchronisation bug is discovered by hardware
      team, which leads to incorrect timer value read from 32K sync timer
      IP when the IP is comming out of idle.
      
      The issue is due to the synchronization methodology used in the SYNCTIMER IP.
      The value of the counter register in 32kHz domain is synchronized to the OCP
      domain register only at count up event, and if the OCP clock is switched off,
      the OCP register gets out of synch until the first count up event after the
      clock is switched back -at the next falling edge of the 32kHz clock.
      
      Further investigation revealed that it applies to gptimer1 and watchdog timer2
      as well which may run on 32KHz. This patch fixes the issue for all the
      applicable modules.
      
      The BUG has not made it yet to the OMAP errata list and it is applicable to
      OMAP1/2/3/4/5. OMAP1/2/3 it is taken care indirectly by autodeps.
      
      By enabling static depedency of wakeup clockdomain with MPU, as soon as MPU
      is woken up from lowpower state(idle) or whenever MPU is active, PRCM forces
      the OCP clock to be running and allow the counter value to be updated properly
      in the OCP clock domain.
      
      The bug is going to fixed in future OMAP versions.
      
      Reported-Tested-by: dave.long@linaro.org
      [dave.long@linaro.org: Reported the oprofile time stamp issue with synctimer
      and helped to test this patch]
      Signed-off-by: NSantosh Shilimkar <santosh.shilimkar@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      68523f42
  10. 22 3月, 2012 1 次提交
  11. 21 3月, 2012 1 次提交