diff mbox

[1/2] target-arm/kvm64: Add cortex-a53 cpu support

Message ID 1433154861-4116-2-git-send-email-shannon.zhao@linaro.org
State New
Headers show

Commit Message

Shannon Zhao June 1, 2015, 10:34 a.m. UTC
From: Shannon Zhao <shannon.zhao@linaro.org>

Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
 target-arm/cpu64.c      | 1 +
 target-arm/kvm-consts.h | 2 ++
 target-arm/kvm64.c      | 1 +
 3 files changed, 4 insertions(+)

Comments

Shannon Zhao June 1, 2015, 12:48 p.m. UTC | #1
On 2015/6/1 18:54, Peter Crosthwaite wrote:
> On Mon, Jun 1, 2015 at 3:34 AM,  <shannon.zhao@linaro.org> wrote:
>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>
>
> Say more about the changes. Why the gap to index 4?
>
You mean why the KVM_ARM_TARGET_CORTEX_A53 is 4?

linux-headers/asm-arm64/kvm.h defines it to 4.

/* Supported Processor Types */
#define KVM_ARM_TARGET_AEM_V8		0
#define KVM_ARM_TARGET_FOUNDATION_V8	1
#define KVM_ARM_TARGET_CORTEX_A57	2
#define KVM_ARM_TARGET_XGENE_POTENZA	3
#define KVM_ARM_TARGET_CORTEX_A53	4


>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
>> ---
>>   target-arm/cpu64.c      | 1 +
>>   target-arm/kvm-consts.h | 2 ++
>>   target-arm/kvm64.c      | 1 +
>>   3 files changed, 4 insertions(+)
>>
>> diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
>> index bf7dd68..dd6f9d8 100644
>> --- a/target-arm/cpu64.c
>> +++ b/target-arm/cpu64.c
>> @@ -159,6 +159,7 @@ static void aarch64_a53_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->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;
>>       cpu->midr = 0x410fd034;
>>       cpu->reset_fpsid = 0x41034070;
>>       cpu->mvfr0 = 0x10110222;
>> diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h
>> index aea12f1..4c10476 100644
>> --- a/target-arm/kvm-consts.h
>> +++ b/target-arm/kvm-consts.h
>> @@ -127,6 +127,7 @@ MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED)
>>   #define QEMU_KVM_ARM_TARGET_AEM_V8 0
>>   #define QEMU_KVM_ARM_TARGET_FOUNDATION_V8 1
>>   #define QEMU_KVM_ARM_TARGET_CORTEX_A57 2
>> +#define QEMU_KVM_ARM_TARGET_CORTEX_A53 4
>>
>>   /* There's no kernel define for this: sentinel value which
>>    * matches no KVM target value for either 64 or 32 bit
>> @@ -137,6 +138,7 @@ MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED)
>>   MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_AEM_V8, KVM_ARM_TARGET_AEM_V8)
>>   MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_FOUNDATION_V8, KVM_ARM_TARGET_FOUNDATION_V8)
>>   MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A57, KVM_ARM_TARGET_CORTEX_A57)
>> +MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A53, KVM_ARM_TARGET_CORTEX_A53)
>>   #else
>>   MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A15, KVM_ARM_TARGET_CORTEX_A15)
>>   MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A7, KVM_ARM_TARGET_CORTEX_A7)
>> diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
>> index 93c1ca8..0f1cd29 100644
>> --- a/target-arm/kvm64.c
>> +++ b/target-arm/kvm64.c
>> @@ -50,6 +50,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUClass *ahcc)
>>           KVM_ARM_TARGET_AEM_V8,
>>           KVM_ARM_TARGET_FOUNDATION_V8,
>>           KVM_ARM_TARGET_CORTEX_A57,
>> +        KVM_ARM_TARGET_CORTEX_A53 = 4,
>
> Do you need the = 4? This seems to be a continuous list of indicies
> terminated by _TARGET_NONE.
>
> Regards,
> Peter
>
>>           QEMU_KVM_ARM_TARGET_NONE
>>       };
>>       struct kvm_vcpu_init init;
>> --
>> 2.1.0
>>
>>
Peter Maydell June 1, 2015, 2:27 p.m. UTC | #2
On 1 June 2015 at 13:48, Shannon Zhao <shannon.zhao@linaro.org> wrote:
>
>
> On 2015/6/1 18:54, Peter Crosthwaite wrote:
>>
>> On Mon, Jun 1, 2015 at 3:34 AM,  <shannon.zhao@linaro.org> wrote:
>>>
>>> From: Shannon Zhao <shannon.zhao@linaro.org>
>>>
>>
>> Say more about the changes. Why the gap to index 4?
>>
> You mean why the KVM_ARM_TARGET_CORTEX_A53 is 4?
>
> linux-headers/asm-arm64/kvm.h defines it to 4.
>
> /* Supported Processor Types */
> #define KVM_ARM_TARGET_AEM_V8           0
> #define KVM_ARM_TARGET_FOUNDATION_V8    1
> #define KVM_ARM_TARGET_CORTEX_A57       2
> #define KVM_ARM_TARGET_XGENE_POTENZA    3
> #define KVM_ARM_TARGET_CORTEX_A53       4

I think it would make more sense to include the XGENE_POTENZA
in the enum too; we already have a few in the list (AEM,
FOUNDATION_V8) which we don't have QEMU support for.
That way there isn't a confusing gap in the enumeration.

thanks
-- PMM
diff mbox

Patch

diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
index bf7dd68..dd6f9d8 100644
--- a/target-arm/cpu64.c
+++ b/target-arm/cpu64.c
@@ -159,6 +159,7 @@  static void aarch64_a53_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->kvm_target = QEMU_KVM_ARM_TARGET_CORTEX_A53;
     cpu->midr = 0x410fd034;
     cpu->reset_fpsid = 0x41034070;
     cpu->mvfr0 = 0x10110222;
diff --git a/target-arm/kvm-consts.h b/target-arm/kvm-consts.h
index aea12f1..4c10476 100644
--- a/target-arm/kvm-consts.h
+++ b/target-arm/kvm-consts.h
@@ -127,6 +127,7 @@  MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED)
 #define QEMU_KVM_ARM_TARGET_AEM_V8 0
 #define QEMU_KVM_ARM_TARGET_FOUNDATION_V8 1
 #define QEMU_KVM_ARM_TARGET_CORTEX_A57 2
+#define QEMU_KVM_ARM_TARGET_CORTEX_A53 4
 
 /* There's no kernel define for this: sentinel value which
  * matches no KVM target value for either 64 or 32 bit
@@ -137,6 +138,7 @@  MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED)
 MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_AEM_V8, KVM_ARM_TARGET_AEM_V8)
 MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_FOUNDATION_V8, KVM_ARM_TARGET_FOUNDATION_V8)
 MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A57, KVM_ARM_TARGET_CORTEX_A57)
+MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A53, KVM_ARM_TARGET_CORTEX_A53)
 #else
 MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A15, KVM_ARM_TARGET_CORTEX_A15)
 MISMATCH_CHECK(QEMU_KVM_ARM_TARGET_CORTEX_A7, KVM_ARM_TARGET_CORTEX_A7)
diff --git a/target-arm/kvm64.c b/target-arm/kvm64.c
index 93c1ca8..0f1cd29 100644
--- a/target-arm/kvm64.c
+++ b/target-arm/kvm64.c
@@ -50,6 +50,7 @@  bool kvm_arm_get_host_cpu_features(ARMHostCPUClass *ahcc)
         KVM_ARM_TARGET_AEM_V8,
         KVM_ARM_TARGET_FOUNDATION_V8,
         KVM_ARM_TARGET_CORTEX_A57,
+        KVM_ARM_TARGET_CORTEX_A53 = 4,
         QEMU_KVM_ARM_TARGET_NONE
     };
     struct kvm_vcpu_init init;