mbox series

[SRU,PULL,focal:linux-gcp] Patches needed for AmpereOne (arm64)

Message ID 7e47e6e7-4104-45b3-9791-f48c3eb0e0f6@canonical.com
State New
Headers show
Series [SRU,PULL,focal:linux-gcp] Patches needed for AmpereOne (arm64) | expand

Pull-request

git+ssh://user@kathleen/home/john-cabaj/for-review/focal_linux-gcp/ ampere_one

Message

John Cabaj Nov. 30, 2023, 2:32 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2044192

[Impact]

* Google requested patches for AmpereOne machine type

[Fix]

* Cherry-picks from upstream, 1 backport

0147cdcbae07 ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around")
2332c002702a ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters")
06376f2f83d3 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming")
e77d93ce7b5f ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface")
0c5b5877372b ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
a5f7b785133c ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code")
ae9483c26e4c ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL")
3e84d3142205 ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue")
1bd148a112fb ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names")
75a9e056f111 ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL")
255a1d1d5bcd ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64")
882260181a4b ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors")
b125ec94b94f ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses")

[Test Case]

* Compile tested
* Boot tested on 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 65112cf684647265473997b8dc2522a3b75a5343:

  UBUNTU: Ubuntu-gcp-5.4.0-1119.128 (2023-11-18 14:50:10 -0300)

are available in the git repository at:

  git+ssh://user@kathleen/home/john-cabaj/for-review/focal_linux-gcp/ ampere_one

for you to fetch changes up to 0147cdcbae0748494735b65df089e3fafbc3a3b0:

  clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-27 13:29:30 -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(-)

Comments

Tim Gardner Nov. 30, 2023, 2:51 p.m. UTC | #1 
On 11/30/23 7:32 AM, John Cabaj wrote:
> BugLink: https://bugs.launchpad.net/bugs/2044192
> 
> [Impact]
> 
> * Google requested patches for AmpereOne machine type
> 
> [Fix]
> 
> * Cherry-picks from upstream, 1 backport
> 
> 0147cdcbae07 ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around")
> 2332c002702a ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters")
> 06376f2f83d3 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming")
> e77d93ce7b5f ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface")
> 0c5b5877372b ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
> a5f7b785133c ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code")
> ae9483c26e4c ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL")
> 3e84d3142205 ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue")
> 1bd148a112fb ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names")
> 75a9e056f111 ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL")
> 255a1d1d5bcd ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64")
> 882260181a4b ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors")
> b125ec94b94f ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses")
> 
> [Test Case]
> 
> * Compile tested
> * Boot tested on 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 65112cf684647265473997b8dc2522a3b75a5343:
> 
>    UBUNTU: Ubuntu-gcp-5.4.0-1119.128 (2023-11-18 14:50:10 -0300)
> 
> are available in the git repository at:
> 
>    git+ssh://user@kathleen/home/john-cabaj/for-review/focal_linux-gcp/ ampere_one
> 
> for you to fetch changes up to 0147cdcbae0748494735b65df089e3fafbc3a3b0:
> 
>    clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-27 13:29:30 -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(-)
> 
Acked-by: Tim Gardner <tim.gardner@canonical.com>

Clean cherry picks except for one simple backport [6/13].
Manuel Diewald Nov. 30, 2023, 4:27 p.m. UTC | #2 
On Thu, Nov 30, 2023 at 08:32:58AM -0600, John Cabaj wrote:
> BugLink: https://bugs.launchpad.net/bugs/2044192
> 
> [Impact]
> 
> * Google requested patches for AmpereOne machine type
> 
> [Fix]
> 
> * Cherry-picks from upstream, 1 backport
> 
> 0147cdcbae07 ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around")
> 2332c002702a ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters")
> 06376f2f83d3 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming")
> e77d93ce7b5f ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface")
> 0c5b5877372b ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
> a5f7b785133c ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code")
> ae9483c26e4c ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL")
> 3e84d3142205 ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue")
> 1bd148a112fb ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names")
> 75a9e056f111 ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL")
> 255a1d1d5bcd ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64")
> 882260181a4b ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors")
> b125ec94b94f ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses")
> 
> [Test Case]
> 
> * Compile tested
> * Boot tested on 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 65112cf684647265473997b8dc2522a3b75a5343:
> 
>   UBUNTU: Ubuntu-gcp-5.4.0-1119.128 (2023-11-18 14:50:10 -0300)
> 
> are available in the git repository at:
> 
>   git+ssh://user@kathleen/home/john-cabaj/for-review/focal_linux-gcp/ ampere_one
> 
> for you to fetch changes up to 0147cdcbae0748494735b65df089e3fafbc3a3b0:
> 
>   clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-27 13:29:30 -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(-)
> 
> -- 
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

Acked-by: Manuel Diewald <manuel.diewald@canonical.com>
John Cabaj Nov. 30, 2023, 5:03 p.m. UTC | #3 
On 11/30/23 8:32 AM, John Cabaj wrote:
> BugLink: https://bugs.launchpad.net/bugs/2044192
> 
> [Impact]
> 
> * Google requested patches for AmpereOne machine type
> 
> [Fix]
> 
> * Cherry-picks from upstream, 1 backport
> 
> 0147cdcbae07 ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around")
> 2332c002702a ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters")
> 06376f2f83d3 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming")
> e77d93ce7b5f ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface")
> 0c5b5877372b ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
> a5f7b785133c ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code")
> ae9483c26e4c ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL")
> 3e84d3142205 ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue")
> 1bd148a112fb ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names")
> 75a9e056f111 ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL")
> 255a1d1d5bcd ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64")
> 882260181a4b ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors")
> b125ec94b94f ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses")
> 
> [Test Case]
> 
> * Compile tested
> * Boot tested on 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 65112cf684647265473997b8dc2522a3b75a5343:
> 
>   UBUNTU: Ubuntu-gcp-5.4.0-1119.128 (2023-11-18 14:50:10 -0300)
> 
> are available in the git repository at:
> 
>   git+ssh://user@kathleen/home/john-cabaj/for-review/focal_linux-gcp/ ampere_one
> 
> for you to fetch changes up to 0147cdcbae0748494735b65df089e3fafbc3a3b0:
> 
>   clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-27 13:29:30 -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(-)

Applied to focal:linux-gcp master-next branch.


Thanks,
John