From patchwork Thu Mar 16 16:44:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 95401 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp902638qgd; Thu, 16 Mar 2017 09:44:50 -0700 (PDT) X-Received: by 10.99.43.139 with SMTP id r133mr10902410pgr.114.1489682690717; Thu, 16 Mar 2017 09:44:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 184si4142915pff.134.2017.03.16.09.44.50; Thu, 16 Mar 2017 09:44:50 -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; 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 S1755392AbdCPQot (ORCPT + 25 others); Thu, 16 Mar 2017 12:44:49 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:36840 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753791AbdCPQos (ORCPT ); Thu, 16 Mar 2017 12:44:48 -0400 Received: by mail-wr0-f171.google.com with SMTP id u108so36015769wrb.3 for ; Thu, 16 Mar 2017 09:44:46 -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; bh=lWZWewNofHcKn0z8FDp3QJAt3st6zDCCMg0q7Yl54I4=; b=VqHCRZaYK2EB5ifCcJ8s7E9nrg9EmkGWlX2zwy+XAh2NPaqzul+HHDji4vsYBG6DZM ytCa1SPm4lyFYc3oQrA3YfvGzwRwsGHHsDCz0r/t6j2S+xJsUyc8yl4o59pXZ4xutgHe a03tsyc4M0qavRmx1lqAgQy/Gy3WhyD/7wWT8= 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; bh=lWZWewNofHcKn0z8FDp3QJAt3st6zDCCMg0q7Yl54I4=; b=GtpLVkLaxGsb47dXjXEkUFfGgLjh3qcuFdNEKJhgTRzJaX8N0OG/yQSr7lRLFRxoic 5uY7jm7BMPKtyXZ2wu4VH1ufthTq81FFnfUpoblGGtj2Sb6P2r0D1gGLW37wUlXJw/uF 30tBpGu+jZGGAsWOvmelx8TmZDux1f3+1uyMDWN4QEDg9SffOX2faz4jJEe1f3JeuOA8 +Uu+wtUNWFRdN3giMHhq+utxxJhdNv/R2sGlug5dOamcAf1v2B2FZWeHH0UJRpF5yNsn gW9KeNbLx+SoZCCbmXZJ/9iz1Chv+5sQQz/6+IL7V8pSZEQf66/U3g66R0CEB7H6munr 6AEw== X-Gm-Message-State: AFeK/H3VP4M57w/wiOLvohdd41a0SX25n+Kc1NsN97jREqieUJdJTH9P3MsdL5U6nphS9EWG X-Received: by 10.223.130.81 with SMTP id 75mr9762323wrb.59.1489682685946; Thu, 16 Mar 2017 09:44:45 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id 127sm4924535wmt.20.2017.03.16.09.44.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Mar 2017 09:44:45 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, Romain Izard , Nicolas Ferre , linux-arm-kernel@lists.infradead.org (moderated list:ATMEL Timer Counter (TC) AND CLOCKSOURCE DRIVERS) Subject: [PATCH] Revert "clocksource/drivers/tcb_clksrc: Use 32 bit tcb as sched_clock" Date: Thu, 16 Mar 2017 17:44:05 +0100 Message-Id: <1489682645-11369-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <20170316164208.GB6579@mai> References: <20170316164208.GB6579@mai> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Romain Izard This reverts commit 7b9f1d16e6d1 ("clocksource/drivers/tcb_clksrc: Use 32 bit tcb as sched_clock"). In the current state, the kernel warns against a late registration of the new sched_clock, the printk clock resets after only a few minutes, and it seems that scheduling can be affected as well. Signed-off-by: Romain Izard Signed-off-by: Daniel Lezcano --- drivers/clocksource/tcb_clksrc.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 745844e..d4ca996 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c @@ -10,7 +10,6 @@ #include #include #include -#include /* @@ -57,14 +56,9 @@ static u64 tc_get_cycles(struct clocksource *cs) return (upper << 16) | lower; } -static u32 tc_get_cv32(void) -{ - return __raw_readl(tcaddr + ATMEL_TC_REG(0, CV)); -} - static u64 tc_get_cycles32(struct clocksource *cs) { - return tc_get_cv32(); + return __raw_readl(tcaddr + ATMEL_TC_REG(0, CV)); } static struct clocksource clksrc = { @@ -75,11 +69,6 @@ static struct clocksource clksrc = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u64 notrace tc_read_sched_clock(void) -{ - return tc_get_cv32(); -} - #ifdef CONFIG_GENERIC_CLOCKEVENTS struct tc_clkevt_device { @@ -350,9 +339,6 @@ static int __init tcb_clksrc_init(void) clksrc.read = tc_get_cycles32; /* setup ony channel 0 */ tcb_setup_single_chan(tc, best_divisor_idx); - - /* register sched_clock on chips with single 32 bit counter */ - sched_clock_register(tc_read_sched_clock, 32, divided_rate); } else { /* tclib will give us three clocks no matter what the * underlying platform supports.