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. Also add add the ARM64-specific ACPI Support maintainers in MAINTAINERS.
(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: v7: Move the GTDT driver to drivers/acpi/arm64 Add add the ARM64-specific ACPI Support maintainers in MAINTAINERS Merge 3 patches of GTDT parser driver. Fix the for_each_platform_timer bug.
v6: https://lkml.org/lkml/2016/6/29/580 split the GTDT driver to 4 parts: basic, arch_timer, memory-mapped timer, and SBSA Generic Watchdog timer Improve driver by suggestions and example code from Daniel Lezcano
v5: https://lkml.org/lkml/2016/5/24/356 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 (9): 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/arm64: Add GTDT table parse driver MAINTAINERS / ACPI: add the ARM64-specific ACPI Support maintainers clocksource/drivers/arm_arch_timer: Simplify ACPI support code. acpi/arm64: Add memory-mapped timer support in GTDT driver clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver
MAINTAINERS | 8 + drivers/acpi/Kconfig | 5 + drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 343 +++++++++++++++++++++++++++++++++++ drivers/clocksource/Kconfig | 1 + drivers/clocksource/arm_arch_timer.c | 228 ++++++++++++++++------- drivers/watchdog/Kconfig | 1 + include/clocksource/arm_arch_timer.h | 32 ++++ include/linux/acpi.h | 7 + 11 files changed, 575 insertions(+), 67 deletions(-) create mode 100644 drivers/acpi/arm64/Kconfig create mode 100644 drivers/acpi/arm64/Makefile create mode 100644 drivers/acpi/arm64/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
From: Fu Wei fu.wei@linaro.org
This patch defines pr_fmt(fmt) for all pr_* functions, then the pr_* doesn'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 | 53 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 966c574..e6fd42d 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,8 +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", - clk->irq, smp_processor_id()); + pr_debug("disable IRQ%d cpu #%d\n", clk->irq, smp_processor_id());
disable_percpu_irq(arch_timer_ppi[arch_timer_uses_ppi]); if (arch_timer_has_nonsecure_ppi()) @@ -597,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; }
@@ -650,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); }
@@ -727,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; } } @@ -743,7 +744,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 +779,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 +794,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 +822,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 +832,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 +870,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 patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig" + +endif + endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +# + +menu "The ARM64-specific ACPI Support" + +config ACPI_GTDT + bool "ACPI GTDT table Support" + 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. + +endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/* + * ARM Specific GTDT table Support + * + * Copyright (C) 2016, Linaro Ltd. + * Author: Daniel Lezcano daniel.lezcano@linaro.org + * 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/init.h> +#include <linux/kernel.h> +#include <linux/module.h> + +#include <clocksource/arm_arch_timer.h> + +#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt + +typedef struct { + struct acpi_table_gtdt *gtdt; + void *platform_timer_start; + void *gtdt_end; +} acpi_gtdt_desc_t; + +static acpi_gtdt_desc_t acpi_gtdt_desc __initdata; + +static inline void *next_platform_timer(void *platform_timer) +{ + struct acpi_gtdt_header *gh = platform_timer; + + platform_timer += gh->length; + if (platform_timer < acpi_gtdt_desc.gtdt_end) + return platform_timer; + + return NULL; +} + +#define for_each_platform_timer(_g) \ + for (_g = acpi_gtdt_desc.platform_timer_start; _g; \ + _g = next_platform_timer(_g)) + +static inline bool is_timer_block(void *platform_timer) +{ + struct acpi_gtdt_header *gh = platform_timer; + + if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK) + return true; + + return false; +} + +static inline bool is_watchdog(void *platform_timer) +{ + struct acpi_gtdt_header *gh = platform_timer; + + if (gh->type == ACPI_GTDT_TYPE_WATCHDOG) + return true; + + return false; +} + +/* + * 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. + */ +static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{ + struct acpi_table_gtdt *gtdt = container_of(table, + struct acpi_table_gtdt, + header); + + acpi_gtdt_desc.gtdt = gtdt; + acpi_gtdt_desc.gtdt_end = (void *)table + table->length; + + if (table->revision < 2) { + pr_info("Revision:%d doesn't support Platform Timers.\n", + table->revision); + return 0; + } + + if (!gtdt->platform_timer_count) { + pr_info("No Platform Timer.\n"); + return 0; + } + + acpi_gtdt_desc.platform_timer_start = (void *)gtdt + + gtdt->platform_timer_offset; + if (acpi_gtdt_desc.platform_timer_start < + (void *)table + sizeof(struct acpi_table_gtdt)) { + pr_err(FW_BUG "Platform Timer pointer error.\n"); + acpi_gtdt_desc.platform_timer_start = NULL; + return -EINVAL; + } + + return gtdt->platform_timer_count; +} + +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); +} + +/* + * Map the PPIs of per-cpu arch_timer. + * @type: the type of PPI + * Returns 0 if error. + */ +int __init acpi_gtdt_map_ppi(int type) +{ + struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt; + + switch (type) { + 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: + pr_err("ppi type error.\n"); + } + + return 0; +} + +/* + * acpi_gtdt_c3stop - got c3stop info from GTDT + * + * 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); +} + +int __init gtdt_arch_timer_init(struct acpi_table_header *table) +{ + if (table) + return acpi_gtdt_desc_init(table); + + pr_err("table pointer error.\n"); + + return -EINVAL; +} diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 288fac5..8439579 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 __init acpi_gtdt_map_ppi(int type); +int __init acpi_gtdt_c3stop(void); +#endif + #else /* !CONFIG_ACPI */
#define acpi_disabled 1
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"
This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;
This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;
+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;
Just like above.
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);
Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");
Why pr_err()?
acpi_gtdt_desc.platform_timer_start = NULL;return -EINVAL;}return gtdt->platform_timer_count;+}
+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);+}
+/*
- Map the PPIs of per-cpu arch_timer.
- @type: the type of PPI
- Returns 0 if error.
- */
+int __init acpi_gtdt_map_ppi(int type) +{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;switch (type) {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:pr_err("ppi type error.\n");}return 0;+}
+/*
- acpi_gtdt_c3stop - got c3stop info from GTDT
- Returns 1 if the timer is powered in deep idle state, 0 otherwise.
- */
+int __init acpi_gtdt_c3stop(void)
Why not bool?
+{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;return !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);+}
+int __init gtdt_arch_timer_init(struct acpi_table_header *table) +{
if (table)return acpi_gtdt_desc_init(table);pr_err("table pointer error.\n");
This message is totally unuseful.
return -EINVAL;+}
What is supposed to be calling this function?
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 288fac5..8439579 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 __init acpi_gtdt_map_ppi(int type); +int __init acpi_gtdt_c3stop(void);
The __init thing is not necessary here.
+#endif
#else /* !CONFIG_ACPI */
#define acpi_disabled 1
Thanks, Rafael
On Wed, Jul 13, 2016 at 10:30 PM, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;Just like above.
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;
BTW, breaking lines this way doesn't make the code particularly more readable.
if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {
Same here.
It might be avoided by using a local (void *) variable "start", ie.
start = (void *)gtdt + gtdt->platform_timer_offset; if (start < (void *)table + sizeof(struct acpi_table_gtdt))) { print message; return -EINVAL; } acpi_gtdt_desc.platform_timer_start = start;
Thanks, Rafael
Hi Rafael,
On 14 July 2016 at 04:39, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 10:30 PM, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;Just like above.
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;BTW, breaking lines this way doesn't make the code particularly more readable.
if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {Same here.
It might be avoided by using a local (void *) variable "start", ie.
start = (void *)gtdt + gtdt->platform_timer_offset; if (start < (void *)table + sizeof(struct acpi_table_gtdt))) { print message; return -EINVAL; } acpi_gtdt_desc.platform_timer_start = start;
Pretty good idea, will do , thanks :-)
Thanks, Rafael
On Wed, Jul 13, 2016 at 10:30:37PM +0200, Rafael J. Wysocki wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
It is currently selected in patch 9, in the watchdog driver's Kconfig entry. Not sure if I like that; maybe the watchdog driver should depend on it instead ?
Guenter
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;Just like above.
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
acpi_gtdt_desc.platform_timer_start = NULL;return -EINVAL;}return gtdt->platform_timer_count;+}
+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);+}
+/*
- Map the PPIs of per-cpu arch_timer.
- @type: the type of PPI
- Returns 0 if error.
- */
+int __init acpi_gtdt_map_ppi(int type) +{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;switch (type) {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:pr_err("ppi type error.\n");}return 0;+}
+/*
- acpi_gtdt_c3stop - got c3stop info from GTDT
- Returns 1 if the timer is powered in deep idle state, 0 otherwise.
- */
+int __init acpi_gtdt_c3stop(void)
Why not bool?
+{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;return !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);+}
+int __init gtdt_arch_timer_init(struct acpi_table_header *table) +{
if (table)return acpi_gtdt_desc_init(table);pr_err("table pointer error.\n");This message is totally unuseful.
return -EINVAL;+}
What is supposed to be calling this function?
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 288fac5..8439579 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 __init acpi_gtdt_map_ppi(int type); +int __init acpi_gtdt_c3stop(void);
The __init thing is not necessary here.
+#endif
#else /* !CONFIG_ACPI */
#define acpi_disabled 1
Thanks, Rafael
On Wed, Jul 13, 2016 at 11:08 PM, Guenter Roeck linux@roeck-us.net wrote:
On Wed, Jul 13, 2016 at 10:30:37PM +0200, Rafael J. Wysocki wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
It is currently selected in patch 9, in the watchdog driver's Kconfig entry.
Well, it still doesn't have to be user-selectable for that. :-)
Not sure if I like that; maybe the watchdog driver should depend on it instead ?
If the watchdog is not the only user of it (and I don't think it is), it would be better to arrange things this way.
Thanks, Rafael
Hi Rafael,
On 14 July 2016 at 05:43, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 11:08 PM, Guenter Roeck linux@roeck-us.net wrote:
On Wed, Jul 13, 2016 at 10:30:37PM +0200, Rafael J. Wysocki wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
It is currently selected in patch 9, in the watchdog driver's Kconfig entry.
Well, it still doesn't have to be user-selectable for that. :-)
Actually it is also automatically selected by [PATCH v7 6/9]:
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..71d5b30 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 if ARM64
config CLKSRC_PROBE bool
Not sure if I like that; maybe the watchdog driver should depend on it instead ?
If the watchdog is not the only user of it (and I don't think it is), it would be better to arrange things this way.
There are two user: (1) arm_arch_timer(which will select CLKSRC_ACPI if ACPI, then CLKSRC_ACPI will select ACPI_GTDT if ARM64) So arm_arch_timer will automatically selecte ACPI_GTDT if ARM64 && ACPI
(2) sbsa_gwdt (which will select ACPI_GTDT if ACPI in [PATCH v7 9/9]) So sbsa_gwdt will automatically selecte ACPI_GTDT if ARM64 && ACPI && ARM_ARCH_TIMER
So ACPI_GTDT is automatically selected by both of two users.
But like Timur said before:
maybe we just "selecte ACPI_GTDT if ACPI" for ARM64, because ARM64 require GTDT if we use ACPI.
Thanks, Rafael
On Friday, July 15, 2016 03:45:05 PM Fu Wei wrote:
Hi Rafael,
On 14 July 2016 at 05:43, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 11:08 PM, Guenter Roeck linux@roeck-us.net wrote:
On Wed, Jul 13, 2016 at 10:30:37PM +0200, Rafael J. Wysocki wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
It is currently selected in patch 9, in the watchdog driver's Kconfig entry.
Well, it still doesn't have to be user-selectable for that. :-)
Actually it is also automatically selected by [PATCH v7 6/9]:
Right.
By user-selectable I mean "showing up in a Kconfig configurator tool".
It just need not be visible in the configurator IMO.
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..71d5b30 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 if ARM64
config CLKSRC_PROBE bool
Not sure if I like that; maybe the watchdog driver should depend on it instead ?
If the watchdog is not the only user of it (and I don't think it is), it would be better to arrange things this way.
There are two user: (1) arm_arch_timer(which will select CLKSRC_ACPI if ACPI, then CLKSRC_ACPI will select ACPI_GTDT if ARM64) So arm_arch_timer will automatically selecte ACPI_GTDT if ARM64 && ACPI
(2) sbsa_gwdt (which will select ACPI_GTDT if ACPI in [PATCH v7 9/9]) So sbsa_gwdt will automatically selecte ACPI_GTDT if ARM64 && ACPI && ARM_ARCH_TIMER
So ACPI_GTDT is automatically selected by both of two users.
But like Timur said before:
maybe we just "selecte ACPI_GTDT if ACPI" for ARM64, because ARM64 require GTDT if we use ACPI.
Right. That's the way to do it then and make sbsa_gwdt depend on it instead of selecting it.
Thanks, Rafael
Hi Rafael,
On 15 July 2016 at 20:11, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 03:45:05 PM Fu Wei wrote:
Hi Rafael,
On 14 July 2016 at 05:43, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 11:08 PM, Guenter Roeck linux@roeck-us.net wrote:
On Wed, Jul 13, 2016 at 10:30:37PM +0200, Rafael J. Wysocki wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
It is currently selected in patch 9, in the watchdog driver's Kconfig entry.
Well, it still doesn't have to be user-selectable for that. :-)
Actually it is also automatically selected by [PATCH v7 6/9]:
Right.
By user-selectable I mean "showing up in a Kconfig configurator tool".
It just need not be visible in the configurator IMO.
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..71d5b30 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 if ARM64
config CLKSRC_PROBE bool
Not sure if I like that; maybe the watchdog driver should depend on it instead ?
If the watchdog is not the only user of it (and I don't think it is), it would be better to arrange things this way.
There are two user: (1) arm_arch_timer(which will select CLKSRC_ACPI if ACPI, then CLKSRC_ACPI will select ACPI_GTDT if ARM64) So arm_arch_timer will automatically selecte ACPI_GTDT if ARM64 && ACPI
(2) sbsa_gwdt (which will select ACPI_GTDT if ACPI in [PATCH v7 9/9]) So sbsa_gwdt will automatically selecte ACPI_GTDT if ARM64 && ACPI && ARM_ARCH_TIMER
So ACPI_GTDT is automatically selected by both of two users.
But like Timur said before:
maybe we just "selecte ACPI_GTDT if ACPI" for ARM64, because ARM64 require GTDT if we use ACPI.
Right. That's the way to do it then and make sbsa_gwdt depend on it instead of selecting it.
OK, will do in my v8 patchset
Thanks, Rafael
Hi Rafael,
On 14 July 2016 at 04:30, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
good idea, you are right, will do
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;Just like above.
Thanks, this is better :-) will do
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
yes, pr_debug is better, thanks :-) will do
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
if (true), that means the GTDT table has bugs.
acpi_gtdt_desc.platform_timer_start = NULL;return -EINVAL;}return gtdt->platform_timer_count;+}
+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);+}
+/*
- Map the PPIs of per-cpu arch_timer.
- @type: the type of PPI
- Returns 0 if error.
- */
+int __init acpi_gtdt_map_ppi(int type) +{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;switch (type) {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:pr_err("ppi type error.\n");}return 0;+}
+/*
- acpi_gtdt_c3stop - got c3stop info from GTDT
- Returns 1 if the timer is powered in deep idle state, 0 otherwise.
- */
+int __init acpi_gtdt_c3stop(void)
Why not bool?
I forget to fix it, sorry, will do.
+{
struct acpi_table_gtdt *gtdt = acpi_gtdt_desc.gtdt;return !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);+}
+int __init gtdt_arch_timer_init(struct acpi_table_header *table) +{
if (table)return acpi_gtdt_desc_init(table);pr_err("table pointer error.\n");This message is totally unuseful.
will delete it acpi_gtdt_desc_init, and move the code to here.
return -EINVAL;+}
What is supposed to be calling this function?
at this point, I think I can simplify this code a little bit. Thanks :-) I will delete one
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 288fac5..8439579 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 __init acpi_gtdt_map_ppi(int type); +int __init acpi_gtdt_c3stop(void);
The __init thing is not necessary here.
will delete them, thanks
+#endif
#else /* !CONFIG_ACPI */
#define acpi_disabled 1
Thanks, Rafael
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
On 14 July 2016 at 04:30, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"This should depend on ARM64.
Also I wonder if it needs to be user-selectable? Wouldn't it be better to enable it by default when building for ARM64 with ACPI?
helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
+#include <clocksource/arm_arch_timer.h>
+#undef pr_fmt +#define pr_fmt(fmt) "GTDT: " fmt
I would add "ACPI" to the prefix too if I were you, but that's me.
good idea, you are right, will do
+typedef struct {
struct acpi_table_gtdt *gtdt;void *platform_timer_start;void *gtdt_end;+} acpi_gtdt_desc_t;
+static acpi_gtdt_desc_t acpi_gtdt_desc __initdata;
+static inline void *next_platform_timer(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;platform_timer += gh->length;if (platform_timer < acpi_gtdt_desc.gtdt_end)return platform_timer;return NULL;+}
+#define for_each_platform_timer(_g) \
for (_g = acpi_gtdt_desc.platform_timer_start; _g; \_g = next_platform_timer(_g))+static inline bool is_timer_block(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK)return true;return false;This is just too much code. It would suffice to do
return gh->type == ACPI_GTDT_TYPE_TIMER_BLOCK;+}
+static inline bool is_watchdog(void *platform_timer) +{
struct acpi_gtdt_header *gh = platform_timer;if (gh->type == ACPI_GTDT_TYPE_WATCHDOG)return true;return false;Just like above.
Thanks, this is better :-) will do
+}
+/*
- 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.
- */
+static int __init acpi_gtdt_desc_init(struct acpi_table_header *table) +{
struct acpi_table_gtdt *gtdt = container_of(table,struct acpi_table_gtdt,header);acpi_gtdt_desc.gtdt = gtdt;acpi_gtdt_desc.gtdt_end = (void *)table + table->length;if (table->revision < 2) {pr_info("Revision:%d doesn't support Platform Timers.\n",table->revision);Is it really useful to print this message (and the one below) at the "info" level? What about changing them to pr_debug()?
yes, pr_debug is better, thanks :-) will do
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
Thanks, Rafael
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
[cut]
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
Thanks, Rafael
Hi Rafael,
On 15 July 2016 at 21:07, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
[cut]
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
So can I do this: pr_err(FW_BUG "Can NOT init platform_timer pointer, because of the GTDT table bug\n");
or pr_debug(FW_BUG "Can NOT init platform_timer_start, because of platform_timer_offset bug in GTDT\n");
or just delete it?
which one do you prefer? I think maybe should provide some clue for users to fix the problem :-)
any thought ?
Thanks, Rafael
On Saturday, July 16, 2016 12:32:14 AM Fu Wei wrote:
Hi Rafael,
On 15 July 2016 at 21:07, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
[cut]
return 0;}if (!gtdt->platform_timer_count) {pr_info("No Platform Timer.\n");return 0;}acpi_gtdt_desc.platform_timer_start = (void *)gtdt +gtdt->platform_timer_offset;if (acpi_gtdt_desc.platform_timer_start <(void *)table + sizeof(struct acpi_table_gtdt)) {pr_err(FW_BUG "Platform Timer pointer error.\n");Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
So can I do this: pr_err(FW_BUG "Can NOT init platform_timer pointer, because of the GTDT table bug\n");
or pr_debug(FW_BUG "Can NOT init platform_timer_start, because of platform_timer_offset bug in GTDT\n");
or just delete it?
which one do you prefer? I think maybe should provide some clue for users to fix the problem :-)
And how exactly would they fix it then?
any thought ?
If you print variable or function names and the like, the message should be a debug one, because that's information that can only be understood by developers (some developers are users too, but they are a minority).
If you want to report an error, say what is not working (or not available etc) and why (if you know the reason at the time the message is printed).
Thanks, Rafael
Hi Rafeal,
On 16 July 2016 at 05:22, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Saturday, July 16, 2016 12:32:14 AM Fu Wei wrote:
Hi Rafael,
On 15 July 2016 at 21:07, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
[cut]
> + return 0; > + } > + > + if (!gtdt->platform_timer_count) { > + pr_info("No Platform Timer.\n"); > + return 0; > + } > + > + acpi_gtdt_desc.platform_timer_start = (void *)gtdt + > + gtdt->platform_timer_offset; > + if (acpi_gtdt_desc.platform_timer_start < > + (void *)table + sizeof(struct acpi_table_gtdt)) { > + pr_err(FW_BUG "Platform Timer pointer error.\n");
Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
So can I do this: pr_err(FW_BUG "Can NOT init platform_timer pointer, because of the GTDT table bug\n");
or pr_debug(FW_BUG "Can NOT init platform_timer_start, because of platform_timer_offset bug in GTDT\n");
or just delete it?
which one do you prefer? I think maybe should provide some clue for users to fix the problem :-)
And how exactly would they fix it then?
any thought ?
If you print variable or function names and the like, the message should be a debug one, because that's information that can only be understood by developers (some developers are users too, but they are a minority).
If you want to report an error, say what is not working (or not available etc) and why (if you know the reason at the time the message is printed).
Great thanks, I guess I got you point.
maybe just a very simple message like: pr_err(FW_BUG "Failed to init table: GTDT table is buggy.\n");
I will also check other pr_* , if I can update them
Thanks, Rafael
On Saturday, July 16, 2016 10:24:35 AM Fu Wei wrote:
Hi Rafeal,
On 16 July 2016 at 05:22, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Saturday, July 16, 2016 12:32:14 AM Fu Wei wrote:
Hi Rafael,
On 15 July 2016 at 21:07, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote:
Hi Rafael,
[cut]
> >> + return 0; >> + } >> + >> + if (!gtdt->platform_timer_count) { >> + pr_info("No Platform Timer.\n"); >> + return 0; >> + } >> + >> + acpi_gtdt_desc.platform_timer_start = (void *)gtdt + >> + gtdt->platform_timer_offset; >> + if (acpi_gtdt_desc.platform_timer_start < >> + (void *)table + sizeof(struct acpi_table_gtdt)) { >> + pr_err(FW_BUG "Platform Timer pointer error.\n"); > > Why pr_err()?
if (true), that means the GTDT table has bugs.
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
So can I do this: pr_err(FW_BUG "Can NOT init platform_timer pointer, because of the GTDT table bug\n");
or pr_debug(FW_BUG "Can NOT init platform_timer_start, because of platform_timer_offset bug in GTDT\n");
or just delete it?
which one do you prefer? I think maybe should provide some clue for users to fix the problem :-)
And how exactly would they fix it then?
any thought ?
If you print variable or function names and the like, the message should be a debug one, because that's information that can only be understood by developers (some developers are users too, but they are a minority).
If you want to report an error, say what is not working (or not available etc) and why (if you know the reason at the time the message is printed).
Great thanks, I guess I got you point.
maybe just a very simple message like: pr_err(FW_BUG "Failed to init table: GTDT table is buggy.\n");
To understand this message one needs to know what "table" means here and what "GTDT" is. Also the prefix already will be something like "ACPI: GTDT:", so repeating part of it is not really useful IMO.
Can you tell me please what's not going to work when that message is printed?
Will the system boot at all then? If so, the functionality will be limited somehow I suppose. How is it going to be limited?
I will also check other pr_* , if I can update them
OK, great!
Thanks, Rafael
Hi Rafael,
On 16 July 2016 at 20:35, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Saturday, July 16, 2016 10:24:35 AM Fu Wei wrote:
Hi Rafeal,
On 16 July 2016 at 05:22, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Saturday, July 16, 2016 12:32:14 AM Fu Wei wrote:
Hi Rafael,
On 15 July 2016 at 21:07, Rafael J. Wysocki rjw@rjwysocki.net wrote:
On Friday, July 15, 2016 02:15:27 PM Rafael J. Wysocki wrote:
On Friday, July 15, 2016 03:32:35 PM Fu Wei wrote: > Hi Rafael, >
[cut]
> > > >> + return 0; > >> + } > >> + > >> + if (!gtdt->platform_timer_count) { > >> + pr_info("No Platform Timer.\n"); > >> + return 0; > >> + } > >> + > >> + acpi_gtdt_desc.platform_timer_start = (void *)gtdt + > >> + gtdt->platform_timer_offset; > >> + if (acpi_gtdt_desc.platform_timer_start < > >> + (void *)table + sizeof(struct acpi_table_gtdt)) { > >> + pr_err(FW_BUG "Platform Timer pointer error.\n"); > > > > Why pr_err()? > > if (true), that means the GTDT table has bugs. >
And that's not a very useful piece of information unless you're debugging the platform, is it?
FWIW, I'm not a big fan of printing "your firmware is buggy" type of messages (especially at the "error" log level or higher) unless they can be clearly connected to a specific type of functional failure.
So if you want to pring an error-level message, something like "I cannot do X because of the firmware bug Y" would be better IMO.
So can I do this: pr_err(FW_BUG "Can NOT init platform_timer pointer, because of the GTDT table bug\n");
or pr_debug(FW_BUG "Can NOT init platform_timer_start, because of platform_timer_offset bug in GTDT\n");
or just delete it?
which one do you prefer? I think maybe should provide some clue for users to fix the problem :-)
And how exactly would they fix it then?
any thought ?
If you print variable or function names and the like, the message should be a debug one, because that's information that can only be understood by developers (some developers are users too, but they are a minority).
If you want to report an error, say what is not working (or not available etc) and why (if you know the reason at the time the message is printed).
Great thanks, I guess I got you point.
maybe just a very simple message like: pr_err(FW_BUG "Failed to init table: GTDT table is buggy.\n");
To understand this message one needs to know what "table" means here and what "GTDT" is. Also the prefix already will be something like "ACPI: GTDT:", so repeating part of it is not really useful IMO.
Can you tell me please what's not going to work when that message is printed?
Will the system boot at all then? If so, the functionality will be limited somehow I suppose. How is it going to be limited?
when that message is printed, all kind of platform timer(memory-mapped timer and SBSA watchdog) can't work. actually, I think system can boot without them. I have updated this on my v8(just posted), let's discuss this on v8 :-)
I will also check other pr_* , if I can update them
OK, great!
Thanks, Rafael
On Wed, Jul 13, 2016 at 1:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
Please do not use module.h in drivers that are using a bool Kconfig setting.
Thanks, Paul.
Hi Paul
On 15 July 2016 at 04:33, Paul Gortmaker paul.gortmaker@windriver.com wrote:
On Wed, Jul 13, 2016 at 1:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch adds support for parsing arch timer in GTDT, provides some kernel APIs to parse all the PPIs and always-on info in GTDT and export them.
By this driver, we can simplify arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/Kconfig | 5 ++ drivers/acpi/Makefile | 1 + drivers/acpi/arm64/Kconfig | 15 ++++ drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/acpi_gtdt.c | 170 +++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 6 ++ 6 files changed, 198 insertions(+)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index b7e2e77..1cdc7d2 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -521,4 +521,9 @@ config XPOWER_PMIC_OPREGION
endif
+if ARM64 +source "drivers/acpi/arm64/Kconfig"
+endif
endif # ACPI diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 251ce85..1a94ff7 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_ARM64) += arm64/
video-objs += acpi_video.o video_detect.o diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig new file mode 100644 index 0000000..ff5c253 --- /dev/null +++ b/drivers/acpi/arm64/Kconfig @@ -0,0 +1,15 @@ +# +# ACPI Configuration for ARM64 +#
+menu "The ARM64-specific ACPI Support"
+config ACPI_GTDT
bool "ACPI GTDT table Support"helpGTDT (Generic Timer Description Table) provides informationfor per-processor timers and Platform (memory-mapped) timersfor ARM platforms. Select this option to provide informationneeded for the timers init.+endmenu diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile new file mode 100644 index 0000000..466de6b --- /dev/null +++ b/drivers/acpi/arm64/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_ACPI_GTDT) += acpi_gtdt.o diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c new file mode 100644 index 0000000..9ee977d --- /dev/null +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -0,0 +1,170 @@ +/*
- ARM Specific GTDT table Support
- Copyright (C) 2016, Linaro Ltd.
- Author: Daniel Lezcano daniel.lezcano@linaro.org
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/init.h> +#include <linux/kernel.h> +#include <linux/module.h>
Please do not use module.h in drivers that are using a bool Kconfig setting.
yes, you are right, I forget to delete it, sorry.
Will do, thanks
Thanks, Paul.
From: Fu Wei fu.wei@linaro.org
This patch add the ARM64-specific ACPI Support maintainers in MAINTAINERS, according to the discussion on mailing list: https://lkml.org/lkml/2016/6/29/580 Lorenzo Pieralisi will submit the pull requsts.
The maintainers are listed by the alphabet order of their name.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index 1209323..1e03463 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -315,6 +315,14 @@ W: https://01.org/linux-acpi S: Supported F: drivers/acpi/fan.c
+ACPI FOR ARM64 (ACPI/arm64) +M: Hanjun Guo hanjun.guo@linaro.org +M: Lorenzo Pieralisi lorenzo.pieralisi@arm.com +M: Sudeep Holla sudeep.holla@arm.com +L: linux-acpi@vger.kernel.org +S: Supported +F: drivers/acpi/arm64 + ACPI THERMAL DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch add the ARM64-specific ACPI Support maintainers in MAINTAINERS, according to the discussion on mailing list: https://lkml.org/lkml/2016/6/29/580 Lorenzo Pieralisi will submit the pull requsts.
The maintainers are listed by the alphabet order of their name.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index 1209323..1e03463 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -315,6 +315,14 @@ W: https://01.org/linux-acpi S: Supported F: drivers/acpi/fan.c
+ACPI FOR ARM64 (ACPI/arm64) +M: Hanjun Guo hanjun.guo@linaro.org +M: Lorenzo Pieralisi lorenzo.pieralisi@arm.com +M: Sudeep Holla sudeep.holla@arm.com +L: linux-acpi@vger.kernel.org +S: Supported +F: drivers/acpi/arm64
ACPI THERMAL DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org --
This patch should not be part of your series.
I would prefer it if Hanjun, Lorenzo or Sudeep sent it.
Of course, it doesn't make much sense to send it before creating drivers/acpi/arm64/ and putting something in there, so it should be sent separately after the series has been merged.
Thanks, Rafael
Hi Rafael,
On 14 July 2016 at 04:16, Rafael J. Wysocki rafael@kernel.org wrote:
On Wed, Jul 13, 2016 at 7:53 PM, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This patch add the ARM64-specific ACPI Support maintainers in MAINTAINERS, according to the discussion on mailing list: https://lkml.org/lkml/2016/6/29/580 Lorenzo Pieralisi will submit the pull requsts.
The maintainers are listed by the alphabet order of their name.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index 1209323..1e03463 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -315,6 +315,14 @@ W: https://01.org/linux-acpi S: Supported F: drivers/acpi/fan.c
+ACPI FOR ARM64 (ACPI/arm64) +M: Hanjun Guo hanjun.guo@linaro.org +M: Lorenzo Pieralisi lorenzo.pieralisi@arm.com +M: Sudeep Holla sudeep.holla@arm.com +L: linux-acpi@vger.kernel.org +S: Supported +F: drivers/acpi/arm64
ACPI THERMAL DRIVER M: Zhang Rui rui.zhang@intel.com L: linux-acpi@vger.kernel.org --
This patch should not be part of your series.
I would prefer it if Hanjun, Lorenzo or Sudeep sent it.
Sorry for that, This won't be in my patchset next time.
Of course, it doesn't make much sense to send it before creating drivers/acpi/arm64/ and putting something in there, so it should be sent separately after the series has been merged.
yes, you are right , got it , thanks :-)
Thanks, Rafael
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 | 49 +++++++++--------------------------- 2 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 47352d2..71d5b30 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 if ARM64
config CLKSRC_PROBE bool diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index e6fd42d..f6ab857 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -847,60 +847,35 @@ 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; + int timer_count;
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); + timer_count = gtdt_arch_timer_init(table);
- 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 (timer_count < 0) + 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] = acpi_gtdt_map_ppi(PHYS_SECURE_PPI); + arch_timer_ppi[PHYS_NONSECURE_PPI] = acpi_gtdt_map_ppi(PHYS_NONSECURE_PPI); + arch_timer_ppi[VIRT_PPI] = acpi_gtdt_map_ppi(VIRT_PPI); + arch_timer_ppi[HYP_PPI] = acpi_gtdt_map_ppi(HYP_PPI); + /* Always-on capability */ + arch_timer_c3stop = acpi_gtdt_c3stop();
/* 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 driver adds support for parsing memory-mapped timer in GTDT: provide a kernel APIs to parse GT Block Structure in GTDT, export all the info by filling the struct which provided by parameter(pointer of the struct).
By this driver, we can add ACPI support for memory-mapped timer in arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/arm64/acpi_gtdt.c | 90 ++++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 15 ++++++ include/linux/acpi.h | 1 + 3 files changed, 106 insertions(+)
diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c index 9ee977d..ff62953 100644 --- a/drivers/acpi/arm64/acpi_gtdt.c +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -168,3 +168,93 @@ int __init gtdt_arch_timer_init(struct acpi_table_header *table)
return -EINVAL; } + +/* + * 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.\n"); + return -EINVAL; + } + 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) +{ + void *platform_timer; + int index = 0; + + for_each_platform_timer(platform_timer) { + if (is_timer_block(platform_timer) && + !gtdt_parse_gt_block(platform_timer, index, data)) + index++; + } + + if (index) + pr_info("found %d memory-mapped timer block.\n", index); + + return index; +} diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 16dcd10..ece6b3b 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -56,6 +56,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 +73,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 8439579..b1cacbc 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -536,6 +536,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *); int __init gtdt_arch_timer_init(struct acpi_table_header *table); int __init acpi_gtdt_map_ppi(int type); int __init acpi_gtdt_c3stop(void); +int __init gtdt_arch_timer_mem_init(struct gt_block_data *data); #endif
#else /* !CONFIG_ACPI */
On Thu, Jul 14, 2016 at 01:53:20AM +0800, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This driver adds support for parsing memory-mapped timer in GTDT: provide a kernel APIs to parse GT Block Structure in GTDT, export all the info by filling the struct which provided by parameter(pointer of the struct).
By this driver, we can add ACPI support for memory-mapped timer in arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/arm64/acpi_gtdt.c | 90 ++++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 15 ++++++ include/linux/acpi.h | 1 + 3 files changed, 106 insertions(+)
diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c index 9ee977d..ff62953 100644 --- a/drivers/acpi/arm64/acpi_gtdt.c +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -168,3 +168,93 @@ int __init gtdt_arch_timer_init(struct acpi_table_header *table) return -EINVAL; }
+/*
- 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;
Nit: gt_block is an array, right ? I think it would be much simpler if you treat is as such, so that indexing into it would be done automatically by the compiler. Actually, I do not even think you would need this function at all if you treat gt_block as an array, the length check could be done in gtdt_parse_gt_block() straight away.
- 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;
Nit: See above, data is a struct gt_block_data[] right ? These void pointers parameters are not really great, the caller context knows what they are and it can pass them as pointer to typed array elements anyway unless I am missing something.
- 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++) {
What's j needed for (ie can't you use just i instead ?) ?
frame = gtdt_gt_timer_frame(block, i);if (!frame || !frame->base_address || !frame->timer_interrupt) {pr_err(FW_BUG "invalid GT Block Timer data.\n");return -EINVAL;}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;
This is wrong. NULL is not meant to be used as a physical address, you must not do that. Is not zeroeing timer_count enough ? I have to understand why you need this because casting NULL into it is not safe, at all.
- 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.
It is a helper function that you call once at boot, you easily determine when it is called, it is not meant to be used in different contexts from different subsystems; I think that this comment is not clear so either you make it clearer or you remove it.
- */
+int __init gtdt_arch_timer_mem_init(struct gt_block_data *data) +{
- void *platform_timer;
- int index = 0;
- for_each_platform_timer(platform_timer) {
if (is_timer_block(platform_timer) &&!gtdt_parse_gt_block(platform_timer, index, data))
Passing around these opaque void* is a tad ugly, see my comments above about this.
Apart from the NULL pointer assignment, everything else is just code clean-up.
Thanks, Lorenzo
index++;- }
- if (index)
pr_info("found %d memory-mapped timer block.\n", index);- return index;
+} diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 16dcd10..ece6b3b 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -56,6 +56,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 +73,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 8439579..b1cacbc 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -536,6 +536,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *); int __init gtdt_arch_timer_init(struct acpi_table_header *table); int __init acpi_gtdt_map_ppi(int type); int __init acpi_gtdt_c3stop(void); +int __init gtdt_arch_timer_mem_init(struct gt_block_data *data); #endif
#else /* !CONFIG_ACPI */
2.5.5
Hi Lorenzo,
I have updated my patchset following all your comments. I have just posted v8 patchset, please check.
Great thanks for your comments, they are very helpful :-)
On 14 July 2016 at 21:42, Lorenzo Pieralisi lorenzo.pieralisi@arm.com wrote:
On Thu, Jul 14, 2016 at 01:53:20AM +0800, fu.wei@linaro.org wrote:
From: Fu Wei fu.wei@linaro.org
This driver adds support for parsing memory-mapped timer in GTDT: provide a kernel APIs to parse GT Block Structure in GTDT, export all the info by filling the struct which provided by parameter(pointer of the struct).
By this driver, we can add ACPI support for memory-mapped timer in arm_arch_timer drivers, and separate the ACPI GTDT knowledge from it.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org
drivers/acpi/arm64/acpi_gtdt.c | 90 ++++++++++++++++++++++++++++++++++++ include/clocksource/arm_arch_timer.h | 15 ++++++ include/linux/acpi.h | 1 + 3 files changed, 106 insertions(+)
diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c index 9ee977d..ff62953 100644 --- a/drivers/acpi/arm64/acpi_gtdt.c +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -168,3 +168,93 @@ int __init gtdt_arch_timer_init(struct acpi_table_header *table)
return -EINVAL;}
+/*
- 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;Nit: gt_block is an array, right ? I think it would be much simpler if you treat is as such, so that indexing into it would be done automatically by the compiler. Actually, I do not even think you would need this function at all if you treat gt_block as an array, the length check could be done in gtdt_parse_gt_block() straight away.
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;Nit: See above, data is a struct gt_block_data[] right ? These void pointers parameters are not really great, the caller context knows what they are and it can pass them as pointer to typed array elements anyway unless I am missing something.
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++) {What's j needed for (ie can't you use just i instead ?) ?
frame = gtdt_gt_timer_frame(block, i);if (!frame || !frame->base_address || !frame->timer_interrupt) {pr_err(FW_BUG "invalid GT Block Timer data.\n");return -EINVAL;}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;This is wrong. NULL is not meant to be used as a physical address, you must not do that. Is not zeroeing timer_count enough ? I have to understand why you need this because casting NULL into it is not safe, at all.
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.
It is a helper function that you call once at boot, you easily determine when it is called, it is not meant to be used in different contexts from different subsystems; I think that this comment is not clear so either you make it clearer or you remove it.
- */
+int __init gtdt_arch_timer_mem_init(struct gt_block_data *data) +{
void *platform_timer;int index = 0;for_each_platform_timer(platform_timer) {if (is_timer_block(platform_timer) &&!gtdt_parse_gt_block(platform_timer, index, data))Passing around these opaque void* is a tad ugly, see my comments above about this.
Apart from the NULL pointer assignment, everything else is just code clean-up.
Thanks, Lorenzo
index++;}if (index)pr_info("found %d memory-mapped timer block.\n", index);return index;+} diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 16dcd10..ece6b3b 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -56,6 +56,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 +73,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 8439579..b1cacbc 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -536,6 +536,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *); int __init gtdt_arch_timer_init(struct acpi_table_header *table); int __init acpi_gtdt_map_ppi(int type); int __init acpi_gtdt_c3stop(void); +int __init gtdt_arch_timer_mem_init(struct gt_block_data *data); #endif
#else /* !CONFIG_ACPI */
2.5.5
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 | 131 ++++++++++++++++++++++++++++++++++- 1 file changed, 130 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index f6ab857..0d3ab2b 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -848,7 +848,132 @@ 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) { int timer_count; @@ -874,6 +999,10 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
/* Get the frequency from CNTFRQ */ arch_timer_detect_rate(NULL, NULL); + + if (arch_timer_mem_acpi_init(timer_count)) + pr_err("Failed to initialize memory-mapped timer, skipping\n"); + arch_timer_init();
return 0;
From: Fu Wei fu.wei@linaro.org
This driver adds support for parsing SBSA Generic Watchdog timer in GTDT, 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.
Signed-off-by: Fu Wei fu.wei@linaro.org Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- drivers/acpi/arm64/acpi_gtdt.c | 83 ++++++++++++++++++++++++++++++++++++++++++ drivers/watchdog/Kconfig | 1 + 2 files changed, 84 insertions(+)
diff --git a/drivers/acpi/arm64/acpi_gtdt.c b/drivers/acpi/arm64/acpi_gtdt.c index ff62953..eb3edac 100644 --- a/drivers/acpi/arm64/acpi_gtdt.c +++ b/drivers/acpi/arm64/acpi_gtdt.c @@ -15,6 +15,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/platform_device.h>
#include <clocksource/arm_arch_timer.h>
@@ -258,3 +259,85 @@ int __init gtdt_arch_timer_mem_init(struct gt_block_data *data)
return index; } + +/* + * Initialize a SBSA generic Watchdog platform device info from GTDT + */ +static int __init gtdt_import_sbsa_gwdt(void *platform_timer, int index) +{ + 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; + void *platform_timer; + int index = 0; + + if (acpi_disabled) + return 0; + + if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table))) + return -EINVAL; + + if (acpi_gtdt_desc_init(table) < 0) + return -EINVAL; + + for_each_platform_timer(platform_timer) { + if (is_watchdog(platform_timer) && + !gtdt_import_sbsa_gwdt(platform_timer, index)) + index++; + } + + if (index) + pr_info("found %d SBSA generic Watchdog.\n", index); + + return 0; +} + +device_initcall(gtdt_sbsa_gwdt_init); diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b4b3e25..105f059 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -207,6 +207,7 @@ config ARM_SBSA_WATCHDOG depends on ARM64 depends on ARM_ARCH_TIMER select WATCHDOG_CORE + select ACPI_GTDT if ACPI help ARM SBSA Generic Watchdog has two stage timeouts: the first signal (WS0) is for alerting the system by interrupt,
-
Fu Wei -
fu.wei＠linaro.org
-
Guenter Roeck -
Lorenzo Pieralisi -
Paul Gortmaker -
Rafael J. Wysocki -
Rafael J. Wysocki