From: Peter Maydell Date: Fri, 24 Oct 2014 11:19:13 +0000 (+0100) Subject: target-arm: Report a valid L1Ip field in CTR_EL0 for CPU type "any" X-Git-Tag: v2.2.0-rc0~29^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e7b176ae01d5a664d4cbf619a7315819494e6cb;p=thirdparty%2Fqemu.git target-arm: Report a valid L1Ip field in CTR_EL0 for CPU type "any" For the CPU type "any" (only used with linux-user) we were reporting the L1Ip field as 0b00, which is reserved. Change this field to 0b10 instead, indicating a VIPT icache as the comment describes. Reported-by: Laurent Desnogues Signed-off-by: Peter Maydell Reviewed-by: Laurent Desnogues Message-id: 1412966807-20844-1-git-send-email-peter.maydell@linaro.org --- diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index a95367af2b9..bb778b3d920 100644 --- a/target-arm/cpu64.c +++ b/target-arm/cpu64.c @@ -151,7 +151,7 @@ static void aarch64_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V8_SHA256); set_feature(&cpu->env, ARM_FEATURE_V8_PMULL); set_feature(&cpu->env, ARM_FEATURE_CRC); - cpu->ctr = 0x80030003; /* 32 byte I and D cacheline size, VIPT icache */ + cpu->ctr = 0x80038003; /* 32 byte I and D cacheline size, VIPT icache */ cpu->dcz_blocksize = 7; /* 512 bytes */ } #endif