From patchwork Tue May 28 15:37:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13676999 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 8B9A7C25B7C for ; Tue, 28 May 2024 15:37:37 +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: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:In-Reply-To:References: List-Owner; bh=vBkxOUgBbXIazh8WEn6umgsm8G5SkZi8kzghqs/m1CQ=; b=FHcoki/+DJIAQo QVxLlci0q1KFiGw52lbw4U5IgsAMXmJvvWH6tMVdIuYl5xVyKMd49M2yZqNNz3OfA10NhkJF3nO2T sJ6mBj3XxhSIokk0jq3DKbGZ5VjwqKIvDNlfvyJb1GNvBxndZwb9EKWFT4dKzec996MEOwfI/Yl4t dKSerVYL0E+mPsHNV9QGcZbujhdkAmt+Bo66XvPT177iwOPZUas0InNTD01OsWNSBeneYqrCzkgH2 9AF3KPtD4l65VDm8zhnhBHQ5aGSEOGD0cNSXOwnBN08aGg08/mLGeIRweLdfkZm+78KoXZ46ITsFu k2+QGI+cScVBn3Dn9LEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBytC-00000001GXX-2YsK; Tue, 28 May 2024 15:37:26 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sByt9-00000001GWW-2Ml7 for linux-arm-kernel@lists.infradead.org; Tue, 28 May 2024 15:37:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 911B762215; Tue, 28 May 2024 15:37:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FAABC3277B; Tue, 28 May 2024 15:37:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716910642; bh=7zmzoPvXFhVUfVCN9/UlOHGCv01xisUHkwCvRfpy594=; h=From:To:Cc:Subject:Date:From; b=ko0jqU8QTZDtHSsT6QIpoHm1NNFx8uIxbu8d2Mik/wtpsGNfimV12494zWAPuruCp olbSVSNWvhjdZLVXeZT+PHWFIbUkxsqVdnJU9dGzc6iFimTsBH7g05qpBBOisX6Sgo SBzi0nhuZjNbjXEUBnVZvzzkoZtEbNNFMm9VrVblpoKMR/BAEVEIjCtBhPI2PKi88j niNjMY1uzbUc3QP+VGbPTadqOfT8KMiGn4+xdYZ3GRt4/iDtnpEg2ImkoyDlJpLXzI yan0DL+KBgMqv33cpptYPrnU+cY44u0mMjlN/LPmkkacv4+dMDvgV/K5n9rZ4qErgd 7PIlg4QJhSaAQ== From: Arnd Bergmann To: Catalin Marinas , Will Deacon , Jason Gunthorpe Cc: Arnd Bergmann , Baoquan He , Kefeng Wang , Peter Zijlstra , Mark Rutland , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] arm64/io: add constant-argument check Date: Tue, 28 May 2024 17:37:11 +0200 Message-Id: <20240528153717.2439910-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240528_083724_073469_E4D2A79C X-CRM114-Status: GOOD ( 13.76 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann In some configurations __const_iowrite32_copy() does not get inlined and gcc runs into the BUILD_BUG(): In file included from : In function '__const_memcpy_toio_aligned32', inlined from '__const_iowrite32_copy' at arch/arm64/include/asm/io.h:203:3, inlined from '__const_iowrite32_copy' at arch/arm64/include/asm/io.h:199:20: include/linux/compiler_types.h:487:45: error: call to '__compiletime_assert_538' declared with attribute error: BUILD_BUG failed 487 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ include/linux/compiler_types.h:468:25: note: in definition of macro '__compiletime_assert' 468 | prefix ## suffix(); \ | ^~~~~~ include/linux/compiler_types.h:487:9: note: in expansion of macro '_compiletime_assert' 487 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert' 39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ include/linux/build_bug.h:59:21: note: in expansion of macro 'BUILD_BUG_ON_MSG' 59 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ arch/arm64/include/asm/io.h:193:17: note: in expansion of macro 'BUILD_BUG' 193 | BUILD_BUG(); | ^~~~~~~~~ Move the check for constant arguments into the inline function to ensure it is still constant if the compiler decides against inlining it. Fixes: ead79118dae6 ("arm64/io: Provide a WC friendly __iowriteXX_copy()") Signed-off-by: Arnd Bergmann --- v2: - fix both 32-bit and 64-bit copies - remove now-redundant macros --- arch/arm64/include/asm/io.h | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 4ff0ae3f6d66..902026f81b97 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -196,21 +196,18 @@ static inline void __const_memcpy_toio_aligned32(volatile u32 __iomem *to, void __iowrite32_copy_full(void __iomem *to, const void *from, size_t count); -static inline void __const_iowrite32_copy(void __iomem *to, const void *from, - size_t count) +static inline void __iowrite32_copy(void __iomem *to, const void *from, + size_t count) { - if (count == 8 || count == 4 || count == 2 || count == 1) { + if (__builtin_constant_p(count) && + (count == 8 || count == 4 || count == 2 || count == 1)) { __const_memcpy_toio_aligned32(to, from, count); dgh(); } else { __iowrite32_copy_full(to, from, count); } } - -#define __iowrite32_copy(to, from, count) \ - (__builtin_constant_p(count) ? \ - __const_iowrite32_copy(to, from, count) : \ - __iowrite32_copy_full(to, from, count)) +#define __iowrite32_copy(to, from, count) __iowrite32_copy(to, from, count) static inline void __const_memcpy_toio_aligned64(volatile u64 __iomem *to, const u64 *from, size_t count) @@ -255,21 +252,18 @@ static inline void __const_memcpy_toio_aligned64(volatile u64 __iomem *to, void __iowrite64_copy_full(void __iomem *to, const void *from, size_t count); -static inline void __const_iowrite64_copy(void __iomem *to, const void *from, +static inline void __iowrite64_copy(void __iomem *to, const void *from, size_t count) { - if (count == 8 || count == 4 || count == 2 || count == 1) { + if (__builtin_constant_p(count) && + (count == 8 || count == 4 || count == 2 || count == 1)) { __const_memcpy_toio_aligned64(to, from, count); dgh(); } else { __iowrite64_copy_full(to, from, count); } } - -#define __iowrite64_copy(to, from, count) \ - (__builtin_constant_p(count) ? \ - __const_iowrite64_copy(to, from, count) : \ - __iowrite64_copy_full(to, from, count)) +#define __iowrite64_copy(to, from, count) __iowrite64_copy(to, from, count) /* * I/O memory mapping functions.