From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EB94C43217 for ; Mon, 30 May 2022 14:31:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242187AbiE3Oav (ORCPT ); Mon, 30 May 2022 10:30:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241730AbiE3OSA (ORCPT ); Mon, 30 May 2022 10:18:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02BAF7C146; Mon, 30 May 2022 06:48:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id BCA7CB80DA7; Mon, 30 May 2022 13:47:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A5B4C3411C; Mon, 30 May 2022 13:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918477; bh=ecnKdu3dNIXXUsykxvWsk2ozbn7wJ/lFBbmn3Vbe17A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jAIY5E6ssVVJDokVt64BPe10yTQfcw8IW18UX99UdHN+As1O17T1fY+AzqdO+oeVx aNnMJr9VDLqMrDcltK9iTFIklH3BxR143l8SBkOcPJkPJF1Qu5kHSjH/51+QaA5oXB PQzDDHYt9Gi36dpS/XNVQoLQCXdVmyDhwtI2bJDYrOnFuG3IgrpG6duK/zQpyU8tne eLnc4YpKd+clLLgXhXYm4r1KT7M9z4q7WGWwbEYaJjwsXtFL3NsbngeJlFubCjQEaH jxl2NgNuD2yqO88GPSlyQdjsie7NZXQnb0NojpOa/il1dOh9247+0FWlTRQHDFELQw CEEbUODOE9o1w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Marek Szyprowski , Catalin Marinas , Sasha Levin , will@kernel.org, maz@kernel.org, suzuki.poulose@arm.com, vladimir.murzin@arm.com, james.morse@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 22/55] arm64/sme: Add ID_AA64SMFR0_EL1 to __read_sysreg_by_encoding() Date: Mon, 30 May 2022 09:46:28 -0400 Message-Id: <20220530134701.1935933-22-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> References: <20220530134701.1935933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit 8a58bcd00e2e8d46afce468adc09fcd7968f514c ] We need to explicitly enumerate all the ID registers which we rely on for CPU capabilities in __read_sysreg_by_encoding(), ID_AA64SMFR0_EL1 was missed from this list so we trip a BUG() in paths which rely on that function such as CPU hotplug. Add the register. Reported-by: Marek Szyprowski Signed-off-by: Mark Brown Tested-by: Marek Szyprowski Link: https://lore.kernel.org/r/20220427130828.162615-1-broonie@kernel.org Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/cpufeature.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index d07dadd6b8ff..7759cd8293d8 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -845,6 +845,7 @@ static u64 __read_sysreg_by_encoding(u32 sys_id) read_sysreg_case(SYS_ID_AA64PFR0_EL1); read_sysreg_case(SYS_ID_AA64PFR1_EL1); read_sysreg_case(SYS_ID_AA64ZFR0_EL1); + read_sysreg_case(SYS_ID_AA64SMFR0_EL1); read_sysreg_case(SYS_ID_AA64DFR0_EL1); read_sysreg_case(SYS_ID_AA64DFR1_EL1); read_sysreg_case(SYS_ID_AA64MMFR0_EL1); -- 2.35.1