Thread (2 messages) 2 messages, 2 authors, 2021-01-13

[PATCH] dmaengine: qcom: Always inline gpi_update_reg

flat view
STALE2046d LANDED

From: Nathan Chancellor <hidden>
Date: 2021-01-12 19:13:34
Also in: linux-arm-msm, lkml
Subsystem: arm/qualcomm mailing list, dma generic offload engine subsystem, the rest · Maintainers: Vinod Koul, Linus Torvalds

Landed in mainline as 0a6d3038d914 on 2021-01-13.

When building with CONFIG_UBSAN_UNSIGNED_OVERFLOW, clang decides not to
inline gpi_update_reg, which causes a linkage failure around __bad_mask:

ld.lld: error: undefined symbol: __bad_mask
quoted
quoted
referenced by bitfield.h:119 (include/linux/bitfield.h:119)
              dma/qcom/gpi.o:(gpi_update_reg) in archive drivers/built-in.a
referenced by bitfield.h:119 (include/linux/bitfield.h:119)
              dma/qcom/gpi.o:(gpi_update_reg) in archive drivers/built-in.a
If gpi_update_reg is not inlined, the mask value will not be known at
compile time so the check in field_multiplier stays in the final
object file, causing the above linkage failure. Always inline
gpi_update_reg so that this check can never fail.

Fixes: 5d0c3533a19f ("dmaengine: qcom: Add GPI dma driver")
Link: https://github.com/ClangBuiltLinux/linux/issues/1243
Signed-off-by: Nathan Chancellor <redacted>
---
 drivers/dma/qcom/gpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
index 1a0bf6b0567a..e48eb397f433 100644
--- a/drivers/dma/qcom/gpi.c
+++ b/drivers/dma/qcom/gpi.c
@@ -584,7 +584,7 @@ static inline void gpi_write_reg_field(struct gpii *gpii, void __iomem *addr,
 	gpi_write_reg(gpii, addr, val);
 }
 
-static inline void
+static __always_inline void
 gpi_update_reg(struct gpii *gpii, u32 offset, u32 mask, u32 val)
 {
 	void __iomem *addr = gpii->regs + offset;
base-commit: 7c53f6b671f4aba70ff15e1b05148b10d58c2837
-- 
2.30.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help