Skip to contentSkip to conversation

scsi: ufs: Fix the build for gcc 9 and before

PATCH Applied Bart Van Assche 4 participants 4 messages Aug 1, 2023 – Aug 8, 2023

Subsystems (2)
lore
Share & tools
lore

Bart Van Assche

author reviewer
#0 lore raw

PATCH v2 1/1 scsi: ufs: Fix the build for gcc 9 and before

gcc compilers before version 10 cannot do constant-folding for sub-byte bitfields. This makes the compiler layout tests fail. Hence skip the layout checks for gcc 9 and before.

---
 drivers/ufs/core/ufshcd.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/ufs/core/ufshcd.c +8 -0
index 23335aaa6a66..4f5174735a4c 100644
@@ -10564,6 +10564,14 @@ static const struct dev_pm_ops ufshcd_wl_pm_ops = {
 
 static void ufshcd_check_header_layout(void)
 {
+	/*
+	 * gcc compilers before version 10 cannot do constant-folding for
+	 * sub-byte bitfields. Hence skip the layout checks for gcc 9 and
+	 * before.
+	 */
+	if (IS_ENABLED(CONFIG_CC_IS_GCC) && CONFIG_GCC_VERSION < 100000)
+		return;
+
 	BUILD_BUG_ON(((u8 *)&(struct request_desc_header){
 				.cci = 3})[0] != 3);
 
Tested-by on v2 1/1
#1 lore raw
Quoted 10 lines · Bart Van Assche

gcc compilers before version 10 cannot do constant-folding for sub-byte bitfields. This makes the compiler layout tests fail. Hence skip the layout checks for gcc 9 and before.

Looks good to me, I gave it a quick spin with all versions from gcc-6 through gcc-10 to make sure this works for all of them.

#2 lore raw
Quoted 6 lines · Arnd Bergmann
Quoted 4 lines · Bart Van Assche

gcc compilers before version 10 cannot do constant-folding for sub-byte bitfields. This makes the compiler layout tests fail. Hence skip the layout checks for gcc 9 and before.

Quoted 6 lines
Quoted 6 lines

Would it be a good idea to provide a link to the original report ?

Quoted 6 lines

Looks good to me, I gave it a quick spin with all versions from gcc-6 through gcc-10 to make sure this works for all of them.

--
Linaro LKFT
https://lkft.linaro.org

#3 lore raw
In reply to Bart Van Assche

Bart,

Quoted 3 lines

gcc compilers before version 10 cannot do constant-folding for sub-byte bitfields. This makes the compiler layout tests fail. Hence skip the layout checks for gcc 9 and before.

Applied to 6.6/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering