[GIT PULL] clockevents fixes for 4.12-rc5

[GIT PULL] clockevents fixes for 4.12-rc5

[Daniel Lezcano]

Hi Thomas,

here is a couple of fixes for 4.12-rc5.

 - Fixed wrong iomem area unmapped in the arch_arm_timer (Frank Rowand)

 - Added missing includes for sun5i and cadence-ttc (Stephen Rothwell)

Thanks.

  -- Daniel

The following changes since commit ff86bf0c65f14346bf2440534f9ba5ac232c39a0:

  alarmtimer: Rate limit periodic intervals (2017-06-04 15:21:18 +0200)

are available in the git repository at:

  https://git@git.linaro.org/people/daniel.lezcano/linux.git clockevents/4.12-fixes

for you to fetch changes up to 459fa246d8fa4a543ed9a3331f15c8fe1caf9937:

  clocksource: Explicitly include linux/clocksource.h when needed (2017-06-13 17:57:16 +0200)

----------------------------------------------------------------
Frank Rowand (1):
      clocksource/drivers/arm_arch_timer: Fix read and iounmap of incorrect variable

Stephen Rothwell (1):
      clocksource: Explicitly include linux/clocksource.h when needed

 drivers/clocksource/arm_arch_timer.c    | 4 ++--
 drivers/clocksource/cadence_ttc_timer.c | 1 +
 drivers/clocksource/timer-sun5i.c       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

-- 

 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[PATCH 1/2] clocksource/drivers/arm_arch_timer: Fix read and iounmap of incorrect variable

[Daniel Lezcano]

From: Frank Rowand <frank.rowand@sony.com>

Fix boot warning 'Trying to vfree() nonexistent vm area'
from arch_timer_mem_of_init().

Refactored code attempts to read and iounmap using address frame
instead of address ioremap(frame->cntbase).

Fixes: c389d701dfb70 ("clocksource: arm_arch_timer: split MMIO timer probing.")

Signed-off-by: Frank Rowand <frank.rowand@sony.com>
Reviewed-by: Fu Wei <fu.wei@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/arm_arch_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 4bed671..8b5c300 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -1209,9 +1209,9 @@ arch_timer_mem_frame_get_cntfrq(struct arch_timer_mem_frame *frame)
 		return 0;
 	}
 
-	rate = readl_relaxed(frame + CNTFRQ);
+	rate = readl_relaxed(base + CNTFRQ);
 
-	iounmap(frame);
+	iounmap(base);
 
 	return rate;
 }
-- 
2.7.4

[PATCH 2/2] clocksource: Explicitly include linux/clocksource.h when needed

[Daniel Lezcano]

From: Stephen Rothwell <sfr@canb.auug.org.au>

The kbuild test robot reported errors in these files when doing an ia64
allmodconfig build.

drivers/clocksource/timer-sun5i.c:52:21: error: field 'clksrc' has incomplete type
   struct clocksource clksrc;
                      ^~~~~~
drivers/clocksource/cadence_ttc_timer.c:92:21: error: field 'cs' has incomplete type
   struct clocksource cs;
                      ^~

(and many more errors for these files)

Cc: Michal Simek <michal.simek@xilinx.com>
Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/clocksource/cadence_ttc_timer.c | 1 +
 drivers/clocksource/timer-sun5i.c       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 44e5e95..8e64b84 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -18,6 +18,7 @@
 #include <linux/clk.h>
 #include <linux/interrupt.h>
 #include <linux/clockchips.h>
+#include <linux/clocksource.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/slab.h>
diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
index 2e9c830..c4656c4 100644
--- a/drivers/clocksource/timer-sun5i.c
+++ b/drivers/clocksource/timer-sun5i.c
@@ -12,6 +12,7 @@
 
 #include <linux/clk.h>
 #include <linux/clockchips.h>
+#include <linux/clocksource.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-- 
2.7.4