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

Commit d003d029 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: arch_timer: Add HISILICON_ERRATUM_161010101 ACPI matching data 



In order to deal with ACPI enabled platforms suffering from the
HISILICON_ERRATUM_161010101, let's add the required OEM data that
allow the workaround to be enabled.

Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatardann frazier <dann.frazier@canonical.com>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 5a38bcac

drivers/clocksource/arm_arch_timer.c

+33 −0
Original line number Diff line number Diff line
@@ -270,6 +270,29 @@ static u64 notrace hisi_161010101_read_cntvct_el0(void) 
{

	return __hisi_161010101_read_reg(cntvct_el0);

}



static struct ate_acpi_oem_info hisi_161010101_oem_info[] = {

	/*

	 * Note that trailing spaces are required to properly match

	 * the OEM table information.

	 */

	{

		.oem_id		= "HISI  ",

		.oem_table_id	= "HIP05   ",

		.oem_revision	= 0,

	},

	{

		.oem_id		= "HISI  ",

		.oem_table_id	= "HIP06   ",

		.oem_revision	= 0,

	},

	{

		.oem_id		= "HISI  ",

		.oem_table_id	= "HIP07   ",

		.oem_revision	= 0,

	},

	{ /* Sentinel indicating the end of the OEM array */ },

};

#endif



#ifdef CONFIG_ARM64_ERRATUM_858921
@@ -347,6 +370,16 @@ static const struct arch_timer_erratum_workaround ool_workarounds[] = { 
		.set_next_event_phys = erratum_set_next_event_tval_phys,

		.set_next_event_virt = erratum_set_next_event_tval_virt,

	},

	{

		.match_type = ate_match_acpi_oem_info,

		.id = hisi_161010101_oem_info,

		.desc = "HiSilicon erratum 161010101",

		.read_cntp_tval_el0 = hisi_161010101_read_cntp_tval_el0,

		.read_cntv_tval_el0 = hisi_161010101_read_cntv_tval_el0,

		.read_cntvct_el0 = hisi_161010101_read_cntvct_el0,

		.set_next_event_phys = erratum_set_next_event_tval_phys,

		.set_next_event_virt = erratum_set_next_event_tval_virt,

	},

#endif

#ifdef CONFIG_ARM64_ERRATUM_858921

	{