From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D02C3A960E; Mon, 8 Jun 2026 08:03:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780905816; cv=none; b=CIEwCOj+dWTU4h9ux1jgE9LrD4nZr80L0QILkiB/UVwwvV6mmF3tZPhxO27IknTe8KJOLLIplyxtgFXew/bmZzDNiSThGTeFk9ddz99WY+ErFQrBBtrD7uQqKDmutHNGP3hUvTvTZdh2i4GwBqzMR9HRHmlKtCtRO6Spblam1uU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780905816; c=relaxed/simple; bh=WXfd4/8pNtG1ZKqgumbu9eGHbV3MEBCwTLGzug8pVmY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RSBb9Dvcmm5o3rku0oJ0KY2lyviT7mvpe4z2aJdyHOkTaehUzuEGClGM88aXF+DHW2kDQAk0erzSqof8DRmedU9Fv6DL8ra4T0AD312HHVkMxKyczR7cRV8cxUl1trGY7n5SnGBn9gzAcRh6Iyn/UlCf583jKjPu0a7DLvYVPaA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ryTyo01J; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=R5Its/gR; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ryTyo01J"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="R5Its/gR" Date: Mon, 08 Jun 2026 08:03:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780905812; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5bSirnrb9y7UvK90B3E67HE9yRjtM5Bj3BjW7fCfbOg=; b=ryTyo01J+GMOOAYF+euuHidtcmTCs/UVIO8wiM5tJzjw0YYzlWJOraXXxf/xOsKzycqa98 +GHH0EOESREMfz957szfEpTmusFKuLb/rcPMJn0c6trQTyHnKDZkV5XPohH9VkKPCYZ34U 2HpmMFuNSwW7WqfWveKGfRYfDT37sxFzSxE+pl0/F2tSVqNKSdLqGYXVz4OVg+NM5B2pJV 8q6ex43HKNC4QtdDXrvAwLpk0XRg4/ETqTgvn3Qv4Ftu9W3JAEVO/TM1Z3TAGvgiskh5UC yH4yKoSHhcWZjfVLtgt47nrsSADQIwAQaFHSZpPZe8WO9aroVoqBc2+E/d/7cw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780905812; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5bSirnrb9y7UvK90B3E67HE9yRjtM5Bj3BjW7fCfbOg=; b=R5Its/gRQ2IAE+kgdqznxGddmsy2Xi6qF6qFeI9T33VC3dHqJTp2emreyLvqRkDElSuuWx x6l/EPFTmCFU0UBQ== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/msr] x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu() Cc: K Prateek Nayak , Juergen Gross , Ingo Molnar , Dave Hansen , "Rafael J. Wysocki" , Viresh Kumar , Guenter Roeck , Daniel Lezcano , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260608051741.3207435-4-jgross@suse.com> References: <20260608051741.3207435-4-jgross@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178090581007.529383.18064692200435893999.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the x86/msr branch of tip: Commit-ID: 40b57cfbd29ec71a7a401d1836fe5c94a6f2e230 Gitweb: https://git.kernel.org/tip/40b57cfbd29ec71a7a401d1836fe5c94a6f= 2e230 Author: Juergen Gross AuthorDate: Mon, 08 Jun 2026 07:17:33 +02:00 Committer: Ingo Molnar CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00 x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu() In order to prepare retiring rdmsr_on_cpu() switch rdmsr_on_cpu() users to rdmsrq_on_cpu(). Tested-by: K Prateek Nayak Signed-off-by: Juergen Gross Signed-off-by: Ingo Molnar Reviewed-by: Dave Hansen Cc: Rafael J. Wysocki Cc: Viresh Kumar Cc: Guenter Roeck Cc: Daniel Lezcano Link: https://patch.msgid.link/20260608051741.3207435-4-jgross@suse.com --- arch/x86/include/asm/msr.h | 2 +- arch/x86/kernel/cpu/mce/amd.c | 6 ++-- arch/x86/kernel/cpu/mce/inject.c | 8 ++--- drivers/cpufreq/amd_freq_sensitivity.c | 6 +--- drivers/cpufreq/p4-clockmod.c | 32 +++++++++---------- drivers/cpufreq/speedstep-centrino.c | 27 ++++++++-------- drivers/hwmon/coretemp.c | 12 +++---- drivers/thermal/intel/x86_pkg_temp_thermal.c | 25 +++++++-------- 8 files changed, 58 insertions(+), 60 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index fddadbc..d5985d6 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -292,7 +292,7 @@ static inline int wrmsrq_on_cpu(unsigned int cpu, u32 msr= _no, u64 q) static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no, struct msr __percpu *msrs) { - rdmsr_on_cpu(0, msr_no, raw_cpu_ptr(&msrs->l), raw_cpu_ptr(&msrs->h)); + rdmsrq_on_cpu(0, msr_no, raw_cpu_ptr(&msrs->q)); } static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no, struct msr __percpu *msrs) diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 6605a02..1305d9a 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -969,13 +969,13 @@ store_threshold_limit(struct threshold_block *b, const = char *buf, size_t size) =20 static ssize_t show_error_count(struct threshold_block *b, char *buf) { - u32 lo, hi; + struct msr val; =20 /* CPU might be offline by now */ - if (rdmsr_on_cpu(b->cpu, b->address, &lo, &hi)) + if (rdmsrq_on_cpu(b->cpu, b->address, &val.q)) return -ENODEV; =20 - return sprintf(buf, "%u\n", ((hi & THRESHOLD_MAX) - + return sprintf(buf, "%u\n", ((val.h & THRESHOLD_MAX) - (THRESHOLD_MAX - b->threshold_limit))); } =20 diff --git a/arch/x86/kernel/cpu/mce/inject.c b/arch/x86/kernel/cpu/mce/injec= t.c index d02c4f5..bee9c35 100644 --- a/arch/x86/kernel/cpu/mce/inject.c +++ b/arch/x86/kernel/cpu/mce/inject.c @@ -316,18 +316,18 @@ static struct notifier_block inject_nb =3D { */ static int toggle_hw_mce_inject(unsigned int cpu, bool enable) { - u32 l, h; + struct msr val; int err; =20 - err =3D rdmsr_on_cpu(cpu, MSR_K7_HWCR, &l, &h); + err =3D rdmsrq_on_cpu(cpu, MSR_K7_HWCR, &val.q); if (err) { pr_err("%s: error reading HWCR\n", __func__); return err; } =20 - enable ? (l |=3D BIT(18)) : (l &=3D ~BIT(18)); + enable ? (val.l |=3D BIT(18)) : (val.l &=3D ~BIT(18)); =20 - err =3D wrmsr_on_cpu(cpu, MSR_K7_HWCR, l, h); + err =3D wrmsr_on_cpu(cpu, MSR_K7_HWCR, val.l, val.h); if (err) pr_err("%s: error writing HWCR\n", __func__); =20 diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_fre= q_sensitivity.c index 13fed4b..739d54d 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c @@ -51,10 +51,8 @@ static unsigned int amd_powersave_bias_target(struct cpufr= eq_policy *policy, if (!policy->freq_table) return freq_next; =20 - rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, - &actual.l, &actual.h); - rdmsr_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_REFERENCE, - &reference.l, &reference.h); + rdmsrq_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, &actual.q); + rdmsrq_on_cpu(policy->cpu, MSR_AMD64_FREQ_SENSITIVITY_REFERENCE, &reference= .q); actual.h &=3D 0x00ffffff; reference.h &=3D 0x00ffffff; =20 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c index 69c1923..d96e8b6 100644 --- a/drivers/cpufreq/p4-clockmod.c +++ b/drivers/cpufreq/p4-clockmod.c @@ -51,24 +51,24 @@ static unsigned int cpufreq_p4_get(unsigned int cpu); =20 static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate) { - u32 l, h; + struct msr val; =20 if ((newstate > DC_DISABLE) || (newstate =3D=3D DC_RESV)) return -EINVAL; =20 - rdmsr_on_cpu(cpu, MSR_IA32_THERM_STATUS, &l, &h); + rdmsrq_on_cpu(cpu, MSR_IA32_THERM_STATUS, &val.q); =20 - if (l & 0x01) + if (val.l & 0x01) pr_debug("CPU#%d currently thermal throttled\n", cpu); =20 if (has_N44_O17_errata[cpu] && (newstate =3D=3D DC_25PT || newstate =3D=3D DC_DFLT)) newstate =3D DC_38PT; =20 - rdmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &l, &h); + rdmsrq_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &val.q); if (newstate =3D=3D DC_DISABLE) { pr_debug("CPU#%d disabling modulation\n", cpu); - wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, l & ~(1<<4), h); + wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, val.l & ~(1<<4), val.h); } else { pr_debug("CPU#%d setting duty cycle to %d%%\n", cpu, ((125 * newstate) / 10)); @@ -77,9 +77,9 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int = newstate) * bits 3-1 : duty cycle * bit 0 : reserved */ - l =3D (l & ~14); - l =3D l | (1<<4) | ((newstate & 0x7)<<1); - wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, l, h); + val.l =3D (val.l & ~14); + val.l =3D val.l | (1<<4) | ((newstate & 0x7)<<1); + wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, val.l, val.h); } =20 return 0; @@ -205,18 +205,18 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *p= olicy) =20 static unsigned int cpufreq_p4_get(unsigned int cpu) { - u32 l, h; + struct msr val; =20 - rdmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &l, &h); + rdmsrq_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &val.q); =20 - if (l & 0x10) { - l =3D l >> 1; - l &=3D 0x7; + if (val.l & 0x10) { + val.l =3D val.l >> 1; + val.l &=3D 0x7; } else - l =3D DC_DISABLE; + val.l =3D DC_DISABLE; =20 - if (l !=3D DC_DISABLE) - return stock_freq * l / 8; + if (val.l !=3D DC_DISABLE) + return stock_freq * val.l / 8; =20 return stock_freq; } diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep= -centrino.c index 3e6e85a..cefee19 100644 --- a/drivers/cpufreq/speedstep-centrino.c +++ b/drivers/cpufreq/speedstep-centrino.c @@ -322,11 +322,11 @@ static unsigned extract_clock(unsigned msr, unsigned in= t cpu, int failsafe) /* Return the current CPU frequency in kHz */ static unsigned int get_cur_freq(unsigned int cpu) { - unsigned l, h; + struct msr val; unsigned clock_freq; =20 - rdmsr_on_cpu(cpu, MSR_IA32_PERF_STATUS, &l, &h); - clock_freq =3D extract_clock(l, cpu, 0); + rdmsrq_on_cpu(cpu, MSR_IA32_PERF_STATUS, &val.q); + clock_freq =3D extract_clock(val.l, cpu, 0); =20 if (unlikely(clock_freq =3D=3D 0)) { /* @@ -335,8 +335,8 @@ static unsigned int get_cur_freq(unsigned int cpu) * P-state transition (like TM2). Get the last freq set=20 * in PERF_CTL. */ - rdmsr_on_cpu(cpu, MSR_IA32_PERF_CTL, &l, &h); - clock_freq =3D extract_clock(l, cpu, 1); + rdmsrq_on_cpu(cpu, MSR_IA32_PERF_CTL, &val.q); + clock_freq =3D extract_clock(val.l, cpu, 1); } return clock_freq; } @@ -417,7 +417,8 @@ static void centrino_cpu_exit(struct cpufreq_policy *poli= cy) */ static int centrino_target(struct cpufreq_policy *policy, unsigned int index) { - unsigned int msr, oldmsr =3D 0, h =3D 0, cpu =3D policy->cpu; + unsigned int msr, cpu =3D policy->cpu; + struct msr oldmsr =3D { .q =3D 0 }; int retval =3D 0; unsigned int j, first_cpu; struct cpufreq_frequency_table *op_points; @@ -459,22 +460,22 @@ static int centrino_target(struct cpufreq_policy *polic= y, unsigned int index) msr =3D op_points->driver_data; =20 if (first_cpu) { - rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h); - if (msr =3D=3D (oldmsr & 0xffff)) { + rdmsrq_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr.q); + if (msr =3D=3D (oldmsr.l & 0xffff)) { pr_debug("no change needed - msr was and needs " - "to be %x\n", oldmsr); + "to be %x\n", oldmsr.l); retval =3D 0; goto out; } =20 first_cpu =3D 0; /* all but 16 LSB are reserved, treat them with care */ - oldmsr &=3D ~0xffff; + oldmsr.l &=3D ~0xffff; msr &=3D 0xffff; - oldmsr |=3D msr; + oldmsr.l |=3D msr; } =20 - wrmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, oldmsr, h); + wrmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, oldmsr.l, oldmsr.h); if (policy->shared_type =3D=3D CPUFREQ_SHARED_TYPE_ANY) break; =20 @@ -490,7 +491,7 @@ static int centrino_target(struct cpufreq_policy *policy,= unsigned int index) */ =20 for_each_cpu(j, covered_cpus) - wrmsr_on_cpu(j, MSR_IA32_PERF_CTL, oldmsr, h); + wrmsr_on_cpu(j, MSR_IA32_PERF_CTL, oldmsr.l, oldmsr.h); } retval =3D 0; =20 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 6a0d947..1259c78 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -356,15 +356,15 @@ static ssize_t show_label(struct device *dev, static ssize_t show_crit_alarm(struct device *dev, struct device_attribute *devattr, char *buf) { - u32 eax, edx; + struct msr val; struct temp_data *tdata =3D container_of(devattr, struct temp_data, sd_attrs[ATTR_CRIT_ALARM]); =20 mutex_lock(&tdata->update_lock); - rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx); + rdmsrq_on_cpu(tdata->cpu, tdata->status_reg, &val.q); mutex_unlock(&tdata->update_lock); =20 - return sprintf(buf, "%d\n", (eax >> 5) & 1); + return sprintf(buf, "%d\n", (val.l >> 5) & 1); } =20 static ssize_t show_tjmax(struct device *dev, @@ -398,7 +398,7 @@ static ssize_t show_ttarget(struct device *dev, static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, char *buf) { - u32 eax, edx; + struct msr val; struct temp_data *tdata =3D container_of(devattr, struct temp_data, sd_attr= s[ATTR_TEMP]); int tjmax; =20 @@ -407,14 +407,14 @@ static ssize_t show_temp(struct device *dev, tjmax =3D get_tjmax(tdata, dev); /* Check whether the time interval has elapsed */ if (time_after(jiffies, tdata->last_updated + HZ)) { - rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx); + rdmsrq_on_cpu(tdata->cpu, tdata->status_reg, &val.q); /* * Ignore the valid bit. In all observed cases the register * value is either low or zero if the valid bit is 0. * Return it instead of reporting an error which doesn't * really help at all. */ - tdata->temp =3D tjmax - ((eax >> 16) & 0xff) * 1000; + tdata->temp =3D tjmax - ((val.l >> 16) & 0xff) * 1000; tdata->last_updated =3D jiffies; } =20 diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/i= ntel/x86_pkg_temp_thermal.c index 5401097..2e7de8c 100644 --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c @@ -125,8 +125,9 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, { struct zone_device *zonedev =3D thermal_zone_device_priv(tzd); unsigned int trip_index =3D THERMAL_TRIP_PRIV_TO_INT(trip->priv); - u32 l, h, mask, shift, intr; + u32 mask, shift, intr; int tj_max, val, ret; + struct msr v; =20 if (temp =3D=3D THERMAL_TEMP_INVALID) temp =3D 0; @@ -141,8 +142,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, if (trip_index >=3D MAX_NUMBER_OF_TRIPS || val < 0 || val > 0x7f) return -EINVAL; =20 - ret =3D rdmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, - &l, &h); + ret =3D rdmsrq_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, &v.q); if (ret < 0) return ret; =20 @@ -155,20 +155,19 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, shift =3D THERM_SHIFT_THRESHOLD0; intr =3D THERM_INT_THRESHOLD0_ENABLE; } - l &=3D ~mask; + v.l &=3D ~mask; /* * When users space sets a trip temperature =3D=3D 0, which is indication * that, it is no longer interested in receiving notifications. */ if (!temp) { - l &=3D ~intr; + v.l &=3D ~intr; } else { - l |=3D val << shift; - l |=3D intr; + v.l |=3D val << shift; + v.l |=3D intr; } =20 - return wrmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, - l, h); + return wrmsr_on_cpu(zonedev->cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, v.l, v.= h); } =20 /* Thermal zone callback registry */ @@ -277,7 +276,8 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_ma= x, struct thermal_trip *trips, int num_trips) { unsigned long thres_reg_value; - u32 mask, shift, eax, edx; + u32 mask, shift; + struct msr val; int ret, i; =20 for (i =3D 0; i < num_trips; i++) { @@ -290,12 +290,11 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_= max, shift =3D THERM_SHIFT_THRESHOLD0; } =20 - ret =3D rdmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, - &eax, &edx); + ret =3D rdmsrq_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, &val.q); if (ret < 0) return ret; =20 - thres_reg_value =3D (eax & mask) >> shift; + thres_reg_value =3D (val.l & mask) >> shift; =20 trips[i].temperature =3D thres_reg_value ? tj_max - thres_reg_value * 1000 : THERMAL_TEMP_INVALID;