From patchwork Thu Mar 30 21:01:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 96330 Delivered-To: patches@linaro.org Received: by 10.140.89.233 with SMTP id v96csp425835qgd; Thu, 30 Mar 2017 14:01:41 -0700 (PDT) X-Received: by 10.98.207.68 with SMTP id b65mr1112485pfg.12.1490907701022; Thu, 30 Mar 2017 14:01:41 -0700 (PDT) Return-Path: Received: from mail-pg0-x22e.google.com (mail-pg0-x22e.google.com. [2607:f8b0:400e:c05::22e]) by mx.google.com with ESMTPS id s23si2939494plk.178.2017.03.30.14.01.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 14:01:41 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e as permitted sender) client-ip=2607:f8b0:400e:c05::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of john.stultz@linaro.org designates 2607:f8b0:400e:c05::22e as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-pg0-x22e.google.com with SMTP id 81so50248354pgh.2 for ; Thu, 30 Mar 2017 14:01:40 -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=fD2OqPqSpubE5NhVvsdsmud5OLintw4XXjCsp/fxwLc=; b=PGKtTjkZl78G51/bzthBZDefknBAeyKi+Ur04d+6MAwjCxQQWEzKBLGvPCVmFRUQOE Ru58p87rIRdehoNDzWj5plpRf9in7eyB2rhTIAKVH6hYMYPm4tb6LH5rdAf0W5K9E9sJ oMJnGjEilPW8LCxZrMVOhyOZDJ4fjTUejdPXw= 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=fD2OqPqSpubE5NhVvsdsmud5OLintw4XXjCsp/fxwLc=; b=k1Z8GdA4glbxo3jkCUTPeebD6agVohn7sTOJX2T1jugOdsvivRHRpo/QNXHbm7iRr9 YubtGlb62JCxu0gwrsXkNgT5RGVTK+TlsCakrvubD0a6jD/YSV5/hbS5Gi2F1T979a20 G7L4vxAgfrWQBs+yt0mtula4u6EtAr1DyWZuIc/Ny77axM8dEtzsfl3DGvhUXICqMnNj +/+AGRYUJFCGGRH9VvUEqpJXoi2PDetOqlfrgKIsF0Zp94LyeZjw2Ydez5nd9RCJHrSV djwNdySg29ZQn750V988YMdZZbqfb7ZSs7yWQDZQM3uzMJkvLVYxCnhhyp2BbuHWQ1j9 ujqw== X-Gm-Message-State: AFeK/H3uxEvIhRNqcNyu7P2/2QNB2fF72AN5y35O1Nj4tuZu6Ds5a0hnwb0My/Kt7UWnkv4ARLI= X-Received: by 10.99.211.21 with SMTP id b21mr1206722pgg.48.1490907700706; Thu, 30 Mar 2017 14:01:40 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:1002:83f0:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id y7sm6162626pfk.93.2017.03.30.14.01.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Mar 2017 14:01:39 -0700 (PDT) From: John Stultz To: lkml Cc: Nicolai Stange , Ingo Molnar , Thomas Gleixner , Daniel Lezcano , Richard Cochran , Prarit Bhargava , Stephen Boyd , John Stultz Subject: [PATCH 5/9] clocksource: h8300_timer8: Don't reset rate in ->set_state_oneshot() Date: Thu, 30 Mar 2017 14:01:20 -0700 Message-Id: <1490907684-11186-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490907684-11186-1-git-send-email-john.stultz@linaro.org> References: <1490907684-11186-1-git-send-email-john.stultz@linaro.org> From: Nicolai Stange With the upcoming NTP correction related rate adjustments to be implemented in the clockevents core, the latter needs to get informed about every rate change of a clockevent device made after its registration. Currently, h8300_timer8 violates this requirement in that it registers its clockevent device with the correct rate, but resets its ->mult and ->rate values in timer8_clock_event_start(), called from its ->set_state_oneshot() function. It seems like commit 4633f4cac85a ("clocksource/drivers/h8300: Cleanup startup and remove module code."), which introduced the rate initialization at registration, missed to remove the manual setting of ->mult and ->shift from timer8_clock_event_start(). Purge the setting of ->mult, ->shift, ->min_delta_ns and ->max_delta_ns from timer8_clock_event_start(). Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Daniel Lezcano Cc: Richard Cochran Cc: Prarit Bhargava Cc: Stephen Boyd Signed-off-by: Nicolai Stange Signed-off-by: John Stultz --- drivers/clocksource/h8300_timer8.c | 8 -------- 1 file changed, 8 deletions(-) -- 2.7.4 diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c index 546bb18..804c489 100644 --- a/drivers/clocksource/h8300_timer8.c +++ b/drivers/clocksource/h8300_timer8.c @@ -101,15 +101,7 @@ static inline struct timer8_priv *ced_to_priv(struct clock_event_device *ced) static void timer8_clock_event_start(struct timer8_priv *p, unsigned long delta) { - struct clock_event_device *ced = &p->ced; - timer8_start(p); - - ced->shift = 32; - ced->mult = div_sc(p->rate, NSEC_PER_SEC, ced->shift); - ced->max_delta_ns = clockevent_delta2ns(0xffff, ced); - ced->min_delta_ns = clockevent_delta2ns(0x0001, ced); - timer8_set_next(p, delta); }