SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hvf: arm: Ignore writes to CNTP_CTL_EL0

Browse Source 
MacOS unconditionally disables interrupts of the physical timer on boot
and then continues to use the virtual one. We don't really want to support
a full physical timer emulation, so let's just ignore those writes.

Signed-off-by: Alexander Graf <graf@amazon.com>
Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20230830161425.91946-5-graf@amazon.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Alexander Graf 2023-06-14 22:40:30 +00:00 committed by Philippe Mathieu-Daudé
parent 9863d46a5a
commit a7e7066b93
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/arm/hvf/hvf.c
View File

@ -11,6 +11,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/log.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "sysemu/hvf.h" #include "sysemu/hvf.h"
@ -184,6 +185,7 @@ void hvf_arm_init_debug(void)
#define SYSREG_OSLSR_EL1 SYSREG(2, 0, 1, 1, 4) #define SYSREG_OSLSR_EL1 SYSREG(2, 0, 1, 1, 4)
#define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4) #define SYSREG_OSDLR_EL1 SYSREG(2, 0, 1, 3, 4)
#define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1) #define SYSREG_CNTPCT_EL0 SYSREG(3, 3, 14, 0, 1)
#define SYSREG_CNTP_CTL_EL0 SYSREG(3, 3, 14, 2, 1)
#define SYSREG_PMCR_EL0 SYSREG(3, 3, 9, 12, 0) #define SYSREG_PMCR_EL0 SYSREG(3, 3, 9, 12, 0)
#define SYSREG_PMUSERENR_EL0 SYSREG(3, 3, 9, 14, 0) #define SYSREG_PMUSERENR_EL0 SYSREG(3, 3, 9, 14, 0)
#define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1) #define SYSREG_PMCNTENSET_EL0 SYSREG(3, 3, 9, 12, 1)
@ -1620,6 +1622,13 @@ static int hvf_sysreg_write(CPUState *cpu, uint32_t reg, uint64_t val)
case SYSREG_OSLAR_EL1: case SYSREG_OSLAR_EL1:
env->cp15.oslsr_el1 = val & 1; env->cp15.oslsr_el1 = val & 1;
return 0; return 0;
case SYSREG_CNTP_CTL_EL0:
/*
* Guests should not rely on the physical counter, but macOS emits
* disable writes to it. Let it do so, but ignore the requests.
*/
qemu_log_mask(LOG_UNIMP, "Unsupported write to CNTP_CTL_EL0\n");
return 0;
case SYSREG_OSDLR_EL1: case SYSREG_OSDLR_EL1:
/* Dummy register */ /* Dummy register */
return 0; return 0;