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

Commit f79d2094 authored by Fu Wei's avatar Fu Wei Committed by Mark Rutland
Browse files

clocksource: arm_arch_timer: simplify ACPI support code. 



The patch update arm_arch_timer driver to use the function
provided by the new GTDT driver of ACPI.
By this way, arm_arch_timer.c can be simplified, and separate
all the ACPI GTDT knowledge from this timer driver.

Signed-off-by: default avatarFu Wei <fu.wei@linaro.org>
Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Tested-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
parent 5f1ae4eb

drivers/clocksource/arm_arch_timer.c

+10 −30
Original line number Diff line number Diff line
@@ -1385,53 +1385,33 @@ static int __init arch_timer_mem_of_init(struct device_node *np) 
CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem",

		       arch_timer_mem_of_init);



#ifdef CONFIG_ACPI

static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)

{

	int trigger, polarity;



	if (!interrupt)

		return 0;



	trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE

			: ACPI_LEVEL_SENSITIVE;



	polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW

			: ACPI_ACTIVE_HIGH;



	return acpi_register_gsi(NULL, interrupt, trigger, polarity);

}



#ifdef CONFIG_ACPI_GTDT

/* Initialize per-processor generic timer */

static int __init arch_timer_acpi_init(struct acpi_table_header *table)

{

	int ret;

	struct acpi_table_gtdt *gtdt;



	if (arch_timers_present & ARCH_TIMER_TYPE_CP15) {

		pr_warn("already initialized, skipping\n");

		return -EINVAL;

	}



	gtdt = container_of(table, struct acpi_table_gtdt, header);



	arch_timers_present |= ARCH_TIMER_TYPE_CP15;



	arch_timer_ppi[ARCH_TIMER_PHYS_SECURE_PPI] =

		map_generic_timer_interrupt(gtdt->secure_el1_interrupt,

		gtdt->secure_el1_flags);

	ret = acpi_gtdt_init(table, NULL);

	if (ret) {

		pr_err("Failed to init GTDT table.\n");

		return ret;

	}



	arch_timer_ppi[ARCH_TIMER_PHYS_NONSECURE_PPI] =

		map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,

		gtdt->non_secure_el1_flags);

		acpi_gtdt_map_ppi(ARCH_TIMER_PHYS_NONSECURE_PPI);



	arch_timer_ppi[ARCH_TIMER_VIRT_PPI] =

		map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,

		gtdt->virtual_timer_flags);

		acpi_gtdt_map_ppi(ARCH_TIMER_VIRT_PPI);



	arch_timer_ppi[ARCH_TIMER_HYP_PPI] =

		map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,

		gtdt->non_secure_el2_flags);

		acpi_gtdt_map_ppi(ARCH_TIMER_HYP_PPI);



	arch_timer_kvm_info.virtual_irq = arch_timer_ppi[ARCH_TIMER_VIRT_PPI];
@@ -1452,7 +1432,7 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) 
	}



	/* Always-on capability */

	arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);

	arch_timer_c3stop = acpi_gtdt_c3stop(arch_timer_uses_ppi);



	/* Check for globally applicable workarounds */

	arch_timer_check_ool_workaround(ate_match_acpi_oem_info, table);