From patchwork Thu Nov 30 14:33:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1870176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SgzFY5zpKz1yST for ; Fri, 1 Dec 2023 01:33:21 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1r8i6M-0004KN-4y; Thu, 30 Nov 2023 14:33:14 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1r8i6H-0004JX-Nd for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 14:33:09 +0000 Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 39F5A3F179 for ; Thu, 30 Nov 2023 14:33:09 +0000 (UTC) Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3b85fd1bdecso1223991b6e.1 for ; Thu, 30 Nov 2023 06:33:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701354787; x=1701959587; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=avMpXV3TvLBxSC/p0puVIifVrpzLyQBJhZXcKuN0yco=; b=TBXTM61UMS+PbMRNpXsPzKR+dIZWIRB4xFAXdDPl3VXc5TC5f42KIm9D2lKI3Jf9KB W9W2OhPSZvrtiUcJsBhfEGxpBc/aSL7K8uG7vel5oM4fYoZdnCle8+odwXjfp0J4KtqI ExTCi43Mf9IFz2Hp9Qjktr/llJoEQoLP+DuP218L2jOKYlQKeYF4bYfU9Oq964xmhXGP p3fS0CycXp5Jce6XvzfhmQTAv6tHy6DTPQqj4kpgUsJIwrzW3LiNuF+nnH1RTwhPpOmV ADOTso2udGOnoHmIDIOjpexf0u5F7nxAyNf2WEYchfrdP1uRDmp0qP6jkfZ+Hb+0HK/O wdLw== X-Gm-Message-State: AOJu0YxDxC9xQTCUHcG47ij7XVMGqa8Ch7LxiQ/C05hgHnyB2qfepofs vNQgqJUnnT3oKXZ2FROoaZcwk8NHe4Kn0ULcjVJv+uvzZNX4HOe2Ywe4o49ttRNhf9671vBiEGH iFHm725inqXKPpZxwi+poPDYfXSuX40djat6eDBbZUJ8L+9qLlg== X-Received: by 2002:a05:6808:1824:b0:3b8:5bfe:7e36 with SMTP id bh36-20020a056808182400b003b85bfe7e36mr24776713oib.43.1701354787547; Thu, 30 Nov 2023 06:33:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IGkB/FW4djcsXpzyaqx2UX47/Krwd+VyucZEVjw0aH7SdsClF3PlwGxDZuQoVc+lJvhMs+pUQ== X-Received: by 2002:a05:6808:1824:b0:3b8:5bfe:7e36 with SMTP id bh36-20020a056808182400b003b85bfe7e36mr24776696oib.43.1701354787258; Thu, 30 Nov 2023 06:33:07 -0800 (PST) Received: from [192.168.159.111] (h69-130-246-116.mdtnwi.broadband.dynamic.tds.net. [69.130.246.116]) by smtp.gmail.com with ESMTPSA id e1-20020a0cb441000000b0067a35608186sm547647qvf.28.2023.11.30.06.33.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Nov 2023 06:33:06 -0800 (PST) Message-ID: <3b30988e-628e-4a05-a0a7-e11bf672ec5e@canonical.com> Date: Thu, 30 Nov 2023 08:33:06 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: John Cabaj Subject: [SRU][PULL][jammy:linux-gcp] Patches needed for AmpereOne (arm64) To: kernel-team@lists.ubuntu.com Content-Language: en-US X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2044192 [Impact] * Google requested patches for AmpereOne machine type [Fix] * Cherry-picks from upstream 484baebd076c ("clocksource/drivers/arch_arm_timer: Move workaround synchronisation around") ad6c750791e3 ("clocksource/drivers/arm_arch_timer: Fix masking for high freq counters") 6e69aa090138 ("clocksource/drivers/arm_arch_timer: Drop unnecessary ISB on CVAL programming") ab9a0239324a ("clocksource/drivers/arm_arch_timer: Remove any trace of the TVAL programming interface") 9f074b90e6fd ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations") 562eb64c090f ("clocksource/drivers/arm_arch_timer: Advertise 56bit timer to the core code") 7bc14651e24e ("clocksource/drivers/arm_arch_timer: Move MMIO timer programming over to CVAL") 8b06e41fe7bc ("clocksource/drivers/arm_arch_timer: Fix MMIO base address vs callback ordering issue") 0ffa6302e2f6 ("clocksource/drivers/arm_arch_timer: Move drop _tval from erratum function names") 8065137de0cf ("clocksource/drivers/arm_arch_timer: Move system register timer programming over to CVAL") 674941dc157e ("clocksource/drivers/arm_arch_timer: Extend write side of timer register accessors to u64") 0c1f5fc141ea ("clocksource/drivers/arm_arch_timer: Drop CNT*_TVAL read accessors") 02aecc78b278 ("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 04c19cd6345a4c14df5e64d6a4523d52342321dc: UBUNTU: Ubuntu-gcp-5.15.0-1048.56 (2023-11-18 14:50:34 -0300) are available in the git repository at: git+ssh://user@kathleen/home/john-cabaj/for-review/jammy_linux-gcp/ ampere_one for you to fetch changes up to 484baebd076c93b60979ae26718477c8bf1bb47a: clocksource/drivers/arch_arm_timer: Move workaround synchronisation around (2023-11-21 16:21:06 -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 Acked-by: Manuel Diewald