[SRU][PULL][jammy:linux] Patches needed for AmpereOne (arm64)

John Cabaj john.cabaj at canonical.com
Fri Dec 1 00:20:32 UTC 2023


BugLink: https://bugs.launchpad.net/bugs/2044192

[Impact]

* Google requested patches for AmpereOne machine type

[Fix]

* Changes already in Mantic, will be in Jammy 6.5 kernel, targeting Jammy 5.15 GCP and Focal 5.4 GCP for now
* Also submitting to Jammy 5.15 generic
* Cherry-picks from upstream

db26f8f2da92 ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around")
c1153d52c414 ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters")
ec8f7f3342c8 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming")
41f8d02a6a55 ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface")
012f18850452 ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
30aa08da35e0 ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code")
8b82c4f883a7 ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL")
72f47a3f0ea4 ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue")
ac9ef4f24cb2 ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names")
a38b71b0833e ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL")
1e8d929231cf ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64")
d72689988d67 ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors")
4775bc63f880 ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses")

[Test Case]

* Compile tested
* Boot tested on GCP AmpereOne instance

[Where things could go wrong]

* Low chance of regression. Changes isolated to ARM timers.

[Other Info]

* SF #00372821

-----

The following changes since commit 948bd6b3f8eb95d50cf7acbd0f7d082ab7d8d9db:

  UBUNTU: Ubuntu-5.15.0-91.101 (2023-11-14 11:47:56 +0100)

are available in the Git repository at:

  git+ssh://john-cabaj@git.launchpad.net/~john-cabaj/ubuntu/+source/linux/+git/jammy ampere_one

for you to fetch changes up to 2689b46fc765dacf5a246c9c204164ca1585e60e:

  clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-30 16:31:17 -0600)

----------------------------------------------------------------
Marc Zyngier (12):
      clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses
      clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors
      clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64
      clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL
      clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names
      clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue
      clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL
      clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code
      clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations
      clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface
      clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming
      clocksource/drivers/arch_arm_timer: Move workaround synchronisation around

Oliver Upton (1):
      clocksource/drivers/arm_arch_timer: Fix masking for high freq counters

 arch/arm/include/asm/arch_timer.h    |  37 +++++++++++++---------
 arch/arm64/include/asm/arch_timer.h  |  52 ++++++++++++++----------------
 drivers/clocksource/arm_arch_timer.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------
 include/clocksource/arm_arch_timer.h |   2 +-
 4 files changed, 193 insertions(+), 141 deletions(-)



More information about the kernel-team mailing list