arm: prevent coprocessor IO reset
This prevent coprocessor IO structure from being reset on cpu reset. This was a problem for PXA which uses coprocessor 6 and 14. Signed-off-by: Lars Munch <lars@segv.dk> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
3e1dbaddbf
commit
9ba8c3f41d
|
@ -148,13 +148,6 @@ typedef struct CPUARMState {
|
||||||
int pending_exception;
|
int pending_exception;
|
||||||
} v7m;
|
} v7m;
|
||||||
|
|
||||||
/* Coprocessor IO used by peripherals */
|
|
||||||
struct {
|
|
||||||
ARMReadCPFunc *cp_read;
|
|
||||||
ARMWriteCPFunc *cp_write;
|
|
||||||
void *opaque;
|
|
||||||
} cp[15];
|
|
||||||
|
|
||||||
/* Thumb-2 EE state. */
|
/* Thumb-2 EE state. */
|
||||||
uint32_t teecr;
|
uint32_t teecr;
|
||||||
uint32_t teehbr;
|
uint32_t teehbr;
|
||||||
|
@ -204,6 +197,13 @@ typedef struct CPUARMState {
|
||||||
CPU_COMMON
|
CPU_COMMON
|
||||||
|
|
||||||
/* These fields after the common ones so they are preserved on reset. */
|
/* These fields after the common ones so they are preserved on reset. */
|
||||||
|
|
||||||
|
/* Coprocessor IO used by peripherals */
|
||||||
|
struct {
|
||||||
|
ARMReadCPFunc *cp_read;
|
||||||
|
ARMWriteCPFunc *cp_write;
|
||||||
|
void *opaque;
|
||||||
|
} cp[15];
|
||||||
void *nvic;
|
void *nvic;
|
||||||
struct arm_boot_info *boot_info;
|
struct arm_boot_info *boot_info;
|
||||||
} CPUARMState;
|
} CPUARMState;
|
||||||
|
|
Loading…
Reference in a new issue