From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
        Nicholas Piggin <npiggin@gmail.com>
Subject: [PATCH] powerpc/time: Fix build failure due to do_hard_irq_enable()
 on PPC32
Thread-Topic: [PATCH] powerpc/time: Fix build failure due to
 do_hard_irq_enable() on PPC32
Thread-Index: AQHYBjbq+BEYUml/MkaeHEgz4YXd9w==
Date:   Mon, 10 Jan 2022 15:29:53 +0000
Message-ID: <247e01e0e10f4dbc59b5ff89e81702eb1ee7641e.1641828571.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?QA9m4T4lmxlBXkkEkyBwKiRBUZKe7ZFiYc5dsx+sSqJH5D7m3HGw4yfzX4?=
 =?iso-8859-1?Q?pU+EJ0IZ0uXozcgjHy/zFJ2yAJb8/yE0ys4mnidhANwBpbhiws2hh8lbsV?=
 =?iso-8859-1?Q?DYbOC0zcY/O8zkmsEoOpmBrawjrMF5pARdP/ZlW77A6rX3xuNKp82+rS8m?=
 =?iso-8859-1?Q?M4kGDmyIPuScIkc7wojwLJitTVM4Cp3tlc1SDBaLMl98WBgvNm/DbuN+hn?=
 =?iso-8859-1?Q?qcTsg5TelwzwyVc80xAWoRs0YzrMtGrqMTVPL5+TWq56w3pJp4KvJ5KPk2?=
 =?iso-8859-1?Q?5nnqfOndtHfmvv14iCXQ3WPWHZtezeTDU96FHFD9Y4Y2yQdQPVsz5SmQuD?=
 =?iso-8859-1?Q?BVVZVAt2neDYdhzuRvFiSzpCXwo5yPhJF60bZSrrefFqtTGewqpTrWXUfL?=
 =?iso-8859-1?Q?wam/bvj5u9otmdzeYMqFrMOWwl41Iccp09mezXYTLLEatb1vkF+Gvv/LqS?=
 =?iso-8859-1?Q?QpGnX1CO9yeRtGx3bhQDfYvi+Y1oQ1z/DHLL1fED4afpww2aQs9gyF5z7j?=
 =?iso-8859-1?Q?Kp6z1nbz0nQKK72T/T/BHEe4b14KGZ1MaWggx6npDjoh3fMYTOVutYlQPT?=
 =?iso-8859-1?Q?lu3DoWoec5AYiXmyKnGlvTE9CMSvI3rsUw8i7HvhVCJ89WjzBlLj2kbrLZ?=
 =?iso-8859-1?Q?F9gABigqzWOlmEY9sAP/fAunSO9KCIdE+OqLebVLUmSksQLgd7mNadDFz8?=
 =?iso-8859-1?Q?GOhlaoa5pp0EuBgWEPXHM1rJ38vQRMx98SsR4nwFUlvKL8EFyEXCAaMlWG?=
 =?iso-8859-1?Q?EKRvj8ILQj86rFwBj2Ya9bjaIoEhoI2jmMLrPj/J1x6U4rAFIoJ7MOzqoC?=
 =?iso-8859-1?Q?QiYJw5idV0XFdpSyntJnHsZ78HIhRKxBkMOeNI7D8BoEUbQMJ9oA9oTuNb?=
 =?iso-8859-1?Q?9z/T/E5sZJZHBMMT1qdXkZcQvBwr7pE2SUs7oy8GrZLB8Dz96ZVRuiFtDK?=
 =?iso-8859-1?Q?0HDtFU6AeaF1n0VVF31FfVs3qdIf7lfC8EZRXtXdEPHR8SHclGEt7aPr6a?=
 =?iso-8859-1?Q?RJoIMfVea7GDd2cGfV8wPc1O/fSrceTARYSrY/0JLcD8QuN6N//V0aQzeh?=
 =?iso-8859-1?Q?osLh3XVDMJygDsH6AqpqQluGeiwgm1F/zPb0ZTBfn2b3QjSGhnnA9YZyjA?=
 =?iso-8859-1?Q?DBPhHuLuPOWYwRrqxVSMkZp1zWfn56U+/96Q4md7IUUUvpa04zvfcUh6r7?=
 =?iso-8859-1?Q?txTb77lfxdVioONuu+pK9CtLuC7t2X4qb9JdNIALrOxe8tXJXH/yhhC/sl?=
 =?iso-8859-1?Q?QYmxDadXOXKkQulaoZGdzvkbbYMPWmKPXHVj1sRIkdH9tWQxDWuo0eDeK+?=
 =?iso-8859-1?Q?UDvkSnxmKcoEbwDyvIinqpND49UWGOdxn4oGn84bf8V/m4bxHCifL7tuRh?=
 =?iso-8859-1?Q?MNrZtF+zgNDSUgfuMAuLhjJ9LclXxgpytZozgcOceh1YqRxiYzvuJ/pooH?=
 =?iso-8859-1?Q?+kHLzrVp2pXnPIyJkepS42bRpZKdvxmJrqL64iRlt0bxrQ+5VtQIRlQ4gf?=
 =?iso-8859-1?Q?dHWRhCbBBjTCZKV1tfiyqDV31ZYO9oGxb2xgYK9i+2ySPYrrW5IK2WWA/0?=
 =?iso-8859-1?Q?8zQTlLLEwfw+5WuIT2F/A4ZgBNSwEg3NrMti6TnH5NAzqwOr2bDB6EFjTU?=
 =?iso-8859-1?Q?IQsUCNUq+KHg67AF21vQaDz0pyyInsK8asJk3y2c2RWG2n/qixU/UvYWPv?=
 =?iso-8859-1?Q?3UuaQrCiBZzxnqtNIz08BntKotUBc1Z3BIkd47uSGoJ1D/Dtf8TDKehmq6?=
 =?iso-8859-1?Q?qWIT1U+ZpWumdq65ruUB2Xm4M=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a807773-c28e-4ebb-92a4-08d9d44e0c8b
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jan 2022 15:29:53.2022
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: dhwB3U76TCSm3XLOsdXIq//gVMIuLHwGKhThqJlOckA/8rBSQfUqh10kBo6yB50R9xdV22jQiX2UZ+Gttfln6xtbdyA7rK+tot1/5RHt0nc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRZP264MB1895
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

	  CC      arch/powerpc/kernel/time.o
	In file included from <command-line>:
	./arch/powerpc/include/asm/hw_irq.h: In function 'do_hard_irq_enable':
	././include/linux/compiler_types.h:335:45: error: call to '__compiletime_assert_35' declared with attribute error: BUILD_BUG failed
	  335 |         _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
	      |                                             ^
	././include/linux/compiler_types.h:316:25: note: in definition of macro '__compiletime_assert'
	  316 |                         prefix ## suffix();                             \
	      |                         ^~~~~~
	././include/linux/compiler_types.h:335:9: note: in expansion of macro '_compiletime_assert'
	  335 |         _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/powerpc/include/asm/hw_irq.h:483:9: note: in expansion of macro 'BUILD_BUG'
	  483 |         BUILD_BUG();
	      |         ^~~~~~~~~

should_hard_irq_enable() returns false on PPC32 so this BUILD_BUG() shouldn't trigger.

Force inlining of should_hard_irq_enable()

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Fixes: 0faf20a1ad16 ("powerpc/64s/interrupt: Don't enable MSR[EE] in irq handlers unless perf is in use")
Cc: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/include/asm/hw_irq.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index a58fb4aa6c81..674e5aaafcbd 100644
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -473,7 +473,7 @@ static inline bool arch_irq_disabled_regs(struct pt_regs *regs)
 	return !(regs->msr & MSR_EE);
 }
 
-static inline bool should_hard_irq_enable(void)
+static __always_inline bool should_hard_irq_enable(void)
 {
 	return false;
 }
-- 
2.33.1