From patchwork Wed Jun 13 11:32:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "(Exiting) Baolin Wang" X-Patchwork-Id: 10462061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AB457603B4 for ; Wed, 13 Jun 2018 11:34:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A96428952 for ; Wed, 13 Jun 2018 11:34:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8930D28957; Wed, 13 Jun 2018 11:34:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26F2728952 for ; Wed, 13 Jun 2018 11:34:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935494AbeFMLeE (ORCPT ); Wed, 13 Jun 2018 07:34:04 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33946 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935497AbeFMLd6 (ORCPT ); Wed, 13 Jun 2018 07:33:58 -0400 Received: by mail-pg0-f66.google.com with SMTP id q4-v6so1153059pgr.1 for ; Wed, 13 Jun 2018 04:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=eYsaNDXipDe/lJhotbiCb787ugqu/85X8+2xC+bpmGQ=; b=ZEpVWiWrP7BA3MdccZkJpaRhQkH3n9pAVvH5/bFfXXkW51iMrGyt2iXRekl+tw0nxI LvR6KaRN9p8OErUhzSYvQSrUj8EvefINyX3KU4ETegdqyWOC8UnlZH5HUVCkSOHXJvH/ hFXnJPioHEiQSdQfRimDnXyAAIifQxb+IyRxw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=eYsaNDXipDe/lJhotbiCb787ugqu/85X8+2xC+bpmGQ=; b=BFYgCcglodW/gOQ/MzkzANQ2RgscvgpLST7vUC8E5H6mxufJQ3h53jbO2E2pkO9cxd hfWw9YHvmL6A1iWeL33gmC6r/KFL9NGIeDY6IQdPlCPrwhZ6/4fGrng4+R7aQIO/GjfW UYGiWXcYSxL5GxsZW7KnBOlezW4GDZi/QPOVWQ+BoA4AqtoWN+XhKpePD0/XnFg4U5Nd nHWMo3eSyxsozxhBjA6/USub/tjt4sGIgIN2wT8jFKGdnji1htUZW41FMH0y0p5RJrH5 W2bd62ijnzSRl8bQG+1+rlenZXUrIPlOVLakzvrvuen1aqBtyOgBDAhzPCLFzgsryV5V 3u5g== X-Gm-Message-State: APt69E0Z9v+/m6sJ8Bj7CKR466w3X0TLismG7bJodQ/WxyPnNK+srXY+ Jk9vEkfqcirGrtMlfH05Iowp9A== X-Google-Smtp-Source: ADUXVKLrn+a9fFXavYXiRSsORht7x3JF+vrVsGt06RtkqBYlaFxl6lnxrZYbeGpO/xWVtLXkP33jtw== X-Received: by 2002:a65:6148:: with SMTP id o8-v6mr3707740pgv.93.1528889637833; Wed, 13 Jun 2018 04:33:57 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id h8-v6sm2745370pgq.35.2018.06.13.04.33.49 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 13 Jun 2018 04:33:57 -0700 (PDT) From: Baolin Wang To: tglx@linutronix.de, john.stultz@linaro.org, daniel.lezcano@linaro.org, arnd@arndb.de, tony@atomide.com, aaro.koskinen@iki.fi, linux@armlinux.org.uk, mark.rutland@arm.com, marc.zyngier@arm.com Cc: baolin.wang@linaro.org, broonie@kernel.org, paulmck@linux.vnet.ibm.com, mlichvar@redhat.com, rdunlap@infradead.org, kstewart@linuxfoundation.org, gregkh@linuxfoundation.org, pombredanne@nexb.com, thierry.reding@gmail.com, jonathanh@nvidia.com, heiko@sntech.de, linus.walleij@linaro.org, viresh.kumar@linaro.org, mingo@kernel.org, hpa@zytor.com, peterz@infradead.org, douly.fnst@cn.fujitsu.com, len.brown@intel.com, rajvi.jingar@intel.com, alexandre.belloni@bootlin.com, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 7/8] x86: tsc: Register the persistent clock Date: Wed, 13 Jun 2018 19:32:34 +0800 Message-Id: <3010faf8a1dda56be4eac0d5aa393fbfb96f3077.1528878545.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Register the tsc as one persistent clock to compensate the suspend time if the tsc clocksource is always available. Signed-off-by: Baolin Wang --- arch/x86/Kconfig | 1 + arch/x86/kernel/tsc.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 297789a..549dd01 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -200,6 +200,7 @@ config X86 select USER_STACKTRACE_SUPPORT select VIRT_TO_BUS select X86_FEATURE_NAMES if PROC_FS + select PERSISTENT_CLOCK config INSTRUCTION_DECODER def_bool y diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 74392d9..cb4f495 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -1032,6 +1033,11 @@ static u64 read_tsc(struct clocksource *cs) return (u64)rdtsc_ordered(); } +static u64 notrace tsc_read_persistent_clock(void) +{ + return (u64)rdtsc_ordered(); +} + static void tsc_cs_mark_unstable(struct clocksource *cs) { if (tsc_unstable) @@ -1300,6 +1306,14 @@ static void tsc_refine_calibration_work(struct work_struct *work) if (boot_cpu_has(X86_FEATURE_ART)) art_related_clocksource = &clocksource_tsc; clocksource_register_khz(&clocksource_tsc, tsc_khz); + + if (clocksource_tsc.flags & CLOCK_SOURCE_SUSPEND_NONSTOP) { + persistent_clock_init_and_register(tsc_read_persistent_clock, + CLOCKSOURCE_MASK(64), + tsc_khz * 1000, 0); + persistent_clock_start_alarmtimer(); + } + unreg: clocksource_unregister(&clocksource_tsc_early); } @@ -1327,6 +1341,13 @@ static int __init init_tsc_clocksource(void) if (boot_cpu_has(X86_FEATURE_ART)) art_related_clocksource = &clocksource_tsc; clocksource_register_khz(&clocksource_tsc, tsc_khz); + + if (clocksource_tsc.flags & CLOCK_SOURCE_SUSPEND_NONSTOP) { + persistent_clock_init_and_register(tsc_read_persistent_clock, + CLOCKSOURCE_MASK(64), + tsc_khz * 1000, 0); + persistent_clock_start_alarmtimer(); + } unreg: clocksource_unregister(&clocksource_tsc_early); return 0;