From: Fu Wei fu.wei@linaro.org
This patchset: (1)Preparation for adding GTDT support in arm_arch_timer 1. Move some enums and marcos to header file 2. Add a new enum for spi type. 3. Improve printk relevant code
(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 arm_arch_timer
(4)Add GTDT support for ARM memory-mapped timer
This patchset has been tested on the following platforms: (1)ARM Foundation v8 model
Changelog: v5: Sorting out all patches, simplify the API of GTDT driver: GTDT driver just fills the data struct for arm_arch_timer driver.
v4: https://lists.linaro.org/pipermail/linaro-acpi/2016-March/006667.html 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 (6): clocksource/drivers/arm_arch_timer: Move enums and defines to header file clocksource/drivers/arm_arch_timer: Add a new enum for spi type clocksource/drivers/arm_arch_timer: Improve printk relevant code acpi: Add GTDT table parse driver into ACPI driver clocksource/drivers/arm_arch_timer: Simplify ACPI support code. clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer
drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_gtdt.c | 309 +++++++++++++++++++++++++++++++++++ drivers/clocksource/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 233 ++++++++++++++++++-------- include/clocksource/arm_arch_timer.h | 33 ++++ include/linux/acpi.h | 6 + 7 files changed, 522 insertions(+), 70 deletions(-) create mode 100644 drivers/acpi/acpi_gtdt.c
From: Fu Wei fu.wei@linaro.org
To support the arm_arch_timer via ACPI we need to share defines and enums between the driver and the ACPI parser code.
Split out the relevant defines and enums into arm_arch_timer.h. No functional change.
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 11 ----------- include/clocksource/arm_arch_timer.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4814446..5d7272e 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; diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index caedb74..6f06481 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -19,6 +19,9 @@ #include <linux/timecounter.h> #include <linux/types.h>
+#define ARCH_CP15_TIMER BIT(0) +#define ARCH_MEM_TIMER BIT(1) + #define ARCH_TIMER_CTRL_ENABLE (1 << 0) #define ARCH_TIMER_CTRL_IT_MASK (1 << 1) #define ARCH_TIMER_CTRL_IT_STAT (1 << 2) @@ -34,6 +37,14 @@ enum arch_timer_reg { ARCH_TIMER_REG_TVAL, };
+enum ppi_nr { + PHYS_SECURE_PPI, + PHYS_NONSECURE_PPI, + VIRT_PPI, + HYP_PPI, + MAX_TIMER_PPI +}; + #define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2
From: Fu Wei fu.wei@linaro.org
This patch add a new enum "spi_nr" and use it in the driver. Just for code's readability, no functional change.
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 4 ++-- include/clocksource/arm_arch_timer.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5d7272e..966c574 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -826,9 +826,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 6f06481..16dcd10 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -45,6 +45,12 @@ enum ppi_nr { 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
On 05/24/2016 03:30 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch add a new enum "spi_nr" and use it in the driver. Just for code's readability, no functional change.
Signed-off-by: Fu Wei fu.wei@linaro.org
drivers/clocksource/arm_arch_timer.c | 4 ++-- include/clocksource/arm_arch_timer.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5d7272e..966c574 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -826,9 +826,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);
elseirq = irq_of_parse_and_map(best_frame, VIRT_SPI);
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 6f06481..16dcd10 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -45,6 +45,12 @@ enum ppi_nr { MAX_TIMER_PPI };
+enum spi_nr {
- PHYS_SPI,
- VIRT_SPI,
- MAX_TIMER_SPI
+};
Wouldn't make sense to use the constant below instead of defining new ones ?
#define ARCH_TIMER_PHYS_ACCESS 0 #define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2
Hi Daniel,
On 30 May 2016 at 23:07, Daniel Lezcano daniel.lezcano@linaro.org wrote:
On 05/24/2016 03:30 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch add a new enum "spi_nr" and use it in the driver. Just for code's readability, no functional change.
Signed-off-by: Fu Wei fu.wei@linaro.org
drivers/clocksource/arm_arch_timer.c | 4 ++-- include/clocksource/arm_arch_timer.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 5d7272e..966c574 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -826,9 +826,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 6f06481..16dcd10 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -45,6 +45,12 @@ enum ppi_nr { MAX_TIMER_PPI };
+enum spi_nr {
PHYS_SPI,
VIRT_SPI,
MAX_TIMER_SPI
+};
Wouldn't make sense to use the constant below instead of defining new ones ?
#define ARCH_TIMER_PHYS_ACCESS 0
#define ARCH_TIMER_VIRT_ACCESS 1 #define ARCH_TIMER_MEM_PHYS_ACCESS 2
I think the meaning of them are different.
"#define ARCH_TIMER_* " are for arch_timer_reg_read/arch_timer_reg_write, they are the index of register access(code path) But in irq_of_parse_and_map, The second parameter means the index of interrupts in a memory-mapped timer node of device tree.
Even we try to reuse it, for a memory-mapped timer, we should use ARCH_TIMER_MEM_*_ACCESS, but the definition is 2 or 3, which is not suitable for this case.
So I define a new enum for this case.
Please correct me if I misunderstand something.
-- http://www.linaro.org/ Linaro.org │ Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro Facebook | http://twitter.com/#!/linaroorg Twitter | http://www.linaro.org/linaro-blog/ Blog
From: Fu Wei fu.wei@linaro.org
This patch defines pr_fmt(fmt) for all pr_* functions, then the pr_* don't need to add "arch_timer:" everytime.
Also delete some Blank Spaces in arch_timer_banner, according to the suggestion from checkpatch.pl.
No functional change.
Signed-off-by: Fu Wei fu.wei@linaro.org --- drivers/clocksource/arm_arch_timer.c | 52 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 966c574..9540e9d 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,24 +391,24 @@ 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", - type & ARCH_CP15_TIMER ? "cp15" : "", - type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ? " and " : "", - type & ARCH_MEM_TIMER ? "mmio" : "", - (unsigned long)arch_timer_rate / 1000000, - (unsigned long)(arch_timer_rate / 10000) % 100, - type & ARCH_CP15_TIMER ? - (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" : - "", - type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ? "/" : "", - type & ARCH_MEM_TIMER ? - arch_timer_mem_use_virtual ? "virt" : "phys" : - ""); + 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" : "", + (unsigned long)arch_timer_rate / 1000000, + (unsigned long)(arch_timer_rate / 10000) % 100, + type & ARCH_CP15_TIMER ? + (arch_timer_uses_ppi == VIRT_PPI) ? "virt" : "phys" : + "", + type == (ARCH_CP15_TIMER | ARCH_MEM_TIMER) ? "/" : "", + type & ARCH_MEM_TIMER ? + arch_timer_mem_use_virtual ? "virt" : "phys" : + ""); }
u32 arch_timer_get_rate(void) @@ -498,7 +501,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]); @@ -597,8 +600,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; }
@@ -650,7 +652,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); }
@@ -727,7 +729,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; } } @@ -743,7 +745,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; }
@@ -778,7 +780,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; }
@@ -793,7 +795,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; } @@ -821,7 +823,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; }
@@ -831,7 +833,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; } @@ -869,7 +871,7 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table) struct acpi_table_gtdt *gtdt;
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
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 filling the structs which provided by parameters(pointer of them).
(2)memory-mapped timer: provide a kernel APIs to parse GT Block Structure in GTDT, export all the timer info by filling the struct which provided by parameter(pointer of the 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/acpi_gtdt.c | 309 +++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 16 ++ include/linux/acpi.h | 6 + 5 files changed, 341 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..27a5cf9 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 251ce85..848aa8a 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -99,5 +99,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) += acpi_gtdt.o
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/acpi_gtdt.c b/drivers/acpi/acpi_gtdt.c new file mode 100644 index 0000000..e54fadf --- /dev/null +++ b/drivers/acpi/acpi_gtdt.c @@ -0,0 +1,309 @@ +/* + * 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 + +typedef int (*platform_timer_handler)(void *platform_timer, int index, + void *data); + +static void *platform_timer_struct __initdata; +static u32 platform_timer_count __initdata; +static void *gtdt_end __initdata; + +static int __init for_platform_timer(enum acpi_gtdt_type type, + platform_timer_handler handler, void *data) +{ + struct acpi_gtdt_header *header; + int i, index, ret; + void *platform_timer = platform_timer_struct; + + for (i = 0, index = 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 == type) { + ret = handler(platform_timer, index, data); + if (ret) + pr_err("failed to handler subtable %d.\n", i); + else + index++; + } + platform_timer += header->length; + } + + return index; +} + +/* + * 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_init(struct acpi_table_header *table, + struct acpi_table_gtdt *gtdt) +{ + gtdt_end = (void *)table + table->length; + + if (table->revision < 2) { + pr_info("Revision:%d doesn't support Platform Timers.\n", + table->revision); + return; + } + + platform_timer_count = gtdt->platform_timer_count; + if (!platform_timer_count) { + pr_info("No Platform Timer structures.\n"); + return; + } + + 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"); + platform_timer_struct = NULL; + platform_timer_count = 0; + } +} + +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_init(struct acpi_table_header *table, int *ppi, + bool *c3stop, u32 *timer_count) +{ + struct acpi_table_gtdt *gtdt; + + if (acpi_disabled || !table || !ppi || !c3stop) + return -EINVAL; + + gtdt = container_of(table, struct acpi_table_gtdt, header); + if (!gtdt) { + pr_err("table pointer error.\n"); + return -EINVAL; + } + + ppi[PHYS_SECURE_PPI] = + map_generic_timer_interrupt(gtdt->secure_el1_interrupt, + gtdt->secure_el1_flags); + + ppi[PHYS_NONSECURE_PPI] = + map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, + gtdt->non_secure_el1_flags); + + ppi[VIRT_PPI] = + map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, + gtdt->virtual_timer_flags); + + ppi[HYP_PPI] = + map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, + gtdt->non_secure_el2_flags); + + *c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); + + platform_timer_init(table, gtdt); + if (timer_count) + *timer_count = platform_timer_count; + + return 0; +} + +/* + * 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 = (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; + + return NULL; +} + +static int __init gtdt_parse_gt_block(void *platform_timer, int index, + void *data) +{ + struct acpi_gtdt_timer_block *block; + struct acpi_gtdt_timer_entry *frame; + struct gt_block_data *block_data; + int i, j; + + if (!platform_timer || !data) + return -EINVAL; + + block = platform_timer; + block_data = data + sizeof(struct gt_block_data) * index; + + if (!block->block_address || !block->timer_count) { + pr_err(FW_BUG "invalid GT Block data.\n"); + return -EINVAL; + } + block_data->cntctlbase_phy = (phys_addr_t)block->block_address; + block_data->timer_count = block->timer_count; + + /* + * Get the GT timer Frame data for every GT Block Timer + */ + for (i = 0, j = 0; i < block->timer_count; i++) { + frame = gtdt_gt_timer_frame(block, i); + if (!frame || !frame->base_address || !frame->timer_interrupt) { + pr_err(FW_BUG "invalid GT Block Timer data, skip.\n"); + continue; + } + block_data->timer[j].frame_nr = frame->frame_number; + block_data->timer[j].cntbase_phy = frame->base_address; + block_data->timer[j].irq = map_generic_timer_interrupt( + frame->timer_interrupt, + frame->timer_flags); + if (frame->virtual_timer_interrupt) + block_data->timer[j].virt_irq = + map_generic_timer_interrupt( + frame->virtual_timer_interrupt, + frame->virtual_timer_flags); + j++; + } + + if (j) + return 0; + + block_data->cntctlbase_phy = (phys_addr_t)NULL; + block_data->timer_count = 0; + + return -EINVAL; +} + +/* + * Get the GT block info for memory-mapped timer from GTDT table. + * Please make sure we have called gtdt_arch_timer_init, because it helps to + * init the global variables. + */ +int __init gtdt_arch_timer_mem_init(struct gt_block_data *data) +{ + int ret = for_platform_timer(ACPI_GTDT_TYPE_TIMER_BLOCK, + gtdt_parse_gt_block, (void *)data); + + pr_info("found %d memory-mapped timer block.\n", ret); + + return ret; +} + +/* + * Initialize a SBSA generic Watchdog platform device info from GTDT + */ +static int __init gtdt_import_sbsa_gwdt(void *platform_timer, + int index, void *data) +{ + struct platform_device *pdev; + struct acpi_gtdt_watchdog *wd = platform_timer; + 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_table_gtdt *gtdt; + int ret; + + if (acpi_disabled) + return 0; + + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) + return -EINVAL; + + /* global variables initialization */ + gtdt_end = (void *)table + table->length; + gtdt = container_of(table, struct acpi_table_gtdt, header); + platform_timer_struct = (void *)gtdt + gtdt->platform_timer_offset; + + ret = for_platform_timer(ACPI_GTDT_TYPE_WATCHDOG, + gtdt_import_sbsa_gwdt, NULL); + pr_info("found %d SBSA generic Watchdog.\n", ret); + + return 0; +} + +device_initcall(gtdt_sbsa_gwdt_init); diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 16dcd10..4e5b2a2 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -21,6 +21,7 @@
#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) @@ -56,6 +57,8 @@ enum spi_nr { #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) @@ -71,6 +74,19 @@ struct arch_timer_kvm_info { int virtual_irq; };
+struct gt_timer_data { + int frame_nr; + phys_addr_t cntbase_phy; + int irq; + int virt_irq; +}; + +struct gt_block_data { + phys_addr_t cntctlbase_phy; + int timer_count; + struct gt_timer_data timer[ARCH_TIMER_MEM_MAX_FRAME]; +}; + #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 288fac5..53b35d4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -532,6 +532,12 @@ 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 +int __init gtdt_arch_timer_init(struct acpi_table_header *table, int *ppi, + bool *c3stop, u32 *timer_count); +int __init gtdt_arch_timer_mem_init(struct gt_block_data *data); +#endif + #else /* !CONFIG_ACPI */
#define acpi_disabled 1
On 05/24/2016 03:30 PM, fu.wei@linaro.org wrote:
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 filling the structs which provided by parameters(pointer of them).
(2)memory-mapped timer: provide a kernel APIs to parse GT Block Structure in GTDT, export all the timer info by filling the struct which provided by parameter(pointer of the 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
Hi Fu Wei,
the code is better than the previous version but it is still confusing. There are global variables accessed several times by different functions and modified. This is an encapsulation issue.
This code is a bit hard to follow.
Please split it out into 4 patches:
1. Create a clean base with helper functions and proper encapsulation for gtdt.
2. Add gtdt timer based code
3. Add gtdt mem timer based code
4. Add gtdt watchdog based code
Comments below.
Thanks !
-- Daniel
drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_gtdt.c | 309 +++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 16 ++ include/linux/acpi.h | 6 + 5 files changed, 341 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..27a5cf9 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.
Why not ARM64's Kconfig select ACPI_GTDT ?
This config option assumes an user will manually select this option which I believe it makes sense to have always on when ARM64=y. So why not create a silent option and select it directly from the ARM64 platform Kconfig ?
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..848aa8a 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -99,5 +99,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) += acpi_gtdt.o
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/acpi_gtdt.c b/drivers/acpi/acpi_gtdt.c new file mode 100644 index 0000000..e54fadf --- /dev/null +++ b/drivers/acpi/acpi_gtdt.c @@ -0,0 +1,309 @@ +/*
- 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
+typedef int (*platform_timer_handler)(void *platform_timer, int index,
void *data);
+static void *platform_timer_struct __initdata; +static u32 platform_timer_count __initdata; +static void *gtdt_end __initdata;
I am pretty sure you can get ride of these global variables with a little effort.
+static int __init for_platform_timer(enum acpi_gtdt_type type,
platform_timer_handler handler, void *data)
For the clarity of the code, I suggest to use a macro with a name similar to what we find in the kernel:
#define gtdt_for_each(type, ...) ... #define gtdt_for_each_timer gtdt_for_each(ACPI_GTDT_TYPE_TIMER_BLOCK) #define gtdt_for_each_wd gtdt_for_each(ACPI_GTDT_TYPE_WATCHDOG)
... and rework this function to clarify its purpose.
What is for ? Count the number of 'type' which succeed to call the handler ?
+{
- struct acpi_gtdt_header *header;
- int i, index, ret;
- void *platform_timer = platform_timer_struct;
- for (i = 0, index = 0; i < platform_timer_count; i++) {
if (platform_timer > gtdt_end) {
pr_err(FW_BUG "subtable pointer overflows.\n");
platform_timer_count = i;
Fix firmware bug in the kernel ? No. Up to the firmware to fix it, "no handy, no candy".
break;
}
header = (struct acpi_gtdt_header *)platform_timer;
if (header->type == type) {
ret = handler(platform_timer, index, data);
if (ret)
pr_err("failed to handler subtable %d.\n", i);
else
index++;
}
platform_timer += header->length;
That is not correct. This function is setting the platform_timer pointer to the end. Even if that works, it violates the encapsulation paradigm. Regarding how are used those global variables, please kill them and use proper parameter and structure encapsulation.
- }
- return index;
+}
+/*
- 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_init(struct acpi_table_header *table,
struct acpi_table_gtdt *gtdt)
+{
- gtdt_end = (void *)table + table->length;
- if (table->revision < 2) {
pr_info("Revision:%d doesn't support Platform Timers.\n",
table->revision);
return;
- }
This check should be called much sooner, before entering the gtdt subsystems. It is too late here.
- platform_timer_count = gtdt->platform_timer_count;
- if (!platform_timer_count) {
pr_info("No Platform Timer structures.\n");
return;
- }
- 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");
platform_timer_struct = NULL;
platform_timer_count = 0;
- }
Why this check ?
+}
+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_init(struct acpi_table_header *table, int *ppi,
bool *c3stop, u32 *timer_count)
+{
- struct acpi_table_gtdt *gtdt;
This API is not correctly separating both subsystems. Moving the code from the arch_arm_timer init function here is not the solution.
I suggest the following:
1. Change CLOCKSOURCE_ACPI_DECLARE to pass the init function as:
int __init gtdt_init(struct acpi_table_gtdt *gtdt);
2. Add helpers:
int gtdt_map_irq(struct acpi_table_gtdt *gtdt, int flags);
int gtdt_c3stop(struct acpi_table_gtdt *gtdt);
3. Export these helpers
arch_arm_timer.c should see nothing more than:
struct acpi_table_gtdt;
4. Use these helpers in the arch_arm_timer.c
static int __init arch_timer_acpi_init(struct acpi_table_gtdt *gtdt) { arch_timer_ppi[PHYS_SECURE_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[PHYS_NONSECURE_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[VIRT_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[HYP_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_c3stop = gtdt_c3stop(gtdt);
arch_timer_init();
return 0; }
- if (acpi_disabled || !table || !ppi || !c3stop)
return -EINVAL;
Why acpi_disabled is an error here but ok for gtdt_sbsa_gwdt_init() ?
- gtdt = container_of(table, struct acpi_table_gtdt, header);
- if (!gtdt) {
pr_err("table pointer error.\n");
return -EINVAL;
- }
- ppi[PHYS_SECURE_PPI] =
map_generic_timer_interrupt(gtdt->secure_el1_interrupt,
gtdt->secure_el1_flags);
- ppi[PHYS_NONSECURE_PPI] =
map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,
gtdt->non_secure_el1_flags);
- ppi[VIRT_PPI] =
map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,
gtdt->virtual_timer_flags);
- ppi[HYP_PPI] =
map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,
gtdt->non_secure_el2_flags);
- *c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);
- platform_timer_init(table, gtdt);
- if (timer_count)
*timer_count = platform_timer_count;
come on !
- return 0;
+}
+/*
- 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 = (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;
- return NULL;
+}
+static int __init gtdt_parse_gt_block(void *platform_timer, int index,
void *data)
+{
- struct acpi_gtdt_timer_block *block;
- struct acpi_gtdt_timer_entry *frame;
- struct gt_block_data *block_data;
- int i, j;
- if (!platform_timer || !data)
return -EINVAL;
- block = platform_timer;
- block_data = data + sizeof(struct gt_block_data) * index;
- if (!block->block_address || !block->timer_count) {
pr_err(FW_BUG "invalid GT Block data.\n");
return -EINVAL;
- }
- block_data->cntctlbase_phy = (phys_addr_t)block->block_address;
- block_data->timer_count = block->timer_count;
- /*
* Get the GT timer Frame data for every GT Block Timer
*/
- for (i = 0, j = 0; i < block->timer_count; i++) {
frame = gtdt_gt_timer_frame(block, i);
if (!frame || !frame->base_address || !frame->timer_interrupt) {
pr_err(FW_BUG "invalid GT Block Timer data, skip.\n");
continue;
}
block_data->timer[j].frame_nr = frame->frame_number;
block_data->timer[j].cntbase_phy = frame->base_address;
block_data->timer[j].irq = map_generic_timer_interrupt(
frame->timer_interrupt,
frame->timer_flags);
if (frame->virtual_timer_interrupt)
block_data->timer[j].virt_irq =
map_generic_timer_interrupt(
frame->virtual_timer_interrupt,
frame->virtual_timer_flags);
j++;
- }
- if (j)
return 0;
- block_data->cntctlbase_phy = (phys_addr_t)NULL;
- block_data->timer_count = 0;
- return -EINVAL;
+}
+/*
- Get the GT block info for memory-mapped timer from GTDT table.
- Please make sure we have called gtdt_arch_timer_init, because it helps to
- init the global variables.
- */
+int __init gtdt_arch_timer_mem_init(struct gt_block_data *data) +{
- int ret = for_platform_timer(ACPI_GTDT_TYPE_TIMER_BLOCK,
gtdt_parse_gt_block, (void *)data);
(void *) explicit cast is not needed.
- pr_info("found %d memory-mapped timer block.\n", ret);
- return ret;
+}
+/*
- Initialize a SBSA generic Watchdog platform device info from GTDT
- */
+static int __init gtdt_import_sbsa_gwdt(void *platform_timer,
int index, void *data)
+{
- struct platform_device *pdev;
- struct acpi_gtdt_watchdog *wd = platform_timer;
- 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_table_gtdt *gtdt;
- int ret;
- if (acpi_disabled)
return 0;
- if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table)))
return -EINVAL;
- /* global variables initialization */
- gtdt_end = (void *)table + table->length;
That is prone to bug. The end of the table is computed here and stored in the global variable and then computed again in platform_timer_init and also stored in the global variable.
Kill this global variable.
- gtdt = container_of(table, struct acpi_table_gtdt, header);
- platform_timer_struct = (void *)gtdt + gtdt->platform_timer_offset;
- ret = for_platform_timer(ACPI_GTDT_TYPE_WATCHDOG,
gtdt_import_sbsa_gwdt, NULL);
- pr_info("found %d SBSA generic Watchdog.\n", ret);
- return 0;
+}
+device_initcall(gtdt_sbsa_gwdt_init);
Do you really have to call device_initcall ?
Hi Daniel,
Thanks for review my patches. :-)
On 31 May 2016 at 06:56, Daniel Lezcano daniel.lezcano@linaro.org wrote:
On 05/24/2016 03:30 PM, fu.wei@linaro.org wrote:
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 filling the structs which provided by parameters(pointer of them).
(2)memory-mapped timer: provide a kernel APIs to parse GT Block Structure in GTDT, export all the timer info by filling the struct which provided by parameter(pointer of the 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
Hi Fu Wei,
the code is better than the previous version but it is still confusing. There are global variables accessed several times by different functions and modified. This is an encapsulation issue.
This code is a bit hard to follow.
Please split it out into 4 patches:
- Create a clean base with helper functions and proper encapsulation for
gtdt.
Add gtdt timer based code
Add gtdt mem timer based code
Add gtdt watchdog based code
spliting the GTDT driver patch is a good idea, will do.
Comments below.
Thanks !
-- Daniel
drivers/acpi/Kconfig | 9 + drivers/acpi/Makefile | 1 + drivers/acpi/acpi_gtdt.c | 309 +++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 16 ++ include/linux/acpi.h | 6 + 5 files changed, 341 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..27a5cf9 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.
Why not ARM64's Kconfig select ACPI_GTDT ?
This config option assumes an user will manually select this option which I believe it makes sense to have always on when ARM64=y. So why not create a silent option and select it directly from the ARM64 platform Kconfig ?
I use "depends on ARM64" here, because GTDT is only for ARM, and only ARM64 support ACPI. GTDT is meaningless for other architecture. This "depends on" just makes sure only ARM64 can select it.
But user don't need to manually select this option. Once ARM64=y and ACPI=y, this will be automatically selected, because we have this in [PATCH v5 5/6]:
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..5a5baa1 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
And CLKSRC_ACPI will be selected by below in Kconfig of clocksource(mainline kernel):
config ARM_ARCH_TIMER bool select CLKSRC_OF if OF select CLKSRC_ACPI if ACPI
And ARM_ARCH_TIMER will be selected by ARM64 in arch/arm64/Kconfig(mainline kernel).
So ARM64=y --> ARM_ARCH_TIMER=y (if ACPI=y) --> CLKSRC_ACPI=y --> ACPI_GTDT=y
I think that is the right solution. Do I miss something?
endif # ACPI
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..848aa8a 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -99,5 +99,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) += acpi_gtdt.o
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/acpi_gtdt.c b/drivers/acpi/acpi_gtdt.c new file mode 100644 index 0000000..e54fadf --- /dev/null +++ b/drivers/acpi/acpi_gtdt.c @@ -0,0 +1,309 @@ +/*
- 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
+typedef int (*platform_timer_handler)(void *platform_timer, int index,
void *data);
+static void *platform_timer_struct __initdata; +static u32 platform_timer_count __initdata; +static void *gtdt_end __initdata;
I am pretty sure you can get ride of these global variables with a little effort.
yes, I am also trying to get ride of these global variables. will try.
+static int __init for_platform_timer(enum acpi_gtdt_type type,
platform_timer_handler handler, void
*data)
For the clarity of the code, I suggest to use a macro with a name similar to what we find in the kernel:
#define gtdt_for_each(type, ...) ... #define gtdt_for_each_timer gtdt_for_each(ACPI_GTDT_TYPE_TIMER_BLOCK) #define gtdt_for_each_wd gtdt_for_each(ACPI_GTDT_TYPE_WATCHDOG)
... and rework this function to clarify its purpose.
yes, that is a very good idea, thanks, will do.
What is for ? Count the number of 'type' which succeed to call the handler ?
because we need a index of watchdog timer for importing it into the resource of platform_device, but I think I can ues a static variable to solve this problem? Any thought?
+{
struct acpi_gtdt_header *header;
int i, index, ret;
void *platform_timer = platform_timer_struct;
for (i = 0, index = 0; i < platform_timer_count; i++) {
if (platform_timer > gtdt_end) {
pr_err(FW_BUG "subtable pointer overflows.\n");
platform_timer_count = i;
Fix firmware bug in the kernel ? No. Up to the firmware to fix it, "no handy, no candy".
So you are suggesting that if we find this firmware bug, just return error instead of using the info in a problematic table, right?
break;
}
header = (struct acpi_gtdt_header *)platform_timer;
if (header->type == type) {
ret = handler(platform_timer, index, data);
if (ret)
pr_err("failed to handler subtable
%d.\n", i);
else
index++;
}
platform_timer += header->length;
That is not correct. This function is setting the platform_timer pointer to the end. Even if that works, it violates the encapsulation paradigm. Regarding how are used those global variables, please kill them and use proper parameter and structure encapsulation.
So let me explain this a little: "void *platform_timer = platform_timer_struct;" is getting the pointer of first Platform Timer Structure, platform_timer_struct in this patchset is a global variable, but platform_timer is a local variable in the for_platform_timer function.
Platform Timer Structure Field is a array of Platform Timer Type structures. And the length of each structure maybe different, so I think "platform_timer += header->length" is a right approach to move on to next Platform Timer structures
Do I misunderstand your comment? or maybe I miss something?
}
return index;
+}
+/*
- 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_init(struct acpi_table_header *table,
struct acpi_table_gtdt *gtdt)
+{
gtdt_end = (void *)table + table->length;
if (table->revision < 2) {
pr_info("Revision:%d doesn't support Platform Timers.\n",
table->revision);
return;
}
This check should be called much sooner, before entering the gtdt subsystems. It is too late here.
the reason I check table revision here is that: the difference between revision 1 and 2 is revision-2 adds Platform Timer Structure support. and this init function is just for getting some basic Platform Timer info in "main" table. So at the beginning of this function I check the revision.
But it also makes sense to move this out to gtdt_arch_timer_init like this:
if (table->revision < 2) return 0; else platform_timer_init(table, gtdt);
Any suggestion??
platform_timer_count = gtdt->platform_timer_count;
if (!platform_timer_count) {
pr_info("No Platform Timer structures.\n");
return;
}
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");
platform_timer_struct = NULL;
platform_timer_count = 0;
}
Why this check ?
just make sure the pointer of first Platform Timer Structur we got is OK, or platform_timer_offset is right. But considering the suggestion you've given above, maybe I should just return error for the bad table.
+}
+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_init(struct acpi_table_header *table, int *ppi,
bool *c3stop, u32 *timer_count)
+{
struct acpi_table_gtdt *gtdt;
This API is not correctly separating both subsystems. Moving the code from the arch_arm_timer init function here is not the solution.
I suggest the following:
- Change CLOCKSOURCE_ACPI_DECLARE to pass the init function as:
int __init gtdt_init(struct acpi_table_gtdt *gtdt);
Add helpers:
int gtdt_map_irq(struct acpi_table_gtdt *gtdt, int flags);
I guess "int flags" is enum ppi_nr, right?
int gtdt_c3stop(struct acpi_table_gtdt *gtdt);
- Export these helpers
arch_arm_timer.c should see nothing more than:
struct acpi_table_gtdt;
- Use these helpers in the arch_arm_timer.c
static int __init arch_timer_acpi_init(struct acpi_table_gtdt *gtdt) { arch_timer_ppi[PHYS_SECURE_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[PHYS_NONSECURE_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[VIRT_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_ppi[HYP_PPI] = gtdt_map_irq(gtdt, flags); arch_timer_c3stop = gtdt_c3stop(gtdt);
arch_timer_init(); return 0;
}
this makes sense, will do this way.
if (acpi_disabled || !table || !ppi || !c3stop)
return -EINVAL;
Why acpi_disabled is an error here but ok for gtdt_sbsa_gwdt_init() ?
It should return 0, too. Thanks for pointing it out. will fix it.
gtdt = container_of(table, struct acpi_table_gtdt, header);
if (!gtdt) {
pr_err("table pointer error.\n");
return -EINVAL;
}
ppi[PHYS_SECURE_PPI] =
map_generic_timer_interrupt(gtdt->secure_el1_interrupt,
gtdt->secure_el1_flags);
ppi[PHYS_NONSECURE_PPI] =
map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,
gtdt->non_secure_el1_flags);
ppi[VIRT_PPI] =
map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,
gtdt->virtual_timer_flags);
ppi[HYP_PPI] =
map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,
gtdt->non_secure_el2_flags);
*c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);
platform_timer_init(table, gtdt);
if (timer_count)
*timer_count = platform_timer_count;
come on !
All right, will fix it by the suggestion you've given above.
return 0;
+}
+/*
- 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 = (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;
return NULL;
+}
+static int __init gtdt_parse_gt_block(void *platform_timer, int index,
void *data)
+{
struct acpi_gtdt_timer_block *block;
struct acpi_gtdt_timer_entry *frame;
struct gt_block_data *block_data;
int i, j;
if (!platform_timer || !data)
return -EINVAL;
block = platform_timer;
block_data = data + sizeof(struct gt_block_data) * index;
if (!block->block_address || !block->timer_count) {
pr_err(FW_BUG "invalid GT Block data.\n");
return -EINVAL;
}
block_data->cntctlbase_phy = (phys_addr_t)block->block_address;
block_data->timer_count = block->timer_count;
/*
* Get the GT timer Frame data for every GT Block Timer
*/
for (i = 0, j = 0; i < block->timer_count; i++) {
frame = gtdt_gt_timer_frame(block, i);
if (!frame || !frame->base_address ||
!frame->timer_interrupt) {
pr_err(FW_BUG "invalid GT Block Timer data,
skip.\n");
continue;
}
block_data->timer[j].frame_nr = frame->frame_number;
block_data->timer[j].cntbase_phy = frame->base_address;
block_data->timer[j].irq = map_generic_timer_interrupt(
frame->timer_interrupt,
frame->timer_flags);
if (frame->virtual_timer_interrupt)
block_data->timer[j].virt_irq =
map_generic_timer_interrupt(
frame->virtual_timer_interrupt,
frame->virtual_timer_flags);
j++;
}
if (j)
return 0;
block_data->cntctlbase_phy = (phys_addr_t)NULL;
block_data->timer_count = 0;
return -EINVAL;
+}
+/*
- Get the GT block info for memory-mapped timer from GTDT table.
- Please make sure we have called gtdt_arch_timer_init, because it
helps to
- init the global variables.
- */
+int __init gtdt_arch_timer_mem_init(struct gt_block_data *data) +{
int ret = for_platform_timer(ACPI_GTDT_TYPE_TIMER_BLOCK,
gtdt_parse_gt_block, (void *)data);
(void *) explicit cast is not needed.
yes, you are right, will delete it.
pr_info("found %d memory-mapped timer block.\n", ret);
return ret;
+}
+/*
- Initialize a SBSA generic Watchdog platform device info from GTDT
- */
+static int __init gtdt_import_sbsa_gwdt(void *platform_timer,
int index, void *data)
+{
struct platform_device *pdev;
struct acpi_gtdt_watchdog *wd = platform_timer;
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_table_gtdt *gtdt;
int ret;
if (acpi_disabled)
return 0;
if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table)))
return -EINVAL;
/* global variables initialization */
gtdt_end = (void *)table + table->length;
That is prone to bug. The end of the table is computed here and stored in the global variable and then computed again in platform_timer_init and also stored in the global variable.
Kill this global variable.
Actually this is not a bug, I mean to do this twice. Let me explain this:
when we initialize arch_timer and memory-mapped timer, we are in the very early stage of initialization, so we use bootmem at that time.
But the time we try to import SBSA watchdog info to the resource of platform_device is in " do_initcalls();", at that time we have already switched to slab. So the previous pointer can not be used again(mapping is changed), we have to map the table and get a new pointer.
gtdt = container_of(table, struct acpi_table_gtdt, header);
platform_timer_struct = (void *)gtdt +
gtdt->platform_timer_offset;
ret = for_platform_timer(ACPI_GTDT_TYPE_WATCHDOG,
gtdt_import_sbsa_gwdt, NULL);
pr_info("found %d SBSA generic Watchdog.\n", ret);
return 0;
+}
+device_initcall(gtdt_sbsa_gwdt_init);
Do you really have to call device_initcall ?
I think so, because SBSA watchdog is a platform device, the driver get device info from the resource of platform_device. So I import the watchdog info from GTDT to the resource of platform_device here. That means we have to do this after "driver_init();", so I think device_initcall(will be called in do_initcalls();) makes sense
-- http://www.linaro.org/ Linaro.org │ Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro Facebook | http://twitter.com/#!/linaroorg Twitter | http://www.linaro.org/linaro-blog/ Blog
On 06/01/2016 05:34 PM, Fu Wei wrote:
Hi Fu Wei,
can you fix your email formatting, it is inserting tabulation at the beginning of each lines.
+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. Why not ARM64's Kconfig select ACPI_GTDT ? This config option assumes an user will manually select this option which I believe it makes sense to have always on when ARM64=y. So why not create a silent option and select it directly from the ARM64 platform Kconfig ?
I use "depends on ARM64" here, because GTDT is only for ARM, and only ARM64 support ACPI. GTDT is meaningless for other architecture. This "depends on" just makes sure only ARM64 can select it.
But user don't need to manually select this option. Once ARM64=y and ACPI=y, this will be automatically selected, because we have this in [PATCH v5 5/6]: diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..5a5baa1 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
And CLKSRC_ACPI will be selected by below in Kconfig of clocksource(mainline kernel):
config ARM_ARCH_TIMER bool select CLKSRC_OF if OF select CLKSRC_ACPI if ACPI
And ARM_ARCH_TIMER will be selected by ARM64 in arch/arm64/Kconfig(mainline kernel).
So ARM64=y --> ARM_ARCH_TIMER=y (if ACPI=y) --> CLKSRC_ACPI=y --> ACPI_GTDT=y
I think that is the right solution. Do I miss something?
It is correct if ACPI_GTDT is a silent option.
Otherwise, if you give the user the opportunity to enable/disable the ACPI_GTDT, then CLKSRC_ACPI *depends* on it.
[ ... ]
+static int __init for_platform_timer(enum acpi_gtdt_type type, + platform_timer_handler handler, void *data) For the clarity of the code, I suggest to use a macro with a name similar to what we find in the kernel: #define gtdt_for_each(type, ...) ... #define gtdt_for_each_timer gtdt_for_each(ACPI_GTDT_TYPE_TIMER_BLOCK) #define gtdt_for_each_wd gtdt_for_each(ACPI_GTDT_TYPE_WATCHDOG) ... and rework this function to clarify its purpose.
yes, that is a very good idea, thanks, will do.
What is for ? Count the number of 'type' which succeed to call the handler ?
because we need a index of watchdog timer for importing it into the resource of platform_device, but I think I can ues a static variable to solve this problem? Any thought?
Don't use static variable. It is possible to fill the index by passing the structure to the function or whatever else.
+{ + struct acpi_gtdt_header *header; + int i, index, ret; + void *platform_timer = platform_timer_struct; + + for (i = 0, index = 0; i < platform_timer_count; i++) { + if (platform_timer > gtdt_end) { + pr_err(FW_BUG "subtable pointer overflows.\n"); + platform_timer_count = i; Fix firmware bug in the kernel ? No. Up to the firmware to fix it, "no handy, no candy".
So you are suggesting that if we find this firmware bug, just return error instead of using the info in a problematic table, right?
Yes. Let's imagine the following scenario. The firmware is tested on a system with this code. The system boots. Ok, the firmware is working. Green light, the firmware is delivered.
After a while someone notice "firmware bug, subtable pointer overflows" but nobody cares because 'it works for me'.
After a while again, someone notice the ACPI table is partially used and there is a subtle bug with the watchdog. Too late, the hardware is already delivered and nobody wants the user to upgrade the firmware.
At the end, we have bogus firmware, hence bogus system, unfixable because the kernel allowed that.
If the kernel is permissive with firmware bugs, those bugs won't be spotted in time or will be ignored because the kernel is giving the illusion everything is fine.
If the kernel is strict and find an inconsistency in the firmware, then it can just prevent the feature to work at all and force the "tester" to fix the bug for the firmware before releasing it.
+ break; + } + header = (struct acpi_gtdt_header *)platform_timer; + if (header->type == type) { + ret = handler(platform_timer, index, data); + if (ret) + pr_err("failed to handler subtable %d.\n", i); + else + index++; + } + platform_timer += header->length; That is not correct. This function is setting the platform_timer pointer to the end. Even if that works, it violates the encapsulation paradigm. Regarding how are used those global variables, please kill them and use proper parameter and structure encapsulation.
So let me explain this a little: "void *platform_timer = platform_timer_struct;" is getting the pointer of first Platform Timer Structure, platform_timer_struct in this patchset is a global variable, but platform_timer is a local variable in the for_platform_timer function.
Platform Timer Structure Field is a array of Platform Timer Type structures. And the length of each structure maybe different, so I think "platform_timer += header->length" is a right approach to move on to next Platform Timer structures
Do I misunderstand your comment? or maybe I miss something?
No. I mixed platform_timer and platform_timer_struct. I thought platform_timer was the global variable. So far, the function is correct.
+/* + * 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_init(struct acpi_table_header *table, + struct acpi_table_gtdt *gtdt) +{ + gtdt_end = (void *)table + table->length; + + if (table->revision < 2) { + pr_info("Revision:%d doesn't support Platform Timers.\n", + table->revision); + return; + } This check should be called much sooner, before entering the gtdt subsystems. It is too late here.
the reason I check table revision here is that: the difference between revision 1 and 2 is revision-2 adds Platform Timer Structure support. and this init function is just for getting some basic Platform Timer info in "main" table. So at the beginning of this function I check the revision.
But it also makes sense to move this out to gtdt_arch_timer_init like this:
if (table->revision < 2) return 0; else platform_timer_init(table, gtdt);
Any suggestion??
You should think about the API and what kind of data this subsystem is dealing with.
There is here:
1. timer 2. watchdog 3. mem timers 4. acpi table 5. gtdt table
The watchdog code calls if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) to get the acpi table pointer. But timer and mem timer functions don't have this.
Actually, we are not interested in the acpi table except for the revision and the length.
Coming back to my initial suggestion: write all the gtdt code first without timers and watchdog. Define a clear API dealing with *gtdt structures only* and then build timers and wd on top.
-- Daniel
Needs polishing, probably going back and forth to integrate it cleanly.
Signed-off-by: Daniel Lezcano daniel.lezcano@linaro.org --- drivers/acpi/acpi_gtdt.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 drivers/acpi/acpi_gtdt.c
diff --git a/drivers/acpi/acpi_gtdt.c b/drivers/acpi/acpi_gtdt.c new file mode 100644 index 0000000..cb5ac2b --- /dev/null +++ b/drivers/acpi/acpi_gtdt.c @@ -0,0 +1,174 @@ +/* + * ARM Specific GTDT table Support + * + * Copyright (C) 2016, 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> + +enum ppi_nr { + PHYS_SECURE_PPI, + PHYS_NONSECURE_PPI, + VIRT_PPI, + HYP_PPI, + MAX_TIMER_PPI +}; + +struct acpi_gtdt_desc { + struct acpi_table_gtdt *gtdt; + void *start; + void *end; +}; + +static struct acpi_gtdt_desc acpi_gtdt_desc __initdata; + +static inline void *gtdt_next(struct acpi_table_gtdt *gtdt, void *end, int type) +{ + struct acpi_gtdt_header *gh = (struct acpi_gtdt_header *)gtdt; + + while ((void *)(gh += gh->length) < end) + if (gh->type == type) + return (void *)gtdt; + return NULL; +} + +#define for_each_gtdt_type(_g, _t) \ + for (_g = acpi_gtdt_desc.start; _g; \ + _g = gtdt_next(_g, acpi_gtdt_desc.end, _t)) + +#define for_each_gtdt_timer(_g) \ + for_each_gtdt_type(_g, ACPI_GTDT_TYPE_TIMER_BLOCK) + +#define for_each_gtdt_watchdog(_g) \ + for_each_gtdt_type(_g, ACPI_GTDT_TYPE_WATCHDOG) + + +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); +} + +/** + * acpi_gtdt_map_irq - + * @flag: + * + * + */ +int __init acpi_gtdt_map_irq(int flag) +{ + struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt; + + switch(flag) { + case PHYS_SECURE_PPI: + return map_generic_timer_interrupt(gtdt->secure_el1_interrupt, + gtdt->secure_el1_flags); + case PHYS_NONSECURE_PPI: + return map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt, + gtdt->non_secure_el1_flags); + case VIRT_PPI: + return map_generic_timer_interrupt(gtdt->virtual_timer_interrupt, + gtdt->virtual_timer_flags); + + case HYP_PPI: + return map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, + gtdt->non_secure_el2_flags); + default: + return -EINVAL; + } +} + +/** + * acpi_gtdt_c3stop - + * + * Returns 1 if the timer is powered in deep idle state, 0 otherwise. + */ +int __init acpi_gtdt_c3stop(void) +{ + struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt; + + return !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON); +} + +/** + * acpi_gtdt_timer_init - + * + * + */ +int __init acpi_gtdt_timer_init(void) +{ + struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt; + int count = 0; + + if (gtdt->header.revision < 2) + return -ENOTSUPP; + + for_each_gtdt_timer(gtdt) { + /* */ + count++; + } + + pr_notice("Found %d timer(s)", count); + + return 0; +} + +/** + * acpi_gtdt_watchdog_init - + * + */ +int __init acpi_gtdt_watchdog_init(void) +{ + struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt; + int count = 0; + + for_each_gtdt_watchdog(gtdt) { + /* */ + count++; + } + + pr_notice("Found %d watchdog(s)", count); + + return 0; +} + +/** + * acpi_gtdt_init - + * + */ +int __init acpi_gtdt_init(void) +{ + struct acpi_table_header *table; + + if (acpi_disabled) + return 0; + + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) + return -EINVAL; + + acpi_gtdt_desc.gtdt = container_of(table, struct acpi_table_gtdt, header); + acpi_gtdt_desc.start = acpi_gtdt_desc.gtdt + acpi_gtdt_desc.gtdt->platform_timer_offset; + acpi_gtdt_desc.end = (void *)table + table->length; + + return 0; +}
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 | 45 ++++-------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..5a5baa1 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 9540e9d..505e65c 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -848,60 +848,25 @@ 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; - if (arch_timers_present & ARCH_CP15_TIMER) { pr_warn("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); - - arch_timer_ppi[HYP_PPI] = - map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt, - gtdt->non_secure_el2_flags); + if (gtdt_arch_timer_init(table, arch_timer_ppi, &arch_timer_c3stop, + NULL)) + return -EINVAL;
/* 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);
fu.wei@linaro.org wrote:
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..5a5baa1 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
I think this should be under the ARM64 Kconfig option (arch/arm64/Kconfig), perhaps like this:
select ACPI_SPCR_TABLE if ACPI + select ACPI_GTDT if ACPI
We want GTDT to be parsed on ARM64 if we have ACPI, even if we don't have CLKSRC enabled.
From: Fu Wei fu.wei@linaro.org
The patch add memory-mapped timer register support 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 | 147 +++++++++++++++++++++++++++++++++-- 1 file changed, 142 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 505e65c..3ac0fda 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -849,24 +849,161 @@ CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem", arch_timer_mem_init);
#ifdef CONFIG_ACPI_GTDT -/* Initialize per-processor generic timer */ +static struct gt_timer_data __init *arch_timer_mem_get_timer( + struct gt_block_data *gt_blocks) +{ + struct gt_block_data *gt_block = gt_blocks; + struct gt_timer_data *best_frame = NULL; + void __iomem *cntctlbase; + u32 cnttidr; + int i; + + /* + * According to ARMv8 Architecture Reference Manual(ARM), + * the size of CNTCTLBase frame of memory-mapped timer + * is SZ_4K(Offset 0x000 – 0xFFF). + */ + cntctlbase = ioremap(gt_block->cntctlbase_phy, SZ_4K); + if (!cntctlbase) { + pr_err("Can't map CNTCTLBase\n"); + return NULL; + } + cnttidr = readl_relaxed(cntctlbase + CNTTIDR); + + /* + * Try to find a virtual capable frame. Otherwise fall back to a + * physical capable frame. + */ + for (i = 0; i < gt_block->timer_count; i++) { + int n; + u32 cntacr; + + n = gt_block->timer[i].frame_nr; + + /* Try enabling everything, and see what sticks */ + cntacr = CNTACR_RFRQ | CNTACR_RWPT | CNTACR_RPCT | + CNTACR_RWVT | CNTACR_RVOFF | CNTACR_RVCT; + writel_relaxed(cntacr, cntctlbase + CNTACR(n)); + cntacr = readl_relaxed(cntctlbase + CNTACR(n)); + + if ((cnttidr & CNTTIDR_VIRT(n)) && + !(~cntacr & (CNTACR_RWVT | CNTACR_RVCT))) { + best_frame = >_block->timer[i]; + arch_timer_mem_use_virtual = true; + break; + } + + if (~cntacr & (CNTACR_RWPT | CNTACR_RPCT)) + continue; + + best_frame = >_block->timer[i]; + } + iounmap(cntctlbase); + + return best_frame; +} + +static int __init arch_timer_mem_acpi_init(u32 timer_count) +{ + struct gt_block_data *gt_blocks; + struct gt_timer_data *gt_timer; + void __iomem *timer_cntbase; + int ret = -EINVAL; + int timer_irq; + + /* + * If we have some Platform Timer Structures, + * try to find and register a memory-mapped timer. + * If not, just return. + */ + if (!timer_count) + return 0; + + if (arch_timers_present & ARCH_MEM_TIMER) { + pr_warn("memory-mapped timer already initialized, skipping\n"); + return 0; + } + arch_timers_present |= ARCH_MEM_TIMER; + /* + * before really check all the Platform Timer Structures, + * we assume they are GT block, and allocate memory for them. + * We will free these memory once we finish the initialization. + */ + gt_blocks = kcalloc(timer_count, sizeof(*gt_blocks), GFP_KERNEL); + if (!gt_blocks) + return -ENOMEM; + + if (gtdt_arch_timer_mem_init(gt_blocks)) { + gt_timer = arch_timer_mem_get_timer(gt_blocks); + if (!gt_timer) { + pr_err("Failed to get mem timer info.\n"); + goto error; + } + + if (arch_timer_mem_use_virtual) + timer_irq = gt_timer->virt_irq; + else + timer_irq = gt_timer->irq; + if (!timer_irq) { + pr_err("Frame missing %s irq", + arch_timer_mem_use_virtual ? "virt" : "phys"); + goto error; + } + + /* + * According to ARMv8 Architecture Reference Manual(ARM), + * the size of CNTBaseN frames of memory-mapped timer + * is SZ_4K(Offset 0x000 – 0xFFF). + */ + timer_cntbase = ioremap(gt_timer->cntbase_phy, SZ_4K); + if (!timer_cntbase) { + pr_err("Can't map CntBase.\n"); + goto error; + } + arch_counter_base = timer_cntbase; + ret = arch_timer_mem_register(timer_cntbase, timer_irq); + if (ret) { + iounmap(timer_cntbase); + arch_counter_base = NULL; + pr_err("Failed to register mem timer.\n"); + } + } + +error: + kfree(gt_blocks); + return ret; +} + +/* Initialize per-processor generic timer and memory-mapped timer(if present) */ static int __init arch_timer_acpi_init(struct acpi_table_header *table) { + u32 timer_count; + if (arch_timers_present & ARCH_CP15_TIMER) { pr_warn("already initialized, skipping\n"); return -EINVAL; } - arch_timers_present |= ARCH_CP15_TIMER;
+ /* + * Get the per-processor generic timer info. + */ if (gtdt_arch_timer_init(table, arch_timer_ppi, &arch_timer_c3stop, - NULL)) + &timer_count)) return -EINVAL;
- /* Get the frequency from CNTFRQ */ + /* + * Because in a system that implements both Secure and + * Non-secure states, CNTFRQ is only accessible in Secure state. + * So we just try to get the system counter frequency from cntfrq_el0 + * (system coprocessor register) here . + */ arch_timer_detect_rate(NULL, NULL); - arch_timer_init();
+ if (arch_timer_mem_acpi_init(timer_count)) + pr_err("Failed to initialize memory-mapped timer, skipping\n"); + + arch_timer_init(); return 0; } CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);