diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2011-09-07 12:20:06 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-09-21 20:17:48 -0700 |
| commit | 7ed44e17cb44fa54110753977fedb5302b94111c (patch) | |
| tree | 7006c7998a87c7d4376e520bb427d6dae850df4d | |
| parent | 7c3e671d05fcabdac4e73adf8f3f297924d44498 (diff) | |
arm: mm: Don't enable arm errata 752520 for versions r1p*
Bug 831928
Change-Id: Icfccefe0122a3b2ef059869ae7d086a73ce1db26
Reviewed-on: http://git-master/r/51159
Tested-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index af69f64b814d..98d6618f5a05 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -290,10 +290,13 @@ __v7_setup: mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register #endif #ifdef CONFIG_ARM_ERRATA_752520 + teq r5, #0x00100000 @ not present in r1p* + beq skip_752520 cmp r6, #0x29 @ present prior to r2p9 mrclt p15, 0, r10, c15, c0, 1 @ read diagnostic register orrlt r10, r10, #1 << 20 @ set bit #20 mcrlt p15, 0, r10, c15, c0, 1 @ write diagnostic register +skip_752520: #endif #endif |