diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c
index 34838753e22..08c833d1a2d 100644
--- a/sys/x86/cpufreq/hwpstate_amd.c
+++ b/sys/x86/cpufreq/hwpstate_amd.c
@@ -115,9 +115,11 @@
 
 #define	HWP_AMD_CLASSNAME			"hwpstate_amd"
 
-#define	BITS_VALUE(bits, num)			(((num) & (bits)) >> (ffsll((bits)) - 1))
-#define	BITS_WITH_VALUE(bits, val)		((uintmax_t)(val) << (ffsll((bits)) - 1))
-#define	SET_BITS_VALUE(var, bits, val) \
+#define	BITS_VALUE(bits, val)						\
+	(((val) & (bits)) >> (ffsll((bits)) - 1))
+#define	BITS_WITH_VALUE(bits, val)					\
+	(((uintmax_t)(val) << (ffsll((bits)) - 1)) & (bits))
+#define	SET_BITS_VALUE(var, bits, val)					\
 	((var) = ((var) & ~(bits)) | BITS_WITH_VALUE((bits), (val)))
 
 #define	HWPSTATE_DEBUG(dev, msg...)			\