mirror of https://gitee.com/openkylin/linux.git
c3fb04162a
Patch from Dimitry Andric In arch/arm/mach-s3c2410/sleep.S, the coprocessor registers are saved at suspend time, and restored at resume time. However, an undefined instruction is used when attempting to restore a non-existent "auxiliary control register". This leads to a crash on S3C2412, which has an ARM926 core instead of an ARM920. At suspend time, the following fragment runs: mrc p15, 0, r7, c2, c0, 0 @ translation table base address mrc p15, 0, r8, c2, c0, 0 @ auxiliary control register mrc p15, 0, r9, c1, c0, 0 @ control register and at resume time, the following fragment runs: mcr p15, 0, r7, c2, c0, 0 @ translation table base mcr p15, 0, r8, c1, c1, 0 @ auxilliary control ... mcr p15, 0, r9, c1, c0, 0 @ turn on MMU, etc There are several problems with these fragments: 1. The ARM920 and ARM926 cores don't have any "auxiliary control register", at least not according to the ARM920 and ARM926 TRM's. 2. The 2nd line of suspend erroneously saves the c2 register again. 3. This saved c2 value is restored using an undefined instruction. For some reason this does not crash on ARM920, but does crash on ARM926. The following patch fixes all these problems. Signed-off-by: Dimitry Andric <dimitry@andric.com> Yes, this looks sensible Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| bast-irq.c | ||
| bast.h | ||
| clock.c | ||
| clock.h | ||
| common-smdk.c | ||
| common-smdk.h | ||
| cpu.c | ||
| cpu.h | ||
| devs.c | ||
| devs.h | ||
| dma.c | ||
| gpio.c | ||
| irq.c | ||
| irq.h | ||
| mach-anubis.c | ||
| mach-bast.c | ||
| mach-h1940.c | ||
| mach-n30.c | ||
| mach-nexcoder.c | ||
| mach-osiris.c | ||
| mach-otom.c | ||
| mach-rx3715.c | ||
| mach-smdk2410.c | ||
| mach-smdk2440.c | ||
| mach-vr1000.c | ||
| pm-simtec.c | ||
| pm.c | ||
| pm.h | ||
| s3c2400-gpio.c | ||
| s3c2400.h | ||
| s3c2410-gpio.c | ||
| s3c2410.c | ||
| s3c2410.h | ||
| s3c2440-clock.c | ||
| s3c2440-dsc.c | ||
| s3c2440-irq.c | ||
| s3c2440.c | ||
| s3c2440.h | ||
| sleep.S | ||
| time.c | ||
| usb-simtec.c | ||
| usb-simtec.h | ||