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 868EEC433F5 for ; Tue, 12 Apr 2022 00:49:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232748AbiDLAwG (ORCPT ); Mon, 11 Apr 2022 20:52:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244213AbiDLAup (ORCPT ); Mon, 11 Apr 2022 20:50:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6C931DFA; Mon, 11 Apr 2022 17:46:55 -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 67177B819C1; Tue, 12 Apr 2022 00:46:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85ABCC385AB; Tue, 12 Apr 2022 00:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724413; bh=0w5fkYWRq9t9bwKn/65Gjp/8xhsgA6n0+Ym3YnpIS4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BBR5QgQ717gYhD6qL04QoH9T9SiBhM2VAAr79BsjMQlvB2Z4mSEK0ybwfYLhxbejj cDFn/aez/NZXe1O67/etIBAIA+Sz0KxpCTLRn1qaHE6jiASeXNFKMLd5fPP92C4q2/ nC1IiqBsKXJLZf049aqQrJGKcnHPngHBmnubSElZPuG1rGP18ZTAD2VZWKtxTwE9up qsKRIDFm9cGyo7sg6l2znly7SlSPUGam0eOkN33B3sdpuBLkItJZot2KlVwW273pOz fzQV7oR37/5cubrP9LlxZS+T1JfrULOyeLyWAccDyl5bruHYCcLTa5+KWr166cObSa cMAHZ+/vHTCxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Frank Li , Will Deacon , Mark Rutland , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, Sasha Levin Subject: [PATCH AUTOSEL 5.17 49/49] perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant Date: Mon, 11 Apr 2022 20:44:07 -0400 Message-Id: <20220412004411.349427-49-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov [ Upstream commit d02b4dd84e1a90f7f1444d027c0289bf355b0d5a ] Fix: In file included from :0:0: In function ‘ddr_perf_counter_enable’, inlined from ‘ddr_perf_irq_handler’ at drivers/perf/fsl_imx8_ddr_perf.c:651:2: ././include/linux/compiler_types.h:352:38: error: call to ‘__compiletime_assert_729’ \ declared with attribute error: FIELD_PREP: mask is not constant _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ... See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic for the gory details as to why it triggers with older gccs only. Signed-off-by: Borislav Petkov Cc: Frank Li Cc: Will Deacon Cc: Mark Rutland Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon Link: https://lore.kernel.org/r/20220405151517.29753-10-bp@alien8.de Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/fsl_imx8_ddr_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c index 94ebc1ecace7..b1b2a55de77f 100644 --- a/drivers/perf/fsl_imx8_ddr_perf.c +++ b/drivers/perf/fsl_imx8_ddr_perf.c @@ -29,7 +29,7 @@ #define CNTL_OVER_MASK 0xFFFFFFFE #define CNTL_CSV_SHIFT 24 -#define CNTL_CSV_MASK (0xFF << CNTL_CSV_SHIFT) +#define CNTL_CSV_MASK (0xFFU << CNTL_CSV_SHIFT) #define EVENT_CYCLES_ID 0 #define EVENT_CYCLES_COUNTER 0 -- 2.35.1 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 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 8EAA6C433F5 for ; Tue, 12 Apr 2022 00:48:38 +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=MRe9MK7S1xsILPfc+lpsKaNQ90GcKgWoYVhoSFBEFs0=; b=Z+sMN/fh7NUj2T 2QLmAhKM4MJw7ReU4u0d7v+gLDw8ZmIN73qVHsEnksJqokvJF1juBmwLYNb0IvGbq5VU0z5OeyJA6 RL97itRESecUJnGxWF82Zt3gk9YgxbTGeYIL0bDsdkoof8OoP+zQUmXJtZXjUmqMzF6gaI0Nyk7bz p8K/aGiRjIXs1xr+68ICdIElQcKj2MyjNJ2ZGUoI34yofWOlbr9dTZYyMLWDe3HLT9i03ApNtSCoU kVMnXz24Clv6i02eMDnaL6JTSdhGNTKseUVADkBEe2i7Hg6jG2KTczpJMcfm7pWJIXmj6R5Wfas2h 66HIq8D/J061Maf9oouQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne4gM-00B1Tm-Hc; Tue, 12 Apr 2022 00:46:58 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ne4gI-00B1Rn-1F for linux-arm-kernel@lists.infradead.org; Tue, 12 Apr 2022 00:46:56 +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 A09F2617DA; Tue, 12 Apr 2022 00:46:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85ABCC385AB; Tue, 12 Apr 2022 00:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649724413; bh=0w5fkYWRq9t9bwKn/65Gjp/8xhsgA6n0+Ym3YnpIS4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BBR5QgQ717gYhD6qL04QoH9T9SiBhM2VAAr79BsjMQlvB2Z4mSEK0ybwfYLhxbejj cDFn/aez/NZXe1O67/etIBAIA+Sz0KxpCTLRn1qaHE6jiASeXNFKMLd5fPP92C4q2/ nC1IiqBsKXJLZf049aqQrJGKcnHPngHBmnubSElZPuG1rGP18ZTAD2VZWKtxTwE9up qsKRIDFm9cGyo7sg6l2znly7SlSPUGam0eOkN33B3sdpuBLkItJZot2KlVwW273pOz fzQV7oR37/5cubrP9LlxZS+T1JfrULOyeLyWAccDyl5bruHYCcLTa5+KWr166cObSa cMAHZ+/vHTCxg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Borislav Petkov , Frank Li , Will Deacon , Mark Rutland , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org, Sasha Levin Subject: [PATCH AUTOSEL 5.17 49/49] perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant Date: Mon, 11 Apr 2022 20:44:07 -0400 Message-Id: <20220412004411.349427-49-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412004411.349427-1-sashal@kernel.org> References: <20220412004411.349427-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-20220411_174654_167329_4A6D20A9 X-CRM114-Status: GOOD ( 14.36 ) 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="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgoKWyBVcHN0cmVhbSBjb21taXQgZDAy YjRkZDg0ZTFhOTBmN2YxNDQ0ZDAyN2MwMjg5YmYzNTViMGQ1YSBdCgpGaXg6CgogIEluIGZpbGUg aW5jbHVkZWQgZnJvbSA8Y29tbWFuZC1saW5lPjowOjA6CiAgSW4gZnVuY3Rpb24g4oCYZGRyX3Bl cmZfY291bnRlcl9lbmFibGXigJksCiAgICAgIGlubGluZWQgZnJvbSDigJhkZHJfcGVyZl9pcnFf aGFuZGxlcuKAmSBhdCBkcml2ZXJzL3BlcmYvZnNsX2lteDhfZGRyX3BlcmYuYzo2NTE6MjoKICAu Ly4vaW5jbHVkZS9saW51eC9jb21waWxlcl90eXBlcy5oOjM1MjozODogZXJyb3I6IGNhbGwgdG8g 4oCYX19jb21waWxldGltZV9hc3NlcnRfNzI54oCZIFwKCWRlY2xhcmVkIHdpdGggYXR0cmlidXRl IGVycm9yOiBGSUVMRF9QUkVQOiBtYXNrIGlzIG5vdCBjb25zdGFudAogICAgX2NvbXBpbGV0aW1l X2Fzc2VydChjb25kaXRpb24sIG1zZywgX19jb21waWxldGltZV9hc3NlcnRfLCBfX0NPVU5URVJf XykKLi4uCgpTZWUgaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvci9Za3dRNiUyQnRJSDhHUXB1Y3RA em4udG5pYyBmb3IgdGhlIGdvcnkKZGV0YWlscyBhcyB0byB3aHkgaXQgdHJpZ2dlcnMgd2l0aCBv bGRlciBnY2NzIG9ubHkuCgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2Uu ZGU+CkNjOiBGcmFuayBMaSA8RnJhbmsubGlAbnhwLmNvbT4KQ2M6IFdpbGwgRGVhY29uIDx3aWxs QGtlcm5lbC5vcmc+CkNjOiBNYXJrIFJ1dGxhbmQgPG1hcmsucnV0bGFuZEBhcm0uY29tPgpDYzog U2hhd24gR3VvIDxzaGF3bmd1b0BrZXJuZWwub3JnPgpDYzogU2FzY2hhIEhhdWVyIDxzLmhhdWVy QHBlbmd1dHJvbml4LmRlPgpDYzogUGVuZ3V0cm9uaXggS2VybmVsIFRlYW0gPGtlcm5lbEBwZW5n dXRyb25peC5kZT4KQ2M6IEZhYmlvIEVzdGV2YW0gPGZlc3RldmFtQGdtYWlsLmNvbT4KQ2M6IE5Y UCBMaW51eCBUZWFtIDxsaW51eC1pbXhAbnhwLmNvbT4KQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlz dHMuaW5mcmFkZWFkLm9yZwpBY2tlZC1ieTogV2lsbCBEZWFjb24gPHdpbGxAa2VybmVsLm9yZz4K TGluazogaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvci8yMDIyMDQwNTE1MTUxNy4yOTc1My0xMC1i cEBhbGllbjguZGUKU2lnbmVkLW9mZi1ieTogV2lsbCBEZWFjb24gPHdpbGxAa2VybmVsLm9yZz4K U2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZl cnMvcGVyZi9mc2xfaW14OF9kZHJfcGVyZi5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5z ZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9wZXJmL2ZzbF9p bXg4X2Rkcl9wZXJmLmMgYi9kcml2ZXJzL3BlcmYvZnNsX2lteDhfZGRyX3BlcmYuYwppbmRleCA5 NGViYzFlY2FjZTcuLmIxYjJhNTVkZTc3ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9wZXJmL2ZzbF9p bXg4X2Rkcl9wZXJmLmMKKysrIGIvZHJpdmVycy9wZXJmL2ZzbF9pbXg4X2Rkcl9wZXJmLmMKQEAg LTI5LDcgKzI5LDcgQEAKICNkZWZpbmUgQ05UTF9PVkVSX01BU0sJCTB4RkZGRkZGRkUKIAogI2Rl ZmluZSBDTlRMX0NTVl9TSElGVAkJMjQKLSNkZWZpbmUgQ05UTF9DU1ZfTUFTSwkJKDB4RkYgPDwg Q05UTF9DU1ZfU0hJRlQpCisjZGVmaW5lIENOVExfQ1NWX01BU0sJCSgweEZGVSA8PCBDTlRMX0NT Vl9TSElGVCkKIAogI2RlZmluZSBFVkVOVF9DWUNMRVNfSUQJCTAKICNkZWZpbmUgRVZFTlRfQ1lD TEVTX0NPVU5URVIJMAotLSAKMi4zNS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=