Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3dcea2c authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

arm64: capabilities: Merge duplicate entries for Qualcomm erratum 1003 



Remove duplicate entries for Qualcomm erratum 1003. Since the entries
are not purely based on generic MIDR checks, use the multi_cap_entry
type to merge the entries.

Cc: Christopher Covington <cov@codeaurora.org>
Cc: Will Deacon <will.deacon@arm.com>
Reviewed-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Tested-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent f58cdf7e

arch/arm64/kernel/cpu_errata.c

+16 −9
Original line number Original line Diff line number Diff line
@@ -592,6 +592,19 @@ static const struct midr_range cavium_erratum_30115_cpus[] = { 
};

};

#endif

#endif





#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003

static const struct arm64_cpu_capabilities qcom_erratum_1003_list[] = {

	{

		ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),

	},

	{

		.midr_range.model = MIDR_QCOM_KRYO,

		.matches = is_kryo_midr,

	},

	{},

};

#endif



#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE

#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE

static const struct midr_range workaround_clean_cache[] = {

static const struct midr_range workaround_clean_cache[] = {

#if	defined(CONFIG_ARM64_ERRATUM_826319) || \

#if	defined(CONFIG_ARM64_ERRATUM_826319) || \
@@ -685,16 +698,10 @@ const struct arm64_cpu_capabilities arm64_errata[] = { 
	},

	},

#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003

#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1003

	{

	{

		.desc = "Qualcomm Technologies Falkor erratum 1003",

		.desc = "Qualcomm Technologies Falkor/Kryo erratum 1003",

		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,

		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,

		ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),

		.matches = multi_entry_cap_matches,

	},

		.match_list = qcom_erratum_1003_list,

	{

		.desc = "Qualcomm Technologies Kryo erratum 1003",

		.capability = ARM64_WORKAROUND_QCOM_FALKOR_E1003,

		.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,

		.midr_range.model = MIDR_QCOM_KRYO,

		.matches = is_kryo_midr,

	},

	},

#endif

#endif

#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009

#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009