From patchwork Thu May 11 06:05:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 92364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4148167vqo; Wed, 10 May 2023 23:20:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5RdDMAWg0ft5Bt3ObapqEf4MsO4D2My3ihxA7kk3n6vssQVUcV1tLG1m5Gcq2mxr7fyxZG X-Received: by 2002:a17:902:d48d:b0:1ac:8835:b89b with SMTP id c13-20020a170902d48d00b001ac8835b89bmr13436815plg.5.1683786012950; Wed, 10 May 2023 23:20:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683786012; cv=none; d=google.com; s=arc-20160816; b=HzICyVjzdNZWNZHUvqmPD6ndT6CvgvXe00IkpNGCX7miiyJ3yZyoGclTw75FkT2FXX Uh15Ij/bbwztkWzasL22t3thzq18U4HeMc7gIo7rcXTKFxRFg+TeU/rkdCggE9KWOO1X MfJycMwYXUOoo3tS0/BHcW7m8poUk1qEafzsqYJTNqA2HI9EGuYt1hI8xY1pbon5mmxo ePlVQNkl1Z4a3RXaAc3SZe5EQObAvkBoppBOiLiDTfVxqWb9llXkvDXQsReJuhg/Jpog QgFLzHaUiVKTmSmwFCtw+hsaj/rn3W8ElcXmcOGrZhsKQoiblgX50bDMytz8g/vQOuDt 4baw== 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=A3UuCiGJtdwTPIFnzAdYJ5VMzaMa5MMW3ZNaqT6yI7s=; b=QqaNZaiBocrhEyFknIihSuovAZyvP8nbbOVK7qWWIYjfa1Ejz+eZJSkJjT2XSbTMMB Q37wVNiWTU4eUA9fV5FBCMI5dUvCLb/61YFvzrkjsuZNxRUaEOztZzH94ikY7pZW+b+f aY2bT8+kuZOfeEAeEgT1EZ96Ibgs19EC/z9PK7VSBFpSjeoHwwzHEtPM6Kfejp6nKdzC K4Z4u8CQbO0QNi+cz7VT4KUBjmUMYnWfzIUQM6MGQh/UFNtFy+nLTxha8OgqhLDBD8BA JZfM26NylX0z4tGwiZj6g2PeGj3spop1CBPZfkqm+HvWZL6v08heq+CB7Qj22MvJf7sF kL1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="e/i4W5vs"; 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 k7-20020a170902c40700b001a1cefdaa33si6161451plk.342.2023.05.10.23.19.58; Wed, 10 May 2023 23:20:12 -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="e/i4W5vs"; 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 S237072AbjEKGF1 (ORCPT + 99 others); Thu, 11 May 2023 02:05:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236901AbjEKGFZ (ORCPT ); Thu, 11 May 2023 02:05:25 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 254E0138 for ; Wed, 10 May 2023 23:05:24 -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 A9DE4641DF for ; Thu, 11 May 2023 06:05:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97F31C4339E; Thu, 11 May 2023 06:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683785123; bh=S6YXxPKCuvrJZSp4g1qPNxn4rPj71MCJ5tyMyEU+OlU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=e/i4W5vs2CAii8f/zTNZdR9jd5TkkvT72VO+ABbiYZ69muhhl9n1IoWczRsgbMsnu Y8sEs9B//o41QAfRWx2R00NpgRgWw9rXWqFVogFoO00l8DrXZc8Hel50okINXt71lm yWVMhmo+UX+UKte4QEhpHk3zKbtdm6May+HxLMr6oR3oDaFGg1lbnmmeN2E9AyDg2c iM0MKzl0wQImKr+04xkgNZcvwAEUW9rFdElToNGuGF04EGUqBiRoJqlxwScGEZJGxF K9MGpRkRzgX2bzKTaul4HWpGdMHFIILwjEITvOz9M1MxL1ovzJE+RTYFk93tdPpDfI gsiBlK9Cqs7jA== From: Mark Brown Date: Thu, 11 May 2023 15:05:14 +0900 Subject: [PATCH v3 1/2] arm64/esr: Use GENMASK() for the ISS mask MIME-Version: 1.0 Message-Id: <20230417-arm64-iss2-dabt-decode-v3-1-c1fa503e503a@kernel.org> References: <20230417-arm64-iss2-dabt-decode-v3-0-c1fa503e503a@kernel.org> In-Reply-To: <20230417-arm64-iss2-dabt-decode-v3-0-c1fa503e503a@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-bfdf5 X-Developer-Signature: v=1; a=openpgp-sha256; l=839; i=broonie@kernel.org; h=from:subject:message-id; bh=S6YXxPKCuvrJZSp4g1qPNxn4rPj71MCJ5tyMyEU+OlU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBkXIWdH/PbDVh1N7DNVOWDj/16UI+DtsYg10Tld TZATiVKPTmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZFyFnQAKCRAk1otyXVSH 0IyXB/wLKiMIokWbIaB4IwKWUb1ivlQnriSR6ezLjsBfcQ/4D+KQeL0EIPAhjcYNQfbF+zpe4lA SmKqwNhmvSUllKfZ/jsmRlBW32vCH0qYK4DHAKhW1SnxeL1QJkjCEs5T0m8YYJhdV2Ts6q0wulR s7U8mkXal4wycJHbibsMYY5o+i3yv7SbHOp6BtuXmyoC3e9Udx6dGAVAANhQok5sfeSxk0J9Bro bXx5NMuuaAtBNGnbDGHrsmrRYod+JnblQQg8oDu4z2z8jDFtx94VqlwAFysSUTPu7sTdsu+ZZoQ /c4zTHqmG6INGrPdPlYhyt5ckZWkxdpokY+OZ064NMLopkol X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1765577602197008258?= X-GMAIL-MSGID: =?utf-8?q?1765577602197008258?= 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 */