From patchwork Fri Jan 17 12:25:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 23335 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1091C20540 for ; Fri, 17 Jan 2014 13:00:22 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id gq1sf7499783obb.0 for ; Fri, 17 Jan 2014 05:00:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=FGSH+MSIzcG3HZOOUR1i/aTAqKrVo+9WYUG42OjAeNc=; b=nAVFMGkCwp2quS+b8xGLtV4cCvKJbehvi0LBW2+foHObYqT0963r0mVwdSzsJVHIea IxxuO21JOtKdSwuxUqlExcSD5vkE1AL51vJ2gkP5b3DAP0iJZKPCkEZTPet+JusapnVA xwjJsjJrbKyB7pV2lrZ5T20fwkyAobYGM/1hVKuz9hY9PPnb89+YdSnx9BmBQPW+YfU9 th9r9A81V/eXVVPU7+kOLZWfJIVSNRq/+D40j8tzjsi+zkEafL0HsrGZqrvWdgXS2nvg dJHNqDWtXbhvO2Cj/EG874GwyXNzMKkB1HmVxzzAk70Vy6O7Gqy3yS/EiyqOulMW/nrq qw1A== X-Gm-Message-State: ALoCoQkfuVTlIBocnBLnXaiWicXrRQMmK3dbf6RjJBUD0prueideE8qR3sr8DHTdlwDg0KPQ9uSg X-Received: by 10.42.46.3 with SMTP id i3mr505083icf.31.1389963622171; Fri, 17 Jan 2014 05:00:22 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.35 with SMTP id j32ls422158qga.40.gmail; Fri, 17 Jan 2014 05:00:22 -0800 (PST) X-Received: by 10.52.24.101 with SMTP id t5mr75993vdf.79.1389963622060; Fri, 17 Jan 2014 05:00:22 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id er6si4855955vdc.140.2014.01.17.05.00.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:00:22 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id cz12so1540371veb.26 for ; Fri, 17 Jan 2014 05:00:22 -0800 (PST) X-Received: by 10.53.11.69 with SMTP id eg5mr97867vdd.54.1389963621929; Fri, 17 Jan 2014 05:00:21 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp17743ved; Fri, 17 Jan 2014 05:00:21 -0800 (PST) X-Received: by 10.68.138.165 with SMTP id qr5mr1866944pbb.123.1389963620758; Fri, 17 Jan 2014 05:00:20 -0800 (PST) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by mx.google.com with ESMTPS id yy4si10052380pbc.309.2014.01.17.05.00.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:00:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.54 is neither permitted nor denied by best guess record for domain of hanjun.guo@linaro.org) client-ip=209.85.220.54; Received: by mail-pa0-f54.google.com with SMTP id fa1so4088517pad.13 for ; Fri, 17 Jan 2014 05:00:20 -0800 (PST) X-Received: by 10.68.242.68 with SMTP id wo4mr2059612pbc.32.1389963620347; Fri, 17 Jan 2014 05:00:20 -0800 (PST) Received: from localhost ([218.17.215.175]) by mx.google.com with ESMTPSA id kk1sm22672700pbd.22.2014.01.17.04.57.19 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jan 2014 05:00:19 -0800 (PST) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , Will Deacon , Russell King - ARM Linux Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Grant Likely , Matthew Garrett , Olof Johansson , Linus Walleij , Bjorn Helgaas , Rob Herring , Mark Rutland , Arnd Bergmann , patches@linaro.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org, Charles.Garcia-Tobin@arm.com, Hanjun Guo , Amit Daniel Kachhap Subject: [PATCH 19/20] clocksource / ACPI: Introduce clocksource_acpi_init() using CLOCKSOURCE_ACPI_DECLARE Date: Fri, 17 Jan 2014 20:25:13 +0800 Message-Id: <1389961514-13562-20-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> References: <1389961514-13562-1-git-send-email-hanjun.guo@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , acpi_table_parse() will find table with table id and run handler on it. So we use CLOCKSOURCE_ACPI_DECLARE to decalare timer tables and glue its handler, then initialize them in clocksource_acpi_init(). Signed-off-by: Hanjun Guo Signed-off-by: Amit Daniel Kachhap --- drivers/clocksource/Makefile | 1 + drivers/clocksource/arm_arch_timer.c | 1 + drivers/clocksource/clksrc-acpi.c | 36 ++++++++++++++++++++++++++++++++++ include/linux/clocksource.h | 3 +++ 4 files changed, 41 insertions(+) create mode 100644 drivers/clocksource/clksrc-acpi.c diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 33621ef..2304c99 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_CLKSRC_OF) += clksrc-of.o +obj-$(CONFIG_ACPI) += clksrc-acpi.o obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o obj-$(CONFIG_X86_CYCLONE_TIMER) += cyclone.o obj-$(CONFIG_X86_PM_TIMER) += acpi_pm.o diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 1fa5f67..6489037 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -738,6 +738,7 @@ void __init arch_timer_acpi_init(struct acpi_table_header *table) arch_timers_present |= ARCH_CP15_TIMER; arch_timer_init(); } +CLOCKSOURCE_ACPI_DECLARE(armv8_arch_timer, "GTDT", arch_timer_acpi_init); #endif static void __init arch_timer_mem_init(struct device_node *np) diff --git a/drivers/clocksource/clksrc-acpi.c b/drivers/clocksource/clksrc-acpi.c new file mode 100644 index 0000000..41efc83 --- /dev/null +++ b/drivers/clocksource/clksrc-acpi.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2014, Hanjun Guo + * Copyright (c) 2014, Amit Daniel Kachhap + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include + +extern struct acpi_device_id __clksrc_acpi_table[]; + +static const struct acpi_device_id __clksrc_acpi_table_sentinel + __used __section(__clksrc_acpi_table_end); + +void __init clocksource_acpi_init(void) +{ + const struct acpi_device_id *id; + acpi_tbl_table_handler init_func; + + for (id = __clksrc_acpi_table; id->id[0]; id++) { + init_func = (acpi_tbl_table_handler)id->driver_data; + acpi_table_parse(id->id, init_func); + } +} diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 1d500cf..9bee8b3 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -361,12 +361,15 @@ static inline void clocksource_of_init(void) {} #endif #ifdef CONFIG_ACPI +extern void clocksource_acpi_init(void); + #define CLOCKSOURCE_ACPI_DECLARE(name, compat, fn) \ static const struct acpi_device_id __clksrc_acpi_table_##name \ __used __section(__clksrc_acpi_table) \ = { .id = compat, \ .driver_data = (kernel_ulong_t)fn } #else +static inline void clocksource_acpi_init(void) { return; } #define CLOCKSOURCE_ACPI_DECLARE(name, compat, fn) #endif