ARM: tegra11x: Define ncpu residency for 2 clusters

[linux-3.10.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c81d15d1d7ef3032b94882cbbdaf516d9bfad335..38f99cfb2507d3336f3de08d3c9d19809fa406cb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -609,6 +609,7 @@ config ARCH_TEGRA
        select HAVE_CLK
        select HAVE_SMP
        select MIGHT_HAVE_CACHE_L2X0
+       select NEED_MACH_MEMORY_H
        select USE_OF
        select FIQ
        select PCI
@@ -1367,6 +1368,17 @@ config ARM_ERRATA_752520
          and MMU are enabled, with the TLB descriptors marked as L1 cacheable,
          so that Page Table Walks are performed as cache linefills.
 
+config ARM_ERRATA_761320
+       bool "Full cache line writes to the same memory region from at least two processors might deadlock processor"
+       depends on CPU_V7 && SMP
+       help
+         Under very rare circumstances, full cache line writes
+         from (at least) 2 processors on cache lines in hazard with
+         other requests may cause arbitration issues in the SCU,
+         leading to processor deadlock. This erratum can be
+         worked around by setting bit[21] of the undocumented
+         Diagnostic Control Register to 1.
+
 config PL310_ERRATA_769419
        bool "PL310 errata: no automatic Store Buffer drain"
        depends on CACHE_L2X0
@@ -1692,6 +1704,7 @@ config HZ
                ARCH_S5PV210 || ARCH_EXYNOS4
        default AT91_TIMER_HZ if ARCH_AT91
        default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
+       default TEGRA_TIMER_HZ if ARCH_TEGRA
        default 100
 
 config SCHED_HRTICK
@@ -2245,6 +2258,8 @@ source "drivers/cpuidle/Kconfig"
 
 source "drivers/cpuquiet/Kconfig"
 
+source "drivers/edp/Kconfig"
+
 endmenu
 
 menu "Floating point emulation"