1 files changed, 16 insertions, 5 deletions

diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index a2cb6fae9295..d189d8cb69f7 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -99,17 +99,17 @@ static void gt_compare_set(unsigned long delta, int periodic)
 
         counter += delta;
         ctrl = GT_CONTROL_TIMER_ENABLE;
-        writel(ctrl, gt_base + GT_CONTROL);
-        writel(lower_32_bits(counter), gt_base + GT_COMP0);
-        writel(upper_32_bits(counter), gt_base + GT_COMP1);
+        writel_relaxed(ctrl, gt_base + GT_CONTROL);
+        writel_relaxed(lower_32_bits(counter), gt_base + GT_COMP0);
+        writel_relaxed(upper_32_bits(counter), gt_base + GT_COMP1);
 
         if (periodic) {
-                writel(delta, gt_base + GT_AUTO_INC);
+                writel_relaxed(delta, gt_base + GT_AUTO_INC);
                 ctrl |= GT_CONTROL_AUTO_INC;
         }
 
         ctrl |= GT_CONTROL_COMP_ENABLE | GT_CONTROL_IRQ_ENABLE;
-        writel(ctrl, gt_base + GT_CONTROL);
+        writel_relaxed(ctrl, gt_base + GT_CONTROL);
 }
 
 static int gt_clockevent_shutdown(struct clock_event_device *evt)
@@ -195,12 +195,23 @@ static cycle_t gt_clocksource_read(struct clocksource *cs)
         return gt_counter_read();
 }
 
+static void gt_resume(struct clocksource *cs)
+{
+        unsigned long ctrl;
+
+        ctrl = readl(gt_base + GT_CONTROL);
+        if (!(ctrl & GT_CONTROL_TIMER_ENABLE))
+                /* re-enable timer on resume */
+                writel(GT_CONTROL_TIMER_ENABLE, gt_base + GT_CONTROL);
+}
+
 static struct clocksource gt_clocksource = {
         .name   = "arm_global_timer",
         .rating = 300,
         .read   = gt_clocksource_read,
         .mask   = CLOCKSOURCE_MASK(64),
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
+        .resume = gt_resume,
 };
 
 #ifdef CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK