From patchwork Mon May 14 08:55:35 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: 135697 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1484583lji; Mon, 14 May 2018 01:57:39 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoTGNp+EpSXxE9NUe2ir8jyaTKT1sXNM7qnerqN5okrW7hBqDNWZ+yNzjkckmKxwBv09N4L X-Received: by 2002:a17:902:5304:: with SMTP id b4-v6mr8702930pli.231.1526288259303; Mon, 14 May 2018 01:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526288259; cv=none; d=google.com; s=arc-20160816; b=wWaV83kkKpOvghl1QglN/K8aqOip+ayINfT0IxC4yPMWAi+ESP0CG/Yd+FAlYrobvw gcw15vSl7IOjanaRpRluHlHoekkZ03u2m1sQsdm/764gmkUm5JeZ7X+dxlPaPPeIlrDQ gDoSzInoGewth2BiJG0REy2F6PRIwkP1nDOrNTiHy4IH3ZLyDho5Jt0QakS0JUTNwXs1 VsiZIYmgFt1hie6ECytyIcWv5lfej5QUd6uxtzEmY8Xzb3mJad+JInoERHKBw1ZEkx4d LTGnfBmIWye9/1wKgUaN5Tfe2c0/spkqTiMrxmMbOLDRtTkZk10+CnBl0bVrqIl53b+s WkQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=6dTncBxPB46L6hH2lsBRv+i0+ICaH1S5Yj0USGe1ULU=; b=dXHlIIsY6Am84Hu/nHCKBa1c4F+dCYgJaSlcv9N54tfiYOjc8LcIz7+7QHUlUYqH9B iOXsY6sRBVsoSa1ZS/GHg0EqgP4by0R+wAsqVut74/uTQFf16yg4oWHvSCwEv2BE9kv0 e+sPNPHr4YDrtXXdbBBfXqnk+KK8G71Ora6dWjHCXMcWaTzonnpLD6h9Ts/3ePNbvszw bgtHpQJLUU1in8kgq9kz3OLiWjw6lF6pL+qdL7UuaNRyBNOACmQ1zZxsXFqDgmp+ItS6 976DRaqf27MEBab2rQag9Y+S3UVYIDzccfDLvlw3s5sNwYnHLhlSnAFrrXU2I+c+bodg Zb7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O7LuXt9D; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d9-v6si7059973pga.192.2018.05.14.01.57.39; Mon, 14 May 2018 01:57:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O7LuXt9D; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbeENI5h (ORCPT + 29 others); Mon, 14 May 2018 04:57:37 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40704 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752244AbeENI5d (ORCPT ); Mon, 14 May 2018 04:57:33 -0400 Received: by mail-pl0-f65.google.com with SMTP id t12-v6so6981068plo.7 for ; Mon, 14 May 2018 01:57:33 -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=6dTncBxPB46L6hH2lsBRv+i0+ICaH1S5Yj0USGe1ULU=; b=O7LuXt9DjUTWeJP/XeLZTEombDNfkbsNPcXYQDRVo8/kyygjDd5bsOm7BsX5MZ52We wTZactJEMMYsAEDWAXjNWu57Lzvg2A+b6KbfdKn1jJ6tW1uUae0+9VNYGF6+yP4JuQnM wmGNd4JVC5aGXUv6pM81TKbgSIw74U0Mhqd5E= 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=6dTncBxPB46L6hH2lsBRv+i0+ICaH1S5Yj0USGe1ULU=; b=tqGX8NcPY5Kr+vlblTdU5NeCOJfCk61g63befy7zorPgbHdA/1I/+0lVFjaIl6w58a yTKjM2KrjSQAoKC4igm/EehMP7QhQ7EHnUCJFhL57fWBwHs9xG5HJEswHdTul+gHD55/ wAgoY6euxLThhAE3cYDYyQHPDO6H5qmNnH7pXs4qbPzhmP2eXw+p6Iej6/5dv3GewkOZ Hfc59EzJGLbSlZ48if62pNVNAsTiM6ALa+KRjUmVpPuBR/i/zb6/EE9RtP7oaqyveTKC ZJKrqiPtDSG4QxXHBxt5Kr8JgvMqBP7LrG7LpozkMc6NUA5OYEMO5GKBY+2SHGlvG1VX LyfA== X-Gm-Message-State: ALKqPwd9HiWZ7u6CmYIPSqk6ogzJZKnYxPsMMHMnvFDHwyi2COCI7ODO SDDJXBtcv4RlaOeje/BrG1AXgA== X-Received: by 2002:a17:902:4483:: with SMTP id l3-v6mr9076404pld.282.1526288253397; Mon, 14 May 2018 01:57:33 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id x71-v6sm23308158pfe.47.2018.05.14.01.57.23 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 May 2018 01:57:32 -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: [RFC PATCH 09/10] x86: tsc: Register the persistent clock Date: Mon, 14 May 2018 16:55:35 +0800 Message-Id: <3b626f6d7dd5ca047e6835b10c3a4e662db2539f.1526285602.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) -- 1.7.9.5 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c07f492..667e3a7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -195,6 +195,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..dd8d7c3 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,11 @@ 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, 0); unreg: clocksource_unregister(&clocksource_tsc_early); } @@ -1327,6 +1338,11 @@ 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, 0); unreg: clocksource_unregister(&clocksource_tsc_early); return 0;