Skip to content

Commit 8f956e9

Browse files
elongbugjlahtine-intel
authored andcommitted
drm/i915/hwmon: Fix a build error used with clang compiler
Use REG_FIELD_PREP() and a constant value for hwm_field_scale_and_write() If the first argument of FIELD_PREP() is not a compile-time constant value or unsigned long long type, this routine of the __BF_FIELD_CHECK() macro used internally by the FIELD_PREP() macro always returns false. BUILD_BUG_ON_MSG(__bf_cast_unsigned(_mask, _mask) > \ __bf_cast_unsigned(_reg, ~0ull), \ _pfx "type of reg too small for mask"); \ And it returns a build error by the option among the clang compilation options. [-Werror,-Wtautological-constant-out-of-range-compare] Reported build error while using clang compiler: drivers/gpu/drm/i915/i915_hwmon.c:115:16: error: result of comparison of constant 18446744073709551615 with expression of type 'typeof (_Generic((field_msk), char: (unsigned char)0, unsigned char: (unsigned char)0, signed char: (unsigned char)0, unsigned short: (unsigned short)0, short: (unsigned short)0, unsigned int: (unsigned int)0, int: (unsigned int)0, unsigned long: (unsigned long)0, long: (unsigned long)0, unsigned long long: (unsigned long long)0, long long: (unsigned long long)0, default: (field_msk)))' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare] bits_to_set = FIELD_PREP(field_msk, nval); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/bitfield.h:114:3: note: expanded from macro 'FIELD_PREP' __BF_FIELD_CHECK(_mask, 0ULL, _val, "FIELD_PREP: "); \ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/bitfield.h:71:53: note: expanded from macro '__BF_FIELD_CHECK' BUILD_BUG_ON_MSG(__bf_cast_unsigned(_mask, _mask) > \ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~ ./include/linux/build_bug.h:39:58: note: expanded from macro 'BUILD_BUG_ON_MSG' ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~ ./include/linux/compiler_types.h:357:22: note: expanded from macro 'compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/compiler_types.h:345:23: note: expanded from macro '_compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/compiler_types.h:337:9: note: expanded from macro '__compiletime_assert' if (!(condition)) \ v2: Use REG_FIELD_PREP() macro instead of FIELD_PREP() (Jani) Fixes: 99f55ef ("drm/i915/hwmon: Power PL1 limit and TDP setting") Cc: Ashutosh Dixit <[email protected]> Cc: Anshuman Gupta <[email protected]> Cc: Andi Shyti <[email protected]> Cc: Jani Nikula <[email protected]> Signed-off-by: Gwan-gyeong Mun <[email protected]> Reviewed-by: Ashutosh Dixit <[email protected]> Acked-by: Jani Nikula <[email protected]> [Joonas: Wrapped commit message error line length to be more reasonable] Signed-off-by: Joonas Lahtinen <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0aeec60 commit 8f956e9

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

drivers/gpu/drm/i915/i915_hwmon.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,21 +101,16 @@ hwm_field_read_and_scale(struct hwm_drvdata *ddat, i915_reg_t rgadr,
101101

102102
static void
103103
hwm_field_scale_and_write(struct hwm_drvdata *ddat, i915_reg_t rgadr,
104-
u32 field_msk, int nshift,
105-
unsigned int scale_factor, long lval)
104+
int nshift, unsigned int scale_factor, long lval)
106105
{
107106
u32 nval;
108-
u32 bits_to_clear;
109-
u32 bits_to_set;
110107

111108
/* Computation in 64-bits to avoid overflow. Round to nearest. */
112109
nval = DIV_ROUND_CLOSEST_ULL((u64)lval << nshift, scale_factor);
113110

114-
bits_to_clear = field_msk;
115-
bits_to_set = FIELD_PREP(field_msk, nval);
116-
117111
hwm_locked_with_pm_intel_uncore_rmw(ddat, rgadr,
118-
bits_to_clear, bits_to_set);
112+
PKG_PWR_LIM_1,
113+
REG_FIELD_PREP(PKG_PWR_LIM_1, nval));
119114
}
120115

121116
/*
@@ -406,7 +401,6 @@ hwm_power_write(struct hwm_drvdata *ddat, u32 attr, int chan, long val)
406401
case hwmon_power_max:
407402
hwm_field_scale_and_write(ddat,
408403
hwmon->rg.pkg_rapl_limit,
409-
PKG_PWR_LIM_1,
410404
hwmon->scl_shift_power,
411405
SF_POWER, val);
412406
return 0;

0 commit comments

Comments
 (0)