From: Fu Wei fu.wei@linaro.org
This patchset: (1)Move some enums and marcos to header file for arm_arch_timer, improve the pr_* code by defining "pr_fmt(fmt)" in arm_arch_timer.c
(2)Introduce ACPI GTDT parser: drivers/acpi/gtdt.c Parse all kinds of timer in GTDT table of ACPI:arch timer, memory-mapped timer and SBSA Generic Watchdog timer. This driver can help to simplify all the relevant timer drivers, and separate all the ACPI GTDT knowledge from them.
(3)Simplify ACPI code for arch timer in arm_arch_timer.c
(4)Add memory-mapped timer support in arm_arch_timer.c
Changelog: v4: Delete the kvm relevant patches Separate two patches for sorting out the code for arm_arch_timer. Improve irq info export code to allow missing irq info in GTDT table.
v3: https://lkml.org/lkml/2016/2/1/658 Improve GTDT driver code: (1)improve pr_* by defining pr_fmt(fmt) (2)simplify gtdt_sbsa_gwdt_init (3)improve gtdt_arch_timer_data_init, if table is NULL, it will try to get GTDT table. Move enum ppi_nr to arm_arch_timer.h, and add enum spi_nr. Add arm_arch_timer get ppi from DT and GTDT support for kvm.
v2: https://lkml.org/lkml/2015/12/2/10 Rebase to latest kernel version(4.4-rc3). Fix the bug about the config problem, use CONFIG_ACPI_GTDT instead of CONFIG_ACPI in arm_arch_timer.c
v1: The first upstreaming version: https://lkml.org/lkml/2015/10/28/553
Fu Wei (5): clocksource: move some enums and marcos to header file for arm_arch_timer ACPI: add GTDT table parse driver into ACPI driver clocksource: simplify ACPI code in arm_arch_timer.c clocksource: a little improvment for printk in arm_arch_timer.c clocksource: add memory-mapped timer support in arm_arch_timer.c
drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/gtdt.c | 376 +++++++++++++++++++++++++++++++++++ drivers/clocksource/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 217 ++++++++++++++------ include/clocksource/arm_arch_timer.h | 33 +++ include/linux/acpi.h | 17 ++ 7 files changed, 595 insertions(+), 59 deletions(-) create mode 100644 drivers/acpi/gtdt.c
From: Fu Wei fu.wei@linaro.org
The patch sorts out the code for arm_arch_timer: (1)move enum ppi_nr to the header file (2)move "ARCH_*_TIMER" marcos to the header file (3)add enum spi_nr in the header file, and use it in the driver (4)add ARCH_WD_TIMER and ARCH_TIMER_MEM_MAX_FRAME marcos
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 15 ++------------- include/clocksource/arm_arch_timer.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5152b38..11744c0 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -48,8 +48,6 @@ #define CNTV_TVAL 0x38 #define CNTV_CTL 0x3c
-#define ARCH_CP15_TIMER BIT(0) -#define ARCH_MEM_TIMER BIT(1) static unsigned arch_timers_present __initdata;
static void __iomem *arch_counter_base; @@ -62,15 +60,6 @@ struct arch_timer { #define to_arch_timer(e) container_of(e, struct arch_timer, evt)
static u32 arch_timer_rate; - -enum ppi_nr { - PHYS_SECURE_PPI, - PHYS_NONSECURE_PPI, - VIRT_PPI, - HYP_PPI, - MAX_TIMER_PPI -}; - static int arch_timer_ppi[MAX_TIMER_PPI];
static struct clock_event_device __percpu *arch_timer_evt; @@ -834,9 +823,9 @@ static void __init arch_timer_mem_init(struct device_node *np) }
if (arch_timer_mem_use_virtual) - irq = irq_of_parse_and_map(best_frame, 1); + irq = irq_of_parse_and_map(best_frame, VIRT_SPI); else - irq = irq_of_parse_and_map(best_frame, 0); + irq = irq_of_parse_and_map(best_frame, PHYS_SPI);
if (!irq) { pr_err("arch_timer: Frame missing %s irq", diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 25d0914..3e060fc 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -19,6 +19,10 @@ #include <linux/timecounter.h> #include <linux/types.h>
+#define ARCH_CP15_TIMER BIT(0) +#define ARCH_MEM_TIMER BIT(1) +#define ARCH_WD_TIMER BIT(2) + #define ARCH_TIMER_CTRL_ENABLE (1 << 0) #define ARCH_TIMER_CTRL_IT_MASK (1 << 1) #define ARCH_TIMER_CTRL_IT_STAT (1 << 2) @@ -34,11 +38,27 @@ enum arch_timer_reg { ARCH_TIMER_REG_TVAL, };
+enum ppi_nr { + PHYS_SECURE_PPI, + PHYS_NONSECURE_PPI, + VIRT_PPI, + HYP_PPI, + MAX_TIMER_PPI +}; + +enum spi_nr { + PHYS_SPI, + VIRT_SPI, + MAX_TIMER_SPI +}; + #define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2 #define ARCH_TIMER_MEM_VIRT_ACCESS 3
+#define ARCH_TIMER_MEM_MAX_FRAME 8 + #define ARCH_TIMER_USR_PCT_ACCESS_EN (1 << 0) /* physical counter */ #define ARCH_TIMER_USR_VCT_ACCESS_EN (1 << 1) /* virtual counter */ #define ARCH_TIMER_VIRT_EVT_EN (1 << 2)
From: Fu Wei fu.wei@linaro.org
This driver adds support for parsing all kinds of timer in GTDT: (1)arch timer: provide a kernel API to parse all the PPIs and always-on info in GTDT and export them by arch_timer_data struct.
(2)memory-mapped timer: provide several kernel APIs to parse GT Block Structure in GTDT, export those info by return value and arch_timer_mem_data struct.
(3)SBSA Generic Watchdog: parse all info in SBSA Generic Watchdog Structure in GTDT, and creating a platform device with that information. This allows the operating system to obtain device data from the resource of platform device. The platform device named "sbsa-gwdt" can be used by the ARM SBSA Generic Watchdog driver.
By this driver, we can simplify all the relevant drivers, and separate all the ACPI GTDT knowledge from them.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/gtdt.c | 376 +++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 13 ++ include/linux/acpi.h | 17 ++ 5 files changed, 416 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 82b96ee..abf33d3 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,13 @@ config XPOWER_PMIC_OPREGION
endif
+config ACPI_GTDT + bool "ACPI GTDT Support" + depends on ARM64 + help + GTDT (Generic Timer Description Table) provides information + for per-processor timers and Platform (memory-mapped) timers + for ARM platforms. Select this option to provide information + needed for the timers init. + endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index edeb2d1..f7ea779 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -98,5 +98,6 @@ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o +obj-$(CONFIG_ACPI_GTDT) += gtdt.o
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/gtdt.c b/drivers/acpi/gtdt.c new file mode 100644 index 0000000..d1b851c --- /dev/null +++ b/drivers/acpi/gtdt.c @@ -0,0 +1,376 @@ +/* + * ARM Specific GTDT table Support + * + * Copyright (C) 2015, Linaro Ltd. + * Author: Fu Wei fu.wei@linaro.org + * Hanjun Guo hanjun.guo@linaro.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <clocksource/arm_arch_timer.h> + +#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt + +static u32 platform_timer_count __initdata; +static int gtdt_timers_existence __initdata; + +/* + * Get some basic info from GTDT table, and init the global variables above + * for all timers initialization of Generic Timer. + * This function does some validation on GTDT table, and will be run only once. + */ +static void __init *platform_timer_info_init(struct acpi_table_header *table) +{ + void *gtdt_end, *platform_timer_struct, *platform_timer; + struct acpi_gtdt_header *header; + struct acpi_table_gtdt *gtdt; + u32 i; + + gtdt = container_of(table, struct acpi_table_gtdt, header); + if (!gtdt) { + pr_err("table pointer error.\n"); + return NULL; + } + gtdt_end = (void *)table + table->length; + gtdt_timers_existence |= ARCH_CP15_TIMER; + + if (table->revision < 2) { + pr_info("Revision:%d doesn't support Platform Timers.\n", + table->revision); + return NULL; + } + + platform_timer_count = gtdt->platform_timer_count; + if (!platform_timer_count) { + pr_info("No Platform Timer structures.\n"); + return NULL; + } + + platform_timer_struct = (void *)gtdt + gtdt->platform_timer_offset; + if (platform_timer_struct < (void *)table + + sizeof(struct acpi_table_gtdt)) { + pr_err(FW_BUG "Platform Timer pointer error.\n"); + return NULL; + } + + platform_timer = platform_timer_struct; + for (i = 0; i < platform_timer_count; i++) { + if (platform_timer > gtdt_end) { + pr_err(FW_BUG "subtable pointer overflows.\n"); + platform_timer_count = i; + break; + } + header = (struct acpi_gtdt_header *)platform_timer; + if (header->type == ACPI_GTDT_TYPE_TIMER_BLOCK) + gtdt_timers_existence |= ARCH_MEM_TIMER; + else if (header->type == ACPI_GTDT_TYPE_WATCHDOG) + gtdt_timers_existence |= ARCH_WD_TIMER; + platform_timer += header->length; + } + + return platform_timer_struct; +} + +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); +} + +/* + * Get the necessary info of arch_timer from GTDT table. + */ +int __init gtdt_arch_timer_data_init(struct acpi_table_header *table, + struct arch_timer_data *data) +{ + struct acpi_table_gtdt *gtdt; + + if (acpi_disabled || !data) + return -EINVAL; + + if (!table) { + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) + return -EINVAL; + } + + if (!gtdt_timers_existence) + platform_timer_info_init(table); + + gtdt = container_of(table, struct acpi_table_gtdt, header); + + data->phys_secure_ppi = + map_generic_timer_interrupt(gtdt->secure_el1_interrupt, + gtdt->secure_el1_flags); + + data->phys_nonsecure_ppi = + map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, + gtdt->non_secure_el1_flags); + + data->virt_ppi = + map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, + gtdt->virtual_timer_flags); + + data->hyp_ppi = + map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, + gtdt->non_secure_el2_flags); + + data->c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); + + return 0; +} + +bool __init gtdt_timer_is_available(int type) +{ + return gtdt_timers_existence | type; +} + +/* + * Helper function for getting the pointer of platform_timer_struct. + */ +static void __init *get_platform_timer_struct(struct acpi_table_header *table) +{ + struct acpi_table_gtdt *gtdt; + + if (!table) { + pr_err("table pointer error.\n"); + return NULL; + } + + gtdt = container_of(table, struct acpi_table_gtdt, header); + + return (void *)gtdt + gtdt->platform_timer_offset; +} + + /* + * Get the pointer of GT Block Structure in GTDT table + */ +void __init *gtdt_gt_block(struct acpi_table_header *table, int index) +{ + struct acpi_gtdt_header *header; + void *platform_timer; + int i, j; + + if (!gtdt_timers_existence) + platform_timer = platform_timer_info_init(table); + else + platform_timer = get_platform_timer_struct(table); + + if (!gtdt_timer_is_available(ARCH_MEM_TIMER)) + return NULL; + + for (i = 0, j = 0; i < platform_timer_count; i++) { + header = (struct acpi_gtdt_header *)platform_timer; + if (header->type == ACPI_GTDT_TYPE_TIMER_BLOCK && j++ == index) + return platform_timer; + platform_timer += header->length; + } + + return NULL; +} + +/* + * Get the timer_count(the number of timer frame) of a GT Block in GTDT table + */ +u32 __init gtdt_gt_timer_count(struct acpi_gtdt_timer_block *gt_block) +{ + if (!gt_block) { + pr_err("invalid GT Block baseaddr.\n"); + return 0; + } + + return gt_block->timer_count; +} + +/* + * Get the physical address of GT Block in GTDT table + */ +void __init *gtdt_gt_cntctlbase(struct acpi_gtdt_timer_block *gt_block) +{ + if (!gt_block) { + pr_err("invalid GT Block baseaddr.\n"); + return NULL; + } + + return (void *)gt_block->block_address; +} + +/* + * Helper function for getting the pointer of a timer frame in GT block. + */ +static void __init *gtdt_gt_timer_frame(struct acpi_gtdt_timer_block *gt_block, + int index) +{ + void *timer_frame; + + if (!(gt_block && gt_block->timer_count)) + return NULL; + + timer_frame = (void *)gt_block + gt_block->timer_offset + + sizeof(struct acpi_gtdt_timer_entry) * index; + + if (timer_frame <= (void *)gt_block + gt_block->header.length - + sizeof(struct acpi_gtdt_timer_entry)) + return timer_frame; + + pr_err(FW_BUG "invalid GT Block timer frame entry addr.\n"); + + return NULL; +} + +/* + * Get the GT timer Frame Number(ID) in a GT Block Timer Structure. + * The maximum Frame Number(ID) is (ARCH_TIMER_MEM_MAX_FRAME - 1), + * so returning ARCH_TIMER_MEM_MAX_FRAME means error. + */ +u32 __init gtdt_gt_frame_number(struct acpi_gtdt_timer_block *gt_block, + int index) +{ + struct acpi_gtdt_timer_entry *frame; + + frame = (struct acpi_gtdt_timer_entry *)gtdt_gt_timer_frame(gt_block, + index); + if (frame) + return frame->frame_number; + + return ARCH_TIMER_MEM_MAX_FRAME; +} + +/* + * Get the GT timer Frame data in a GT Block Timer Structure + */ +int __init gtdt_gt_timer_data(struct acpi_gtdt_timer_block *gt_block, + int index, bool virt, + struct arch_timer_mem_data *data) +{ + struct acpi_gtdt_timer_entry *frame; + + frame = (struct acpi_gtdt_timer_entry *)gtdt_gt_timer_frame(gt_block, + index); + if (!frame) + return -EINVAL; + + data->cntbase_phy = (phys_addr_t)frame->base_address; + if (virt) + data->irq = map_generic_timer_interrupt( + frame->virtual_timer_interrupt, + frame->virtual_timer_flags); + else + data->irq = map_generic_timer_interrupt(frame->timer_interrupt, + frame->timer_flags); + + return 0; +} + +/* + * Initialize a SBSA generic Watchdog platform device info from GTDT + */ +static int __init gtdt_import_sbsa_gwdt(struct acpi_gtdt_watchdog *wd, + int index) +{ + struct platform_device *pdev; + int irq = map_generic_timer_interrupt(wd->timer_interrupt, + wd->timer_flags); + int no_irq = 1; + + /* + * According to SBSA specification the size of refresh and control + * frames of SBSA Generic Watchdog is SZ_4K(Offset 0x000 – 0xFFF). + */ + struct resource res[] = { + DEFINE_RES_MEM(wd->control_frame_address, SZ_4K), + DEFINE_RES_MEM(wd->refresh_frame_address, SZ_4K), + DEFINE_RES_IRQ(irq), + }; + + pr_debug("a Watchdog GT(0x%llx/0x%llx gsi:%u flags:0x%x).\n", + wd->refresh_frame_address, wd->control_frame_address, + wd->timer_interrupt, wd->timer_flags); + + if (!(wd->refresh_frame_address && wd->control_frame_address)) { + pr_err(FW_BUG "failed getting the Watchdog GT frame addr.\n"); + return -EINVAL; + } + + if (!wd->timer_interrupt) + pr_warn(FW_BUG "failed getting the Watchdog GT GSIV.\n"); + else if (irq <= 0) + pr_warn("failed to map the Watchdog GT GSIV.\n"); + else + no_irq = 0; + + /* + * Add a platform device named "sbsa-gwdt" to match the platform driver. + * "sbsa-gwdt": SBSA(Server Base System Architecture) Generic Watchdog + * The platform driver (like drivers/watchdog/sbsa_gwdt.c)can get device + * info below by matching this name. + */ + pdev = platform_device_register_simple("sbsa-gwdt", index, res, + ARRAY_SIZE(res) - no_irq); + if (IS_ERR(pdev)) { + acpi_unregister_gsi(wd->timer_interrupt); + return PTR_ERR(pdev); + } + + return 0; +} + +static int __init gtdt_sbsa_gwdt_init(void) +{ + struct acpi_table_header *table; + struct acpi_gtdt_header *header; + void *platform_timer; + int i, gwdt_index; + int ret = 0; + + if (acpi_disabled) + return 0; + + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) + return -EINVAL; + + /* + * At this proint, we have got and validate some info about platform + * timer in platform_timer_info_init. + */ + if (!gtdt_timer_is_available(ARCH_WD_TIMER)) + return -EINVAL; + + platform_timer = get_platform_timer_struct(table); + + for (i = 0, gwdt_index = 0; i < platform_timer_count; i++) { + header = (struct acpi_gtdt_header *)platform_timer; + if (header->type == ACPI_GTDT_TYPE_WATCHDOG) { + ret = gtdt_import_sbsa_gwdt(platform_timer, gwdt_index); + if (ret) + pr_err("failed to import subtable %d.\n", i); + else + gwdt_index++; + } + platform_timer += header->length; + } + + return ret; +} + +device_initcall(gtdt_sbsa_gwdt_init); diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 3e060fc..8abbe67 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -69,6 +69,19 @@ enum spi_nr {
#define ARCH_TIMER_EVT_STREAM_FREQ 10000 /* 100us */
+struct arch_timer_data { + int phys_secure_ppi; + int phys_nonsecure_ppi; + int virt_ppi; + int hyp_ppi; + bool c3stop; +}; + +struct arch_timer_mem_data { + phys_addr_t cntbase_phy; + int irq; +}; + #ifdef CONFIG_ARM_ARCH_TIMER
extern u32 arch_timer_get_rate(void); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 06ed7e5..51bebe9 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -540,6 +540,23 @@ void acpi_walk_dep_device_list(acpi_handle handle); struct platform_device *acpi_create_platform_device(struct acpi_device *); #define ACPI_PTR(_ptr) (_ptr)
+#ifdef CONFIG_ACPI_GTDT +bool __init gtdt_timer_is_available(int type); + +struct arch_timer_data; +int __init gtdt_arch_timer_data_init(struct acpi_table_header *table, + struct arch_timer_data *data); +struct arch_timer_mem_data; +void __init *gtdt_gt_block(struct acpi_table_header *table, int index); +u32 __init gtdt_gt_timer_count(struct acpi_gtdt_timer_block *gt_block); +void __init *gtdt_gt_cntctlbase(struct acpi_gtdt_timer_block *gt_block); +u32 __init gtdt_gt_frame_number(struct acpi_gtdt_timer_block *gt_block, + int index); +int __init gtdt_gt_timer_data(struct acpi_gtdt_timer_block *gt_block, + int index, bool virt, + struct arch_timer_mem_data *data); +#endif + #else /* !CONFIG_ACPI */
#define acpi_disabled 1
From: Fu Wei fu.wei@linaro.org
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: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/clocksource/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 48 ++++++++---------------------------- 2 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index c346be6..68d2f40 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -8,6 +8,7 @@ config CLKSRC_OF config CLKSRC_ACPI bool select CLKSRC_PROBE + select ACPI_GTDT
config CLKSRC_PROBE bool diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 11744c0..d0b01fb5 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -843,60 +843,32 @@ out: CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_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) { - struct acpi_table_gtdt *gtdt; + struct arch_timer_data data;
if (arch_timers_present & ARCH_CP15_TIMER) { pr_warn("arch_timer: already initialized, skipping\n"); return -EINVAL; }
- gtdt = container_of(table, struct acpi_table_gtdt, header); - arch_timers_present |= ARCH_CP15_TIMER;
- arch_timer_ppi[PHYS_SECURE_PPI] = - map_generic_timer_interrupt(gtdt->secure_el1_interrupt, - gtdt->secure_el1_flags); - - arch_timer_ppi[PHYS_NONSECURE_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, - gtdt->non_secure_el1_flags); - - arch_timer_ppi[VIRT_PPI] = - map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, - gtdt->virtual_timer_flags); + if (gtdt_arch_timer_data_init(table, &data)) + return -EINVAL;
- arch_timer_ppi[HYP_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, - gtdt->non_secure_el2_flags); + arch_timer_ppi[PHYS_SECURE_PPI] = data.phys_secure_ppi; + arch_timer_ppi[PHYS_NONSECURE_PPI] = data.phys_nonsecure_ppi; + arch_timer_ppi[VIRT_PPI] = data.virt_ppi; + arch_timer_ppi[HYP_PPI] = data.hyp_ppi; + arch_timer_c3stop = data.c3stop; /* Always-on capability */
/* Get the frequency from CNTFRQ */ arch_timer_detect_rate(NULL, NULL); - - /* Always-on capability */ - arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); - arch_timer_init(); + return 0; } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
From: Fu Wei fu.wei@linaro.org
This patch defines pr_fmt(fmt) for all pr_* functions.
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d0b01fb5..db466d5 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -29,6 +29,9 @@
#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "arch_timer: " fmt + #define CNTTIDR 0x08 #define CNTTIDR_VIRT(n) (BIT(1) << ((n) * 4))
@@ -388,12 +391,12 @@ arch_timer_detect_rate(void __iomem *cntbase, struct device_node *np)
/* Check the timer frequency. */ if (arch_timer_rate == 0) - pr_warn("Architected timer frequency not available\n"); + pr_warn("frequency not available\n"); }
static void arch_timer_banner(unsigned type) { - pr_info("Architected %s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n", + pr_info("%s%s%s timer(s) running at %lu.%02luMHz (%s%s%s).\n", type & ARCH_CP15_TIMER ? "cp15" : "", type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ? " and " : "", type & ARCH_MEM_TIMER ? "mmio" : "", @@ -497,7 +500,7 @@ static void __init arch_counter_register(unsigned type)
static void arch_timer_stop(struct clock_event_device *clk) { - pr_debug("arch_timer_teardown disable IRQ%d cpu #%d\n", + pr_debug("teardown, disable IRQ%d cpu #%d\n", clk->irq, smp_processor_id());
disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]); @@ -596,8 +599,7 @@ static int __init arch_timer_register(void) }
if (err) { - pr_err("arch_timer: can't register interrupt %d (%d)\n", - ppi, err); + pr_err("can't register interrupt %d (%d)\n", ppi, err); goto out_free; }
@@ -649,7 +651,7 @@ static int __init arch_timer_mem_register(void __iomem *base, unsigned int irq)
ret = request_irq(irq, func, IRQF_TIMER, "arch_mem_timer", &t->evt); if (ret) { - pr_err("arch_timer: Failed to request mem timer irq\n"); + pr_err("Failed to request mem timer irq\n"); kfree(t); }
@@ -726,7 +728,7 @@ static void __init arch_timer_init(void) }
if (!has_ppi) { - pr_warn("arch_timer: No interrupt available, giving up\n"); + pr_warn("No interrupt available, giving up\n"); return; } } @@ -740,7 +742,7 @@ static void __init arch_timer_of_init(struct device_node *np) int i;
if (arch_timers_present & ARCH_CP15_TIMER) { - pr_warn("arch_timer: multiple nodes in dt, skipping\n"); + pr_warn("multiple nodes in dt, skipping\n"); return; }
@@ -775,7 +777,7 @@ static void __init arch_timer_mem_init(struct device_node *np) arch_timers_present |= ARCH_MEM_TIMER; cntctlbase = of_iomap(np, 0); if (!cntctlbase) { - pr_err("arch_timer: Can't find CNTCTLBase\n"); + pr_err("Can't find CNTCTLBase\n"); return; }
@@ -790,7 +792,7 @@ static void __init arch_timer_mem_init(struct device_node *np) u32 cntacr;
if (of_property_read_u32(frame, "frame-number", &n)) { - pr_err("arch_timer: Missing frame-number\n"); + pr_err("Missing frame-number\n"); of_node_put(frame); goto out; } @@ -818,7 +820,7 @@ static void __init arch_timer_mem_init(struct device_node *np)
base = arch_counter_base = of_iomap(best_frame, 0); if (!base) { - pr_err("arch_timer: Can't map frame's registers\n"); + pr_err("Can't map frame's registers\n"); goto out; }
@@ -828,7 +830,7 @@ static void __init arch_timer_mem_init(struct device_node *np) irq = irq_of_parse_and_map(best_frame, PHYS_SPI);
if (!irq) { - pr_err("arch_timer: Frame missing %s irq", + pr_err("Frame missing %s irq", arch_timer_mem_use_virtual ? "virt" : "phys"); goto out; } @@ -850,7 +852,7 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) struct arch_timer_data data;
if (arch_timers_present & ARCH_CP15_TIMER) { - pr_warn("arch_timer: already initialized, skipping\n"); + pr_warn("already initialized, skipping\n"); return -EINVAL; }
From: Fu Wei fu.wei@linaro.org
The patch add memory-mapped timer register support for arm_arch_timer driver by using the information provided by the new GTDT driver of ACPI.
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 136 +++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index db466d5..7e7604b 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -680,6 +680,15 @@ arch_timer_needs_probing(int type, const struct of_device_id *matches) needs_probing = true; of_node_put(dn);
+#ifdef CONFIG_ACPI_GTDT + /* + * Check if we have timer in GTDT table + */ + if (!acpi_disabled && gtdt_timer_is_available(type) && + !(arch_timers_present & type)) + needs_probing = true; +#endif + return needs_probing; }
@@ -874,4 +883,131 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) return 0; } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init); + +static u32 __init arch_timer_mem_cnttidr(struct acpi_gtdt_timer_block *gt_block) +{ + phys_addr_t cntctlbase_phy; + void __iomem *cntctlbase; + u32 cnttidr; + + cntctlbase_phy = (phys_addr_t)gtdt_gt_cntctlbase(gt_block); + if (!cntctlbase_phy) { + pr_err("Can't find CNTCTLBase.\n"); + return 0; + } + + /* + * According to ARMv8 Architecture Reference Manual(ARM), + * the size of CNTCTLBase frame of memory-mapped timer + * is SZ_4K(Offset 0x000 – 0xFFF). + */ + cntctlbase = ioremap(cntctlbase_phy, SZ_4K); + if (!cntctlbase) { + pr_err("Can't map CNTCTLBase\n"); + return 0; + } + cnttidr = readl_relaxed(cntctlbase + CNTTIDR); + iounmap(cntctlbase); + + return cnttidr; +} + +static int __init arch_timer_mem_best_frame(struct acpi_table_header *table, + struct arch_timer_mem_data *data) +{ + struct acpi_gtdt_timer_block *gt_block; + u32 frame_number, timer_count, cnttidr; + int i; + + gt_block = gtdt_gt_block(table, 0); + if (!gt_block) { + pr_err("Can't find GT Block.\n"); + return -EINVAL; + } + + timer_count = gtdt_gt_timer_count(gt_block); + if (!timer_count) { + pr_err("Can't find GT frame number.\n"); + return -EINVAL; + } + + if (gtdt_gt_timer_data(gt_block, 0, false, data)) { + pr_err("Can't get first phy timer.\n"); + return -EINVAL; + } + + /* + * Get Generic Timer Counter-timer Timer ID Register + * for Virtual Timer Capability info + */ + cnttidr = arch_timer_mem_cnttidr(gt_block); + + /* + * Try to find a virtual capable frame. + * Otherwise fall back to the first physical capable frame. + */ + for (i = 0; i < timer_count; i++) { + frame_number = gtdt_gt_frame_number(gt_block, i); + if (frame_number < ARCH_TIMER_MEM_MAX_FRAME && + cnttidr & CNTTIDR_VIRT(frame_number)) { + if (!gtdt_gt_timer_data(gt_block, i, true, data)) { + arch_timer_mem_use_virtual = true; + return 0; + } + pr_warn("Can't get virt timer.\n"); + } + } + + return 0; +} + +/* Initialize memory-mapped timer(wake-up timer) */ +static int __init arch_timer_mem_acpi_init(struct acpi_table_header *table) +{ + struct arch_timer_mem_data data; + void __iomem *cntbase; + + if (arch_timers_present & ARCH_MEM_TIMER) { + pr_warn("memory-mapped timer already initialized, skipping\n"); + return -EINVAL; + } + arch_timers_present |= ARCH_MEM_TIMER; + + if (arch_timer_mem_best_frame(table, &data)) + return -EINVAL; + + /* + * According to ARMv8 Architecture Reference Manual(ARM), + * the size of CNTBaseN frames of memory-mapped timer + * is SZ_4K(Offset 0x000 – 0xFFF). + */ + cntbase = ioremap(data.cntbase_phy, SZ_4K); + if (!cntbase) { + pr_err("Can't map CntBase.\n"); + return -EINVAL; + } + arch_counter_base = cntbase; + + if (!data.irq) { + pr_err("Frame missing %s irq", + arch_timer_mem_use_virtual ? "virt" : "phys"); + return -EINVAL; + } + + /* + * Because in a system that implements both Secure and + * Non-secure states, CNTFRQ is only accessible in Secure state. + * So we try to get the system counter frequency from cntfrq_el0 + * (system coprocessor register) here just like arch_timer. + */ + arch_timer_detect_rate(NULL, NULL); + + arch_timer_mem_register(cntbase, data.irq); + arch_timer_common_init(); + + return 0; +} + +CLOCKSOURCE_ACPI_DECLARE(arch_timer_mem, ACPI_SIG_GTDT, + arch_timer_mem_acpi_init); #endif
fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patchset: (1)Move some enums and marcos to header file for arm_arch_timer, improve the pr_* code by defining "pr_fmt(fmt)" in arm_arch_timer.c
(2)Introduce ACPI GTDT parser: drivers/acpi/gtdt.c Parse all kinds of timer in GTDT table of ACPI:arch timer, memory-mapped timer and SBSA Generic Watchdog timer. This driver can help to simplify all the relevant timer drivers, and separate all the ACPI GTDT knowledge from them. (3)Simplify ACPI code for arch timer in arm_arch_timer.c (4)Add memory-mapped timer support in arm_arch_timer.c
The SBSA watchdog driver is already in watchdog-next and will be merged into 4.6. These five patches are necessary for the watchdog driver to probe on an ACPI system.
I'm guessing since that v4 was posted in the middle of the 4.6 merge window, that these patches won't make it and we'll have to wait until 4.7 (at the earliest)?
On Thursday, March 17, 2016 10:07:30 AM Timur Tabi wrote:
fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patchset: (1)Move some enums and marcos to header file for arm_arch_timer, improve the pr_* code by defining "pr_fmt(fmt)" in arm_arch_timer.c
(2)Introduce ACPI GTDT parser: drivers/acpi/gtdt.c Parse all kinds of timer in GTDT table of ACPI:arch timer, memory-mapped timer and SBSA Generic Watchdog timer. This driver can help to simplify all the relevant timer drivers, and separate all the ACPI GTDT knowledge from them. (3)Simplify ACPI code for arch timer in arm_arch_timer.c (4)Add memory-mapped timer support in arm_arch_timer.cThe SBSA watchdog driver is already in watchdog-next and will be merged into 4.6. These five patches are necessary for the watchdog driver to probe on an ACPI system.
I'm guessing since that v4 was posted in the middle of the 4.6 merge window, that these patches won't make it and we'll have to wait until 4.7 (at the earliest)?
First off, the last version I've seen is the v3. I must have overlooked the v4 then, but I don't think it was CCed to linux-acpi (which should have happened).
Second, these patches require review from multiple maintainers and (or including) people who actually know how the GTDT is supposed to be used. I haven't seen any responses from any of them yet, so the answer to your question is "yes".
I will have a couple of comments for patch [1/6] (in the v3), but it's not been a priority due to the apparent overall lack of interest in this series.
Thanks, Rafael
Rafael J. Wysocki wrote:
I will have a couple of comments for patch [1/6] (in the v3), but it's not been a priority due to the apparent overall lack of interest in this series.
Well, I am very interested in this series, if that counts. :-)
On 18 March 2016 at 08:55, Timur Tabi timur@codeaurora.org wrote:
Rafael J. Wysocki wrote:
I will have a couple of comments for patch [1/6] (in the v3), but it's not been a priority due to the apparent overall lack of interest in this series.
Well, I am very interested in this series, if that counts. :-)
Thank you for your feedback, do you have any suggestion for v4?
-- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation.
Hi Rafael,
Great thanks for your feedback!
On 18 March 2016 at 08:41, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Thursday, March 17, 2016 10:07:30 AM Timur Tabi wrote:
fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patchset: (1)Move some enums and marcos to header file for arm_arch_timer, improve the pr_* code by defining "pr_fmt(fmt)" in arm_arch_timer.c
(2)Introduce ACPI GTDT parser: drivers/acpi/gtdt.c Parse all kinds of timer in GTDT table of ACPI:arch timer, memory-mapped timer and SBSA Generic Watchdog timer. This driver can help to simplify all the relevant timer drivers, and separate all the ACPI GTDT knowledge from them. (3)Simplify ACPI code for arch timer in arm_arch_timer.c (4)Add memory-mapped timer support in arm_arch_timer.cThe SBSA watchdog driver is already in watchdog-next and will be merged into 4.6. These five patches are necessary for the watchdog driver to probe on an ACPI system.
I'm guessing since that v4 was posted in the middle of the 4.6 merge window, that these patches won't make it and we'll have to wait until 4.7 (at the earliest)?
First off, the last version I've seen is the v3. I must have overlooked the v4 then, but I don't think it was CCed to linux-acpi (which should have happened).
Sorry for this, That is my fault. I updated the script of git-send-email for sending the v4 patchset, but lost a space between two "--cc". :-(
Second, these patches require review from multiple maintainers and (or including) people who actually know how the GTDT is supposed to be used. I haven't seen any responses from any of them yet, so the answer to your question is "yes".
I will have a couple of comments for patch [1/6] (in the v3), but it's not been a priority due to the apparent overall lack of interest in this series.
Since this device is a generic watchdog for ARM server, it is(will be) used in a lot of chips. So I think many people are interested in it. They haven't provided any feedback, maybe due to my "--cc" mistake, or busy on something else now. :-(
I would like to learn your comments for patch [1/6] , then improve my v4, post v5 ASAP.
This patchset includes GTDT and memory-mapped timer patches, because my memory-mapped timer patches depends on GTDT. But maybe we can upstream GTDT separately?
any suggestion?
Thanks for your help!
Thanks, Rafael
Hi Rafael,
On 18 March 2016 at 12:22, Fu Wei fu.wei@linaro.org wrote:
Hi Rafael,
Great thanks for your feedback!
On 18 March 2016 at 08:41, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Thursday, March 17, 2016 10:07:30 AM Timur Tabi wrote:
fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patchset: (1)Move some enums and marcos to header file for arm_arch_timer, improve the pr_* code by defining "pr_fmt(fmt)" in arm_arch_timer.c
(2)Introduce ACPI GTDT parser: drivers/acpi/gtdt.c Parse all kinds of timer in GTDT table of ACPI:arch timer, memory-mapped timer and SBSA Generic Watchdog timer. This driver can help to simplify all the relevant timer drivers, and separate all the ACPI GTDT knowledge from them. (3)Simplify ACPI code for arch timer in arm_arch_timer.c (4)Add memory-mapped timer support in arm_arch_timer.cThe SBSA watchdog driver is already in watchdog-next and will be merged into 4.6. These five patches are necessary for the watchdog driver to probe on an ACPI system.
I'm guessing since that v4 was posted in the middle of the 4.6 merge window, that these patches won't make it and we'll have to wait until 4.7 (at the earliest)?
First off, the last version I've seen is the v3. I must have overlooked the v4 then, but I don't think it was CCed to linux-acpi (which should have happened).
Sorry for this, That is my fault. I updated the script of git-send-email for sending the v4 patchset, but lost a space between two "--cc". :-(
I have re-posted the v4 patchset:
https://lkml.org/lkml/2016/3/18/80
Second, these patches require review from multiple maintainers and (or including) people who actually know how the GTDT is supposed to be used. I haven't seen any responses from any of them yet, so the answer to your question is "yes".
I will have a couple of comments for patch [1/6] (in the v3), but it's not been a priority due to the apparent overall lack of interest in this series.
Since this device is a generic watchdog for ARM server, it is(will be) used in a lot of chips. So I think many people are interested in it. They haven't provided any feedback, maybe due to my "--cc" mistake, or busy on something else now. :-(
I would like to learn your comments for patch [1/6] , then improve my v4, post v5 ASAP.
This patchset includes GTDT and memory-mapped timer patches, because my memory-mapped timer patches depends on GTDT. But maybe we can upstream GTDT separately?
any suggestion?
Thanks for your help!
Thanks, Rafael
-- Best regards,
Fu Wei Software Engineer Red Hat Software (Beijing) Co.,Ltd.Shanghai Branch Ph: +86 21 61221326(direct) Ph: +86 186 2020 4684 (mobile) Room 1512, Regus One Corporate Avenue,Level 15, One Corporate Avenue,222 Hubin Road,Huangpu District, Shanghai,China 200021
-
Fu Wei -
fu.wei＠linaro.org
-
Rafael J. Wysocki -
Timur Tabi