From patchwork Thu Nov 30 14:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1870175 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 4SgzFY60msz23nw 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 1r8i6I-0004IB-Gy; Thu, 30 Nov 2023 14:33:10 +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 1r8i6A-0004HF-D0 for kernel-team@lists.ubuntu.com; Thu, 30 Nov 2023 14:33:02 +0000 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) (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 581053F179 for ; Thu, 30 Nov 2023 14:33:01 +0000 (UTC) Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-67a4bb77f47so22836576d6.0 for ; Thu, 30 Nov 2023 06:33:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701354780; x=1701959580; 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=njgvC5y1s9/nvQKZgXKWI07xmU4D9sA2/AYjrXdNX2I=; b=ABwdqnBNe2+mIiCSszb3Cb21u8diUQQZYYlHjTbcUU2LsYVGOAmMEk5wG7oh7QEQP8 BooP+84DZqmurArjaN5wMO+ZBfi3u+c6D3vyisqLQtxgkvqOZN9VkpWMHxURoxS0+wgw 42oLg62KUyedaPELO/hxnQelf4zkxi6efzy4U8+kgwYpZ4bGZ8hLlLevusSdknQOqhg1 my58GE3bcFe4/d3cImtJih/Kju27gmuKKtC6iHg5lnPgQLpVucnd/UtoahwU3YJBc6UN ZITZGx1TwxtCCC0IBjwug3MAmAh6nofI5INNmLinOBWW5eRf5wNP3zTj9OrPnlJIVi/K 4Veg== X-Gm-Message-State: AOJu0YwfCfebsQANpQIEo+9q8RMsqseVTamgkHy609ayutiZJZr1k3nx c8pprfGaBOZ+JBZRbpV9flDV16DNY0b6x/SiafeirlFYxIzVSSoTjl9fmygau273ru2QXLTcl+A yAAtxxg/DOB/4HHTjJtufFdO16H6XsHBoxUX40zwHNDUdBEdTZA== X-Received: by 2002:a05:6214:5993:b0:67a:2351:ccac with SMTP id qp19-20020a056214599300b0067a2351ccacmr37241822qvb.29.1701354780079; Thu, 30 Nov 2023 06:33:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IE6BSMDgjl+K3ukQr5TaDZp2cpI3vkptm4nOAPwHggVssRqVGFG54HMLVnyl7G4d3NDZiQfsA== X-Received: by 2002:a05:6214:5993:b0:67a:2351:ccac with SMTP id qp19-20020a056214599300b0067a2351ccacmr37241801qvb.29.1701354779837; Thu, 30 Nov 2023 06:32:59 -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.32.59 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Nov 2023 06:32:59 -0800 (PST) Message-ID: <7e47e6e7-4104-45b3-9791-f48c3eb0e0f6@canonical.com> Date: Thu, 30 Nov 2023 08:32:58 -0600 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: John Cabaj Subject: [SRU][PULL][focal: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, 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 Acked-by: Manuel Diewald