[PATCH 0/4] Add KRYO2XX Errata / mitigations data

[PATCH 0/4] Add KRYO2XX Errata / mitigations data

[Konrad Dybcio]

This series adds Spectre mitigations and errata data for
Qualcomm KRYO2XX Gold (big) and Silver (LITTLE) series of
CPU cores, used for example in MSM8998 and SDM660-series SoCs.

Konrad Dybcio (4):
  arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
  arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
  arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
  arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

 arch/arm64/include/asm/cputype.h | 4 ++++
 arch/arm64/kernel/cpu_errata.c   | 2 ++
 arch/arm64/kernel/cpufeature.c   | 2 ++
 arch/arm64/kernel/proton-pack.c  | 1 +
 4 files changed, 9 insertions(+)

-- 
2.29.2

[PATCH 1/4] arm64: Add MIDR value for KRYO2XX gold/silver CPU cores

[Konrad Dybcio]

Add MIDR value for KRYO2XX gold (big) and silver (LITTLE)
CPU cores which are used in Qualcomm Technologies, Inc.
SoCs. This will be used to identify and apply errata
which are applicable for these CPU cores.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/include/asm/cputype.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index 9e2e9a63c7b6..ef5b040dee44 100644
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -86,6 +86,8 @@
 #define QCOM_CPU_PART_FALKOR_V1		0x800
 #define QCOM_CPU_PART_FALKOR		0xC00
 #define QCOM_CPU_PART_KRYO		0x200
+#define QCOM_CPU_PART_KRYO_2XX_GOLD	0x800
+#define QCOM_CPU_PART_KRYO_2XX_SILVER	0x801
 #define QCOM_CPU_PART_KRYO_3XX_SILVER	0x803
 #define QCOM_CPU_PART_KRYO_4XX_GOLD	0x804
 #define QCOM_CPU_PART_KRYO_4XX_SILVER	0x805
@@ -116,6 +118,8 @@
 #define MIDR_QCOM_FALKOR_V1 MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR_V1)
 #define MIDR_QCOM_FALKOR MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_FALKOR)
 #define MIDR_QCOM_KRYO MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO)
+#define MIDR_QCOM_KRYO_2XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_GOLD)
+#define MIDR_QCOM_KRYO_2XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_2XX_SILVER)
 #define MIDR_QCOM_KRYO_3XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_3XX_SILVER)
 #define MIDR_QCOM_KRYO_4XX_GOLD MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_GOLD)
 #define MIDR_QCOM_KRYO_4XX_SILVER MIDR_CPU_MODEL(ARM_CPU_IMP_QCOM, QCOM_CPU_PART_KRYO_4XX_SILVER)
-- 
2.29.2

[PATCH 2/4] arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist

[Konrad Dybcio]

QCOM KRYO2XX gold (big) silver (LITTLE) CPU cores are based on
Cortex-A73 and Cortex-A53 respectively and are meltdown safe,
hence add them to kpti_safe_list[].

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/kernel/cpufeature.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index dcc165b3fc04..6f36c4f62f69 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -1337,6 +1337,8 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A73),
 		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
 		MIDR_ALL_VERSIONS(MIDR_NVIDIA_CARMEL),
+		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_GOLD),
+		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER),
 		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
 		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
 		{ /* sentinel */ }
-- 
2.29.2

[PATCH 3/4] arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list

[Konrad Dybcio]

KRYO2XX silver (LITTLE) CPUs are based on Cortex-A53
and they are not affected by spectre-v2.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/kernel/proton-pack.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c
index c18eb7d41274..f6e4e3737405 100644
--- a/arch/arm64/kernel/proton-pack.c
+++ b/arch/arm64/kernel/proton-pack.c
@@ -118,6 +118,7 @@ static enum mitigation_state spectre_v2_get_cpu_hw_mitigation_state(void)
 		MIDR_ALL_VERSIONS(MIDR_CORTEX_A55),
 		MIDR_ALL_VERSIONS(MIDR_BRAHMA_B53),
 		MIDR_ALL_VERSIONS(MIDR_HISI_TSV110),
+		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_2XX_SILVER),
 		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_3XX_SILVER),
 		MIDR_ALL_VERSIONS(MIDR_QCOM_KRYO_4XX_SILVER),
 		{ /* sentinel */ }
-- 
2.29.2

[PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Konrad Dybcio]

QCOM KRYO2XX Silver cores are Cortex-A53 based and are
susceptible to the 845719 erratum. Add them to the lookup
list to apply the erratum.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
---
 arch/arm64/kernel/cpu_errata.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 61314fd70f13..cafaf0da05b7 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -299,6 +299,8 @@ static const struct midr_range erratum_845719_list[] = {
 	MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
 	/* Brahma-B53 r0p[0] */
 	MIDR_REV(MIDR_BRAHMA_B53, 0, 0),
+	/* Kryo2XX Silver rAp4 */
+	MIDR_REV(MIDR_QCOM_KRYO_2XX_SILVER, 0xa, 0x4),
 	{},
 };
 #endif
-- 
2.29.2

Re: [PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Marc Zyngier]

On 2020-11-04 23:22, Konrad Dybcio wrote:
> QCOM KRYO2XX Silver cores are Cortex-A53 based and are
> susceptible to the 845719 erratum. Add them to the lookup
> list to apply the erratum.
> 
> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
> ---
>  arch/arm64/kernel/cpu_errata.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm64/kernel/cpu_errata.c 
> b/arch/arm64/kernel/cpu_errata.c
> index 61314fd70f13..cafaf0da05b7 100644
> --- a/arch/arm64/kernel/cpu_errata.c
> +++ b/arch/arm64/kernel/cpu_errata.c
> @@ -299,6 +299,8 @@ static const struct midr_range 
> erratum_845719_list[] = {
>  	MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
>  	/* Brahma-B53 r0p[0] */
>  	MIDR_REV(MIDR_BRAHMA_B53, 0, 0),
> +	/* Kryo2XX Silver rAp4 */
> +	MIDR_REV(MIDR_QCOM_KRYO_2XX_SILVER, 0xa, 0x4),

Is this the only affected version? If this is actually an A53, how do 
the
revisions map between Kryo and Cortex cores?

         M.
-- 
Jazz is not dead. It just smells funny...

Re: [PATCH 0/4] Add KRYO2XX Errata / mitigations data

[Will Deacon]

Hi Konrad,

[+Jeffrey]

On Thu, Nov 05, 2020 at 12:22:09AM +0100, Konrad Dybcio wrote:
> This series adds Spectre mitigations and errata data for
> Qualcomm KRYO2XX Gold (big) and Silver (LITTLE) series of
> CPU cores, used for example in MSM8998 and SDM660-series SoCs.
> 
> Konrad Dybcio (4):
>   arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
>   arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
>   arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
>   arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

This mostly looks fine to me, but I've added Jeffrey to check the MIDRs
because he's my go-to person for the Qualcomm numbering scheme.

Jeffrey -- please can you check these patches [1], especially the last patch
which has some cryptic revision number in there too?

Cheers,

Will

[1] http://lkml.kernel.org/r/20201104232218.198800-1-konrad.dybcio@somainline.org

Re: [PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Konrad Dybcio]

> Is this the only affected version? If this is actually an A53, how do the

> revisions map between Kryo and Cortex cores?


Hi,

sadly, I do not have access to such information. Only this specific revision has been marked as affected in the BSP kernel.


Konrad

Re: [PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Sai Prakash Ranjan]

Hi Marc,

On 2020-11-05 14:59, Marc Zyngier wrote:
> On 2020-11-04 23:22, Konrad Dybcio wrote:
>> QCOM KRYO2XX Silver cores are Cortex-A53 based and are
>> susceptible to the 845719 erratum. Add them to the lookup
>> list to apply the erratum.
>> 
>> Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
>> ---
>>  arch/arm64/kernel/cpu_errata.c | 2 ++
>>  1 file changed, 2 insertions(+)
>> 
>> diff --git a/arch/arm64/kernel/cpu_errata.c 
>> b/arch/arm64/kernel/cpu_errata.c
>> index 61314fd70f13..cafaf0da05b7 100644
>> --- a/arch/arm64/kernel/cpu_errata.c
>> +++ b/arch/arm64/kernel/cpu_errata.c
>> @@ -299,6 +299,8 @@ static const struct midr_range 
>> erratum_845719_list[] = {
>>  	MIDR_REV_RANGE(MIDR_CORTEX_A53, 0, 0, 4),
>>  	/* Brahma-B53 r0p[0] */
>>  	MIDR_REV(MIDR_BRAHMA_B53, 0, 0),
>> +	/* Kryo2XX Silver rAp4 */
>> +	MIDR_REV(MIDR_QCOM_KRYO_2XX_SILVER, 0xa, 0x4),
> 
> Is this the only affected version? If this is actually an A53, how do 
> the
> revisions map between Kryo and Cortex cores?
> 

 From what I see from the docs, this is the only version used
in MSM8998(silver cores are based on Cortex A53) and it maps
to r0p4. @Konrad, can you include (rap4 => r0p4) in comment.

Thanks,
Sai

-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a 
member
of Code Aurora Forum, hosted by The Linux Foundation

Re: [PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Konrad Dybcio]

> From what I see from the docs, this is the only version used
> in MSM8998(silver cores are based on Cortex A53) and it maps
> to r0p4. @Konrad, can you include (rap4 => r0p4) in comment.


Hi,

Thanks for looking into it. Could you perhaps check if it's also the case on sdm630/636/660?

Konrad

Re: [PATCH 4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver

[Sai Prakash Ranjan]

Hi,

On 2020-11-10 00:58, Konrad Dybcio wrote:
>> From what I see from the docs, this is the only version used
>> in MSM8998(silver cores are based on Cortex A53) and it maps
>> to r0p4. @Konrad, can you include (rap4 => r0p4) in comment.
> 
> 
> Hi,
> 
> Thanks for looking into it. Could you perhaps check if it's also the
> case on sdm630/636/660?
> 

Yes I checked with CPU team now and its the same.

Thanks,
Sai

-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a 
member
of Code Aurora Forum, hosted by The Linux Foundation

Re: [PATCH 0/4] Add KRYO2XX Errata / mitigations data

[Sai Prakash Ranjan]

On 2020-11-05 15:03, Will Deacon wrote:
> Hi Konrad,
> 
> [+Jeffrey]
> 
> On Thu, Nov 05, 2020 at 12:22:09AM +0100, Konrad Dybcio wrote:
>> This series adds Spectre mitigations and errata data for
>> Qualcomm KRYO2XX Gold (big) and Silver (LITTLE) series of
>> CPU cores, used for example in MSM8998 and SDM660-series SoCs.
>> 
>> Konrad Dybcio (4):
>>   arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
>>   arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
>>   arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
>>   arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver
> 
> This mostly looks fine to me, but I've added Jeffrey to check the MIDRs
> because he's my go-to person for the Qualcomm numbering scheme.
> 
> Jeffrey -- please can you check these patches [1], especially the last 
> patch
> which has some cryptic revision number in there too?

Jeffrey can confirm this, but the MIDR is right and the cryptic revision
maps to cortex r0p4.

Thanks,
Sai

-- 
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a 
member
of Code Aurora Forum, hosted by The Linux Foundation

Re: [PATCH 0/4] Add KRYO2XX Errata / mitigations data

[Will Deacon]

On Thu, 5 Nov 2020 00:22:09 +0100, Konrad Dybcio wrote:
> This series adds Spectre mitigations and errata data for
> Qualcomm KRYO2XX Gold (big) and Silver (LITTLE) series of
> CPU cores, used for example in MSM8998 and SDM660-series SoCs.
> 
> Konrad Dybcio (4):
>   arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
>   arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
>   arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
>   arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/4] arm64: Add MIDR value for KRYO2XX gold/silver CPU cores
      https://git.kernel.org/arm64/c/77473cffef21
[2/4] arm64: kpti: Add KRYO2XX gold/silver CPU cores to kpti safelist
      https://git.kernel.org/arm64/c/e3dd11a9f252
[3/4] arm64: proton-pack: Add KRYO2XX silver CPUs to spectre-v2 safe-list
      https://git.kernel.org/arm64/c/38328d401167
[4/4] arm64: cpu_errata: Apply Erratum 845719 to KRYO2XX Silver
      https://git.kernel.org/arm64/c/23c216416056

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev