From: Hanjun Guo <hanjun.guo@linaro.org> To: fu.wei@linaro.org, rjw@rjwysocki.net, lenb@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de, marc.zyngier@arm.com, mark.rutland@arm.com, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com Cc: linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rruigrok@codeaurora.org, harba@codeaurora.org, cov@codeaurora.org, timur@codeaurora.org, graeme.gregory@linaro.org, al.stone@linaro.org, jcm@redhat.com, wei@redhat.com, arnd@arndb.de, catalin.marinas@arm.com, will.deacon@arm.com, Suravee.Suthikulpanit@amd.com, leo.duran@amd.com, wim@iguana.be, linux@roeck-us.net, linux-watchdog@vger.kernel.org, tn@semihalf.com, christoffer.dall@linaro.org, julien.grall@arm.com Subject: Re: [PATCH v20 13/17] acpi/arm64: Add GTDT table parse driver Date: Thu, 19 Jan 2017 17:11:29 +0800 [thread overview] Message-ID: <e69d80d1-0954-b1be-817e-c0be6fc24b77@linaro.org> (raw) In-Reply-To: <20170118132541.8989-14-fu.wei@linaro.org> On 2017/1/18 21:25, fu.wei@linaro.org wrote: > From: Fu Wei <fu.wei@linaro.org> > > This patch adds support for parsing arch timer info 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> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> > --- > arch/arm64/Kconfig | 1 + > drivers/acpi/arm64/Kconfig | 3 + > drivers/acpi/arm64/Makefile | 1 + > drivers/acpi/arm64/gtdt.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/acpi.h | 6 ++ > 5 files changed, 168 insertions(+) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 1117421..ab1ee10 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -2,6 +2,7 @@ config ARM64 > def_bool y > select ACPI_CCA_REQUIRED if ACPI > select ACPI_GENERIC_GSI if ACPI > + select ACPI_GTDT if ACPI > select ACPI_REDUCED_HARDWARE_ONLY if ACPI > select ACPI_MCFG if ACPI > select ACPI_SPCR_TABLE if ACPI > diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig > index 4616da4..5a6f80f 100644 > --- a/drivers/acpi/arm64/Kconfig > +++ b/drivers/acpi/arm64/Kconfig > @@ -4,3 +4,6 @@ > > config ACPI_IORT > bool > + > +config ACPI_GTDT > + bool > diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile > index 72331f2..1017def 100644 > --- a/drivers/acpi/arm64/Makefile > +++ b/drivers/acpi/arm64/Makefile > @@ -1 +1,2 @@ > obj-$(CONFIG_ACPI_IORT) += iort.o > +obj-$(CONFIG_ACPI_GTDT) += gtdt.o > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c > new file mode 100644 > index 0000000..d93a790 > --- /dev/null > +++ b/drivers/acpi/arm64/gtdt.c > @@ -0,0 +1,157 @@ [...] > + > +/** > + * acpi_gtdt_init() - Get the info of GTDT table to prepare for further init. > + * @table: The pointer to GTDT table. > + * @platform_timer_count: The pointer of int variate for returning the > + * number of platform timers. It can be NULL, if > + * driver don't need this info. > + * > + * Return: 0 if success, -EINVAL if error. > + */ > +int __init acpi_gtdt_init(struct acpi_table_header *table, > + int *platform_timer_count) > +{ > + int ret = 0; > + int timer_count = 0; > + void *platform_timer = NULL; > + struct acpi_table_gtdt *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_debug("Revision:%d doesn't support Platform Timers.\n", > + table->revision); GTDT table revision is updated to 2 in ACPI 5.1, we will not support ACPI version under 5.1 and disable ACPI in FADT parse before this code is called, so if we get revision <2 here, I think we need to print warning (we need to keep the firmware stick to the spec on ARM64). > + else if (!gtdt->platform_timer_count) > + pr_debug("No Platform Timer.\n"); > + else > + timer_count = gtdt->platform_timer_count; > + > + if (timer_count) { > + platform_timer = (void *)gtdt + gtdt->platform_timer_offset; > + if (platform_timer < (void *)table + > + sizeof(struct acpi_table_gtdt)) { > + pr_err(FW_BUG "invalid timer data.\n"); It's ok but I didn't see other ACPI tables parsing did this check, maybe we can just remove it :) > + timer_count = 0; > + platform_timer = NULL; > + ret = -EINVAL; > + } > + } > + > + acpi_gtdt_desc.platform_timer = platform_timer; > + if (platform_timer_count) > + *platform_timer_count = timer_count; Then the code will much simple: if (gtdt->platform_timer_count) { acpi_gtdt_desc.platform_timer = (void *)gtdt + gtdt->platform_timer_offset; if (platform_timer_count) *platform_timer_count = gtdt->platform_timer_count; } return 0; and remove ret, timer_count and platform_timer. Thanks Hanjun
WARNING: multiple messages have this Message-ID (diff)
From: hanjun.guo@linaro.org (Hanjun Guo) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v20 13/17] acpi/arm64: Add GTDT table parse driver Date: Thu, 19 Jan 2017 17:11:29 +0800 [thread overview] Message-ID: <e69d80d1-0954-b1be-817e-c0be6fc24b77@linaro.org> (raw) In-Reply-To: <20170118132541.8989-14-fu.wei@linaro.org> On 2017/1/18 21:25, fu.wei at linaro.org wrote: > From: Fu Wei <fu.wei@linaro.org> > > This patch adds support for parsing arch timer info 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> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com> > --- > arch/arm64/Kconfig | 1 + > drivers/acpi/arm64/Kconfig | 3 + > drivers/acpi/arm64/Makefile | 1 + > drivers/acpi/arm64/gtdt.c | 157 ++++++++++++++++++++++++++++++++++++++++++++ > include/linux/acpi.h | 6 ++ > 5 files changed, 168 insertions(+) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 1117421..ab1ee10 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -2,6 +2,7 @@ config ARM64 > def_bool y > select ACPI_CCA_REQUIRED if ACPI > select ACPI_GENERIC_GSI if ACPI > + select ACPI_GTDT if ACPI > select ACPI_REDUCED_HARDWARE_ONLY if ACPI > select ACPI_MCFG if ACPI > select ACPI_SPCR_TABLE if ACPI > diff --git a/drivers/acpi/arm64/Kconfig b/drivers/acpi/arm64/Kconfig > index 4616da4..5a6f80f 100644 > --- a/drivers/acpi/arm64/Kconfig > +++ b/drivers/acpi/arm64/Kconfig > @@ -4,3 +4,6 @@ > > config ACPI_IORT > bool > + > +config ACPI_GTDT > + bool > diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile > index 72331f2..1017def 100644 > --- a/drivers/acpi/arm64/Makefile > +++ b/drivers/acpi/arm64/Makefile > @@ -1 +1,2 @@ > obj-$(CONFIG_ACPI_IORT) += iort.o > +obj-$(CONFIG_ACPI_GTDT) += gtdt.o > diff --git a/drivers/acpi/arm64/gtdt.c b/drivers/acpi/arm64/gtdt.c > new file mode 100644 > index 0000000..d93a790 > --- /dev/null > +++ b/drivers/acpi/arm64/gtdt.c > @@ -0,0 +1,157 @@ [...] > + > +/** > + * acpi_gtdt_init() - Get the info of GTDT table to prepare for further init. > + * @table: The pointer to GTDT table. > + * @platform_timer_count: The pointer of int variate for returning the > + * number of platform timers. It can be NULL, if > + * driver don't need this info. > + * > + * Return: 0 if success, -EINVAL if error. > + */ > +int __init acpi_gtdt_init(struct acpi_table_header *table, > + int *platform_timer_count) > +{ > + int ret = 0; > + int timer_count = 0; > + void *platform_timer = NULL; > + struct acpi_table_gtdt *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_debug("Revision:%d doesn't support Platform Timers.\n", > + table->revision); GTDT table revision is updated to 2 in ACPI 5.1, we will not support ACPI version under 5.1 and disable ACPI in FADT parse before this code is called, so if we get revision <2 here, I think we need to print warning (we need to keep the firmware stick to the spec on ARM64). > + else if (!gtdt->platform_timer_count) > + pr_debug("No Platform Timer.\n"); > + else > + timer_count = gtdt->platform_timer_count; > + > + if (timer_count) { > + platform_timer = (void *)gtdt + gtdt->platform_timer_offset; > + if (platform_timer < (void *)table + > + sizeof(struct acpi_table_gtdt)) { > + pr_err(FW_BUG "invalid timer data.\n"); It's ok but I didn't see other ACPI tables parsing did this check, maybe we can just remove it :) > + timer_count = 0; > + platform_timer = NULL; > + ret = -EINVAL; > + } > + } > + > + acpi_gtdt_desc.platform_timer = platform_timer; > + if (platform_timer_count) > + *platform_timer_count = timer_count; Then the code will much simple: if (gtdt->platform_timer_count) { acpi_gtdt_desc.platform_timer = (void *)gtdt + gtdt->platform_timer_offset; if (platform_timer_count) *platform_timer_count = gtdt->platform_timer_count; } return 0; and remove ret, timer_count and platform_timer. Thanks Hanjun
next prev parent reply other threads:[~2017-01-19 9:11 UTC|newest] Thread overview: 134+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-18 13:25 [PATCH v20 00/17] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` [PATCH v20 01/17] clocksource/drivers/arm_arch_timer: Improve printk relevant code fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` [PATCH v20 02/17] clocksource/drivers/arm_arch_timer: Rename the timer type macros fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 03/17] clocksource/drivers/arm_arch_timer: Rename the PPI enum and its values fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` [PATCH v20 04/17] clocksource/drivers/arm_arch_timer: Move enums and defines to header file fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 05/17] clocksource/drivers/arm_arch_timer: Add a new enum for spi type fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 06/17] clocksource/drivers/arm_arch_timer: rework PPI determination fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 07/17] clocksource/drivers/arm_arch_timer: Separate out device-tree code from arch_timer_detect_rate fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 08/17] clocksource/drivers/arm_arch_timer: Rework counter frequency detection fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org [not found] ` <20170118132541.8989-9-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-01-19 8:02 ` Hanjun Guo 2017-01-19 8:02 ` Hanjun Guo 2017-01-19 8:02 ` Hanjun Guo [not found] ` <cafa8c7a-9c7c-51ba-5566-0cfe1fe6f764-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-01-19 9:44 ` Fu Wei 2017-01-19 9:44 ` Fu Wei 2017-01-19 9:44 ` Fu Wei 2017-01-19 12:41 ` Hanjun Guo 2017-01-19 12:41 ` Hanjun Guo 2017-01-19 12:41 ` Hanjun Guo 2017-01-19 12:41 ` Hanjun Guo 2017-01-24 17:24 ` Mark Rutland 2017-01-24 17:24 ` Mark Rutland 2017-01-25 6:46 ` Fu Wei 2017-01-25 6:46 ` Fu Wei 2017-01-25 6:46 ` Fu Wei 2017-01-25 7:23 ` Fu Wei 2017-01-25 7:23 ` Fu Wei 2017-01-25 7:23 ` Fu Wei 2017-01-25 15:38 ` Christopher Covington 2017-01-25 15:38 ` Christopher Covington 2017-01-25 15:38 ` Christopher Covington 2017-01-25 17:36 ` Mark Rutland 2017-01-25 17:36 ` Mark Rutland 2017-01-25 17:36 ` Mark Rutland 2017-01-26 5:55 ` Fu Wei 2017-01-26 5:55 ` Fu Wei 2017-01-26 5:55 ` Fu Wei 2017-01-25 17:25 ` Mark Rutland 2017-01-25 17:25 ` Mark Rutland 2017-01-25 17:25 ` Mark Rutland 2017-01-26 5:49 ` Fu Wei 2017-01-26 5:49 ` Fu Wei 2017-01-26 5:49 ` Fu Wei 2017-01-30 17:49 ` Mark Rutland 2017-01-30 17:49 ` Mark Rutland 2017-01-30 17:49 ` Mark Rutland 2017-01-31 11:42 ` Mark Rutland 2017-01-31 11:42 ` Mark Rutland 2017-01-31 11:42 ` Mark Rutland 2017-01-31 18:43 ` Fu Wei 2017-01-31 18:43 ` Fu Wei 2017-01-31 18:43 ` Fu Wei 2017-01-31 18:49 ` Mark Rutland 2017-01-31 18:49 ` Mark Rutland 2017-01-31 18:49 ` Mark Rutland 2017-01-31 19:07 ` Fu Wei 2017-01-31 19:07 ` Fu Wei 2017-01-31 19:07 ` Fu Wei 2017-01-18 13:25 ` [PATCH v20 09/17] clocksource/drivers/arm_arch_timer: Refactor arch_timer_needs_probing fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 10/17] clocksource/drivers/arm_arch_timer: Move arch_timer_needs_of_probing into DT init call fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 11/17] clocksource/drivers/arm_arch_timer: Introduce some new structs to prepare for GTDT fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-19 8:28 ` Hanjun Guo 2017-01-19 8:28 ` Hanjun Guo 2017-01-19 9:47 ` Fu Wei 2017-01-19 9:47 ` Fu Wei 2017-01-19 9:47 ` Fu Wei 2017-01-18 13:25 ` [PATCH v20 12/17] clocksource/drivers/arm_arch_timer: Refactor MMIO timer probing fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 13/17] acpi/arm64: Add GTDT table parse driver fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-19 9:11 ` Hanjun Guo [this message] 2017-01-19 9:11 ` Hanjun Guo [not found] ` <e69d80d1-0954-b1be-817e-c0be6fc24b77-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-01-19 10:32 ` Fu Wei 2017-01-19 10:32 ` Fu Wei 2017-01-19 10:32 ` Fu Wei 2017-01-19 11:16 ` Mark Rutland 2017-01-19 11:16 ` Mark Rutland 2017-01-19 11:16 ` Mark Rutland 2017-01-19 12:28 ` Fu Wei 2017-01-19 12:28 ` Fu Wei 2017-01-19 12:28 ` Fu Wei 2017-01-18 13:25 ` [PATCH v20 14/17] clocksource/drivers/arm_arch_timer: Simplify ACPI support code fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 15/17] acpi/arm64: Add memory-mapped timer support in GTDT driver fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` [PATCH v20 16/17] clocksource/drivers/arm_arch_timer: Add GTDT support for memory-mapped timer fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org [not found] ` <20170118132541.8989-17-fu.wei-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-01-19 9:16 ` Hanjun Guo 2017-01-19 9:16 ` Hanjun Guo 2017-01-19 9:16 ` Hanjun Guo 2017-01-19 10:02 ` Fu Wei 2017-01-19 10:02 ` Fu Wei 2017-01-19 10:02 ` Fu Wei 2017-01-19 12:42 ` Hanjun Guo 2017-01-19 12:42 ` Hanjun Guo 2017-01-19 12:42 ` Hanjun Guo 2017-01-18 13:25 ` [PATCH v20 17/17] acpi/arm64: Add SBSA Generic Watchdog support in GTDT driver fu.wei 2017-01-18 13:25 ` fu.wei at linaro.org 2017-01-18 13:25 ` fu.wei 2017-01-18 13:25 ` fu.wei 2017-01-19 9:20 ` [PATCH v20 00/17] acpi, clocksource: add GTDT driver and GTDT support in arm_arch_timer Hanjun Guo 2017-01-19 9:20 ` Hanjun Guo 2017-01-19 9:20 ` Hanjun Guo 2017-01-19 11:06 ` Fu Wei 2017-01-19 11:06 ` Fu Wei 2017-01-19 11:06 ` Fu Wei 2017-01-23 18:54 ` Mark Rutland 2017-01-23 18:54 ` Mark Rutland 2017-01-24 5:11 ` Fu Wei 2017-01-24 5:11 ` Fu Wei 2017-01-24 5:11 ` Fu Wei
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e69d80d1-0954-b1be-817e-c0be6fc24b77@linaro.org \ --to=hanjun.guo@linaro.org \ --cc=Suravee.Suthikulpanit@amd.com \ --cc=al.stone@linaro.org \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@linaro.org \ --cc=cov@codeaurora.org \ --cc=daniel.lezcano@linaro.org \ --cc=fu.wei@linaro.org \ --cc=graeme.gregory@linaro.org \ --cc=harba@codeaurora.org \ --cc=jcm@redhat.com \ --cc=julien.grall@arm.com \ --cc=lenb@kernel.org \ --cc=leo.duran@amd.com \ --cc=linaro-acpi@lists.linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=lorenzo.pieralisi@arm.com \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.com \ --cc=rjw@rjwysocki.net \ --cc=rruigrok@codeaurora.org \ --cc=sudeep.holla@arm.com \ --cc=tglx@linutronix.de \ --cc=timur@codeaurora.org \ --cc=tn@semihalf.com \ --cc=wei@redhat.com \ --cc=will.deacon@arm.com \ --cc=wim@iguana.be \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.