Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 16:49:28 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 May 2016 16:49:28 +0000 (09:49 -0700)
Pull timer updates from Thomas Gleixner:
 "A rather small set of patches from the timer departement:

   - Some more y2038 work
   - Yet another new clocksource driver
   - The usual set of small fixes, cleanups and enhancements"

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/tegra: Remove unused suspend/resume code
  clockevents/driversi/mps2: add MPS2 Timer driver
  dt-bindings: document the MPS2 timer bindings
  clocksource/drivers/mtk_timer: Add __init attribute
  clockevents/drivers/dw_apb_timer: Implement ->set_state_oneshot_stopped()
  time: Introduce do_sys_settimeofday64()
  security: Introduce security_settime64()
  clocksource: Add missing include of of.h.

14 files changed:
Documentation/devicetree/bindings/timer/arm,mps2-timer.txt [new file with mode: 0644]
drivers/clocksource/Kconfig
drivers/clocksource/Makefile
drivers/clocksource/dw_apb_timer.c
drivers/clocksource/mps2-timer.c [new file with mode: 0644]
drivers/clocksource/mtk_timer.c
drivers/clocksource/tegra20_timer.c
include/linux/clocksource.h
include/linux/lsm_hooks.h
include/linux/security.h
include/linux/timekeeping.h
kernel/time/time.c
security/commoncap.c
security/security.c

diff --git a/Documentation/devicetree/bindings/timer/arm,mps2-timer.txt b/Documentation/devicetree/bindings/timer/arm,mps2-timer.txt
new file mode 100644 (file)
index 0000000..48f84d7
--- /dev/null
@@ -0,0 +1,28 @@
+ARM MPS2 timer
+
+The MPS2 platform has simple general-purpose 32 bits timers.
+
+Required properties:
+- compatible   : Should be "arm,mps2-timer"
+- reg          : Address and length of the register set
+- interrupts   : Reference to the timer interrupt
+
+Required clocking property, have to be one of:
+- clocks         : The input clock of the timer
+- clock-frequency : The rate in HZ in input of the ARM MPS2 timer
+
+Examples:
+
+timer1: mps2-timer@40000000 {
+       compatible = "arm,mps2-timer";
+       reg = <0x40000000 0x1000>;
+       interrupts = <8>;
+       clocks = <&sysclk>;
+};
+
+timer2: mps2-timer@40001000 {
+       compatible = "arm,mps2-timer";
+       reg = <0x40001000 0x1000>;
+       interrupts = <9>;
+       clock-frequency = <25000000>;
+};
index c346be650892affaa890ad3a3212c0f62e360fb4..6ff327abc555879462dcb9885e9ab0a1190c3258 100644 (file)
@@ -186,6 +186,12 @@ config CLKSRC_STM32
        depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST)
        select CLKSRC_MMIO
 
+config CLKSRC_MPS2
+       bool "Clocksource for MPS2 SoCs" if COMPILE_TEST
+       depends on GENERIC_SCHED_CLOCK
+       select CLKSRC_MMIO
+       select CLKSRC_OF
+
 config ARM_ARCH_TIMER
        bool
        select CLKSRC_OF if OF
index dc2b8997f6e637c0ae83f09b4b6bd4b92bffbf8d..b0a3c96fcd4f4c7606b1a71e799948c5fcfb5ad2 100644 (file)
@@ -39,6 +39,7 @@ obj-$(CONFIG_CLKSRC_EFM32)    += time-efm32.o
 obj-$(CONFIG_CLKSRC_STM32)     += timer-stm32.o
 obj-$(CONFIG_CLKSRC_EXYNOS_MCT)        += exynos_mct.o
 obj-$(CONFIG_CLKSRC_LPC32XX)   += time-lpc32xx.o
+obj-$(CONFIG_CLKSRC_MPS2)      += mps2-timer.o
 obj-$(CONFIG_CLKSRC_SAMSUNG_PWM)       += samsung_pwm_timer.o
 obj-$(CONFIG_FSL_FTM_TIMER)    += fsl_ftm_timer.o
 obj-$(CONFIG_VF_PIT_TIMER)     += vf_pit_timer.o
index 63345260244d7d97df303b3fd12445612e6b4395..797505aa2ba41263f5f2080f9b777f383b744bfe 100644 (file)
@@ -264,6 +264,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating,
        dw_ced->ced.set_state_shutdown = apbt_shutdown;
        dw_ced->ced.set_state_periodic = apbt_set_periodic;
        dw_ced->ced.set_state_oneshot = apbt_set_oneshot;
+       dw_ced->ced.set_state_oneshot_stopped = apbt_shutdown;
        dw_ced->ced.tick_resume = apbt_resume;
        dw_ced->ced.set_next_event = apbt_next_event;
        dw_ced->ced.irq = dw_ced->timer.irq;
diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c
new file mode 100644 (file)
index 0000000..3d33a5e
--- /dev/null
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2015 ARM Limited
+ *
+ * Author: Vladimir Murzin <vladimir.murzin@arm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt)    KBUILD_MODNAME ": " fmt
+
+#include <linux/clk.h>
+#include <linux/clockchips.h>
+#include <linux/clocksource.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of_address.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/sched_clock.h>
+#include <linux/slab.h>
+
+#define TIMER_CTRL             0x0
+#define TIMER_CTRL_ENABLE      BIT(0)
+#define TIMER_CTRL_IE          BIT(3)
+
+#define TIMER_VALUE            0x4
+#define TIMER_RELOAD           0x8
+#define TIMER_INT              0xc
+
+struct clockevent_mps2 {
+       void __iomem *reg;
+       u32 clock_count_per_tick;
+       struct clock_event_device clkevt;
+};
+
+static void __iomem *sched_clock_base;
+
+static u64 notrace mps2_sched_read(void)
+{
+       return ~readl_relaxed(sched_clock_base + TIMER_VALUE);
+}
+
+static inline struct clockevent_mps2 *to_mps2_clkevt(struct clock_event_device *c)
+{
+       return container_of(c, struct clockevent_mps2, clkevt);
+}
+
+static void clockevent_mps2_writel(u32 val, struct clock_event_device *c, u32 offset)
+{
+       writel_relaxed(val, to_mps2_clkevt(c)->reg + offset);
+}
+
+static int mps2_timer_shutdown(struct clock_event_device *ce)
+{
+       clockevent_mps2_writel(0, ce, TIMER_RELOAD);
+       clockevent_mps2_writel(0, ce, TIMER_CTRL);
+
+       return 0;
+}
+
+static int mps2_timer_set_next_event(unsigned long next, struct clock_event_device *ce)
+{
+       clockevent_mps2_writel(next, ce, TIMER_VALUE);
+       clockevent_mps2_writel(TIMER_CTRL_IE | TIMER_CTRL_ENABLE, ce, TIMER_CTRL);
+
+       return 0;
+}
+
+static int mps2_timer_set_periodic(struct clock_event_device *ce)
+{
+       u32 clock_count_per_tick = to_mps2_clkevt(ce)->clock_count_per_tick;
+
+       clockevent_mps2_writel(clock_count_per_tick, ce, TIMER_RELOAD);
+       clockevent_mps2_writel(clock_count_per_tick, ce, TIMER_VALUE);
+       clockevent_mps2_writel(TIMER_CTRL_IE | TIMER_CTRL_ENABLE, ce, TIMER_CTRL);
+
+       return 0;
+}
+
+static irqreturn_t mps2_timer_interrupt(int irq, void *dev_id)
+{
+       struct clockevent_mps2 *ce = dev_id;
+       u32 status = readl_relaxed(ce->reg + TIMER_INT);
+
+       if (!status) {
+               pr_warn("spurious interrupt\n");
+               return IRQ_NONE;
+       }
+
+       writel_relaxed(1, ce->reg + TIMER_INT);
+
+       ce->clkevt.event_handler(&ce->clkevt);
+
+       return IRQ_HANDLED;
+}
+
+static int __init mps2_clockevent_init(struct device_node *np)
+{
+       void __iomem *base;
+       struct clk *clk = NULL;
+       struct clockevent_mps2 *ce;
+       u32 rate;
+       int irq, ret;
+       const char *name = "mps2-clkevt";
+
+       ret = of_property_read_u32(np, "clock-frequency", &rate);
+       if (ret) {
+               clk = of_clk_get(np, 0);
+               if (IS_ERR(clk)) {
+                       ret = PTR_ERR(clk);
+                       pr_err("failed to get clock for clockevent: %d\n", ret);
+                       goto out;
+               }
+
+               ret = clk_prepare_enable(clk);
+               if (ret) {
+                       pr_err("failed to enable clock for clockevent: %d\n", ret);
+                       goto out_clk_put;
+               }
+
+               rate = clk_get_rate(clk);
+       }
+
+       base = of_iomap(np, 0);
+       if (!base) {
+               ret = -EADDRNOTAVAIL;
+               pr_err("failed to map register for clockevent: %d\n", ret);
+               goto out_clk_disable;
+       }
+
+       irq = irq_of_parse_and_map(np, 0);
+       if (!irq) {
+               ret = -ENOENT;
+               pr_err("failed to get irq for clockevent: %d\n", ret);
+               goto out_iounmap;
+       }
+
+       ce = kzalloc(sizeof(*ce), GFP_KERNEL);
+       if (!ce) {
+               ret = -ENOMEM;
+               goto out_iounmap;
+       }
+
+       ce->reg = base;
+       ce->clock_count_per_tick = DIV_ROUND_CLOSEST(rate, HZ);
+       ce->clkevt.irq = irq;
+       ce->clkevt.name = name;
+       ce->clkevt.rating = 200;
+       ce->clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
+       ce->clkevt.cpumask = cpu_possible_mask;
+       ce->clkevt.set_state_shutdown   = mps2_timer_shutdown,
+       ce->clkevt.set_state_periodic   = mps2_timer_set_periodic,
+       ce->clkevt.set_state_oneshot    = mps2_timer_shutdown,
+       ce->clkevt.set_next_event       = mps2_timer_set_next_event;
+
+       /* Ensure timer is disabled */
+       writel_relaxed(0, base + TIMER_CTRL);
+
+       ret = request_irq(irq, mps2_timer_interrupt, IRQF_TIMER, name, ce);
+       if (ret) {
+               pr_err("failed to request irq for clockevent: %d\n", ret);
+               goto out_kfree;
+       }
+
+       clockevents_config_and_register(&ce->clkevt, rate, 0xf, 0xffffffff);
+
+       return 0;
+
+out_kfree:
+       kfree(ce);
+out_iounmap:
+       iounmap(base);
+out_clk_disable:
+       /* clk_{disable, unprepare, put}() can handle NULL as a parameter */
+       clk_disable_unprepare(clk);
+out_clk_put:
+       clk_put(clk);
+out:
+       return ret;
+}
+
+static int __init mps2_clocksource_init(struct device_node *np)
+{
+       void __iomem *base;
+       struct clk *clk = NULL;
+       u32 rate;
+       int ret;
+       const char *name = "mps2-clksrc";
+
+       ret = of_property_read_u32(np, "clock-frequency", &rate);
+       if (ret) {
+               clk = of_clk_get(np, 0);
+               if (IS_ERR(clk)) {
+                       ret = PTR_ERR(clk);
+                       pr_err("failed to get clock for clocksource: %d\n", ret);
+                       goto out;
+               }
+
+               ret = clk_prepare_enable(clk);
+               if (ret) {
+                       pr_err("failed to enable clock for clocksource: %d\n", ret);
+                       goto out_clk_put;
+               }
+
+               rate = clk_get_rate(clk);
+       }
+
+       base = of_iomap(np, 0);
+       if (!base) {
+               ret = -EADDRNOTAVAIL;
+               pr_err("failed to map register for clocksource: %d\n", ret);
+               goto out_clk_disable;
+       }
+
+       /* Ensure timer is disabled */
+       writel_relaxed(0, base + TIMER_CTRL);
+
+       /* ... and set it up as free-running clocksource */
+       writel_relaxed(0xffffffff, base + TIMER_VALUE);
+       writel_relaxed(0xffffffff, base + TIMER_RELOAD);
+
+       writel_relaxed(TIMER_CTRL_ENABLE, base + TIMER_CTRL);
+
+       ret = clocksource_mmio_init(base + TIMER_VALUE, name,
+                                   rate, 200, 32,
+                                   clocksource_mmio_readl_down);
+       if (ret) {
+               pr_err("failed to init clocksource: %d\n", ret);
+               goto out_iounmap;
+       }
+
+       sched_clock_base = base;
+       sched_clock_register(mps2_sched_read, 32, rate);
+
+       return 0;
+
+out_iounmap:
+       iounmap(base);
+out_clk_disable:
+       /* clk_{disable, unprepare, put}() can handle NULL as a parameter */
+       clk_disable_unprepare(clk);
+out_clk_put:
+       clk_put(clk);
+out:
+       return ret;
+}
+
+static void __init mps2_timer_init(struct device_node *np)
+{
+       static int has_clocksource, has_clockevent;
+       int ret;
+
+       if (!has_clocksource) {
+               ret = mps2_clocksource_init(np);
+               if (!ret) {
+                       has_clocksource = 1;
+                       return;
+               }
+       }
+
+       if (!has_clockevent) {
+               ret = mps2_clockevent_init(np);
+               if (!ret) {
+                       has_clockevent = 1;
+                       return;
+               }
+       }
+}
+
+CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init);
index d67bc356488ffd0590f76abea3c28087c051ffcb..7e583f8ea5f4ea0d99cd1ca7441d0c16d74975ac 100644 (file)
@@ -152,7 +152,7 @@ static irqreturn_t mtk_timer_interrupt(int irq, void *dev_id)
 }
 
 static void
-mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
+__init mtk_timer_setup(struct mtk_clock_event_device *evt, u8 timer, u8 option)
 {
        writel(TIMER_CTRL_CLEAR | TIMER_CTRL_DISABLE,
                evt->gpt_base + TIMER_CTRL_REG(timer));
index 38333aba3055b3e376bb163ad0517c348178ec7b..7b94ad2ab27861192f08601cd5cb787d94111806 100644 (file)
@@ -258,17 +258,3 @@ static void __init tegra20_init_rtc(struct device_node *np)
        register_persistent_clock(NULL, tegra_read_persistent_clock64);
 }
 CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
-
-#ifdef CONFIG_PM
-static u32 usec_config;
-
-void tegra_timer_suspend(void)
-{
-       usec_config = timer_readl(TIMERUS_USEC_CFG);
-}
-
-void tegra_timer_resume(void)
-{
-       timer_writel(usec_config, TIMERUS_USEC_CFG);
-}
-#endif
index a307bf62974fd34d9115d04f663bc9fa3caa0d9d..44a1aff225666108c91a8d9f61081315b75d0617 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/cache.h>
 #include <linux/timer.h>
 #include <linux/init.h>
+#include <linux/of.h>
 #include <asm/div64.h>
 #include <asm/io.h>
 
index cdee11cbcdf1487a7cd99d0f58a3c348e4b118d0..41ab4662f95c715db44593effba2db0f0022f052 100644 (file)
  *     Return 0 if permission is granted.
  * @settime:
  *     Check permission to change the system time.
- *     struct timespec and timezone are defined in include/linux/time.h
+ *     struct timespec64 is defined in include/linux/time64.h and timezone
+ *     is defined in include/linux/time.h
  *     @ts contains new time
  *     @tz contains new timezone
  *     Return 0 if permission is granted.
@@ -1327,7 +1328,7 @@ union security_list_options {
        int (*quotactl)(int cmds, int type, int id, struct super_block *sb);
        int (*quota_on)(struct dentry *dentry);
        int (*syslog)(int type);
-       int (*settime)(const struct timespec *ts, const struct timezone *tz);
+       int (*settime)(const struct timespec64 *ts, const struct timezone *tz);
        int (*vm_enough_memory)(struct mm_struct *mm, long pages);
 
        int (*bprm_set_creds)(struct linux_binprm *bprm);
index 157f0cb1e4d2f9a6116b81d517093ec914b853a7..35ac8d9d4739d9eee29efd17c3b98d0977cb55a9 100644 (file)
@@ -71,7 +71,7 @@ struct timezone;
 /* These functions are in security/commoncap.c */
 extern int cap_capable(const struct cred *cred, struct user_namespace *ns,
                       int cap, int audit);
-extern int cap_settime(const struct timespec *ts, const struct timezone *tz);
+extern int cap_settime(const struct timespec64 *ts, const struct timezone *tz);
 extern int cap_ptrace_access_check(struct task_struct *child, unsigned int mode);
 extern int cap_ptrace_traceme(struct task_struct *parent);
 extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
@@ -208,7 +208,13 @@ int security_capable_noaudit(const struct cred *cred, struct user_namespace *ns,
 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
 int security_quota_on(struct dentry *dentry);
 int security_syslog(int type);
-int security_settime(const struct timespec *ts, const struct timezone *tz);
+int security_settime64(const struct timespec64 *ts, const struct timezone *tz);
+static inline int security_settime(const struct timespec *ts, const struct timezone *tz)
+{
+       struct timespec64 ts64 = timespec_to_timespec64(*ts);
+
+       return security_settime64(&ts64, tz);
+}
 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
 int security_bprm_set_creds(struct linux_binprm *bprm);
 int security_bprm_check(struct linux_binprm *bprm);
@@ -462,10 +468,18 @@ static inline int security_syslog(int type)
        return 0;
 }
 
+static inline int security_settime64(const struct timespec64 *ts,
+                                    const struct timezone *tz)
+{
+       return cap_settime(ts, tz);
+}
+
 static inline int security_settime(const struct timespec *ts,
                                   const struct timezone *tz)
 {
-       return cap_settime(ts, tz);
+       struct timespec64 ts64 = timespec_to_timespec64(*ts);
+
+       return cap_settime(&ts64, tz);
 }
 
 static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)
index 96f37bee3bc13b96f3ddd9a27657e6d64340ceb3..37dbacf84849add3a31b410ee06d26ec08c56a07 100644 (file)
@@ -1,6 +1,8 @@
 #ifndef _LINUX_TIMEKEEPING_H
 #define _LINUX_TIMEKEEPING_H
 
+#include <asm-generic/errno-base.h>
+
 /* Included from linux/ktime.h */
 
 void timekeeping_init(void);
@@ -11,8 +13,19 @@ extern int timekeeping_suspended;
  */
 extern void do_gettimeofday(struct timeval *tv);
 extern int do_settimeofday64(const struct timespec64 *ts);
-extern int do_sys_settimeofday(const struct timespec *tv,
-                              const struct timezone *tz);
+extern int do_sys_settimeofday64(const struct timespec64 *tv,
+                                const struct timezone *tz);
+static inline int do_sys_settimeofday(const struct timespec *tv,
+                                     const struct timezone *tz)
+{
+       struct timespec64 ts64;
+
+       if (!tv)
+               return -EINVAL;
+
+       ts64 = timespec_to_timespec64(*tv);
+       return do_sys_settimeofday64(&ts64, tz);
+}
 
 /*
  * Kernel time accessors
index be115b020d2772ae6794320cf79499723137411d..a4064b6120664c0cb87b553cba3dc8c454dec997 100644 (file)
@@ -160,15 +160,15 @@ static inline void warp_clock(void)
  * various programs will get confused when the clock gets warped.
  */
 
-int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
+int do_sys_settimeofday64(const struct timespec64 *tv, const struct timezone *tz)
 {
        static int firsttime = 1;
        int error = 0;
 
-       if (tv && !timespec_valid(tv))
+       if (tv && !timespec64_valid(tv))
                return -EINVAL;
 
-       error = security_settime(tv, tz);
+       error = security_settime64(tv, tz);
        if (error)
                return error;
 
@@ -186,7 +186,7 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
                }
        }
        if (tv)
-               return do_settimeofday(tv);
+               return do_settimeofday64(tv);
        return 0;
 }
 
index 48071ed7c445d025fa4ae57c12f032bfa916521f..2074bf6a2fe3d98d029215e656d781b65c90f43f 100644 (file)
@@ -111,7 +111,7 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
  * Determine whether the current process may set the system clock and timezone
  * information, returning 0 if permission granted, -ve if denied.
  */
-int cap_settime(const struct timespec *ts, const struct timezone *tz)
+int cap_settime(const struct timespec64 *ts, const struct timezone *tz)
 {
        if (!capable(CAP_SYS_TIME))
                return -EPERM;
index 3644b0344d29f3a17ef4f94b1156c9dffff02e65..8c44a64f191d56df9fe93305e7b463b61974f731 100644 (file)
@@ -208,7 +208,7 @@ int security_syslog(int type)
        return call_int_hook(syslog, 0, type);
 }
 
-int security_settime(const struct timespec *ts, const struct timezone *tz)
+int security_settime64(const struct timespec64 *ts, const struct timezone *tz)
 {
        return call_int_hook(settime, 0, ts, tz);
 }