- 08 Dec, 2011 17 commits
-
-
Santosh Shilimkar authored
Add WakeupGen and secure GIC low power support to save and restore it's registers. WakeupGen Registers are saved to pre-defined SAR RAM layout and the restore is automatically done by hardware(ROM code) while coming out of MPUSS OSWR or Device off state. Secure GIC is saved using secure API and restored by hardware like WakeupGen. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
With OMAP4 suspend, idle and hotplug series, we no longer need do_wfi() macro. Remove the same. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
This patch adds MPUSS(MPU Sub System) power domain CSWR(Close Switch Retention) support to system wide suspend. For MPUSS power domain to hit retention(CSWR or OSWR), both CPU0 and CPU1 power domains need to be in OFF or DORMANT state, since CPU power domain CSWR is not supported by hardware Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
Default arch_idle() isn't good enough for OMAP4 because of aync bridge errata and necessity of NOPs post WFI to avoid speculative prefetch aborts. Hence Use OMAP4 custom omap_do_wfi() hook for default idle. Later in the series, async bridge errata work-around patch updates the omap_do_wfi() with necessary interconnects barriers. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
The SGI(Software Generated Interrupts) are not wakeup capable from low power states. This is known limitation on OMAP4 and needs to be worked around by using software forced clockdomain wake-up. CPU0 forces the CPU1 clockdomain to software force wakeup. More details can be found in OMAP4430 TRM - Version J Section : 4.3.4.2 Power States of CPU0 and CPU1 Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
Program non-boot CPUs to hit lowest supported power state when it is off-lined using cpu hotplug framework. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
Remove the __INIT from omap_secondary_startup() so that it can be re-used for CPU hotplug. While at this, remove the un-used AUXBOOT register reference. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
This patch adds the CPU0 and CPU1 off mode support. CPUX close switch retention (CSWR) is not supported by hardware design. The CPUx OFF mode isn't supported on OMAP4430 ES1.0 CPUx sleep code is common for hotplug, suspend and CPUilde. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
OMAP WakeupGen is the interrupt controller extension used along with ARM GIC to wake the CPU out from low power states on external interrupts. The WakeupGen unit is responsible for generating the wakeup event from the incoming interrupts and enable bits. It is implemented in the MPU always ON power domain. During normal operation, WakeupGen delivers the external interrupts directly to the GIC. WakeupGen specification has one restriction as per Veyron version 1.6. It is SW responsibility to program interrupt enabling/disabling coherently in the GIC and in the WakeupGen enable registers. That is, a given interrupt for a given CPU is either enable at both GIC and WakeupGen, or disable at both, but no mix. That's the reason the WakeupGen is implemented as an extension of GIC. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
Allocate the memory to save secure ram context which needs to be done when MPU is hitting OFF mode. The ROM code expects a physical address to this memory and hence use memblock APIs to reserve this memory as part of .reserve() callback. Maximum size as per secure RAM requirements is allocated. To keep omap1 build working, omap-secure.h file is created under plat-omap directory. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
On OMAP secure/emulation devices, certain APIs are exported by secure code. Add an infrastructure so that relevant operations on secure devices can be implemented using it. While at this, rename omap44xx-smc.S to omap-smc.S since the common APIs can be used on other OMAP's too. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
Initialise hardware supervised mode for all clockdomains if it's supported. Initiate sleep transition for other clockdomains, if they are not being used. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by:
Rajendra Nayak <rnayak@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
On OMAP4430 ES1.0, Power Management features are not supported. Avoid omap4_pm_init() on ES1.0 silicon so that we can continue to use same kernel binary to boot on all OMAP4 silicons. The ES1.0 boot failure with OMAP4 PM series was because of the clockdomain initialisation code. Hardware supervised clockdomain mode isn't functional for all clockdomains on OMAP4430 ES1.0 silicon so avoid the same. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Reported-by:
Kevin Hilman <khilman@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
As per OMAP4430 TRM, the dynamic dependency between MPUSS -> EMIF and MPUSS -> L4PER/L3_* and DUCATI -> L3_* clockdomains is enable by default. Refer register CM_MPU_DYNAMICDEP description for details. But these dynamic dependencies doesn't work as expected. The hardware recommendation is to enable static dependencies for above clockdomains. Without this, system locks up or randomly crashes. Signed-off-by:
Rajendra Nayak <rnayak@ti.com> Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Paul Walmsley <paul@pwsan.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
This patch adds SAR RAM support on OMAP4430. SAR RAM used to save and restore the HW context in low power modes. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
This patch exports APIs to get base address for GIC distributor, CPU interface, SCU and PL310 L2 Cache which are used in OMAP4 PM code. This was suggested by Kevin Hilman <khilman@ti.com> during OMAP4 PM code review. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
Santosh Shilimkar authored
OMAP4 L2X0 initialisation code uses BUG_ON() for the ioremap() failure scenarios. Use WARN_ON() instead and allow graceful function exits. This was suggsted by Kevin Hilman <khilman@ti.com> during OMAP4 PM code review. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Kevin Hilman <khilman@ti.com> Tested-by:
Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by:
Kevin Hilman <khilman@ti.com>
-
- 06 Dec, 2011 2 commits
-
-
Tony Lindgren authored
ARM restart changes needed changes to common.h to make it local. This conflicted with v3.2-rc4 DSS related hwmod changes that git mergetool was not able to handle. Signed-off-by:
Tony Lindgren <tony@atomide.com> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Tony Lindgren authored
Otherwise we get the following error: In function 'omap_init_consistent_dma_size': error: implicit declaration of function 'init_consistent_dma_size' Signed-off-by:
Tony Lindgren <tony@atomide.com> Acked-by:
Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
- 05 Dec, 2011 4 commits
-
-
-
Russell King authored
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h
-
Santosh Shilimkar authored
Fix the below build break by including common.h arch/arm/mach-omap2/cpuidle34xx.c: In function 'omap3_enter_idle': arch/arm/mach-omap2/cpuidle34xx.c:117: error: implicit declaration of function 'omap_irq_pending' make[1]: *** [arch/arm/mach-omap2/cpuidle34xx.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
Santosh Shilimkar authored
Fix the build break by adding the necessary irq functions to common header. Signed-off-by:
Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by:
Russell King <rmk+kernel@arm.linux.org.uk>
-
- 03 Dec, 2011 1 commit
-
-
Russell King authored
Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
-
- 02 Dec, 2011 8 commits
-
-
Will Deacon authored
-
Ming Lei authored
This patch introduces .enable_irq and .disable_irq into struct arm_pmu_platdata, so platform specific irq enablement can be handled after request_irq, and platform specific irq disablement can be handled before free_irq. This patch is for support of pmu irq routed from CTI on omap4. Acked-by:
Jean Pihet <j-pihet@ti.com> Reviewed-by:
Will Deacon <will.deacon@arm.com> Signed-off-by:
Ming Lei <ming.lei@canonical.com> Signed-off-by:
Will Deacon <will.deacon@arm.com>
-
Ming Lei authored
OMAP4 uses cross trigger interface(CTI) to route performance monitor irq to GIC, so introduce cti helpers to make access for cti easily. Acked-by:
Jean Pihet <j-pihet@ti.com> Signed-off-by:
Ming Lei <ming.lei@canonical.com> Signed-off-by:
Will Deacon <will.deacon@arm.com>
-
Will Deacon authored
armpmu_get_max_events is only called from perf_num_counters, so we can inline it there. It existed as a separate entity as a hangover from the original perf-based oprofile implementation. Signed-off-by:
Will Deacon <will.deacon@arm.com>
-
Will Deacon authored
Commit 8f622422 ("perf events: Add generic front-end and back-end stalled cycle event definitions") added two new ABI events for counting stalled cycles. This patch adds support for these new events to the ARM perf implementation. Cc: Jamie Iles <jamie@jamieiles.com> Cc: Jean Pihet <j-pihet@ti.com> Signed-off-by:
Will Deacon <will.deacon@arm.com>
-
Will Deacon authored
This patch updates the ARMv7 perf event numbers so that: (1) A consistent naming scheme is used between different CPUs. (2) Only events actually used by Linux are described. (3) Where possible, architected events are used in preference to CPU-specific events. This results in the removal of a load of unused, hardcoded data and makes it more clear as to which events are supported on each PMU. Cc: Jean Pihet <j-pihet@ti.com> Signed-off-by:
Will Deacon <will.deacon@arm.com>
-
Axel Lin authored
Trivial fix to fix below build error: CC arch/arm/mach-exynos/mach-universal_c210.o arch/arm/mach-exynos/mach-universal_c210.c:24: error: expected identifier or '(' before '<' token Signed-off-by:
Axel Lin <axel.lin@gmail.com> Signed-off-by:
Marc Zyngier <marc.zyngier@arm.com>
-
Axel Lin authored
Fix below build error: CC arch/arm/mach-exynos/cpu.o arch/arm/mach-exynos/cpu.c: In function 'exynos4_init_irq': arch/arm/mach-exynos/cpu.c:245: error: 'gic_bank_offset' undeclared (first use in this function) arch/arm/mach-exynos/cpu.c:245: error: (Each undeclared identifier is reported only once arch/arm/mach-exynos/cpu.c:245: error: for each function it appears in.) arch/arm/mach-exynos/cpu.c:243: warning: unused variable 'bank_offset' make[1]: *** [arch/arm/mach-exynos/cpu.o] Error 1 make: *** [arch/arm/mach-exynos] Error 2 Signed-off-by:
Axel Lin <axel.lin@gmail.com> Signed-off-by:
Marc Zyngier <marc.zyngier@arm.com>
-
- 01 Dec, 2011 8 commits
-
-
Linus Torvalds authored
-
git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2Linus Torvalds authored
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: (31 commits) ocfs2: avoid unaligned access to dqc_bitmap ocfs2: Use filemap_write_and_wait() instead of write_inode_now() ocfs2: honor O_(D)SYNC flag in fallocate ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2 ocfs2: send correct UUID to cleancache initialization ocfs2: Commit transactions in error cases -v2 ocfs2: make direntry invalid when deleting it fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free ocfs2: Avoid livelock in ocfs2_readpage() ocfs2: serialize unaligned aio ocfs2: Implement llseek() ocfs2: Fix ocfs2_page_mkwrite() ocfs2: Add comment about orphan scanning ocfs2: Clean up messages in the fs ocfs2/cluster: Cluster up now includes network connections too ocfs2/cluster: Add new function o2net_fill_node_map() ocfs2/cluster: Fix output in file elapsed_time_in_ms ocfs2/dlm: dlmlock_remote() needs to account for remastery ocfs2/dlm: Take inflight reference count for remotely mastered resources too ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery() ...
-
Akinobu Mita authored
The dqc_bitmap field of struct ocfs2_local_disk_chunk is 32-bit aligned, but not 64-bit aligned. The dqc_bitmap is accessed by ocfs2_set_bit(), ocfs2_clear_bit(), ocfs2_test_bit(), or ocfs2_find_next_zero_bit(). These are wrapper macros for ext2_*_bit() which need to take an unsigned long aligned address (though some architectures are able to handle unaligned address correctly) So some 64bit architectures may not be able to access the dqc_bitmap correctly. This avoids such unaligned access by using another wrapper functions for ext2_*_bit(). The code is taken from fs/ext4/mballoc.c which also need to handle unaligned bitmap access. Signed-off-by:
Akinobu Mita <akinobu.mita@gmail.com> Acked-by:
Joel Becker <jlbec@evilplan.org> Cc: Mark Fasheh <mfasheh@suse.com> Signed-off-by:
Andrew Morton <akpm@linux-foundation.org> Signed-off-by:
Joel Becker <jlbec@evilplan.org>
-
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-armLinus Torvalds authored
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: ARM: 7182/1: ARM cpu topology: fix warning ARM: 7181/1: Restrict kprobes probing SWP instructions to ARMv5 and below ARM: 7180/1: Change kprobes testcase with unpredictable STRD instruction ARM: 7177/1: GIC: avoid skipping non-existent PPIs in irq_start calculation ARM: 7176/1: cpu_pm: register GIC PM notifier only once ARM: 7175/1: add subname parameter to mfp_set_groupg callers ARM: 7174/1: Fix build error in kprobes test code on Thumb2 kernels ARM: 7172/1: dma: Drop GFP_COMP for DMA memory allocations ARM: 7171/1: unwind: add unwind directives to bitops assembly macros ARM: 7170/2: fix compilation breakage in entry-armv.S ARM: 7168/1: use cache type functions for arch_get_unmapped_area ARM: perf: check that we have a platform device when reserving PMU ARM: 7166/1: Use PMD_SHIFT instead of PGDIR_SHIFT in dma-consistent.c ARM: 7165/2: PL330: Fix typo in _prepare_ccr() ARM: 7163/2: PL330: Only register usable channels ARM: 7162/1: errata: tidy up Kconfig options for PL310 errata workarounds ARM: 7161/1: errata: no automatic store buffer drain ARM: perf: initialise used_mask for fake PMU during validation ARM: PMU: remove pmu_init declaration ARM: PMU: re-export release_pmu symbol to modules
-
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfsLinus Torvalds authored
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix meta data raid-repair merge problem Btrfs: skip allocation attempt from empty cluster Btrfs: skip block groups without enough space for a cluster Btrfs: start search for new cluster at the beginning Btrfs: reset cluster's max_size when creating bitmap Btrfs: initialize new bitmaps' list Btrfs: fix oops when calling statfs on readonly device Btrfs: Don't error on resizing FS to same size Btrfs: fix deadlock on metadata reservation when evicting a inode Fix URL of btrfs-progs git repository in docs btrfs scrub: handle -ENOMEM from init_ipath()
-
Jan Schmidt authored
Commit 4a54c8c1 introduced raid-repair, killing the individual readpage_io_failed_hook entries from inode.c and disk-io.c. Commit 4bb31e92 introduced new readahead code, adding a readpage_io_failed_hook to disk-io.c. The raid-repair commit had logic to disable raid-repair, if readpage_io_failed_hook is set. Thus, the readahead commit effectively disabled raid-repair for meta data. This commit changes the logic to always attempt raid-repair when needed and call the readpage_io_failed_hook in case raid-repair fails. This is much more straight forward and should have been like that from the beginning. Signed-off-by:
Jan Schmidt <list.btrfs@jan-o-sch.net> Reported-by:
Stefan Behrens <sbehrens@giantdisaster.de> Signed-off-by:
Chris Mason <chris.mason@oracle.com>
-
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infinibandLinus Torvalds authored
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB: Fix RCU lockdep splats IB/ipoib: Prevent hung task or softlockup processing multicast response IB/qib: Fix over-scheduling of QSFP work RDMA/cxgb4: Fix retry with MPAv1 logic for MPAv2 RDMA/cxgb4: Fix iw_cxgb4 count_rcqes() logic IB/qib: Don't use schedule_work()
-
git://sources.calxeda.com/kernel/linuxLinus Torvalds authored
* 'dt-for-linus' of git://sources.calxeda.com/kernel/linux: of: Add Silicon Image vendor prefix of/irq: of_irq_init: add check for parent equal to child node
-