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 79098C433EF for ; Wed, 1 Jun 2022 14:01:56 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hi7KXOZrFr0tTCIljV5gaR8Uf6agZhPL/0Q/1Q3AXj0=; b=vCa9GlZNg7RbGX l60P5BFZpbPSoL86tY+Ipc6YCvSyW/JAO+t27z6TorjIETB9e+o2mgyPRY1nEf7z6OTgfdU60oqay W7XcTa8eg3UXP1ZalkqS8BTGz9gEVnxm8dfikref4rrkda/PKgHa7hEukjihA3at58rzJs0ACy0d3 WRbNAQuZUb9c6HyfuWmFb0Se69QfF8OHd4M0X6fzhTQTe9fyvPHbIf/EnIf0mcmN6gGXj7HnNqjZr DP9tBAIwUKVCNF3im3DC+icTjOiIAx8wHB40JmGCCouKH1AZ3elITEU2osrYS3tRt7HsA0yhYP4Bf 4xUfJIGKMTGFKDIBImhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwOtX-00GSjq-HD; Wed, 01 Jun 2022 14:00:19 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwOq3-00GQgi-Pc for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2022 13:56:45 +0000 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 dfw.source.kernel.org (Postfix) with ESMTPS id 485B36162A; Wed, 1 Jun 2022 13:56:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E856DC385A5; Wed, 1 Jun 2022 13:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654091803; bh=0EBD0XpZZ+F2n0Cb3NfwT7URAxfSkcxQ+mqo9tvcibY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRvyTRoVrz7x9pXsYEdWCh8d+JDjD4wLPaHsTBYJv58HAe25QMxbpKzZHPdoa9A8U tUoyvCm3NUCXJsX+A5ugeAG5PpskOIEe+EV8sNYSfoxuWuou7IQqyQiCq2R2EGMK54 0zDK/GLHQi9leOUTL7uqibG4xZaATjaIKQkMfrgcRJ1kRzR0eAMY5aHgGA93GCy1vs 3Yg7wusPmMABPaN7RSdi1CmeXbfjGlkLF1aiEOUphFy2vmVGnY2MPxaEqbBDCboIjK pxn0ihKsMCkKUvBr6+Y0ui21RrMHj2iwfmeixwDzPlJb2VKCEO3giu3du2UerthsQ3 yaKvy7UcZPUQg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marc Zyngier , Joey Gouly , Catalin Marinas , Sasha Levin , will@kernel.org, alexandru.elisei@arm.com, broonie@kernel.org, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 12/37] arm64: Expand ESR_ELx_WFx_ISS_TI to match its ARMv8.7 definition Date: Wed, 1 Jun 2022 09:55:57 -0400 Message-Id: <20220601135622.2003939-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220601135622.2003939-1-sashal@kernel.org> References: <20220601135622.2003939-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220601_065643_908307_457F0CA2 X-CRM114-Status: GOOD ( 14.07 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Marc Zyngier [ Upstream commit 6a437208cb942a2dd98f7e1c3fd347ed3d425ffc ] Starting with FEAT_WFXT in ARMv8.7, the TI field in the ISS that is reported on a WFx trap is expanded by one bit to allow the description of WFET and WFIT. Special care is taken to exclude the WFxT bit from the mask used to match WFI so that it also matches WFIT when trapped from EL0. Reviewed-by: Joey Gouly Signed-off-by: Marc Zyngier Acked-by: Catalin Marinas Link: https://lore.kernel.org/r/20220419182755.601427-2-maz@kernel.org Signed-off-by: Sasha Levin --- arch/arm64/include/asm/esr.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 8f59bbeba7a7..37bb84ea724d 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -133,7 +133,8 @@ #define ESR_ELx_CV (UL(1) << 24) #define ESR_ELx_COND_SHIFT (20) #define ESR_ELx_COND_MASK (UL(0xF) << ESR_ELx_COND_SHIFT) -#define ESR_ELx_WFx_ISS_TI (UL(1) << 0) +#define ESR_ELx_WFx_ISS_TI (UL(3) << 0) +#define ESR_ELx_WFx_ISS_WFxT (UL(2) << 0) #define ESR_ELx_WFx_ISS_WFI (UL(0) << 0) #define ESR_ELx_WFx_ISS_WFE (UL(1) << 0) #define ESR_ELx_xVC_IMM_MASK ((1UL << 16) - 1) @@ -146,7 +147,8 @@ #define DISR_EL1_ESR_MASK (ESR_ELx_AET | ESR_ELx_EA | ESR_ELx_FSC) /* ESR value templates for specific events */ -#define ESR_ELx_WFx_MASK (ESR_ELx_EC_MASK | ESR_ELx_WFx_ISS_TI) +#define ESR_ELx_WFx_MASK (ESR_ELx_EC_MASK | \ + (ESR_ELx_WFx_ISS_TI & ~ESR_ELx_WFx_ISS_WFxT)) #define ESR_ELx_WFx_WFI_VAL ((ESR_ELx_EC_WFx << ESR_ELx_EC_SHIFT) | \ ESR_ELx_WFx_ISS_WFI) -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel