Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp5051810ioo; Tue, 31 May 2022 18:43:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydSbG0rHUpr+BgR8GTMCzDcJcT4iTPcIBwQSdSa6qzobsoWvgF2Mnr20Afle6rHyhZ/s8b X-Received: by 2002:a63:d507:0:b0:3fb:22d1:8a51 with SMTP id c7-20020a63d507000000b003fb22d18a51mr22829657pgg.377.1654047804183; Tue, 31 May 2022 18:43:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654047804; cv=none; d=google.com; s=arc-20160816; b=r3YfH4R0OGJfLYdgEg+Hq4QjcvN5/EA6mPP+jCiuCvFWYTn85gf+Z8rUSEyXSY6w+Z VgNTRFcYVAvBTqwzy9usEl9LWIrRgWi9bJOxDRlGFsRgMf/COdq1YsKogBBBuSMH8ErX cjArkfzymjnSwXMqY+Ove2bB4X6JRCbNpA3zwLoS6cmQ/9wqEAv5SPteguaaauL7Izpb VB0z06BCQFLmPggFGjAv93412FgJnX61gT6PxQqw9L949drXWJBb9Q5kq5EwJb9uOVXQ rSDmpxxEJpCP2E5PJ5XBY3aQQ9TPVg/vFPs4TnP13BWHkRhbW5Q9QuzZeIWB1PN0WABC spUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eUqh4korhJy3P8YUDPMB7AWKbO2xCwrv9iVcA6GhMos=; b=iaenHsI6ZIjMJ6enmu1PjdP6KJa2fkgl5EZR9AuhH5n5kbLtUSLb8YI0CdAuBF8oEm H/mUQK5LyGfSGJucbJ7gdFT+8IRnN0MEveCc6rKF5Ky7OVdTC0QSgiykpbucfbVeww9W LIGyAmIgyDdiYR5+oPBPDI06r7yvCRz14FMHu2VQD4AMvgBREpGlG6sAjIzWLfc512vn vq8O2vttj8jfBnGliLHzqfR0JhDgoCssJv8lurIf3fB9lQsbUL/6TYK0+UptFBLGx9nK jSkJ1jQJFxDqJmgYTBBvd6FHqdBE3/Y2OgDDWH0H4n0fXlMKUxo961Nd2OBe9/Mxz9n7 FrOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jAIY5E6s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z13-20020a170902d54d00b0015ed92d19adsi729968plf.42.2022.05.31.18.43.10; Tue, 31 May 2022 18:43:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jAIY5E6s; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242071AbiE3Oav (ORCPT + 99 others); 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 X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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