From patchwork Tue May 21 14:51:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Tymoshenko X-Patchwork-Id: 13669494 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20226C25B74 for ; Tue, 21 May 2024 14:52:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: Mime-Version:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=qNla3D+vK7T7C20B8JljTiyqfY9vW61MmoQcXoJW7UY=; b=lTR W0FNs2dBmMAMTYvVfuvMZ1cXzNspjtFbMFNoovpbwDwBwRjeRjMoCbkwkukVbYp7v3JrsH131c8WI 7U9DRibEBwFvOftMrZxomjjfLcciHY8GoJ6tzMOpQwd0iPxKokAGi2RzTeMfHj8sRg1TrzmCXvZ8t w1ZsSTDZK46CPcwcE2BtraD81MUSrU3R/aEeNWpZFbylGZGSQz1JDL9eUDdo13X8z4W78LaC/5DVl 6QB6gTwYeLLc6lsmR+rt8z8XUI21pzgQLxgYs20Rysmv+SxfyX8+b9I//ekUhSnnwWATJ24nnSySf Cyj7Q4+HRdtp6tQ7RPaS3uDoXCmSGlA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9QqD-00000000EuQ-17hK; Tue, 21 May 2024 14:51:49 +0000 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s9QqA-00000000Etc-0iWp for linux-arm-kernel@lists.infradead.org; Tue, 21 May 2024 14:51:47 +0000 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-1ec48e36217so108255905ad.3 for ; Tue, 21 May 2024 07:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1716303103; x=1716907903; darn=lists.infradead.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=kGoT9PyxEwtgM/5afZe8siksPbu26HURTv64xQc5SOs=; b=ekT/Rd/fie9ZQH9sNVlwBTSCR9Ruev/5/HMWICUBk8JUK40EpIcC6KVhlqr0589CA5 QaMrGIgcn59FgpR+VKffwLVCTZ+6B0Yg4utNl/Tx/NQcuEOB77bX5tC4EptCYNmQSzlf 0t2i2BaDyjuGvaOgBkYBy0LZ2qGrUwmCdPkTBwtkJC0+TOa9b20Pa1pHYxmP8CrwFIKK yv0msr54M2OeyTJnnAvluKDKe+PPvpeL3nY2F4NTynknYt0aCPsiZt+BJ3+tfSG/jcn/ xVybm/UMfqJ3lFdXV0KszlFYjzCC58lL/4A65ZWu8qgqW7dFnbQKPRTdg1bwjpUS6A3a VyGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716303103; x=1716907903; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kGoT9PyxEwtgM/5afZe8siksPbu26HURTv64xQc5SOs=; b=AbFwKFBNrpHpLmi74G++3TtKHJLxC/ADIeEUgJJXJe4H5e1mO4hZ1l1lkYO5kiZY0q E+uFoR4OLwe4Um/YfZQOLbqHmblbsEVbEZn1fX/QCAQ8/1xR2bPDEk1jp/6YbyqEJmn+ RCLn1rQo2cBcU2jnIO/pKdE2y67xADFZLkdE42hCqGJHWct//NbXhbpemK3SHkrEBxZU xxPhTDPXK+zpDPXf8bjmxJIf0BxOcb3wrQayNjS21X1heDWz5fQiJfcrcn4uPPX1QW1y TvA61zFFNlSZKI6gePzG6t21oPQibzx+LXF5Hf20fXsuJT6k5PcE743e9W2YxZ/2JGRM Xmag== X-Gm-Message-State: AOJu0YxsMEVc6CynUiumIgJCQoZWjJqtESGEvpyxifir7usdwaQlPK6k 88t/FwKFWxkj1f/V/Mxv+NddKwe+d9faiYP+45dhq2e/7RPbfLC+xW/D9Q5dJIG4gA== X-Google-Smtp-Source: AGHT+IFGy8cBPN0O/uR94/FNSc4BWHZGPU8P9wMgM4hQOMLL9aP8jYx+Dk+1beqWdZ/Rm6A/aGdurLI= X-Received: from hmarynka.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:925]) (user=ovt job=sendgmr) by 2002:a17:902:d491:b0:1f3:317:50f3 with SMTP id d9443c01a7336-1f303175717mr1476425ad.0.1716303103456; Tue, 21 May 2024 07:51:43 -0700 (PDT) Date: Tue, 21 May 2024 14:51:29 +0000 Mime-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAPC0TGYC/x3M3QpAQBBA4VfRXBvNLrZ4FblgDab8tSMpeXeby +/inAeUg7BCnTwQ+BKVfYswaQJ+7raJUYZosGQLKq3BRRm7c1/FKzo02FPliC05ykuI1RF4lPs /NuAyA+37fkYHcClmAAAA X-Developer-Key: i=ovt@google.com; a=ed25519; pk=HTpF23xI+jZf9amJE+xfTRAPYN+VnG6QbPd+8nM0Fps= X-Developer-Signature: v=1; a=ed25519-sha256; t=1716303101; l=2034; i=ovt@google.com; s=20240521; h=from:subject:message-id; bh=cMh2radWNBGWDH4huHkH6mKDKNWKhn9PdKTJLMYtdFs=; b=kYbb85O8UWePVi4kvyN79NNub5bpiBQwrq2Ul4k4k+eSGt8ADDCjwakfX4lCXPpr0FojOi/XR siaEsTtqS5OCZyMWCZFoASjh9Ngi9ftpjfFxznSo+nKHNheiWg0QR+T X-Mailer: b4 0.12.4 Message-ID: <20240521-lse-atomics-6-1-v1-1-7aa6040fc6cd@google.com> Subject: [PATCH 6.1] arm64: atomics: lse: remove stale dependency on JUMP_LABEL From: Oleksandr Tymoshenko To: Catalin Marinas , Will Deacon , stable@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Mark Rutland , Oleksandr Tymoshenko X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240521_075146_257240_1AA58AF3 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mark Rutland [ Upstream commit 657eef0a5420a02c02945ed8c87f2ddcbd255772 ] Currently CONFIG_ARM64_USE_LSE_ATOMICS depends upon CONFIG_JUMP_LABEL, as the inline atomics were indirected with a static branch. However, since commit: 21fb26bfb01ffe0d ("arm64: alternatives: add alternative_has_feature_*()") ... we use an alternative_branch (which is always available) rather than a static branch, and hence the dependency is unnecessary. Remove the stale dependency, along with the stale include. This will allow the use of LSE atomics in kernels built with CONFIG_JUMP_LABEL=n, and reduces the risk of circular header dependencies via . Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon Link: https://lore.kernel.org/r/20221114125424.2998268-1-mark.rutland@arm.com Signed-off-by: Will Deacon Signed-off-by: Oleksandr Tymoshenko --- arch/arm64/Kconfig | 1 - arch/arm64/include/asm/lse.h | 1 - 2 files changed, 2 deletions(-) --- base-commit: 4078fa637fcd80c8487680ec2e4ef7c58308e9aa change-id: 20240521-lse-atomics-6-1-b0960e206035 Best regards, diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index c15f71501c6c..044b98a62f7b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1752,7 +1752,6 @@ config ARM64_LSE_ATOMICS config ARM64_USE_LSE_ATOMICS bool "Atomic instructions" - depends on JUMP_LABEL default y help As part of the Large System Extensions, ARMv8.1 introduces new diff --git a/arch/arm64/include/asm/lse.h b/arch/arm64/include/asm/lse.h index c503db8e73b0..f99d74826a7e 100644 --- a/arch/arm64/include/asm/lse.h +++ b/arch/arm64/include/asm/lse.h @@ -10,7 +10,6 @@ #include #include -#include #include #include #include