From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CBD713D5C06; Tue, 13 Oct 2026 12:26:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791894404; cv=none; b=HvecaAISzj/KYt++m2VL1B8b8m7m8N6o8Ul4fhA0yzprNw8LTWrraWI2yLTzFAVOaHqskwY1TFUV/K81KOz/ZNZK18K6M7iaNbFV8HGTHX9KwrnSY1vrtvHxSX+O3VjNc6XhqWEiQyjMZcUjPBNHwVYdgWMbv7xPUsTKPPONf8s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791894404; c=relaxed/simple; bh=zAs1hGKZJcjQjM8XU+mVllrDG9qHTI1Y2zgJQPjviLQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AvwNR8f8RuXkAAkwnYqDsEgBtf9W70Gn8KS+Umydd3tfIdr8JOD5k/SslNErh0+bq0tGEmeel/LlsfNM35KJwZVEkAlEl6RGHe9IMgDMaP15Smj+IApk6cQEJ7r5lhyB+1NY4YFM65F9YI7KCNUZpL69Xbcl9oIMY8A0cYtK358= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=g53alhgk; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="g53alhgk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2AD041F000FF; Tue, 13 Oct 2026 12:26:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1791894403; bh=RUYevhyrUxYXjV1ZB6FnxB3Ih02rO8KnX3QyOm58u3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=g53alhgkZP4T0Ewn9+fjCarNL16Uk5eHuiD7ndVqR2zo/KJXE9OCYJx+D95+Yc++f gtGOKyW6LBPZSMDFWlOOzwOHOL+U0Pu7z+Su64kbpY2l3N7I+crT6i/C6Y6giWIGH9 uBfrvP9IAKZIhaXHje0waJ4vqdjUglqjzo/BQI68= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fuad Tabba , Bradley Morgan , Anshuman Khandual , Will Deacon , Sasha Levin Subject: [PATCH 6.18 549/621] arm64/boot: Dont set PMUv3p9 FGT2 bits without PMUv3 Date: Tue, 13 Oct 2026 13:39:04 +0200 Message-ID: <20261013112933.843645272@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261013112920.855194808@linuxfoundation.org> References: <20261013112920.855194808@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fuad Tabba [ Upstream commit b52ef450139f5632d7e53e6fd5f5ec46c7029dac ] On a CPU with FGT2 and an IMPLEMENTATION DEFINED PMU (PMUVer 0b1111), __init_el2_fgt2 sets the PMUv3p9 bits in HDFGRTR2_EL2 and HDFGWTR2_EL2, which are RES0 there. The macro only checks that PMUVer is at least PMUv3p9, and 0b1111 passes. Exclude 0b1111 before the compare, as __init_el2_debug does. Fixes: 858c7bfcb35e1 ("arm64/boot: Enable EL2 requirements for FEAT_PMUv3p9") Signed-off-by: Fuad Tabba Reviewed-by: Bradley Morgan Reviewed-by: Anshuman Khandual Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/el2_setup.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h index 48f686e4bba2f..b26ceeedefa85 100644 --- a/arch/arm64/include/asm/el2_setup.h +++ b/arch/arm64/include/asm/el2_setup.h @@ -412,8 +412,9 @@ mov x2, xzr mrs x1, id_aa64dfr0_el1 ubfx x1, x1, #ID_AA64DFR0_EL1_PMUVer_SHIFT, #4 - cmp x1, #ID_AA64DFR0_EL1_PMUVer_V3P9 - b.lt .Lskip_pmuv3p9_\@ + cmp x1, #ID_AA64DFR0_EL1_PMUVer_IMP_DEF + ccmp x1, #ID_AA64DFR0_EL1_PMUVer_V3P9, #8, ne + b.lt .Lskip_pmuv3p9_\@ // Skip if < PMUv3p9 or IMP_DEF orr x0, x0, #HDFGRTR2_EL2_nPMICNTR_EL0 orr x0, x0, #HDFGRTR2_EL2_nPMICFILTR_EL0 -- 2.53.0