* [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support
@ 2016-02-01 20:26 fu.wei
2016-02-01 20:26 ` [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver fu.wei
` (5 more replies)
0 siblings, 6 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
This patchset:
(1)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.
(2)Simplify ACPI code for arch timer in arm_arch_timer.c
(3)Add memory-mapped timer support in arm_arch_timer.c
(4)Add arm_arch_timer get ppi from DT and GTDT support for kvm
in virt/kvm/arm/arch_timer.c
Changelog:
v3: Improve GTDT driver code:
(1)improve pr_* by defining pr_fmt(fmt)
(2)simplify gtdt_sbsa_gwdt_init
(3)improve gtdt_arch_timer_data_init, if table is NULL, it will try
to get GTDT table.
Move enum ppi_nr to arm_arch_timer.h, and add enum spi_nr.
Add arm_arch_timer get ppi from DT and GTDT support for kvm.
v2: https://lkml.org/lkml/2015/12/2/10
Rebase to latest kernel version(4.4-rc3).
Fix the bug about the config problem,
use CONFIG_ACPI_GTDT instead of CONFIG_ACPI in arm_arch_timer.c
v1: The first upstreaming version: https://lkml.org/lkml/2015/10/28/553
Fu Wei (5):
ACPI: add GTDT table parse driver into ACPI driver
clocksource: simplify ACPI code in arm_arch_timer.c
clocksource: add memory-mapped timer support in arm_arch_timer.c
clocksource: move some enums to arm_arch_timer.h
kvm: arm64: Add ACPI support for virt arch timer
Wei Huang (1):
kvm: arm64: wrapping DT support for virt arch timer
drivers/acpi/Kconfig | 9 +
drivers/acpi/Makefile | 1 +
drivers/acpi/gtdt.c | 375 +++++++++++++++++++++++++++++++++++
drivers/clocksource/Kconfig | 1 +
drivers/clocksource/arm_arch_timer.c | 191 +++++++++++++-----
include/clocksource/arm_arch_timer.h | 33 +++
include/linux/acpi.h | 17 ++
virt/kvm/arm/arch_timer.c | 57 ++++--
8 files changed, 620 insertions(+), 64 deletions(-)
create mode 100644 drivers/acpi/gtdt.c
--
2.5.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-01 20:26 ` [PATCH v3 2/6] clocksource: simplify ACPI code in arm_arch_timer.c fu.wei
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
This driver adds support for parsing all kinds of timer in GTDT:
(1)arch timer: provide a kernel API to parse all the PPIs and
always-on info in GTDT and export them by arch_timer_data struct.
(2)memory-mapped timer: provide several kernel APIs to parse
GT Block Structure in GTDT, export those info by return value
and arch_timer_mem_data struct.
(3)SBSA Generic Watchdog: parse all info in SBSA Generic Watchdog
Structure in GTDT, and creating a platform device with that
information. This allows the operating system to obtain device
data from the resource of platform device.
The platform device named "sbsa-gwdt" can be used by the ARM SBSA
Generic Watchdog driver.
By this driver, we can simplify all the relevant drivers, and
separate all the ACPI GTDT knowledge from them.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
drivers/acpi/Kconfig | 9 +
drivers/acpi/Makefile | 1 +
drivers/acpi/gtdt.c | 375 +++++++++++++++++++++++++++++++++++
drivers/clocksource/arm_arch_timer.c | 2 -
include/clocksource/arm_arch_timer.h | 19 ++
include/linux/acpi.h | 17 ++
6 files changed, 421 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 5eef4cb..e2bfad1 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -510,4 +510,13 @@ config XPOWER_PMIC_OPREGION
endif
+config ACPI_GTDT
+ bool "ACPI GTDT Support"
+ depends on ARM64
+ help
+ GTDT (Generic Timer Description Table) provides information
+ for per-processor timers and Platform (memory-mapped) timers
+ for ARM platforms. Select this option to provide information
+ needed for the timers init.
+
endif # ACPI
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 675eaf3..ac42e31 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -96,5 +96,6 @@ obj-$(CONFIG_ACPI_EXTLOG) += acpi_extlog.o
obj-$(CONFIG_PMIC_OPREGION) += pmic/intel_pmic.o
obj-$(CONFIG_CRC_PMIC_OPREGION) += pmic/intel_pmic_crc.o
obj-$(CONFIG_XPOWER_PMIC_OPREGION) += pmic/intel_pmic_xpower.o
+obj-$(CONFIG_ACPI_GTDT) += gtdt.o
video-objs += acpi_video.o video_detect.o
diff --git a/drivers/acpi/gtdt.c b/drivers/acpi/gtdt.c
new file mode 100644
index 0000000..047fea1
--- /dev/null
+++ b/drivers/acpi/gtdt.c
@@ -0,0 +1,375 @@
+/*
+ * ARM Specific GTDT table Support
+ *
+ * Copyright (C) 2015, Linaro Ltd.
+ * Author: Fu Wei <fu.wei@linaro.org>
+ * Hanjun Guo <hanjun.guo@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <clocksource/arm_arch_timer.h>
+
+#undef pr_fmt
+#define pr_fmt(fmt) "GTDT: " fmt
+
+static u32 platform_timer_count __initdata;
+static int gtdt_timers_existence __initdata;
+
+/*
+ * Get some basic info from GTDT table, and init the global variables above
+ * for all timers initialization of Generic Timer.
+ * This function does some validation on GTDT table, and will be run only once.
+ */
+static void __init *platform_timer_info_init(struct acpi_table_header *table)
+{
+ void *gtdt_end, *platform_timer_struct, *platform_timer;
+ struct acpi_gtdt_header *header;
+ struct acpi_table_gtdt *gtdt;
+ u32 i;
+
+ gtdt = container_of(table, struct acpi_table_gtdt, header);
+ if (!gtdt) {
+ pr_err("table pointer error.\n");
+ return NULL;
+ }
+ gtdt_end = (void *)table + table->length;
+ gtdt_timers_existence |= ARCH_CP15_TIMER;
+
+ if (table->revision < 2) {
+ pr_info("Revision:%d doesn't support Platform Timers.\n",
+ table->revision);
+ return NULL;
+ }
+
+ platform_timer_count = gtdt->platform_timer_count;
+ if (!platform_timer_count) {
+ pr_info("No Platform Timer structures.\n");
+ return NULL;
+ }
+
+ platform_timer_struct = (void *)gtdt + gtdt->platform_timer_offset;
+ if (platform_timer_struct < (void *)table +
+ sizeof(struct acpi_table_gtdt)) {
+ pr_err(FW_BUG "Platform Timer pointer error.\n");
+ return NULL;
+ }
+
+ platform_timer = platform_timer_struct;
+ for (i = 0; i < platform_timer_count; i++) {
+ if (platform_timer > gtdt_end) {
+ pr_err(FW_BUG "subtable pointer overflows.\n");
+ platform_timer_count = i;
+ break;
+ }
+ header = (struct acpi_gtdt_header *)platform_timer;
+ if (header->type == ACPI_GTDT_TYPE_TIMER_BLOCK)
+ gtdt_timers_existence |= ARCH_MEM_TIMER;
+ else if (header->type == ACPI_GTDT_TYPE_WATCHDOG)
+ gtdt_timers_existence |= ARCH_WD_TIMER;
+ platform_timer += header->length;
+ }
+
+ return platform_timer_struct;
+}
+
+static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)
+{
+ int trigger, polarity;
+
+ if (!interrupt)
+ return 0;
+
+ trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
+ : ACPI_LEVEL_SENSITIVE;
+
+ polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
+ : ACPI_ACTIVE_HIGH;
+
+ return acpi_register_gsi(NULL, interrupt, trigger, polarity);
+}
+
+/*
+ * Get the necessary info of arch_timer from GTDT table.
+ */
+int __init gtdt_arch_timer_data_init(struct acpi_table_header *table,
+ struct arch_timer_data *data)
+{
+ struct acpi_table_gtdt *gtdt;
+
+ if (acpi_disabled || !data)
+ return -EINVAL;
+
+ if (!table) {
+ if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table)))
+ return -EINVAL;
+ }
+
+ if (!gtdt_timers_existence)
+ platform_timer_info_init(table);
+
+ gtdt = container_of(table, struct acpi_table_gtdt, header);
+
+ data->phys_secure_ppi =
+ map_generic_timer_interrupt(gtdt->secure_el1_interrupt,
+ gtdt->secure_el1_flags);
+
+ data->phys_nonsecure_ppi =
+ map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,
+ gtdt->non_secure_el1_flags);
+
+ data->virt_ppi =
+ map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,
+ gtdt->virtual_timer_flags);
+
+ data->hyp_ppi =
+ map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,
+ gtdt->non_secure_el2_flags);
+
+ data->c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);
+
+ return 0;
+}
+
+bool __init gtdt_timer_is_available(int type)
+{
+ return gtdt_timers_existence | type;
+}
+
+/*
+ * Helper function for getting the pointer of platform_timer_struct.
+ */
+static void __init *get_platform_timer_struct(struct acpi_table_header *table)
+{
+ struct acpi_table_gtdt *gtdt;
+
+ if (!table) {
+ pr_err("table pointer error.\n");
+ return NULL;
+ }
+
+ gtdt = container_of(table, struct acpi_table_gtdt, header);
+
+ return (void *)gtdt + gtdt->platform_timer_offset;
+}
+
+ /*
+ * Get the pointer of GT Block Structure in GTDT table
+ */
+void __init *gtdt_gt_block(struct acpi_table_header *table, int index)
+{
+ struct acpi_gtdt_header *header;
+ void *platform_timer;
+ int i, j;
+
+ if (!gtdt_timers_existence)
+ platform_timer = platform_timer_info_init(table);
+ else
+ platform_timer = get_platform_timer_struct(table);
+
+ if (!gtdt_timer_is_available(ARCH_MEM_TIMER))
+ return NULL;
+
+ for (i = 0, j = 0; i < platform_timer_count; i++) {
+ header = (struct acpi_gtdt_header *)platform_timer;
+ if (header->type == ACPI_GTDT_TYPE_TIMER_BLOCK && j++ == index)
+ return platform_timer;
+ platform_timer += header->length;
+ }
+
+ return NULL;
+}
+
+/*
+ * Get the timer_count(the number of timer frame) of a GT Block in GTDT table
+ */
+u32 __init gtdt_gt_timer_count(struct acpi_gtdt_timer_block *gt_block)
+{
+ if (!gt_block) {
+ pr_err("invalid GT Block baseaddr.\n");
+ return 0;
+ }
+
+ return gt_block->timer_count;
+}
+
+/*
+ * Get the physical address of GT Block in GTDT table
+ */
+void __init *gtdt_gt_cntctlbase(struct acpi_gtdt_timer_block *gt_block)
+{
+ if (!gt_block) {
+ pr_err("invalid GT Block baseaddr.\n");
+ return NULL;
+ }
+
+ return (void *)gt_block->block_address;
+}
+
+/*
+ * Helper function for getting the pointer of a timer frame in GT block.
+ */
+static void __init *gtdt_gt_timer_frame(struct acpi_gtdt_timer_block *gt_block,
+ int index)
+{
+ void *timer_frame;
+
+ if (!(gt_block && gt_block->timer_count))
+ return NULL;
+
+ timer_frame = (void *)gt_block + gt_block->timer_offset +
+ sizeof(struct acpi_gtdt_timer_entry) * index;
+
+ if (timer_frame <= (void *)gt_block + gt_block->header.length -
+ sizeof(struct acpi_gtdt_timer_entry))
+ return timer_frame;
+
+ pr_err(FW_BUG "invalid GT Block timer frame entry addr.\n");
+
+ return NULL;
+}
+
+/*
+ * Get the GT timer Frame Number(ID) in a GT Block Timer Structure.
+ * The maximum Frame Number(ID) is (ARCH_TIMER_MEM_MAX_FRAME - 1),
+ * so returning ARCH_TIMER_MEM_MAX_FRAME means error.
+ */
+u32 __init gtdt_gt_frame_number(struct acpi_gtdt_timer_block *gt_block,
+ int index)
+{
+ struct acpi_gtdt_timer_entry *frame;
+
+ frame = (struct acpi_gtdt_timer_entry *)gtdt_gt_timer_frame(gt_block,
+ index);
+ if (frame)
+ return frame->frame_number;
+
+ return ARCH_TIMER_MEM_MAX_FRAME;
+}
+
+/*
+ * Get the GT timer Frame data in a GT Block Timer Structure
+ */
+int __init gtdt_gt_timer_data(struct acpi_gtdt_timer_block *gt_block,
+ int index, bool virt,
+ struct arch_timer_mem_data *data)
+{
+ struct acpi_gtdt_timer_entry *frame;
+
+ frame = (struct acpi_gtdt_timer_entry *)gtdt_gt_timer_frame(gt_block,
+ index);
+ if (!frame)
+ return -EINVAL;
+
+ data->cntbase_phy = (phys_addr_t)frame->base_address;
+ if (virt)
+ data->irq = map_generic_timer_interrupt(
+ frame->virtual_timer_interrupt,
+ frame->virtual_timer_flags);
+ else
+ data->irq = map_generic_timer_interrupt(frame->timer_interrupt,
+ frame->timer_flags);
+
+ return 0;
+}
+
+/*
+ * Initialize a SBSA generic Watchdog platform device info from GTDT
+ */
+static int __init gtdt_import_sbsa_gwdt(struct acpi_gtdt_watchdog *wd,
+ int index)
+{
+ struct platform_device *pdev;
+ int irq = map_generic_timer_interrupt(wd->timer_interrupt,
+ wd->timer_flags);
+
+ /*
+ * 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_IRQ(irq),
+ DEFINE_RES_MEM(wd->control_frame_address, SZ_4K),
+ DEFINE_RES_MEM(wd->refresh_frame_address, SZ_4K),
+ };
+
+ 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 &&
+ wd->timer_interrupt)) {
+ pr_err(FW_BUG "failed geting the device info.\n");
+ return -EINVAL;
+ }
+
+ if (irq < 0) {
+ pr_err("failed to register GSI of the Watchdog GT.\n");
+ return -EINVAL;
+ }
+
+ /*
+ * 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));
+ if (IS_ERR(pdev)) {
+ acpi_unregister_gsi(wd->timer_interrupt);
+ return PTR_ERR(pdev);
+ }
+
+ return 0;
+}
+
+static int __init gtdt_sbsa_gwdt_init(void)
+{
+ struct acpi_table_header *table;
+ struct acpi_gtdt_header *header;
+ void *platform_timer;
+ int i, gwdt_index;
+ int ret = 0;
+
+ if (acpi_disabled)
+ return 0;
+
+ if (ACPI_FAILURE(acpi_get_table(ACPI_SIG_GTDT, 0, &table)))
+ return -EINVAL;
+
+ /*
+ * At this proint, we have got and validate some info about platform
+ * timer in platform_timer_info_init.
+ */
+ if (!gtdt_timer_is_available(ARCH_WD_TIMER))
+ return -EINVAL;
+
+ platform_timer = get_platform_timer_struct(table);
+
+ for (i = 0, gwdt_index = 0; i < platform_timer_count; i++) {
+ header = (struct acpi_gtdt_header *)platform_timer;
+ if (header->type == ACPI_GTDT_TYPE_WATCHDOG) {
+ ret = gtdt_import_sbsa_gwdt(platform_timer, gwdt_index);
+ if (ret)
+ pr_err("failed to import subtable %d.\n", i);
+ else
+ gwdt_index++;
+ }
+ platform_timer += header->length;
+ }
+
+ return ret;
+}
+
+device_initcall(gtdt_sbsa_gwdt_init);
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index c64d543..e16fdad 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -40,8 +40,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;
diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h
index 9916d0e..7a6d6dc 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -19,6 +19,10 @@
#include <linux/timecounter.h>
#include <linux/types.h>
+#define ARCH_CP15_TIMER BIT(0)
+#define ARCH_MEM_TIMER BIT(1)
+#define ARCH_WD_TIMER BIT(2)
+
#define ARCH_TIMER_CTRL_ENABLE (1 << 0)
#define ARCH_TIMER_CTRL_IT_MASK (1 << 1)
#define ARCH_TIMER_CTRL_IT_STAT (1 << 2)
@@ -33,6 +37,8 @@ enum arch_timer_reg {
#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)
@@ -43,6 +49,19 @@ enum arch_timer_reg {
#define ARCH_TIMER_EVT_STREAM_FREQ 10000 /* 100us */
+struct arch_timer_data {
+ int phys_secure_ppi;
+ int phys_nonsecure_ppi;
+ int virt_ppi;
+ int hyp_ppi;
+ bool c3stop;
+};
+
+struct arch_timer_mem_data {
+ phys_addr_t cntbase_phy;
+ int irq;
+};
+
#ifdef CONFIG_ARM_ARCH_TIMER
extern u32 arch_timer_get_rate(void);
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 1991aea..2cec0c9 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -468,6 +468,23 @@ void acpi_walk_dep_device_list(acpi_handle handle);
struct platform_device *acpi_create_platform_device(struct acpi_device *);
#define ACPI_PTR(_ptr) (_ptr)
+#ifdef CONFIG_ACPI_GTDT
+bool __init gtdt_timer_is_available(int type);
+
+struct arch_timer_data;
+int __init gtdt_arch_timer_data_init(struct acpi_table_header *table,
+ struct arch_timer_data *data);
+struct arch_timer_mem_data;
+void __init *gtdt_gt_block(struct acpi_table_header *table, int index);
+u32 __init gtdt_gt_timer_count(struct acpi_gtdt_timer_block *gt_block);
+void __init *gtdt_gt_cntctlbase(struct acpi_gtdt_timer_block *gt_block);
+u32 __init gtdt_gt_frame_number(struct acpi_gtdt_timer_block *gt_block,
+ int index);
+int __init gtdt_gt_timer_data(struct acpi_gtdt_timer_block *gt_block,
+ int index, bool virt,
+ struct arch_timer_mem_data *data);
+#endif
+
#else /* !CONFIG_ACPI */
#define acpi_disabled 1
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 2/6] clocksource: simplify ACPI code in arm_arch_timer.c
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
2016-02-01 20:26 ` [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-01 20:26 ` [PATCH v3 3/6] clocksource: add memory-mapped timer support " fu.wei
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
The patch update arm_arch_timer driver to use the function
provided by the new GTDT driver of ACPI.
By this way, arm_arch_timer.c can be simplified, and separate
all the ACPI GTDT knowledge from this timer driver.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
drivers/clocksource/Kconfig | 1 +
drivers/clocksource/arm_arch_timer.c | 48 ++++++++----------------------------
2 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 2eb5f0e..445c7cb 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -8,6 +8,7 @@ config CLKSRC_OF
config CLKSRC_ACPI
bool
select CLKSRC_PROBE
+ select ACPI_GTDT
config CLKSRC_PROBE
bool
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index e16fdad..87d6bae 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -806,60 +806,32 @@ static void __init arch_timer_mem_init(struct device_node *np)
CLOCKSOURCE_OF_DECLARE(armv7_arch_timer_mem, "arm,armv7-timer-mem",
arch_timer_mem_init);
-#ifdef CONFIG_ACPI
-static int __init map_generic_timer_interrupt(u32 interrupt, u32 flags)
-{
- int trigger, polarity;
-
- if (!interrupt)
- return 0;
-
- trigger = (flags & ACPI_GTDT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
- : ACPI_LEVEL_SENSITIVE;
-
- polarity = (flags & ACPI_GTDT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
- : ACPI_ACTIVE_HIGH;
-
- return acpi_register_gsi(NULL, interrupt, trigger, polarity);
-}
-
+#ifdef CONFIG_ACPI_GTDT
/* Initialize per-processor generic timer */
static int __init arch_timer_acpi_init(struct acpi_table_header *table)
{
- struct acpi_table_gtdt *gtdt;
+ struct arch_timer_data data;
if (arch_timers_present & ARCH_CP15_TIMER) {
pr_warn("arch_timer: already initialized, skipping\n");
return -EINVAL;
}
- gtdt = container_of(table, struct acpi_table_gtdt, header);
-
arch_timers_present |= ARCH_CP15_TIMER;
- arch_timer_ppi[PHYS_SECURE_PPI] =
- map_generic_timer_interrupt(gtdt->secure_el1_interrupt,
- gtdt->secure_el1_flags);
-
- arch_timer_ppi[PHYS_NONSECURE_PPI] =
- map_generic_timer_interrupt(gtdt->non_secure_el1_interrupt,
- gtdt->non_secure_el1_flags);
-
- arch_timer_ppi[VIRT_PPI] =
- map_generic_timer_interrupt(gtdt->virtual_timer_interrupt,
- gtdt->virtual_timer_flags);
+ if (gtdt_arch_timer_data_init(table, &data))
+ return -EINVAL;
- arch_timer_ppi[HYP_PPI] =
- map_generic_timer_interrupt(gtdt->non_secure_el2_interrupt,
- gtdt->non_secure_el2_flags);
+ arch_timer_ppi[PHYS_SECURE_PPI] = data.phys_secure_ppi;
+ arch_timer_ppi[PHYS_NONSECURE_PPI] = data.phys_nonsecure_ppi;
+ arch_timer_ppi[VIRT_PPI] = data.virt_ppi;
+ arch_timer_ppi[HYP_PPI] = data.hyp_ppi;
+ arch_timer_c3stop = data.c3stop; /* Always-on capability */
/* Get the frequency from CNTFRQ */
arch_timer_detect_rate(NULL, NULL);
-
- /* Always-on capability */
- arch_timer_c3stop = !(gtdt->non_secure_el1_flags & ACPI_GTDT_ALWAYS_ON);
-
arch_timer_init();
+
return 0;
}
CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 3/6] clocksource: add memory-mapped timer support in arm_arch_timer.c
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
2016-02-01 20:26 ` [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver fu.wei
2016-02-01 20:26 ` [PATCH v3 2/6] clocksource: simplify ACPI code in arm_arch_timer.c fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-01 20:26 ` [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h fu.wei
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
The patch add memory-mapped timer register support for arm_arch_timer driver
by using the information provided by the new GTDT driver of ACPI.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
drivers/clocksource/arm_arch_timer.c | 136 +++++++++++++++++++++++++++++++++++
1 file changed, 136 insertions(+)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 87d6bae..3792fd6 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -666,6 +666,15 @@ arch_timer_needs_probing(int type, const struct of_device_id *matches)
needs_probing = true;
of_node_put(dn);
+#ifdef CONFIG_ACPI_GTDT
+ /*
+ * Check if we have timer in GTDT table
+ */
+ if (!acpi_disabled && gtdt_timer_is_available(type) &&
+ !(arch_timers_present & type))
+ needs_probing = true;
+#endif
+
return needs_probing;
}
@@ -835,4 +844,131 @@ static int __init arch_timer_acpi_init(struct acpi_table_header *table)
return 0;
}
CLOCKSOURCE_ACPI_DECLARE(arch_timer, ACPI_SIG_GTDT, arch_timer_acpi_init);
+
+static u32 __init arch_timer_mem_cnttidr(struct acpi_gtdt_timer_block *gt_block)
+{
+ phys_addr_t cntctlbase_phy;
+ void __iomem *cntctlbase;
+ u32 cnttidr;
+
+ cntctlbase_phy = (phys_addr_t)gtdt_gt_cntctlbase(gt_block);
+ if (!cntctlbase_phy) {
+ pr_err("arch_timer: Can't find CNTCTLBase.\n");
+ return 0;
+ }
+
+ /*
+ * According to ARMv8 Architecture Reference Manual(ARM),
+ * the size of CNTCTLBase frame of memory-mapped timer
+ * is SZ_4K(Offset 0x000 – 0xFFF).
+ */
+ cntctlbase = ioremap(cntctlbase_phy, SZ_4K);
+ if (!cntctlbase) {
+ pr_err("arch_timer: Can't map CNTCTLBase\n");
+ return 0;
+ }
+ cnttidr = readl_relaxed(cntctlbase + CNTTIDR);
+ iounmap(cntctlbase);
+
+ return cnttidr;
+}
+
+static int __init arch_timer_mem_best_frame(struct acpi_table_header *table,
+ struct arch_timer_mem_data *data)
+{
+ struct acpi_gtdt_timer_block *gt_block;
+ u32 frame_number, timer_count, cnttidr;
+ int i;
+
+ gt_block = gtdt_gt_block(table, 0);
+ if (!gt_block) {
+ pr_err("arch_timer: Can't find GT Block.\n");
+ return -EINVAL;
+ }
+
+ timer_count = gtdt_gt_timer_count(gt_block);
+ if (!timer_count) {
+ pr_err("arch_timer: Can't find GT frame number.\n");
+ return -EINVAL;
+ }
+
+ if (gtdt_gt_timer_data(gt_block, 0, false, data)) {
+ pr_err("arch_timer: Can't get first phy timer.\n");
+ return -EINVAL;
+ }
+
+ /*
+ * Get Generic Timer Counter-timer Timer ID Register
+ * for Virtual Timer Capability info
+ */
+ cnttidr = arch_timer_mem_cnttidr(gt_block);
+
+ /*
+ * Try to find a virtual capable frame.
+ * Otherwise fall back to the first physical capable frame.
+ */
+ for (i = 0; i < timer_count; i++) {
+ frame_number = gtdt_gt_frame_number(gt_block, i);
+ if (frame_number < ARCH_TIMER_MEM_MAX_FRAME &&
+ cnttidr & CNTTIDR_VIRT(frame_number)) {
+ if (!gtdt_gt_timer_data(gt_block, i, true, data)) {
+ arch_timer_mem_use_virtual = true;
+ return 0;
+ }
+ pr_warn("arch_timer: Can't get virt timer.\n");
+ }
+ }
+
+ return 0;
+}
+
+/* Initialize memory-mapped timer(wake-up timer) */
+static int __init arch_timer_mem_acpi_init(struct acpi_table_header *table)
+{
+ struct arch_timer_mem_data data;
+ void __iomem *cntbase;
+
+ if (arch_timers_present & ARCH_MEM_TIMER) {
+ pr_warn("arch_timer_mem: already initialized, skipping\n");
+ return -EINVAL;
+ }
+ arch_timers_present |= ARCH_MEM_TIMER;
+
+ if (arch_timer_mem_best_frame(table, &data))
+ return -EINVAL;
+
+ /*
+ * According to ARMv8 Architecture Reference Manual(ARM),
+ * the size of CNTBaseN frames of memory-mapped timer
+ * is SZ_4K(Offset 0x000 – 0xFFF).
+ */
+ cntbase = ioremap(data.cntbase_phy, SZ_4K);
+ if (!cntbase) {
+ pr_err("arch_timer: Can't map CntBase.\n");
+ return -EINVAL;
+ }
+ arch_counter_base = cntbase;
+
+ if (!data.irq) {
+ pr_err("arch_timer: Frame missing %s irq",
+ arch_timer_mem_use_virtual ? "virt" : "phys");
+ return -EINVAL;
+ }
+
+ /*
+ * Because in a system that implements both Secure and
+ * Non-secure states, CNTFRQ is only accessible in Secure state.
+ * So we try to get the system counter frequency from cntfrq_el0
+ * (system coprocessor register) here just like arch_timer.
+ */
+ arch_timer_detect_rate(NULL, NULL);
+
+ arch_timer_mem_register(cntbase, data.irq);
+ arch_timer_common_init();
+
+ return 0;
+}
+
+CLOCKSOURCE_ACPI_DECLARE(arch_timer_mem, ACPI_SIG_GTDT,
+ arch_timer_mem_acpi_init);
#endif
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
` (2 preceding siblings ...)
2016-02-01 20:26 ` [PATCH v3 3/6] clocksource: add memory-mapped timer support " fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-01 20:26 ` [PATCH v3 5/6] kvm: arm64: wrapping DT support for virt arch timer fu.wei
2016-02-01 20:26 ` [PATCH v3 6/6] kvm: arm64: Add ACPI " fu.wei
5 siblings, 0 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
The patch move enum ppi_nr from arm_arch_timer.c
to arm_arch_timer.h, and add enum spi_nr.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
drivers/clocksource/arm_arch_timer.c | 13 ++-----------
include/clocksource/arm_arch_timer.h | 14 ++++++++++++++
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 3792fd6..90d17ef 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -52,15 +52,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;
@@ -798,9 +789,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);
of_node_put(best_frame);
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 7a6d6dc..7bb5c1e 100644
--- a/include/clocksource/arm_arch_timer.h
+++ b/include/clocksource/arm_arch_timer.h
@@ -32,6 +32,20 @@ enum arch_timer_reg {
ARCH_TIMER_REG_TVAL,
};
+enum ppi_nr {
+ PHYS_SECURE_PPI,
+ PHYS_NONSECURE_PPI,
+ VIRT_PPI,
+ HYP_PPI,
+ MAX_TIMER_PPI
+};
+
+enum spi_nr {
+ PHYS_SPI,
+ VIRT_SPI,
+ MAX_TIMER_SPI
+};
+
#define ARCH_TIMER_PHYS_ACCESS 0
#define ARCH_TIMER_VIRT_ACCESS 1
#define ARCH_TIMER_MEM_PHYS_ACCESS 2
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 5/6] kvm: arm64: wrapping DT support for virt arch timer
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
` (3 preceding siblings ...)
2016-02-01 20:26 ` [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-01 20:26 ` [PATCH v3 6/6] kvm: arm64: Add ACPI " fu.wei
5 siblings, 0 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Wei Huang <wei@redhat.com>
This patches wrapping DT support for virt arch timer into a function.
[Fu Wei: improve the DT support, and separate ACPI support]
Signed-off-by: Alexander Spyridaki <a.spyridakis@virtualopensystems.com>
Signed-off-by: Wei Huang <wei@redhat.com>
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
virt/kvm/arm/arch_timer.c | 49 +++++++++++++++++++++++++++++++----------------
1 file changed, 32 insertions(+), 17 deletions(-)
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 69bca185..0a279d3 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -381,9 +381,30 @@ static const struct of_device_id arch_timer_of_match[] = {
{},
};
-int kvm_timer_hyp_init(void)
+static int kvm_timer_get_ppi(unsigned int *ppi)
{
struct device_node *np;
+ int ret = -EINVAL;
+
+ np = of_find_matching_node(NULL, arch_timer_of_match);
+ if (!np) {
+ ret = -ENODEV;
+ *ppi = 0;
+ goto skip_of;
+ }
+
+ *ppi = irq_of_parse_and_map(np, VIRT_PPI);
+ of_node_put(np);
+
+skip_of:
+ if (*ppi)
+ return 0;
+
+ return ret;
+}
+
+int kvm_timer_hyp_init(void)
+{
unsigned int ppi;
int err;
@@ -391,17 +412,11 @@ int kvm_timer_hyp_init(void)
if (!timecounter)
return -ENODEV;
- np = of_find_matching_node(NULL, arch_timer_of_match);
- if (!np) {
- kvm_err("kvm_arch_timer: can't find DT node\n");
- return -ENODEV;
- }
-
- ppi = irq_of_parse_and_map(np, 2);
- if (!ppi) {
- kvm_err("kvm_arch_timer: no virtual timer interrupt\n");
- err = -EINVAL;
- goto out;
+ err = kvm_timer_get_ppi(&ppi);
+ if (err) {
+ kvm_err("kvm_arch_timer: can't find virtual timer info or "
+ "config virtual timer interrupt.\n");
+ return err;
}
err = request_percpu_irq(ppi, kvm_arch_timer_handler,
@@ -409,7 +424,7 @@ int kvm_timer_hyp_init(void)
if (err) {
kvm_err("kvm_arch_timer: can't request interrupt %d (%d)\n",
ppi, err);
- goto out;
+ return err;
}
host_vtimer_irq = ppi;
@@ -426,14 +441,14 @@ int kvm_timer_hyp_init(void)
goto out_free;
}
- kvm_info("%s IRQ%d\n", np->name, ppi);
+ kvm_info("timer IRQ%d.\n", ppi);
on_each_cpu(kvm_timer_init_interrupt, NULL, 1);
- goto out;
+ return 0;
+
out_free:
free_percpu_irq(ppi, kvm_get_running_vcpus());
-out:
- of_node_put(np);
+
return err;
}
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
` (4 preceding siblings ...)
2016-02-01 20:26 ` [PATCH v3 5/6] kvm: arm64: wrapping DT support for virt arch timer fu.wei
@ 2016-02-01 20:26 ` fu.wei
2016-02-07 13:30 ` kbuild test robot
2016-02-08 17:10 ` Marc Zyngier
5 siblings, 2 replies; 10+ messages in thread
From: fu.wei @ 2016-02-01 20:26 UTC (permalink / raw
To: rjw, lenb, daniel.lezcano, tglx, christoffer.dall, marc.zyngier,
gleb, pbonzini, hanjun.guo, wei, a.spyridakis
Cc: linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
From: Fu Wei <fu.wei@linaro.org>
This patch adds ACPI/GTDT support for virt arch timer
using the API in GTDT driver.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
virt/kvm/arm/arch_timer.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 0a279d3..4077347 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -385,6 +385,9 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
{
struct device_node *np;
int ret = -EINVAL;
+#ifdef CONFIG_ACPI_GTDT
+ struct arch_timer_data data;
+#endif
np = of_find_matching_node(NULL, arch_timer_of_match);
if (!np) {
@@ -397,6 +400,11 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
of_node_put(np);
skip_of:
+#ifdef CONFIG_ACPI_GTDT
+ if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
+ *ppi = data.virt_ppi;
+#endif
+
if (*ppi)
return 0;
--
2.5.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
2016-02-01 20:26 ` [PATCH v3 6/6] kvm: arm64: Add ACPI " fu.wei
@ 2016-02-07 13:30 ` kbuild test robot
2016-02-08 17:10 ` Marc Zyngier
1 sibling, 0 replies; 10+ messages in thread
From: kbuild test robot @ 2016-02-07 13:30 UTC (permalink / raw
Cc: kbuild-all, rjw, lenb, daniel.lezcano, tglx, christoffer.dall,
marc.zyngier, gleb, pbonzini, hanjun.guo, wei, a.spyridakis,
linaro-acpi, linux-kernel, linux-acpi, linux-arm-kernel, kvmarm,
kvm, al.stone, graeme.gregory, davem, jeffrey.t.kirsher,
richardcochran, arnd, wim, jcm, leo.duran, mark.rutland,
catalin.marinas, will.deacon, Suravee.Suthikulpanit, robherring2,
Fu Wei
[-- Attachment #1: Type: text/plain, Size: 1562 bytes --]
Hi Fu,
[auto build test ERROR on tip/timers/core]
[also build test ERROR on v4.5-rc2 next-20160205]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/fu-wei-linaro-org/acpi-clocksource-kvm-add-GTDT-and-ARM-memory-mapped-timer-support/20160202-043111
config: arm64-allyesconfig (attached as .config)
reproduce:
wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm64
All errors (new ones prefixed by >>):
arch/arm64/kvm/../../../virt/kvm/arm/arch_timer.c: In function 'kvm_timer_get_ppi':
>> arch/arm64/kvm/../../../virt/kvm/arm/arch_timer.c:404:2: error: implicit declaration of function 'gtdt_arch_timer_data_init' [-Werror=implicit-function-declaration]
if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
^
cc1: some warnings being treated as errors
vim +/gtdt_arch_timer_data_init +404 arch/arm64/kvm/../../../virt/kvm/arm/arch_timer.c
398
399 *ppi = irq_of_parse_and_map(np, VIRT_PPI);
400 of_node_put(np);
401
402 skip_of:
403 #ifdef CONFIG_ACPI_GTDT
> 404 if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
405 *ppi = data.virt_ppi;
406 #endif
407
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 48152 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
2016-02-01 20:26 ` [PATCH v3 6/6] kvm: arm64: Add ACPI " fu.wei
2016-02-07 13:30 ` kbuild test robot
@ 2016-02-08 17:10 ` Marc Zyngier
2016-02-21 16:35 ` Fu Wei
1 sibling, 1 reply; 10+ messages in thread
From: Marc Zyngier @ 2016-02-08 17:10 UTC (permalink / raw
To: fu.wei, rjw, lenb, daniel.lezcano, tglx, christoffer.dall, gleb,
pbonzini, hanjun.guo, wei, a.spyridakis
Cc: leo.duran, al.stone, kvm, linaro-acpi, jcm, richardcochran,
will.deacon, linux-kernel, davem, linux-acpi, wim, arnd,
jeffrey.t.kirsher, catalin.marinas, graeme.gregory, robherring2,
kvmarm, linux-arm-kernel
On 01/02/16 20:26, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
>
> This patch adds ACPI/GTDT support for virt arch timer
> using the API in GTDT driver.
>
> Signed-off-by: Fu Wei <fu.wei@linaro.org>
> ---
> virt/kvm/arm/arch_timer.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
> index 0a279d3..4077347 100644
> --- a/virt/kvm/arm/arch_timer.c
> +++ b/virt/kvm/arm/arch_timer.c
> @@ -385,6 +385,9 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
> {
> struct device_node *np;
> int ret = -EINVAL;
> +#ifdef CONFIG_ACPI_GTDT
> + struct arch_timer_data data;
> +#endif
>
> np = of_find_matching_node(NULL, arch_timer_of_match);
> if (!np) {
> @@ -397,6 +400,11 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
> of_node_put(np);
>
> skip_of:
> +#ifdef CONFIG_ACPI_GTDT
> + if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
> + *ppi = data.virt_ppi;
> +#endif
> +
> if (*ppi)
> return 0;
>
>
As I already pointed out in another thread hacking some KVM ACPI stuff,
this is the wrong approach.
We should have a *common* accessor in the timer code that exports the
relevant information, whatever the firmware "du jour" is.
See Julien's series, which seems to address the issue in a much more
convincing way:
https://lists.cs.columbia.edu/pipermail/kvmarm/2016-February/018531.html
Thanks,
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 6/6] kvm: arm64: Add ACPI support for virt arch timer
2016-02-08 17:10 ` Marc Zyngier
@ 2016-02-21 16:35 ` Fu Wei
0 siblings, 0 replies; 10+ messages in thread
From: Fu Wei @ 2016-02-21 16:35 UTC (permalink / raw
To: Marc Zyngier
Cc: kvm, Linaro ACPI Mailman List, Will Deacon, Wim Van Sebroeck,
kvmarm, Al Stone, Daniel Lezcano, linux-acpi, Rob Herring,
jeffrey.t.kirsher, Catalin Marinas, Len Brown, Arnd Bergmann,
gleb, Jon Masters, richardcochran, Thomas Gleixner,
linux-arm-kernel, G Gregory, Rafael Wysocki, LKML, Leo Duran,
Hanjun Guo, pbonzini, davem
Hi Marc
On 9 February 2016 at 01:10, Marc Zyngier <marc.zyngier@arm.com> wrote:
> On 01/02/16 20:26, fu.wei@linaro.org wrote:
>> From: Fu Wei <fu.wei@linaro.org>
>>
>> This patch adds ACPI/GTDT support for virt arch timer
>> using the API in GTDT driver.
>>
>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>> ---
>> virt/kvm/arm/arch_timer.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
>> index 0a279d3..4077347 100644
>> --- a/virt/kvm/arm/arch_timer.c
>> +++ b/virt/kvm/arm/arch_timer.c
>> @@ -385,6 +385,9 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
>> {
>> struct device_node *np;
>> int ret = -EINVAL;
>> +#ifdef CONFIG_ACPI_GTDT
>> + struct arch_timer_data data;
>> +#endif
>>
>> np = of_find_matching_node(NULL, arch_timer_of_match);
>> if (!np) {
>> @@ -397,6 +400,11 @@ static int kvm_timer_get_ppi(unsigned int *ppi)
>> of_node_put(np);
>>
>> skip_of:
>> +#ifdef CONFIG_ACPI_GTDT
>> + if (!*ppi && !gtdt_arch_timer_data_init(NULL, &data))
>> + *ppi = data.virt_ppi;
>> +#endif
>> +
>> if (*ppi)
>> return 0;
>>
>>
>
> As I already pointed out in another thread hacking some KVM ACPI stuff,
> this is the wrong approach.
>
> We should have a *common* accessor in the timer code that exports the
> relevant information, whatever the firmware "du jour" is.
>
> See Julien's series, which seems to address the issue in a much more
> convincing way:
>
> https://lists.cs.columbia.edu/pipermail/kvmarm/2016-February/018531.html
>
Thanks for your info, I have read through Julien's patchset in mailing list.
This patch is a improvement from Wei Huang's patch using my GTDT driver,
because his approach is getting info from DTB or ACPI directly.
But It seems Wei Huang is helping Julien on his patchset and trying to
provide Tested-by,
So I will delete these two patches(about kvm), and test Julien's patch also.
> Thanks,
>
> M.
> --
> Jazz is not dead. It just smells funny...
--
Best regards,
Fu Wei
Software Engineer
Red Hat Software (Beijing) Co.,Ltd.Shanghai Branch
Ph: +86 21 61221326(direct)
Ph: +86 186 2020 4684 (mobile)
Room 1512, Regus One Corporate Avenue,Level 15,
One Corporate Avenue,222 Hubin Road,Huangpu District,
Shanghai,China 200021
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-02-21 16:35 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-01 20:26 [PATCH v3 0/6] acpi, clocksource, kvm: add GTDT and ARM memory-mapped timer support fu.wei
2016-02-01 20:26 ` [PATCH v3 1/6] ACPI: add GTDT table parse driver into ACPI driver fu.wei
2016-02-01 20:26 ` [PATCH v3 2/6] clocksource: simplify ACPI code in arm_arch_timer.c fu.wei
2016-02-01 20:26 ` [PATCH v3 3/6] clocksource: add memory-mapped timer support " fu.wei
2016-02-01 20:26 ` [PATCH v3 4/6] clocksource: move some enums to arm_arch_timer.h fu.wei
2016-02-01 20:26 ` [PATCH v3 5/6] kvm: arm64: wrapping DT support for virt arch timer fu.wei
2016-02-01 20:26 ` [PATCH v3 6/6] kvm: arm64: Add ACPI " fu.wei
2016-02-07 13:30 ` kbuild test robot
2016-02-08 17:10 ` Marc Zyngier
2016-02-21 16:35 ` Fu Wei
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).