From patchwork Tue Apr 18 13:57:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 84886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2892374vqo; Tue, 18 Apr 2023 07:22:46 -0700 (PDT) X-Google-Smtp-Source: AKy350ZaBUBcmV6ZqgH1keBWwQn16GRYaDGESrk/vGgneG6DMI37TOwGAwVx+SH4RFqO8G5xAxKB X-Received: by 2002:a05:6a20:3d81:b0:ef:b575:e55b with SMTP id s1-20020a056a203d8100b000efb575e55bmr9475743pzi.55.1681827765894; Tue, 18 Apr 2023 07:22:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681827765; cv=none; d=google.com; s=arc-20160816; b=0tVoRZRjMcG9rOyatr0s7a8PwKGL2k9R1czwp4jrBqfdIODW1p08i4r44GDm6z+RCj cSSoU5v8CV1HAEyLCOlK2pq3p66pKppLwn5x1ffIcgyEk2qjPcmrVf9fLyQFtJLsyccN QKZ6Pn7kxPAWuRV/Sh12uaf6bU58T8eBEB880EMYIaxakPkT5FwgXq2Y61JJiup90tj0 mWgPcCvpu5aBz8USFz4ccVe9WabSc767wW2vliIrq7DxTdEGtwg3wkESOMzXKbfWT6Wg d9wiyhjhfaCyUN792J+Q6iG9D2LHYUdBegIqQBmmz0SR4tTRcH6+PK49T3uImi+uUxTy LDFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=kyA3uTsFl3vtP/ldRQLcuA85yLxeSuPnqBnzBeRM3Ys=; b=RTIkixPhGjcYwrtUej/PYj1byO9vkIGFOfhr8Wb6jgih8zVIIoeuCKvitIn4haLK7i LO+0r2DwsMv8Go2zqIA3hslevdShP2+k2YLFHPmswrTSQa5W0wYGWyVCIXxSK1PWbu+0 r5lpQCWA1t3e7K15dZ5vLaTZ1IVtEIAypWBB5fTGxxlJZlA57mp9cRZcJX5VuiM+RXwr Pe6nRQMq5+kS7BxYFp5r6+mZ+oDl4ndy6EWpUtOHRxe6LXoHq/6ArquU9s5+1wEloM27 YM9hYcs3K3CmK0C44xOkh0SRRdlY+Rt/GFaFMd0rC/6GY1mY5cTSNnJHTXppZDHsdFk+ Qciw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bsK6f7SY; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c24-20020a631c58000000b00502d794102asi14146042pgm.588.2023.04.18.07.22.31; Tue, 18 Apr 2023 07:22:45 -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=bsK6f7SY; 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 S231314AbjDROIo (ORCPT + 99 others); Tue, 18 Apr 2023 10:08:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbjDROIn (ORCPT ); Tue, 18 Apr 2023 10:08:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 675A883FE for ; Tue, 18 Apr 2023 07:08:42 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 0315C628A1 for ; Tue, 18 Apr 2023 14:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF856C4339E; Tue, 18 Apr 2023 14:08:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681826921; bh=xpHsOrpkWRpyNCpBAlr/smcDbgm9ns3SuGHZf7AJY+k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bsK6f7SYNFolXhScpxxmBRMAXE1fSceM8+DAksbKK7J3dYaKV6Y1fWyTO+PFnis/l 5JqdgF33ililjaH5lv6Rh/P0TSBfqKaFoovN3CvnW+OdhpgST1wNH94hkmAHqecbiN YUUYAtuG1hW/3bny2P6d4TMV6VQWahUWSs3dFtN22Dy93Ahr39zuqV+oCfRlajIQeE aN0YzXLLIH1VTox8efH9ucZKEK57y1w1jdOjrHizy/tYfmYQA0cwuG0xn/gBgBoaQb H56mMEV00ZvbFlXQ3NGgrdafOOpvBWGx/ljeeJKPQqG3QYolxF0OWvo7PBKsRBmRUd jRjTnocTPrl3Q== From: Mark Brown Date: Tue, 18 Apr 2023 14:57:31 +0100 Subject: [PATCH 1/2] arm64/esr: Use GENMASK() for the ISS mask MIME-Version: 1.0 Message-Id: <20230417-arm64-iss2-dabt-decode-v1-1-2138b5668777@kernel.org> References: <20230417-arm64-iss2-dabt-decode-v1-0-2138b5668777@kernel.org> In-Reply-To: <20230417-arm64-iss2-dabt-decode-v1-0-2138b5668777@kernel.org> To: Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-00303 X-Developer-Signature: v=1; a=openpgp-sha256; l=839; i=broonie@kernel.org; h=from:subject:message-id; bh=xpHsOrpkWRpyNCpBAlr/smcDbgm9ns3SuGHZf7AJY+k=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkPqRkeS7UOEnFRIgdAZNupiulQ4MNR2QjZKhO9kVX HG9SbvuJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZD6kZAAKCRAk1otyXVSH0FhSB/ 9qsI6sABTBumYfQvPtyRsaAmGR4YOv80PLiLvQ8Pya6vJCaGnPe92RvF6fsegVD10YrZBoQi/GMrWC 1gHFxB/bu8Y1hJeVCBEVUAw4BYb/XVENzzAHHCl5hjC6GIYMpAfmpvUL6RQr8febtdOkbXwFUvhon+ DwoWg/MEJ+vkPBl8XTXeaN9Gqbi16OhBBncwZHJdZQt0mg3IcGz9hMf75kk6tfGm9iAUJ7t/t/vQsN trUCSltAjO8tNQRmG/ZYqxZMoW7TBHz6D9of8foVn3iSZrNzm763DPumdBIrxoI/iOqwau1LSnBBEi 4wtNIV2CjX5qD8/qUCaGxL8m6P3X5U X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-7.1 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763524231313901180?= X-GMAIL-MSGID: =?utf-8?q?1763524231313901180?= We express the mask for ESR_ELx.ISS in a non-standard manner, not using the standard helpers. In preparation for adding decode for ISS2 convert to use GENMASK(). No functional change. Signed-off-by: Mark Brown --- arch/arm64/include/asm/esr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 8487aec9b658..0bd879007168 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -75,7 +75,7 @@ #define ESR_ELx_IL_SHIFT (25) #define ESR_ELx_IL (UL(1) << ESR_ELx_IL_SHIFT) -#define ESR_ELx_ISS_MASK (ESR_ELx_IL - 1) +#define ESR_ELx_ISS_MASK (GENMASK(24, 0)) #define ESR_ELx_ISS(esr) ((esr) & ESR_ELx_ISS_MASK) /* ISS field definitions shared by different classes */