[PATCH] intel_idle: Update arguments of mwait_idle_with_hints()

[PATCH] intel_idle: Update arguments of mwait_idle_with_hints()

[Uros Bizjak]

Commit a17b37a3f416 ("x86/idle: Change arguments of mwait_idle_with_hints() to u32")
changed the type of arguments of mwait_idle_with_hints() from unsigned
long to u32. Change the type of variables in the call to
mwait_idle_with_hints() to unsigned int to follow the change.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: Len Brown <lenb@kernel.org>
---
 drivers/idle/intel_idle.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 8ccb483204fa..f3ab1d6e3276 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -152,8 +152,8 @@ static __always_inline int __intel_idle(struct cpuidle_device *dev,
 					int index, bool irqoff)
 {
 	struct cpuidle_state *state = &drv->states[index];
-	unsigned long eax = flg2MWAIT(state->flags);
-	unsigned long ecx = 1*irqoff; /* break on interrupt flag */
+	unsigned int eax = flg2MWAIT(state->flags);
+	unsigned int ecx = 1*irqoff; /* break on interrupt flag */
 
 	mwait_idle_with_hints(eax, ecx);
 
@@ -226,9 +226,9 @@ static __cpuidle int intel_idle_xstate(struct cpuidle_device *dev,
 static __cpuidle int intel_idle_s2idle(struct cpuidle_device *dev,
 				       struct cpuidle_driver *drv, int index)
 {
-	unsigned long ecx = 1; /* break on interrupt flag */
 	struct cpuidle_state *state = &drv->states[index];
-	unsigned long eax = flg2MWAIT(state->flags);
+	unsigned int eax = flg2MWAIT(state->flags);
+	unsigned int ecx = 1; /* break on interrupt flag */
 
 	if (state->flags & CPUIDLE_FLAG_INIT_XSTATE)
 		fpu_idle_fpregs();
-- 
2.49.0

Re: [PATCH] intel_idle: Update arguments of mwait_idle_with_hints()

[Artem Bityutskiy]

On Mon, 2025-06-09 at 08:35 +0200, Uros Bizjak wrote:
> Commit a17b37a3f416 ("x86/idle: Change arguments of mwait_idle_with_hints() to u32")
> changed the type of arguments of mwait_idle_with_hints() from unsigned
> long to u32. Change the type of variables in the call to
> mwait_idle_with_hints() to unsigned int to follow the change.
> 
> Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
> Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> Cc: Len Brown <lenb@kernel.org>

Reviewed-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Re: [PATCH] intel_idle: Update arguments of mwait_idle_with_hints()

[Rafael J. Wysocki]

On Tue, Jun 10, 2025 at 9:11 AM Artem Bityutskiy
<artem.bityutskiy@linux.intel.com> wrote:
>
> On Mon, 2025-06-09 at 08:35 +0200, Uros Bizjak wrote:
> > Commit a17b37a3f416 ("x86/idle: Change arguments of mwait_idle_with_hints() to u32")
> > changed the type of arguments of mwait_idle_with_hints() from unsigned
> > long to u32. Change the type of variables in the call to
> > mwait_idle_with_hints() to unsigned int to follow the change.
> >
> > Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
> > Cc: "Rafael J. Wysocki" <rafael@kernel.org>
> > Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> > Cc: Len Brown <lenb@kernel.org>
>
> Reviewed-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Applied as 6.16-rc material, thanks!