Re: [GIT pull] timer changes for 3.18
* Frederic Weisbecker wrote: > On Wed, Oct 08, 2014 at 05:54:49PM -0400, Linus Torvalds wrote: > > On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner wrote: > > > > > > please pull the latest timers-core-for-linus git tree from: > > > > > >git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git > > > timers-core-for-linus > > > > > > Nothing really exciting this time: > > > > > > - A few fixlets in the NOHZ code > > > > .. but apparently *still* not the fixes from Frederic for the > > issue that people are complaining about killing their > > machines in 3.17. > > > > WTF? What happened to those? > > Thomas just pulled these in -tip today. I'm pretty sure he > plans to make a 2nd timers pile after this one during the merge > window. We just found a non-trivial conflict in my branch > against the RCU tree so this probably needs a bit of last > minute adjustment and testing. Thomas won't be around until next week, I'll send these fixes later today. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT pull] timer changes for 3.18
* Frederic Weisbecker fweis...@gmail.com wrote: On Wed, Oct 08, 2014 at 05:54:49PM -0400, Linus Torvalds wrote: On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner t...@linutronix.de wrote: please pull the latest timers-core-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus Nothing really exciting this time: - A few fixlets in the NOHZ code .. but apparently *still* not the fixes from Frederic for the issue that people are complaining about killing their machines in 3.17. WTF? What happened to those? Thomas just pulled these in -tip today. I'm pretty sure he plans to make a 2nd timers pile after this one during the merge window. We just found a non-trivial conflict in my branch against the RCU tree so this probably needs a bit of last minute adjustment and testing. Thomas won't be around until next week, I'll send these fixes later today. Thanks, Ingo -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT pull] timer changes for 3.18
On Wed, Oct 08, 2014 at 05:54:49PM -0400, Linus Torvalds wrote: > On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner wrote: > > > > please pull the latest timers-core-for-linus git tree from: > > > >git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git > > timers-core-for-linus > > > > Nothing really exciting this time: > > > > - A few fixlets in the NOHZ code > > .. but apparently *still* not the fixes from Frederic for the issue > that people are complaining about killing their machines in 3.17. > > WTF? What happened to those? Thomas just pulled these in -tip today. I'm pretty sure he plans to make a 2nd timers pile after this one during the merge window. We just found a non-trivial conflict in my branch against the RCU tree so this probably needs a bit of last minute adjustment and testing. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT pull] timer changes for 3.18
On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner wrote: > > please pull the latest timers-core-for-linus git tree from: > >git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git > timers-core-for-linus > > Nothing really exciting this time: > > - A few fixlets in the NOHZ code .. but apparently *still* not the fixes from Frederic for the issue that people are complaining about killing their machines in 3.17. WTF? What happened to those? Linus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[GIT pull] timer changes for 3.18
Linus,
please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
timers-core-for-linus
Nothing really exciting this time:
- A few fixlets in the NOHZ code
- A new ARM SoC timer abomination. One should expect that we have
enough of them already, but they insist on inventing new ones.
- The usual bunch of ARM SoC timer updates. That feels like herding
cats.
Thanks,
tglx
-->
Carlo Caione (2):
ARM: meson: documentation: Add timer documentation
ARM: meson6: clocksource: Add Meson6 timer support
Dan Carpenter (1):
timerfd: Remove an always true check
Gael Portay (1):
clocksource: tcb_clksrc: Sanitize IRQ request
Hao Liu (1):
clocksource: sirf: Disable counter before re-setting it
Michal Simek (1):
clocksource: cadence_ttc: Add support for 32bit mode
Nathan Lynch (3):
clocksource: arm_arch_timer: Change clocksource name if CP15 unavailable
clocksource: arm_arch_timer: Enable counter access for 32-bit ARM
clocksource: arm_arch_timer: Consolidate arch_timer_evtstrm_enable
Simon Horman (3):
clocksource: sh_cmt: Document SoC specific bindings
clocksource: sh_mtu2: Document r7s72100 binding
clocksource: sh_tmu: Document r8a7779 binding
Stefan Agner (1):
clocksource: vf_pit_timer: Support shutdown mode
Sudeep Holla (1):
clocksource: arm_arch_timer: Discard unavailable timers correctly
Viresh Kumar (2):
nohz: Fix spurious periodic tick behaviour in low-res dynticks mode
nohz: Avoid tick's double reprogramming in highres mode
.../bindings/timer/amlogic,meson6-timer.txt| 15 ++
.../devicetree/bindings/timer/renesas,cmt.txt | 44 +-
.../devicetree/bindings/timer/renesas,mtu2.txt | 7 +-
.../devicetree/bindings/timer/renesas,tmu.txt | 7 +-
arch/arm/include/asm/arch_timer.h | 25 ---
arch/arm64/include/asm/arch_timer.h| 31
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/arm_arch_timer.c | 64 +++-
drivers/clocksource/cadence_ttc_timer.c| 15 +-
drivers/clocksource/meson6_timer.c | 167 +
drivers/clocksource/tcb_clksrc.c | 13 +-
drivers/clocksource/timer-marco.c | 5 +-
drivers/clocksource/vf_pit_timer.c | 4 +
fs/timerfd.c | 3 +-
kernel/time/tick-sched.c | 8 +
16 files changed, 323 insertions(+), 89 deletions(-)
create mode 100644
Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
create mode 100644 drivers/clocksource/meson6_timer.c
diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
new file mode 100644
index ..a092053f7902
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
@@ -0,0 +1,15 @@
+Amlogic Meson6 SoCs Timer Controller
+
+Required properties:
+
+- compatible : should be "amlogic,meson6-timer"
+- reg : Specifies base physical address and size of the registers.
+- interrupts : The interrupt of the first timer
+
+Example:
+
+timer@c1109940 {
+ compatible = "amlogic,meson6-timer";
+ reg = <0xc1109940 0x14>;
+ interrupts = <0 10 1>;
+};
diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index a17418b0ece3..1a05c1b243c1 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -11,15 +11,47 @@ datasheets.
Required Properties:
- - compatible: must contain one of the following.
-- "renesas,cmt-32" for the 32-bit CMT
+ - compatible: must contain one or more of the following:
+- "renesas,cmt-32-r8a7740" for the r8a7740 32-bit CMT
+ (CMT0)
+- "renesas,cmt-32-sh7372" for the sh7372 32-bit CMT
+ (CMT0)
+- "renesas,cmt-32-sh73a0" for the sh73a0 32-bit CMT
+ (CMT0)
+- "renesas,cmt-32" for all 32-bit CMT without fast clock support
(CMT0 on sh7372, sh73a0 and r8a7740)
-- "renesas,cmt-32-fast" for the 32-bit CMT with fast clock support
+ This is a fallback for the above renesas,cmt-32-* entries.
+
+- "renesas,cmt-32-fast-r8a7740" for the r8a7740 32-bit CMT with fast
+ clock support (CMT[234])
+- "renesas,cmt-32-fast-sh7372" for the sh7372 32-bit CMT with fast
+ clock support (CMT[234])
+- "renesas,cmt-32-fast-sh73a0" for the sh73A0 32-bit CMT with fast
+ clock support (CMT[234])
+- "renesas,cmt-32-fast" for all 32-bit CMT with fast clock support
(CMT[234] on sh7372,
[GIT pull] timer changes for 3.18
Linus,
please pull the latest timers-core-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
timers-core-for-linus
Nothing really exciting this time:
- A few fixlets in the NOHZ code
- A new ARM SoC timer abomination. One should expect that we have
enough of them already, but they insist on inventing new ones.
- The usual bunch of ARM SoC timer updates. That feels like herding
cats.
Thanks,
tglx
--
Carlo Caione (2):
ARM: meson: documentation: Add timer documentation
ARM: meson6: clocksource: Add Meson6 timer support
Dan Carpenter (1):
timerfd: Remove an always true check
Gael Portay (1):
clocksource: tcb_clksrc: Sanitize IRQ request
Hao Liu (1):
clocksource: sirf: Disable counter before re-setting it
Michal Simek (1):
clocksource: cadence_ttc: Add support for 32bit mode
Nathan Lynch (3):
clocksource: arm_arch_timer: Change clocksource name if CP15 unavailable
clocksource: arm_arch_timer: Enable counter access for 32-bit ARM
clocksource: arm_arch_timer: Consolidate arch_timer_evtstrm_enable
Simon Horman (3):
clocksource: sh_cmt: Document SoC specific bindings
clocksource: sh_mtu2: Document r7s72100 binding
clocksource: sh_tmu: Document r8a7779 binding
Stefan Agner (1):
clocksource: vf_pit_timer: Support shutdown mode
Sudeep Holla (1):
clocksource: arm_arch_timer: Discard unavailable timers correctly
Viresh Kumar (2):
nohz: Fix spurious periodic tick behaviour in low-res dynticks mode
nohz: Avoid tick's double reprogramming in highres mode
.../bindings/timer/amlogic,meson6-timer.txt| 15 ++
.../devicetree/bindings/timer/renesas,cmt.txt | 44 +-
.../devicetree/bindings/timer/renesas,mtu2.txt | 7 +-
.../devicetree/bindings/timer/renesas,tmu.txt | 7 +-
arch/arm/include/asm/arch_timer.h | 25 ---
arch/arm64/include/asm/arch_timer.h| 31
drivers/clocksource/Kconfig| 3 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/arm_arch_timer.c | 64 +++-
drivers/clocksource/cadence_ttc_timer.c| 15 +-
drivers/clocksource/meson6_timer.c | 167 +
drivers/clocksource/tcb_clksrc.c | 13 +-
drivers/clocksource/timer-marco.c | 5 +-
drivers/clocksource/vf_pit_timer.c | 4 +
fs/timerfd.c | 3 +-
kernel/time/tick-sched.c | 8 +
16 files changed, 323 insertions(+), 89 deletions(-)
create mode 100644
Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
create mode 100644 drivers/clocksource/meson6_timer.c
diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
new file mode 100644
index ..a092053f7902
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt
@@ -0,0 +1,15 @@
+Amlogic Meson6 SoCs Timer Controller
+
+Required properties:
+
+- compatible : should be amlogic,meson6-timer
+- reg : Specifies base physical address and size of the registers.
+- interrupts : The interrupt of the first timer
+
+Example:
+
+timer@c1109940 {
+ compatible = amlogic,meson6-timer;
+ reg = 0xc1109940 0x14;
+ interrupts = 0 10 1;
+};
diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
index a17418b0ece3..1a05c1b243c1 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.txt
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.txt
@@ -11,15 +11,47 @@ datasheets.
Required Properties:
- - compatible: must contain one of the following.
-- renesas,cmt-32 for the 32-bit CMT
+ - compatible: must contain one or more of the following:
+- renesas,cmt-32-r8a7740 for the r8a7740 32-bit CMT
+ (CMT0)
+- renesas,cmt-32-sh7372 for the sh7372 32-bit CMT
+ (CMT0)
+- renesas,cmt-32-sh73a0 for the sh73a0 32-bit CMT
+ (CMT0)
+- renesas,cmt-32 for all 32-bit CMT without fast clock support
(CMT0 on sh7372, sh73a0 and r8a7740)
-- renesas,cmt-32-fast for the 32-bit CMT with fast clock support
+ This is a fallback for the above renesas,cmt-32-* entries.
+
+- renesas,cmt-32-fast-r8a7740 for the r8a7740 32-bit CMT with fast
+ clock support (CMT[234])
+- renesas,cmt-32-fast-sh7372 for the sh7372 32-bit CMT with fast
+ clock support (CMT[234])
+- renesas,cmt-32-fast-sh73a0 for the sh73A0 32-bit CMT with fast
+ clock support (CMT[234])
+- renesas,cmt-32-fast for all 32-bit CMT with fast clock support
(CMT[234] on sh7372, sh73a0 and r8a7740)
--
Re: [GIT pull] timer changes for 3.18
On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner t...@linutronix.de wrote: please pull the latest timers-core-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus Nothing really exciting this time: - A few fixlets in the NOHZ code .. but apparently *still* not the fixes from Frederic for the issue that people are complaining about killing their machines in 3.17. WTF? What happened to those? Linus -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [GIT pull] timer changes for 3.18
On Wed, Oct 08, 2014 at 05:54:49PM -0400, Linus Torvalds wrote: On Wed, Oct 8, 2014 at 2:12 PM, Thomas Gleixner t...@linutronix.de wrote: please pull the latest timers-core-for-linus git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus Nothing really exciting this time: - A few fixlets in the NOHZ code .. but apparently *still* not the fixes from Frederic for the issue that people are complaining about killing their machines in 3.17. WTF? What happened to those? Thomas just pulled these in -tip today. I'm pretty sure he plans to make a 2nd timers pile after this one during the merge window. We just found a non-trivial conflict in my branch against the RCU tree so this probably needs a bit of last minute adjustment and testing. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
