Skip to content

clocksource: Fix MIPS GIC and DW APB Timer for Baikal-T1 SoC support

Serge Semin linux-devicetree linux-mips linux-rtc lkml 5 versions – Applied

Status from this message: The following commit has been merged into the timers/core branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest8 patches 4 repliesApplied
  2. v47 patches 3 repliesSuperseded
  3. v37 patches 9 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v26 patches7 repliesSuperseded
v13 of 4 patches6 repliesSuperseded

Changes in v5 from the cover letter

- Fix mistakenly added "git_" prefix. Obviously it was supposed to be gic_.
- Add new patch "clocksource: dw_apb_timer: Affiliate of-based timer with any CPU"

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/8dt-bindings: rtc: Convert snps,dw-apb-timer to DT schemaDocumentation/devicetree/bindings/rtc/dw-apb.txt Documentation/devicetree/bindings/rtc/snps,dw-apb-timer.yaml+88 -320 replies
2/8dt-bindings: timer: Move snps,dw-apb-timer DT schema from rtcDocumentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml+1 -10 replies
3/8dt-bindings: interrupt-controller: Convert mti,gic to DT schemaDocumentation/devicetree/bindings/interrupt-controller/mips-gic.txt Documentation/devicetree/bindings/interrupt-controller/mti,gic.yaml+148 -670 replies
4/8clocksource: dw_apb_timer: Make CPU-affiliation being optionaldrivers/clocksource/dw_apb_timer.c+3 -20 replies
5/8clocksource: dw_apb_timer: Affiliate of-based timer with any CPUdrivers/clocksource/dw_apb_timer_of.c+1 -10 replies
6/8clocksource: dw_apb_timer_of: Fix missing clockevent timersdrivers/clocksource/dw_apb_timer_of.c+2 -40 replies
7/8clocksource: mips-gic-timer: Register as sched_clockdrivers/clocksource/mips-gic-timer.c+27 -40 replies
8/8clocksource: mips-gic-timer: Mark GIC timer as unstable if ref clock changesdrivers/clocksource/Kconfig drivers/clocksource/mips-gic-timer.c+19 -10 replies

Reviews trailers per patch

3 of 8 patches have a Reviewed-by or Acked-by.

PatchRob HerringAlexandre Belloni
1/8R-b
2/8A-b A-b
3/8R-b
4/8
5/8
6/8
7/8
8/8

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [PATCH v5 0/8] clocksource: Fix MIPS GIC and DW APB Timer for Baikal-T1 SoC support

As for all Baikal-T1 SoC related patchsets, which need this, we replaced the DW APB Timer legacy plain text-based dt-binding file with DT schema. Similarly the MIPS GIC bindings file is also converted to DT schema seeing it also defines the MIPS GIC Timer binding.

Aside from MIPS-specific r4k timer Baikal-T1 chip also provides a functionality of two another timers: embedded into the MIPS GIC timer and three external DW timers available over APB bus. But we can't use them before the corresponding drivers are properly fixed. First of all DW APB Timer shouldn't be bound to a single CPU, since as being accessible over APB they are external with respect to all possible CPUs. Secondly there might be more than just two DW APB Timers in the system (Baikal-T1 has three of them), so permit the driver to use one of them as a clocksource and the rest - for clockevents. Thirdly it's possible to use MIPS GIC timer as a clocksource so register it in the corresponding subsystem (the patch has been found in the Paul Burton MIPS repo so I left the original Signed-off-by attribute). Finally in the same way as r4k timer the MIPS GIC timer should be used with care when CPUFREQ config is enabled since in case of CM2 the timer counting depends on the CPU reference clock frequency while the clocksource subsystem currently doesn't support the timers with non-stable clock.

This patchset is rebased and tested on the mainline Linux kernel 5.7-rc4:
base-commit: 0e698dfa2822 ("Linux 5.7-rc4")
tag: v5.7-rc4

Changelog v2:
- Fix the SoB tags.
- Our corporate email server doesn't change Message-Id anymore, so the patchset is resubmitted being in the cover-letter-threaded format.
- Convert the "snps,dw-apb-timer" binding to DT schema in a dedicated patch.
- Convert the "mti,gic" binding to DT schema in a dedicated patch.

Changelog v3:
- Make the MIPS GIC timer sub-node name not having a unit-address number.
- Discard allOf: [ $ref: /schemas/interrupt-controller.yaml# ] from MIPS GIC bindings.
- Add patch moving the "snps,dw-apb-timer" binding file to the directory with timers binding files.

Changelog v4:
- Mark clocksource as unstable instead of lowering its rating.
- Move conditional sched clocks registration to the Paul' patch.
- Add Thomas Gleixner to the patchset To-list to draw his attention to the patch "dt-bindings: interrupt-controller: Convert mti,gic to DT schema".

Changelog v5:
- Fix mistakenly added "git_" prefix. Obviously it was supposed to be gic_.
- Add new patch "clocksource: dw_apb_timer: Affiliate of-based timer with any CPU"

Cc Alexey Malahov <[email protected]>
Cc Maxim Kaurkin <[email protected]>
Cc Pavel Parkhomenko <[email protected]>
Cc Ramil Zaripov <[email protected]>
Cc Ekaterina Skachko <[email protected]>
Cc Vadim Vlasov <[email protected]>
Cc Alexey Kolotnikov <[email protected]>
Cc Paul Burton <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Alessandro Zummo <[email protected]>
Cc Alexandre Belloni <[email protected]>
Cc Rob Herring <[email protected]>

Paul Burton (1):
clocksource: mips-gic-timer: Register as sched_clock

Serge Semin (7):
dt-bindings: rtc: Convert snps,dw-apb-timer to DT schema
dt-bindings: timer: Move snps,dw-apb-timer DT schema from rtc
dt-bindings: interrupt-controller: Convert mti,gic to DT schema
clocksource: dw_apb_timer: Make CPU-affiliation being optional
clocksource: dw_apb_timer: Affiliate of-based timer with any CPU
clocksource: dw_apb_timer_of: Fix missing clockevent timers
clocksource: mips-gic-timer: Mark GIC timer as unstable if ref clock
changes

 .../interrupt-controller/mips-gic.txt         |  67 --------
 .../interrupt-controller/mti,gic.yaml         | 148 ++++++++++++++++++
 .../devicetree/bindings/rtc/dw-apb.txt        |  32 ----
 .../bindings/timer/snps,dw-apb-timer.yaml     |  88 +++++++++++
 drivers/clocksource/Kconfig                   |   1 +
 drivers/clocksource/dw_apb_timer.c            |   5 +-
 drivers/clocksource/dw_apb_timer_of.c         |   8 +-
 drivers/clocksource/mips-gic-timer.c          |  50 +++++-
 8 files changed, 288 insertions(+), 111 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mti,gic.yaml
 delete mode 100644 Documentation/devicetree/bindings/rtc/dw-apb.txt
 create mode 100644 Documentation/devicetree/bindings/timer/snps,dw-apb-timer.yaml
Signature · 1 line
2.25.1