x86/msr: Drop 32-bit variants of *_on_cpu() MSR functions
Subsystems (10)
v3 cover x86/msr: Drop 32-bit variants of *_on_cpu() MSR functions
Drop the variants using 2 32-bit values instead of a single 64-bit one of the *_on_cpu() MSR access functions.
Changes in V2:
- patches 1+2 split out from other patch
- keep the *q() variants instead of those without suffix
Changes in V3:
- V3 patch 7 split out from V2 patch 7
Juergen Gross (11):
x86/msr: Switch rdmsrl_on_cpu() users to rdmsrq_on_cpu() x86/msr: Remove rdmsrl_on_cpu()
x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu() x86/msr: Remove rdmsr_on_cpu()
x86/msr: Switch wrmsr_on_cpu() users to wrmsrq_on_cpu() x86/msr: Remove wrmsr_on_cpu()
x86/msr: Don't use rdmsr_safe_on_cpu() in rdmsrq_safe_on_cpu() x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu() x86/msr: Remove rdmsr_safe_on_cpu()
x86/msr: Switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu() x86/msr: Remove wrmsr_safe_on_cpu()
arch/x86/events/intel/ds.c | 11 +-- arch/x86/include/asm/msr.h | 28 +----- arch/x86/kernel/cpu/mce/amd.c | 6 +- arch/x86/kernel/cpu/mce/inject.c | 8 +- arch/x86/kernel/msr.c | 8 +- arch/x86/lib/msr-smp.c | 89 +++----------------- drivers/cpufreq/amd-pstate.c | 2 +- drivers/cpufreq/amd_freq_sensitivity.c | 6 +- drivers/cpufreq/p4-clockmod.c | 32 +++---- drivers/cpufreq/speedstep-centrino.c | 27 +++--- drivers/hwmon/coretemp.c | 44 +++++----- drivers/hwmon/via-cputemp.c | 16 ++-- drivers/thermal/intel/intel_tcc.c | 43 +++++----- drivers/thermal/intel/x86_pkg_temp_thermal.c | 25 +++--- 14 files changed, 128 insertions(+), 217 deletions(-)
Signature · 1 line
2.54.0
PATCH v3 1/11 x86/msr: Switch rdmsrl_on_cpu() users to rdmsrq_on_cpu()
rdmsrl_on_cpu() is a deprecated synonym for rdmsrq_on_cpu(). Switch its only user to rdmsrq_on_cpu().
---
V2:
- carved out from other patch (Ingo Molnar)
--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +1 -1
@@ -476,7 +476,7 @@ static int msr_init_perf(struct amd_cpudata *cpudata)if (ret)return ret; - ret =rdmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req); + ret =rdmsrq_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req);if (ret)return ret;
Signature · 1 line
2.54.0
Re: [PATCH v3 01/11] x86/msr: Switch rdmsrl_on_cpu() users to rdmsrq_on_cpu()
Hello Juergen,
Quoted 5 lines · Juergen Gross
rdmsrl_on_cpu()is a deprecated synonym forrdmsrq_on_cpu(). Switch its only user tordmsrq_on_cpu().Signed-off-by Juergen Gross <[email protected]>Reviewed-by Dave Hansen <[email protected]>
Feel free to include:
Signature · 2 lines
Thanks and Regards, Prateek
[tip: x86/msr] x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
In reply to Juergen GrossThe following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: e2f659dd80a8567a0dad2d45b965ef351aeb88bf Gitweb: https://git.kernel.org/tip/e2f659dd80a8567a0dad2d45b965ef351aeb88bf Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:31 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:36 +02:00
x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
rdmsrl_on_cpu() is a deprecated synonym for rdmsrq_on_cpu(). Switch its only user to rdmsrq_on_cpu().
--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +1 -1
@@ -476,7 +476,7 @@ static int msr_init_perf(struct amd_cpudata *cpudata)if (ret)return ret; - ret =rdmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req); + ret =rdmsrq_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req);if (ret)return ret;
PATCH v3 2/11 x86/msr: Remove rdmsrl_on_cpu()
In reply to Juergen Grossrdmsrl_on_cpu() has no users left. Delete it.
---
V2:
- carved out from other patch (Ingo Molnar)
--- arch/x86/include/asm/msr.h | 1 - 1 file changed, 1 deletion(-)
arch/x86/include/asm/msr.h +0 -1
@@ -329,7 +329,6 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])/* Compatibility wrappers: */ #define rdmsrl (msr, val) rdmsrq(msr, val)#define wrmsrl (msr, val) wrmsrq(msr, val) -#define rdmsrl_on_cpu (cpu, msr, q) rdmsrq_on_cpu(cpu, msr, q)#endif /* __ASSEMBLER__ */ #endif /* _ASM_X86_MSR_H */
Signature · 1 line
2.54.0
PATCH 1/1 x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
Quoted 4 lines · Juergen Gross
rdmsrl_on_cpu()has no users left. Delete it.Signed-off-by Juergen Gross <[email protected]>Reviewed-by Dave Hansen <[email protected]>
There was one user left, see below. I've added this to the series.
Thanks,
Ingo
===========================>
From: Ingo Molnar <[email protected]>
Date: Mon, 8 Jun 2026 08:57:00 +0200
Subject: [PATCH] x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
Convert the final rdmsrl_on_cpu() user to rdmsrq_on_cpu().
--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/amd-pstate.c +1 -1
@@ -476,7 +476,7 @@ static int msr_init_perf(struct amd_cpudata *cpudata)if (ret)return ret; - ret =rdmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req); + ret =rdmsrq_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req);if (ret)return ret;
Re: [PATCH 01.5/11] x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
Quoted 10 lines · Ingo Molnar
Quoted 4 lines · Juergen Gross
rdmsrl_on_cpu()has no users left. Delete it.Signed-off-by Juergen Gross <[email protected]>Reviewed-by Dave Hansen <[email protected]>There was one user left, see below. I've added this to the series.
Hmm, your patch looks exactly like patch 1 of my series.
Juergen
Quoted 32 lines
Thanks,
Ingo
===========================>
From: Ingo Molnar <[email protected]>
Date: Mon, 8 Jun 2026 08:57:00 +0200
Subject: [PATCH] x86/msr: Switchrdmsrl_on_cpu()user tordmsrq_on_cpu()Convert the final
rdmsrl_on_cpu()user tordmsrq_on_cpu().Signed-off-by Ingo Molnar <[email protected]>Cc Juergen Gross <[email protected]>Cc Mario Limonciello <[email protected]>--- drivers/cpufreq/amd-pstate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/cpufreq/amd-pstate.c +1
-1@@ -476,7 +476,7 @@ static int msr_init_perf(struct amd_cpudata *cpudata)if (ret)return ret; - ret =rdmsrl_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req); + ret =rdmsrq_on_cpu (cpudata->cpu,MSR_AMD_CPPC_REQ , &cppc_req);if (ret)return ret;
Re: [PATCH 01.5/11] x86/msr: Switch rdmsrl_on_cpu() user to rdmsrq_on_cpu()
Quoted 6 lines · Jürgen Groß
Quoted 5 lines · Ingo Molnar
Quoted 2 lines · Juergen Gross
rdmsrl_on_cpu()has no users left. Delete it.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Signed-off-by Juergen Gross <[email protected]>Reviewed-by Dave Hansen <[email protected]>There was one user left, see below. I've added this to the series.
Hmm, your patch looks exactly like patch 1 of my series.
Oh, indeed, for some reason gmail ate the first patch in my mbox and I never noticed. :-/
Thanks,
Ingo
[tip: x86/msr] x86/msr: Remove rdmsrl_on_cpu()
In reply to Juergen GrossThe following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: a83db17073f0ecb265f0038aa425343dd2de25ec Gitweb: https://git.kernel.org/tip/a83db17073f0ecb265f0038aa425343dd2de25ec Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:32 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Remove rdmsrl_on_cpu()
rdmsrl_on_cpu() has no users left. Delete it.
--- arch/x86/include/asm/msr.h | 1 - 1 file changed, 1 deletion(-)
arch/x86/include/asm/msr.h +0 -1
@@ -329,7 +329,6 @@ static inline int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 regs[8])/* Compatibility wrappers: */ #define rdmsrl (msr, val) rdmsrq(msr, val)#define wrmsrl (msr, val) wrmsrq(msr, val) -#define rdmsrl_on_cpu (cpu, msr, q) rdmsrq_on_cpu(cpu, msr, q)#endif /* __ASSEMBLER__ */ #endif /* _ASM_X86_MSR_H */
PATCH v3 3/11 x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu()
In reply to Juergen GrossIn order to prepare retiring rdmsr_on_cpu() switch rdmsr_on_cpu() users to rdmsrq_on_cpu().
---
V2:
- instead of changing rdmsr_on_cpu(), use rdmsrq_on_cpu() (Ingo Molnar)
--- 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(-)
arch/x86/include/asm/msr.h +1 -1
@@ -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)
arch/x86/kernel/cpu/mce/amd.c +3 -3
@@ -969,13 +969,13 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)static ssize_t show_error_count (struct threshold_block *b,char *buf) { -u32 lo, hi; +struct msr val;/* 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 ; -return sprintf (buf,"%u\n" , ((hi &THRESHOLD_MAX ) - +return sprintf (buf,"%u\n" , ((val.h &THRESHOLD_MAX ) - (THRESHOLD_MAX - b->threshold_limit))); }
arch/x86/kernel/cpu/mce/inject.c +4 -4
@@ -316,18 +316,18 @@ static struct notifier_block inject_nb = {*/ static int toggle_hw_mce_inject (unsigned int cpu,bool enable) { -u32 l, h; +struct msr val;int err; - err =rdmsr_on_cpu (cpu,MSR_K7_HWCR , &l, &h); + err =rdmsrq_on_cpu (cpu,MSR_K7_HWCR , &val.q);if (err) {pr_err ("%s: error reading HWCR\n" , __func__);return err; } - enable ? (l |=BIT (18 )) : (l &= ~BIT (18 )); + enable ? (val.l |=BIT (18 )) : (val.l &= ~BIT (18 )); - err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , l, h); + err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , val.l, val.h);if (err)pr_err ("%s: error writing HWCR\n" , __func__);
drivers/cpufreq/amd_freq_sensitivity.c +2 -4
@@ -51,10 +51,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,if (!policy->freq_table)return freq_next; -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 &=0x00ffffff ; reference.h &=0x00ffffff ;
drivers/cpufreq/p4-clockmod.c +16 -16
@@ -51,24 +51,24 @@ static unsigned int cpufreq_p4_get(unsigned int cpu);static int cpufreq_p4_setdc (unsigned int cpu,unsigned int newstate) { -u32 l, h; +struct msr val;if ((newstate >DC_DISABLE ) || (newstate ==DC_RESV ))return -EINVAL ; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_STATUS , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_STATUS , &val.q); -if (l &0x01 ) +if (val.l &0x01 )pr_debug ("CPU#%d currently thermal throttled\n" , cpu);if (has_N44_O17_errata[cpu] && (newstate ==DC_25PT || newstate ==DC_DFLT )) newstate =DC_38PT ; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q);if (newstate ==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 = (l & ~14 ); - l = l | (1 <<4 ) | ((newstate &0x7 )<<1 ); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , l, h); + val.l = (val.l & ~14 ); + val.l = val.l | (1 <<4 ) | ((newstate &0x7 )<<1 ); +wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l, val.h); }return 0 ;
@@ -205,18 +205,18 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)static unsigned int cpufreq_p4_get (unsigned int cpu) { -u32 l, h; +struct msr val; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q); -if (l &0x10 ) { - l = l >>1 ; - l &=0x7 ; +if (val.l &0x10 ) { + val.l = val.l >>1 ; + val.l &=0x7 ; }else - l =DC_DISABLE ; + val.l =DC_DISABLE ; -if (l !=DC_DISABLE ) -return stock_freq * l /8 ; +if (val.l !=DC_DISABLE ) +return stock_freq * val.l /8 ;return stock_freq; }
drivers/cpufreq/speedstep-centrino.c +14 -13
@@ -322,11 +322,11 @@ static unsigned extract_clock(unsigned msr, unsigned int 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; -rdmsr_on_cpu (cpu,MSR_IA32_PERF_STATUS , &l, &h); - clock_freq =extract_clock (l, cpu,0 ); +rdmsrq_on_cpu (cpu,MSR_IA32_PERF_STATUS , &val.q); + clock_freq =extract_clock (val.l, cpu,0 );if (unlikely (clock_freq ==0 )) {/*
@@ -335,8 +335,8 @@ static unsigned int get_cur_freq(unsigned int cpu)* P-state transition (like TM2). Get the last freq set * in PERF_CTL. */ -rdmsr_on_cpu (cpu,MSR_IA32_PERF_CTL , &l, &h); - clock_freq =extract_clock (l, cpu,1 ); +rdmsrq_on_cpu (cpu,MSR_IA32_PERF_CTL , &val.q); + clock_freq =extract_clock (val.l, cpu,1 ); }return clock_freq; }
@@ -417,7 +417,8 @@ static void centrino_cpu_exit(struct cpufreq_policy *policy)*/ static int centrino_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int msr, oldmsr =0 , h =0 , cpu = policy->cpu; +unsigned int msr, cpu = policy->cpu; +struct msr oldmsr = { .q =0 };int retval =0 ;unsigned int j, first_cpu;struct cpufreq_frequency_table *op_points;
@@ -459,22 +460,22 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index) msr = op_points->driver_data;if (first_cpu) { -rdmsr_on_cpu (good_cpu,MSR_IA32_PERF_CTL , &oldmsr, &h); -if (msr == (oldmsr &0xffff )) { +rdmsrq_on_cpu (good_cpu,MSR_IA32_PERF_CTL , &oldmsr.q); +if (msr == (oldmsr.l &0xffff )) {pr_debug ("no change needed - msr was and needs " -"to be %x\n" , oldmsr); +"to be %x\n" , oldmsr.l); retval =0 ; goto out; } first_cpu =0 ;/* all but 16 LSB are reserved, treat them with care */ - oldmsr &= ~0xffff ; + oldmsr.l &= ~0xffff ; msr &=0xffff ; - oldmsr |= msr; + oldmsr.l |= msr; } -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 ==CPUFREQ_SHARED_TYPE_ANY )break ;
@@ -490,7 +491,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index)*/ 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 =0 ;
drivers/hwmon/coretemp.c +6 -6
@@ -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 = container_of(devattr, struct temp_data, sd_attrs[ATTR_CRIT_ALARM ]);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); -return sprintf (buf,"%d\n" , (eax >>5 ) &1 ); +return sprintf (buf,"%d\n" , (val.l >>5 ) &1 ); } 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 = container_of(devattr, struct temp_data, sd_attrs[ATTR_TEMP]);int tjmax;
@@ -407,14 +407,14 @@ static ssize_t show_temp(struct device *dev, tjmax =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 = tjmax - ((eax >>16 ) &0xff ) *1000 ; + tdata->temp = tjmax - ((val.l >>16 ) &0xff ) *1000 ; tdata->last_updated = jiffies; }
drivers/thermal/intel/x86_pkg_temp_thermal.c +12 -13
@@ -125,8 +125,9 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, {struct zone_device *zonedev =thermal_zone_device_priv (tzd);unsigned int trip_index =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;if (temp ==THERMAL_TEMP_INVALID ) temp =0 ;
@@ -141,8 +142,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd,if (trip_index >=MAX_NUMBER_OF_TRIPS || val <0 || val >0x7f )return -EINVAL ; - ret =rdmsr_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , - &l, &h); + ret =rdmsrq_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , &v.q);if (ret <0 )return ret;
@@ -155,20 +155,19 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, shift =THERM_SHIFT_THRESHOLD0 ; intr =THERM_INT_THRESHOLD0_ENABLE ; } - l &= ~mask; + v.l &= ~mask;/* * When users space sets a trip temperature == 0, which is indication * that, it is no longer interested in receiving notifications. */ if (!temp) { - l &= ~intr; + v.l &= ~intr; }else { - l |= val << shift; - l |= intr; + v.l |= val << shift; + v.l |= intr; } -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); }/* Thermal zone callback registry */
@@ -277,7 +276,8 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_max, 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;for (i =0 ; i < num_trips; i++) {
@@ -290,12 +290,11 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_max, shift =THERM_SHIFT_THRESHOLD0 ; } - ret =rdmsr_on_cpu (cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , - &eax, &edx); + ret =rdmsrq_on_cpu (cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , &val.q);if (ret <0 )return ret; - thres_reg_value = (eax & mask) >> shift; + thres_reg_value = (val.l & mask) >> shift; trips[i].temperature = thres_reg_value ? tj_max - thres_reg_value *1000 :THERMAL_TEMP_INVALID ;
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Switch rdmsr_on_cpu() users to rdmsrq_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 40b57cfbd29ec71a7a401d1836fe5c94a6f2e230 Gitweb: https://git.kernel.org/tip/40b57cfbd29ec71a7a401d1836fe5c94a6f2e230 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:33 +02:00 Committer: Ingo Molnar <[email protected]> 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().
--- 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(-)
arch/x86/include/asm/msr.h +1 -1
@@ -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)
arch/x86/kernel/cpu/mce/amd.c +3 -3
@@ -969,13 +969,13 @@ store_threshold_limit(struct threshold_block *b, const char *buf, size_t size)static ssize_t show_error_count (struct threshold_block *b,char *buf) { -u32 lo, hi; +struct msr val;/* 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 ; -return sprintf (buf,"%u\n" , ((hi &THRESHOLD_MAX ) - +return sprintf (buf,"%u\n" , ((val.h &THRESHOLD_MAX ) - (THRESHOLD_MAX - b->threshold_limit))); }
arch/x86/kernel/cpu/mce/inject.c +4 -4
@@ -316,18 +316,18 @@ static struct notifier_block inject_nb = {*/ static int toggle_hw_mce_inject (unsigned int cpu,bool enable) { -u32 l, h; +struct msr val;int err; - err =rdmsr_on_cpu (cpu,MSR_K7_HWCR , &l, &h); + err =rdmsrq_on_cpu (cpu,MSR_K7_HWCR , &val.q);if (err) {pr_err ("%s: error reading HWCR\n" , __func__);return err; } - enable ? (l |=BIT (18 )) : (l &= ~BIT (18 )); + enable ? (val.l |=BIT (18 )) : (val.l &= ~BIT (18 )); - err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , l, h); + err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , val.l, val.h);if (err)pr_err ("%s: error writing HWCR\n" , __func__);
drivers/cpufreq/amd_freq_sensitivity.c +2 -4
@@ -51,10 +51,8 @@ static unsigned int amd_powersave_bias_target(struct cpufreq_policy *policy,if (!policy->freq_table)return freq_next; -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 &=0x00ffffff ; reference.h &=0x00ffffff ;
drivers/cpufreq/p4-clockmod.c +16 -16
@@ -51,24 +51,24 @@ static unsigned int cpufreq_p4_get(unsigned int cpu);static int cpufreq_p4_setdc (unsigned int cpu,unsigned int newstate) { -u32 l, h; +struct msr val;if ((newstate >DC_DISABLE ) || (newstate ==DC_RESV ))return -EINVAL ; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_STATUS , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_STATUS , &val.q); -if (l &0x01 ) +if (val.l &0x01 )pr_debug ("CPU#%d currently thermal throttled\n" , cpu);if (has_N44_O17_errata[cpu] && (newstate ==DC_25PT || newstate ==DC_DFLT )) newstate =DC_38PT ; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q);if (newstate ==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 = (l & ~14 ); - l = l | (1 <<4 ) | ((newstate &0x7 )<<1 ); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , l, h); + val.l = (val.l & ~14 ); + val.l = val.l | (1 <<4 ) | ((newstate &0x7 )<<1 ); +wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l, val.h); }return 0 ;
@@ -205,18 +205,18 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)static unsigned int cpufreq_p4_get (unsigned int cpu) { -u32 l, h; +struct msr val; -rdmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &l, &h); +rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q); -if (l &0x10 ) { - l = l >>1 ; - l &=0x7 ; +if (val.l &0x10 ) { + val.l = val.l >>1 ; + val.l &=0x7 ; }else - l =DC_DISABLE ; + val.l =DC_DISABLE ; -if (l !=DC_DISABLE ) -return stock_freq * l /8 ; +if (val.l !=DC_DISABLE ) +return stock_freq * val.l /8 ;return stock_freq; }
drivers/cpufreq/speedstep-centrino.c +14 -13
@@ -322,11 +322,11 @@ static unsigned extract_clock(unsigned msr, unsigned int 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; -rdmsr_on_cpu (cpu,MSR_IA32_PERF_STATUS , &l, &h); - clock_freq =extract_clock (l, cpu,0 ); +rdmsrq_on_cpu (cpu,MSR_IA32_PERF_STATUS , &val.q); + clock_freq =extract_clock (val.l, cpu,0 );if (unlikely (clock_freq ==0 )) {/*
@@ -335,8 +335,8 @@ static unsigned int get_cur_freq(unsigned int cpu)* P-state transition (like TM2). Get the last freq set * in PERF_CTL. */ -rdmsr_on_cpu (cpu,MSR_IA32_PERF_CTL , &l, &h); - clock_freq =extract_clock (l, cpu,1 ); +rdmsrq_on_cpu (cpu,MSR_IA32_PERF_CTL , &val.q); + clock_freq =extract_clock (val.l, cpu,1 ); }return clock_freq; }
@@ -417,7 +417,8 @@ static void centrino_cpu_exit(struct cpufreq_policy *policy)*/ static int centrino_target (struct cpufreq_policy *policy,unsigned int index) { -unsigned int msr, oldmsr =0 , h =0 , cpu = policy->cpu; +unsigned int msr, cpu = policy->cpu; +struct msr oldmsr = { .q =0 };int retval =0 ;unsigned int j, first_cpu;struct cpufreq_frequency_table *op_points;
@@ -459,22 +460,22 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index) msr = op_points->driver_data;if (first_cpu) { -rdmsr_on_cpu (good_cpu,MSR_IA32_PERF_CTL , &oldmsr, &h); -if (msr == (oldmsr &0xffff )) { +rdmsrq_on_cpu (good_cpu,MSR_IA32_PERF_CTL , &oldmsr.q); +if (msr == (oldmsr.l &0xffff )) {pr_debug ("no change needed - msr was and needs " -"to be %x\n" , oldmsr); +"to be %x\n" , oldmsr.l); retval =0 ; goto out; } first_cpu =0 ;/* all but 16 LSB are reserved, treat them with care */ - oldmsr &= ~0xffff ; + oldmsr.l &= ~0xffff ; msr &=0xffff ; - oldmsr |= msr; + oldmsr.l |= msr; } -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 ==CPUFREQ_SHARED_TYPE_ANY )break ;
@@ -490,7 +491,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index)*/ 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 =0 ;
drivers/hwmon/coretemp.c +6 -6
@@ -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 = container_of(devattr, struct temp_data, sd_attrs[ATTR_CRIT_ALARM ]);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); -return sprintf (buf,"%d\n" , (eax >>5 ) &1 ); +return sprintf (buf,"%d\n" , (val.l >>5 ) &1 ); } 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 = container_of(devattr, struct temp_data, sd_attrs[ATTR_TEMP]);int tjmax;
@@ -407,14 +407,14 @@ static ssize_t show_temp(struct device *dev, tjmax =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 = tjmax - ((eax >>16 ) &0xff ) *1000 ; + tdata->temp = tjmax - ((val.l >>16 ) &0xff ) *1000 ; tdata->last_updated = jiffies; }
drivers/thermal/intel/x86_pkg_temp_thermal.c +12 -13
@@ -125,8 +125,9 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, {struct zone_device *zonedev =thermal_zone_device_priv (tzd);unsigned int trip_index =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;if (temp ==THERMAL_TEMP_INVALID ) temp =0 ;
@@ -141,8 +142,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd,if (trip_index >=MAX_NUMBER_OF_TRIPS || val <0 || val >0x7f )return -EINVAL ; - ret =rdmsr_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , - &l, &h); + ret =rdmsrq_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , &v.q);if (ret <0 )return ret;
@@ -155,20 +155,19 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, shift =THERM_SHIFT_THRESHOLD0 ; intr =THERM_INT_THRESHOLD0_ENABLE ; } - l &= ~mask; + v.l &= ~mask;/* * When users space sets a trip temperature == 0, which is indication * that, it is no longer interested in receiving notifications. */ if (!temp) { - l &= ~intr; + v.l &= ~intr; }else { - l |= val << shift; - l |= intr; + v.l |= val << shift; + v.l |= intr; } -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); }/* Thermal zone callback registry */
@@ -277,7 +276,8 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_max, 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;for (i =0 ; i < num_trips; i++) {
@@ -290,12 +290,11 @@ static int pkg_temp_thermal_trips_init(int cpu, int tj_max, shift =THERM_SHIFT_THRESHOLD0 ; } - ret =rdmsr_on_cpu (cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , - &eax, &edx); + ret =rdmsrq_on_cpu (cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , &val.q);if (ret <0 )return ret; - thres_reg_value = (eax & mask) >> shift; + thres_reg_value = (val.l & mask) >> shift; trips[i].temperature = thres_reg_value ? tj_max - thres_reg_value *1000 :THERMAL_TEMP_INVALID ;
PATCH v3 4/11 x86/msr: Remove rdmsr_on_cpu()
In reply to Juergen Grossrdmsr_on_cpu() has no users left. Delete it.
---
V2:
- delete rdmsr_on_cpu() instead of rdmsrq_on_cpu() (Ingo Molnar)
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 22 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -256,7 +256,6 @@ int msr_set_bit(u32 msr, u8 bit);int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP -int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);
@@ -269,11 +268,6 @@ int wrmsrq_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);int wrmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);#else /* CONFIG_SMP */ -static inline int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -rdmsr (msr_no, *l, *h); -return 0 ; -}static inline int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {wrmsr (msr_no, l, h);
arch/x86/lib/msr-smp.c +0 -16
@@ -31,22 +31,6 @@ static void __wrmsr_on_cpu(void *info)wrmsr (rv->msr_no, reg->l, reg->h); } -int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - err =smp_call_function_single (cpu, __rdmsr_on_cpu, &rv,1 ); - *l = rv.reg.l; - *h = rv.reg.h; - -return err; -} -EXPORT_SYMBOL (rdmsr_on_cpu); -int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {int err;
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Remove rdmsr_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 5ad93d5cd69392e35b6d3e4dcfc5d07c2b4afa4b Gitweb: https://git.kernel.org/tip/5ad93d5cd69392e35b6d3e4dcfc5d07c2b4afa4b Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:34 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Remove rdmsr_on_cpu()
rdmsr_on_cpu() has no users left. Delete it.
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 22 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -256,7 +256,6 @@ int msr_set_bit(u32 msr, u8 bit);int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP -int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);
@@ -269,11 +268,6 @@ int wrmsrq_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);int wrmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);#else /* CONFIG_SMP */ -static inline int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -rdmsr (msr_no, *l, *h); -return 0 ; -}static inline int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {wrmsr (msr_no, l, h);
arch/x86/lib/msr-smp.c +0 -16
@@ -31,22 +31,6 @@ static void __wrmsr_on_cpu(void *info)wrmsr (rv->msr_no, reg->l, reg->h); } -int rdmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - err =smp_call_function_single (cpu, __rdmsr_on_cpu, &rv,1 ); - *l = rv.reg.l; - *h = rv.reg.h; - -return err; -} -EXPORT_SYMBOL (rdmsr_on_cpu); -int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {int err;
PATCH v3 5/11 x86/msr: Switch wrmsr_on_cpu() users to wrmsrq_on_cpu()
In reply to Juergen GrossIn order to prepare retiring wrmsr_on_cpu() switch wrmsr_on_cpu() users to wrmsrq_on_cpu().
---
V2:
- instead of changing wrmsr_on_cpu(), use wrmsrq_on_cpu() (Ingo Molnar)
--- arch/x86/events/intel/ds.c | 11 ++++------- arch/x86/include/asm/msr.h | 2 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- drivers/cpufreq/p4-clockmod.c | 4 ++-- drivers/cpufreq/speedstep-centrino.c | 4 ++-- drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-)
arch/x86/events/intel/ds.c +4 -7
@@ -780,9 +780,7 @@ void init_debug_store_on_cpu(int cpu)if (!ds)return ; -wrmsr_on_cpu (cpu,MSR_IA32_DS_AREA , - (u32)((u64 )(unsigned long )ds), - (u32)((u64 )(unsigned long )ds >>32 )); +wrmsrq_on_cpu (cpu,MSR_IA32_DS_AREA , (u64 )(unsigned long )ds); }void fini_debug_store_on_cpu (int cpu)
@@ -790,7 +788,7 @@ void fini_debug_store_on_cpu(int cpu)if (!per_cpu (cpu_hw_events, cpu).ds)return ; -wrmsr_on_cpu (cpu,MSR_IA32_DS_AREA ,0 ,0 ); +wrmsrq_on_cpu (cpu,MSR_IA32_DS_AREA ,0 ); } static DEFINE_PER_CPU(void *, insn_buffer);
@@ -1095,8 +1093,7 @@ void init_arch_pebs_on_cpu(int cpu)* contiguous physical buffer (__alloc_pages_node() with order) */ arch_pebs_base =virt_to_phys (cpuc->pebs_vaddr) |PEBS_BUFFER_SHIFT ; -wrmsr_on_cpu (cpu,MSR_IA32_PEBS_BASE , (u32 )arch_pebs_base, - (u32)(arch_pebs_base >>32 )); +wrmsrq_on_cpu (cpu,MSR_IA32_PEBS_BASE , arch_pebs_base); x86_pmu.pebs_active =1 ; }
@@ -1105,7 +1102,7 @@ inline void fini_arch_pebs_on_cpu(int cpu)if (!x86_pmu.arch_pebs)return ; -wrmsr_on_cpu (cpu,MSR_IA32_PEBS_BASE ,0 ,0 ); +wrmsrq_on_cpu (cpu,MSR_IA32_PEBS_BASE ,0 ); }/*
arch/x86/include/asm/msr.h +1 -1
@@ -291,7 +291,7 @@ static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no,static inline void wrmsr_on_cpus (const struct cpumask *m,u32 msr_no,struct msr __percpu *msrs) { -wrmsr_on_cpu (0 , msr_no,raw_cpu_read (msrs->l),raw_cpu_read (msrs->h)); +wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); }static inline int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h)
arch/x86/kernel/cpu/mce/inject.c +1 -1
@@ -327,7 +327,7 @@ static int toggle_hw_mce_inject(unsigned int cpu, bool enable) enable ? (val.l |=BIT (18 )) : (val.l &= ~BIT (18 )); - err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , val.l, val.h); + err =wrmsrq_on_cpu (cpu,MSR_K7_HWCR , val.q);if (err)pr_err ("%s: error writing HWCR\n" , __func__);
drivers/cpufreq/p4-clockmod.c +2 -2
@@ -68,7 +68,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q);if (newstate ==DC_DISABLE ) {pr_debug ("CPU#%d disabling modulation\n" , cpu); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l & ~(1 <<4 ), val.h); +wrmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.q & ~(1ULL <<4 )); }else {pr_debug ("CPU#%d setting duty cycle to %d%%\n" , cpu, ((125 * newstate) /10 ));
@@ -79,7 +79,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)*/ val.l = (val.l & ~14 ); val.l = val.l | (1 <<4 ) | ((newstate &0x7 )<<1 ); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l, val.h); +wrmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.q); }return 0 ;
drivers/cpufreq/speedstep-centrino.c +2 -2
@@ -475,7 +475,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index) oldmsr.l |= msr; } -wrmsr_on_cpu (good_cpu,MSR_IA32_PERF_CTL , oldmsr.l, oldmsr.h); +wrmsrq_on_cpu (good_cpu,MSR_IA32_PERF_CTL , oldmsr.q);if (policy->shared_type ==CPUFREQ_SHARED_TYPE_ANY )break ;
@@ -491,7 +491,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index)*/ for_each_cpu (j, covered_cpus) -wrmsr_on_cpu (j,MSR_IA32_PERF_CTL , oldmsr.l, oldmsr.h); +wrmsrq_on_cpu (j,MSR_IA32_PERF_CTL , oldmsr.q); } retval =0 ;
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -1
@@ -167,7 +167,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, v.l |= intr; } -return wrmsr_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , v.l, v.h); +return wrmsrq_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , v.q); }/* Thermal zone callback registry */
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Switch wrmsr_on_cpu() users to wrmsrq_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 35971831aa5e0d40046e54422f2ba04734617109 Gitweb: https://git.kernel.org/tip/35971831aa5e0d40046e54422f2ba04734617109 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:35 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Switch wrmsr_on_cpu() users to wrmsrq_on_cpu()
In order to prepare retiring wrmsr_on_cpu() switch wrmsr_on_cpu() users to wrmsrq_on_cpu().
--- arch/x86/events/intel/ds.c | 11 ++++------- arch/x86/include/asm/msr.h | 2 +- arch/x86/kernel/cpu/mce/inject.c | 2 +- drivers/cpufreq/p4-clockmod.c | 4 ++-- drivers/cpufreq/speedstep-centrino.c | 4 ++-- drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- 6 files changed, 11 insertions(+), 14 deletions(-)
arch/x86/events/intel/ds.c +4 -7
@@ -780,9 +780,7 @@ void init_debug_store_on_cpu(int cpu)if (!ds)return ; -wrmsr_on_cpu (cpu,MSR_IA32_DS_AREA , - (u32)((u64 )(unsigned long )ds), - (u32)((u64 )(unsigned long )ds >>32 )); +wrmsrq_on_cpu (cpu,MSR_IA32_DS_AREA , (u64 )(unsigned long )ds); }void fini_debug_store_on_cpu (int cpu)
@@ -790,7 +788,7 @@ void fini_debug_store_on_cpu(int cpu)if (!per_cpu (cpu_hw_events, cpu).ds)return ; -wrmsr_on_cpu (cpu,MSR_IA32_DS_AREA ,0 ,0 ); +wrmsrq_on_cpu (cpu,MSR_IA32_DS_AREA ,0 ); } static DEFINE_PER_CPU(void *, insn_buffer);
@@ -1095,8 +1093,7 @@ void init_arch_pebs_on_cpu(int cpu)* contiguous physical buffer (__alloc_pages_node() with order) */ arch_pebs_base =virt_to_phys (cpuc->pebs_vaddr) |PEBS_BUFFER_SHIFT ; -wrmsr_on_cpu (cpu,MSR_IA32_PEBS_BASE , (u32 )arch_pebs_base, - (u32)(arch_pebs_base >>32 )); +wrmsrq_on_cpu (cpu,MSR_IA32_PEBS_BASE , arch_pebs_base); x86_pmu.pebs_active =1 ; }
@@ -1105,7 +1102,7 @@ inline void fini_arch_pebs_on_cpu(int cpu)if (!x86_pmu.arch_pebs)return ; -wrmsr_on_cpu (cpu,MSR_IA32_PEBS_BASE ,0 ,0 ); +wrmsrq_on_cpu (cpu,MSR_IA32_PEBS_BASE ,0 ); }/*
arch/x86/include/asm/msr.h +1 -1
@@ -291,7 +291,7 @@ static inline void rdmsr_on_cpus(const struct cpumask *m, u32 msr_no,static inline void wrmsr_on_cpus (const struct cpumask *m,u32 msr_no,struct msr __percpu *msrs) { -wrmsr_on_cpu (0 , msr_no,raw_cpu_read (msrs->l),raw_cpu_read (msrs->h)); +wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); }static inline int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h)
arch/x86/kernel/cpu/mce/inject.c +1 -1
@@ -327,7 +327,7 @@ static int toggle_hw_mce_inject(unsigned int cpu, bool enable) enable ? (val.l |=BIT (18 )) : (val.l &= ~BIT (18 )); - err =wrmsr_on_cpu (cpu,MSR_K7_HWCR , val.l, val.h); + err =wrmsrq_on_cpu (cpu,MSR_K7_HWCR , val.q);if (err)pr_err ("%s: error writing HWCR\n" , __func__);
drivers/cpufreq/p4-clockmod.c +2 -2
@@ -68,7 +68,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)rdmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , &val.q);if (newstate ==DC_DISABLE ) {pr_debug ("CPU#%d disabling modulation\n" , cpu); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l & ~(1 <<4 ), val.h); +wrmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.q & ~(1ULL <<4 )); }else {pr_debug ("CPU#%d setting duty cycle to %d%%\n" , cpu, ((125 * newstate) /10 ));
@@ -79,7 +79,7 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)*/ val.l = (val.l & ~14 ); val.l = val.l | (1 <<4 ) | ((newstate &0x7 )<<1 ); -wrmsr_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.l, val.h); +wrmsrq_on_cpu (cpu,MSR_IA32_THERM_CONTROL , val.q); }return 0 ;
drivers/cpufreq/speedstep-centrino.c +2 -2
@@ -475,7 +475,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index) oldmsr.l |= msr; } -wrmsr_on_cpu (good_cpu,MSR_IA32_PERF_CTL , oldmsr.l, oldmsr.h); +wrmsrq_on_cpu (good_cpu,MSR_IA32_PERF_CTL , oldmsr.q);if (policy->shared_type ==CPUFREQ_SHARED_TYPE_ANY )break ;
@@ -491,7 +491,7 @@ static int centrino_target(struct cpufreq_policy *policy, unsigned int index)*/ for_each_cpu (j, covered_cpus) -wrmsr_on_cpu (j,MSR_IA32_PERF_CTL , oldmsr.l, oldmsr.h); +wrmsrq_on_cpu (j,MSR_IA32_PERF_CTL , oldmsr.q); } retval =0 ;
drivers/thermal/intel/x86_pkg_temp_thermal.c +1 -1
@@ -167,7 +167,7 @@ sys_set_trip_temp(struct thermal_zone_device *tzd, v.l |= intr; } -return wrmsr_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , v.l, v.h); +return wrmsrq_on_cpu (zonedev->cpu,MSR_IA32_PACKAGE_THERM_INTERRUPT , v.q); }/* Thermal zone callback registry */
PATCH v3 6/11 x86/msr: Remove wrmsr_on_cpu()
In reply to Juergen Grosswrmsr_on_cpu() has no users left. Delete it.
---
V2:
- delete wrmsr_on_cpu() instead of wrmsrq_on_cpu() (Ingo Molnar)
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 22 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -256,7 +256,6 @@ int msr_set_bit(u32 msr, u8 bit);int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP -int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);
@@ -268,11 +267,6 @@ int wrmsrq_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);int wrmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);#else /* CONFIG_SMP */ -static inline int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -wrmsr (msr_no, l, h); -return 0 ; -}static inline int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {rdmsrq (msr_no, *q);
arch/x86/lib/msr-smp.c +0 -16
@@ -46,22 +46,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) }EXPORT_SYMBOL (rdmsrq_on_cpu); -int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - rv.reg.l = l; - rv.reg.h = h; - err =smp_call_function_single (cpu, __wrmsr_on_cpu, &rv,1 ); - -return err; -} -EXPORT_SYMBOL (wrmsr_on_cpu); -int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q) {int err;
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Remove wrmsr_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 97a6561aca552a942298429b9904825c2c862285 Gitweb: https://git.kernel.org/tip/97a6561aca552a942298429b9904825c2c862285 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:36 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Remove wrmsr_on_cpu()
wrmsr_on_cpu() has no users left. Delete it.
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 22 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -256,7 +256,6 @@ int msr_set_bit(u32 msr, u8 bit);int msr_clear_bit (u32 msr,u8 bit);#ifdef CONFIG_SMP -int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);
@@ -268,11 +267,6 @@ int wrmsrq_safe_on_cpu(unsigned int cpu, u32 msr_no, u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);int wrmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);#else /* CONFIG_SMP */ -static inline int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -wrmsr (msr_no, l, h); -return 0 ; -}static inline int rdmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {rdmsrq (msr_no, *q);
arch/x86/lib/msr-smp.c +0 -16
@@ -46,22 +46,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q) }EXPORT_SYMBOL (rdmsrq_on_cpu); -int wrmsr_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - rv.reg.l = l; - rv.reg.h = h; - err =smp_call_function_single (cpu, __wrmsr_on_cpu, &rv,1 ); - -return err; -} -EXPORT_SYMBOL (wrmsr_on_cpu); -int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q) {int err;
PATCH v3 7/11 x86/msr: Don't use rdmsr_safe_on_cpu() in rdmsrq_safe_on_cpu()
In reply to Juergen GrossIn order to prepare removal of rdmsr_safe_on_cpu(), don't use it in rdmsrq_safe_on_cpu(), but replace it with open coding it.
This will create a nearly verbatim copy of the same code, but this is only temporary until rdmsr_safe_on_cpu() is removed.
---
V3:
- patch carved out from other one (Ingo Molnar)
--- arch/x86/lib/msr-smp.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/x86/lib/msr-smp.c +14 -3
@@ -190,11 +190,22 @@ EXPORT_SYMBOL(wrmsrq_safe_on_cpu);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) { -u32 low, high; +struct msr_info_completion rv; +call_single_data_t csd;int err; - err =rdmsr_safe_on_cpu (cpu, msr_no, &low, &high); - *q = (u64 )high <<32 | low; +INIT_CSD (&csd, __rdmsr_safe_on_cpu, &rv); + +memset (&rv,0 ,sizeof (rv)); +init_completion (&rv.done); + rv.msr.msr_no = msr_no; + + err =smp_call_function_single_async (cpu, &csd); +if (!err) { +wait_for_completion (&rv.done); + err = rv.msr.err; + } + *q = rv.msr.reg.q;return err; }
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Don't use rdmsr_safe_on_cpu() in rdmsrq_safe_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: dfaf45fba11642893ed3d28c1aa9f516330147f1 Gitweb: https://git.kernel.org/tip/dfaf45fba11642893ed3d28c1aa9f516330147f1 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:37 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Don't use rdmsr_safe_on_cpu() in rdmsrq_safe_on_cpu()
In order to prepare removal of rdmsr_safe_on_cpu(), don't use it in rdmsrq_safe_on_cpu(), but replace it with open coding it.
This will create a nearly verbatim copy of the same code, but this is only temporary until rdmsr_safe_on_cpu() is removed.
--- arch/x86/lib/msr-smp.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/x86/lib/msr-smp.c +14 -3
@@ -190,11 +190,22 @@ EXPORT_SYMBOL(wrmsrq_safe_on_cpu);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) { -u32 low, high; +struct msr_info_completion rv; +call_single_data_t csd;int err; - err =rdmsr_safe_on_cpu (cpu, msr_no, &low, &high); - *q = (u64 )high <<32 | low; +INIT_CSD (&csd, __rdmsr_safe_on_cpu, &rv); + +memset (&rv,0 ,sizeof (rv)); +init_completion (&rv.done); + rv.msr.msr_no = msr_no; + + err =smp_call_function_single_async (cpu, &csd); +if (!err) { +wait_for_completion (&rv.done); + err = rv.msr.err; + } + *q = rv.msr.reg.q;return err; }
PATCH v3 8/11 x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()
In reply to Juergen GrossIn order to prepare retiring rdmsr_safe_on_cpu() switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu().
---
V2:
- instead of changing rdmsr_safe_on_cpu(), use rdmsrq_safe_on_cpu() (Ingo Molnar)
--- arch/x86/kernel/msr.c | 4 +-- drivers/hwmon/coretemp.c | 32 +++++++++++------------ drivers/hwmon/via-cputemp.c | 16 ++++++------ drivers/thermal/intel/intel_tcc.c | 43 ++++++++++++++++--------------- 4 files changed, 48 insertions(+), 47 deletions(-)
arch/x86/kernel/msr.c +2 -2
@@ -53,7 +53,7 @@ static ssize_t msr_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { u32 __user *tmp = (u32 __user *) buf; -u32 data[2 ]; +u64 data;u32 reg = *ppos;int cpu =iminor (file_inode (file));int err =0 ;
@@ -63,7 +63,7 @@ static ssize_t msr_read(struct file *file, char __user *buf,return -EINVAL ;/* Invalid chunk size */ for (; count; count -=8 ) { - err =rdmsr_safe_on_cpu (cpu, reg, &data[0 ], &data[1 ]); + err =rdmsrq_safe_on_cpu (cpu, reg, &data);if (err)break ;if (copy_to_user (tmp, &data,8 )) {
drivers/hwmon/coretemp.c +16 -16
@@ -169,7 +169,7 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)int tjmax_ee =85000 ;int usemsr_ee =1 ;int err; -u32 eax, edx; +u64 val;int i;u16 devfn =PCI_DEVFN (0 ,0 );struct pci_dev *host_bridge =pci_get_domain_bus_and_slot (0 ,0 , devfn);
@@ -220,14 +220,14 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)* http://softwarecommunity.intel.com/Wiki/Mobility/720.htm * For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU */ - err =rdmsr_safe_on_cpu (id,0x17 , &eax, &edx); + err =rdmsrq_safe_on_cpu (id,0x17 , &val);if (err) {dev_warn (dev,"Unable to access MSR 0x17, assuming desktop" " CPU\n" ); usemsr_ee =0 ; }else if (c->x86_vfm <INTEL_CORE2_PENRYN && - !(eax &0x10000000 )) { + !(val &0x10000000 )) {/* * Trust bit 28 up to Penryn, I could not find any * documentation on that; if you happen to know
@@ -235,8 +235,8 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)*/ usemsr_ee =0 ; }else { -/* Platform ID bits 52:50 (EDX starts at bit 32) */ - platform_id = (edx >>18 ) &0x7 ; +/* Platform ID bits 52:50 */ + platform_id = (val >>50 ) &0x7 ;/* * Mobile Penryn CPU seems to be platform ID 7 or 5
@@ -255,12 +255,12 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) }if (usemsr_ee) { - err =rdmsr_safe_on_cpu (id,0xee , &eax, &edx); + err =rdmsrq_safe_on_cpu (id,0xee , &val);if (err) {dev_warn (dev,"Unable to access MSR 0xEE, for Tjmax, left" " at default\n" ); - }else if (eax &0x40000000 ) { + }else if (val &0x40000000 ) { tjmax = tjmax_ee; } }else if (tjmax ==100000 ) {
@@ -278,7 +278,7 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev) {struct cpuinfo_x86 *c = &cpu_data (tdata->cpu);int err; -u32 eax, edx; +u64 msrval;u32 val;/* use static tjmax once it is set */
@@ -289,11 +289,11 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev)* A new feature of current Intel(R) processors, the * IA32_TEMPERATURE_TARGET contains the TjMax value */ - err =rdmsr_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &eax, &edx); + err =rdmsrq_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &msrval);if (err) {dev_warn_once (dev,"Unable to read TjMax from CPU %u\n" , tdata->cpu); }else { - val = (eax >>16 ) &0xff ; + val = (msrval >>16 ) &0xff ;if (val)return val *1000 ; }
@@ -314,7 +314,7 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev)static int get_ttarget (struct temp_data *tdata,struct device *dev) { -u32 eax, edx; +u64 val;int tjmax, ttarget_offset, ret;/*
@@ -324,14 +324,14 @@ static int get_ttarget(struct temp_data *tdata, struct device *dev)if (tdata->tjmax)return -ENODEV ; - ret =rdmsr_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &eax, &edx); + ret =rdmsrq_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &val);if (ret)return ret; - tjmax = (eax >>16 ) &0xff ; + tjmax = (val >>16 ) &0xff ;/* Read the still undocumented bits 8:15 of IA32_TEMPERATURE_TARGET. */ - ttarget_offset = (eax >>8 ) &0xff ; + ttarget_offset = (val >>8 ) &0xff ;return (tjmax - ttarget_offset) *1000 ; }
@@ -560,7 +560,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,struct temp_data *tdata;struct platform_data *pdata =platform_get_drvdata (pdev);struct cpuinfo_x86 *c = &cpu_data (cpu); -u32 eax, edx; +u64 val;int err;if (!housekeeping_cpu (cpu,HK_TYPE_MISC ))
@@ -571,7 +571,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,return -ENOMEM ;/* Test if we can access the status register */ - err =rdmsr_safe_on_cpu (cpu, tdata->status_reg, &eax, &edx); + err =rdmsrq_safe_on_cpu (cpu, tdata->status_reg, &val);if (err) goto err;
drivers/hwmon/via-cputemp.c +8 -8
@@ -65,28 +65,28 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, char *buf) {struct via_cputemp_data *data =dev_get_drvdata (dev); -u32 eax, edx; +u64 val;int err; - err =rdmsr_safe_on_cpu (data->id, data->msr_temp, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_temp, &val);if (err)return -EAGAIN ; -return sprintf (buf,"%lu\n" , ((unsigned long )eax &0xffffff ) *1000 ); +return sprintf (buf,"%lu\n" , ((unsigned long )val &0xffffff ) *1000 ); }static ssize_t cpu0_vid_show (struct device *dev,struct device_attribute *devattr,char *buf) {struct via_cputemp_data *data =dev_get_drvdata (dev); -u32 eax, edx; +u64 val;int err; - err =rdmsr_safe_on_cpu (data->id, data->msr_vid, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_vid, &val);if (err)return -EAGAIN ; -return sprintf (buf,"%d\n" ,vid_from_reg (~edx &0x7f , data->vrm)); +return sprintf (buf,"%d\n" ,vid_from_reg (~(val >>32 ) &0x7f , data->vrm)); } static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, SHOW_TEMP);
@@ -112,7 +112,7 @@ static int via_cputemp_probe(struct platform_device *pdev)struct via_cputemp_data *data;struct cpuinfo_x86 *c = &cpu_data (pdev->id);int err; -u32 eax, edx; +u64 val; data =devm_kzalloc (&pdev->dev,sizeof (struct via_cputemp_data ),GFP_KERNEL );
@@ -143,7 +143,7 @@ static int via_cputemp_probe(struct platform_device *pdev) }/* test if we can access the TEMPERATURE MSR */ - err =rdmsr_safe_on_cpu (data->id, data->msr_temp, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_temp, &val);if (err) {dev_err (&pdev->dev,"Unable to access TEMPERATURE MSR, giving up\n" );
drivers/thermal/intel/intel_tcc.c +22 -21
112 lines not on this page · raw message
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 91660aae2f864850f5e5494f6548ce3e534e6d4c Gitweb: https://git.kernel.org/tip/91660aae2f864850f5e5494f6548ce3e534e6d4c Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:38 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu()
In order to prepare retiring rdmsr_safe_on_cpu() switch rdmsr_safe_on_cpu() users to rdmsrq_safe_on_cpu().
--- arch/x86/kernel/msr.c | 4 +-- drivers/hwmon/coretemp.c | 32 +++++++++++----------- drivers/hwmon/via-cputemp.c | 16 +++++------ drivers/thermal/intel/intel_tcc.c | 43 +++++++++++++++--------------- 4 files changed, 48 insertions(+), 47 deletions(-)
arch/x86/kernel/msr.c +2 -2
@@ -53,7 +53,7 @@ static ssize_t msr_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { u32 __user *tmp = (u32 __user *) buf; -u32 data[2 ]; +u64 data;u32 reg = *ppos;int cpu =iminor (file_inode (file));int err =0 ;
@@ -63,7 +63,7 @@ static ssize_t msr_read(struct file *file, char __user *buf,return -EINVAL ;/* Invalid chunk size */ for (; count; count -=8 ) { - err =rdmsr_safe_on_cpu (cpu, reg, &data[0 ], &data[1 ]); + err =rdmsrq_safe_on_cpu (cpu, reg, &data);if (err)break ;if (copy_to_user (tmp, &data,8 )) {
drivers/hwmon/coretemp.c +16 -16
@@ -169,7 +169,7 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)int tjmax_ee =85000 ;int usemsr_ee =1 ;int err; -u32 eax, edx; +u64 val;int i;u16 devfn =PCI_DEVFN (0 ,0 );struct pci_dev *host_bridge =pci_get_domain_bus_and_slot (0 ,0 , devfn);
@@ -220,14 +220,14 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)* http://softwarecommunity.intel.com/Wiki/Mobility/720.htm * For Core2 cores, check MSR 0x17, bit 28 1 = Mobile CPU */ - err =rdmsr_safe_on_cpu (id,0x17 , &eax, &edx); + err =rdmsrq_safe_on_cpu (id,0x17 , &val);if (err) {dev_warn (dev,"Unable to access MSR 0x17, assuming desktop" " CPU\n" ); usemsr_ee =0 ; }else if (c->x86_vfm <INTEL_CORE2_PENRYN && - !(eax &0x10000000 )) { + !(val &0x10000000 )) {/* * Trust bit 28 up to Penryn, I could not find any * documentation on that; if you happen to know
@@ -235,8 +235,8 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)*/ usemsr_ee =0 ; }else { -/* Platform ID bits 52:50 (EDX starts at bit 32) */ - platform_id = (edx >>18 ) &0x7 ; +/* Platform ID bits 52:50 */ + platform_id = (val >>50 ) &0x7 ;/* * Mobile Penryn CPU seems to be platform ID 7 or 5
@@ -255,12 +255,12 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) }if (usemsr_ee) { - err =rdmsr_safe_on_cpu (id,0xee , &eax, &edx); + err =rdmsrq_safe_on_cpu (id,0xee , &val);if (err) {dev_warn (dev,"Unable to access MSR 0xEE, for Tjmax, left" " at default\n" ); - }else if (eax &0x40000000 ) { + }else if (val &0x40000000 ) { tjmax = tjmax_ee; } }else if (tjmax ==100000 ) {
@@ -278,7 +278,7 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev) {struct cpuinfo_x86 *c = &cpu_data (tdata->cpu);int err; -u32 eax, edx; +u64 msrval;u32 val;/* use static tjmax once it is set */
@@ -289,11 +289,11 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev)* A new feature of current Intel(R) processors, the * IA32_TEMPERATURE_TARGET contains the TjMax value */ - err =rdmsr_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &eax, &edx); + err =rdmsrq_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &msrval);if (err) {dev_warn_once (dev,"Unable to read TjMax from CPU %u\n" , tdata->cpu); }else { - val = (eax >>16 ) &0xff ; + val = (msrval >>16 ) &0xff ;if (val)return val *1000 ; }
@@ -314,7 +314,7 @@ static int get_tjmax(struct temp_data *tdata, struct device *dev)static int get_ttarget (struct temp_data *tdata,struct device *dev) { -u32 eax, edx; +u64 val;int tjmax, ttarget_offset, ret;/*
@@ -324,14 +324,14 @@ static int get_ttarget(struct temp_data *tdata, struct device *dev)if (tdata->tjmax)return -ENODEV ; - ret =rdmsr_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &eax, &edx); + ret =rdmsrq_safe_on_cpu (tdata->cpu,MSR_IA32_TEMPERATURE_TARGET , &val);if (ret)return ret; - tjmax = (eax >>16 ) &0xff ; + tjmax = (val >>16 ) &0xff ;/* Read the still undocumented bits 8:15 of IA32_TEMPERATURE_TARGET. */ - ttarget_offset = (eax >>8 ) &0xff ; + ttarget_offset = (val >>8 ) &0xff ;return (tjmax - ttarget_offset) *1000 ; }
@@ -560,7 +560,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,struct temp_data *tdata;struct platform_data *pdata =platform_get_drvdata (pdev);struct cpuinfo_x86 *c = &cpu_data (cpu); -u32 eax, edx; +u64 val;int err;if (!housekeeping_cpu (cpu,HK_TYPE_MISC ))
@@ -571,7 +571,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu,return -ENOMEM ;/* Test if we can access the status register */ - err =rdmsr_safe_on_cpu (cpu, tdata->status_reg, &eax, &edx); + err =rdmsrq_safe_on_cpu (cpu, tdata->status_reg, &val);if (err) goto err;
drivers/hwmon/via-cputemp.c +8 -8
@@ -65,28 +65,28 @@ static ssize_t temp_show(struct device *dev, struct device_attribute *devattr, char *buf) {struct via_cputemp_data *data =dev_get_drvdata (dev); -u32 eax, edx; +u64 val;int err; - err =rdmsr_safe_on_cpu (data->id, data->msr_temp, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_temp, &val);if (err)return -EAGAIN ; -return sprintf (buf,"%lu\n" , ((unsigned long )eax &0xffffff ) *1000 ); +return sprintf (buf,"%lu\n" , ((unsigned long )val &0xffffff ) *1000 ); }static ssize_t cpu0_vid_show (struct device *dev,struct device_attribute *devattr,char *buf) {struct via_cputemp_data *data =dev_get_drvdata (dev); -u32 eax, edx; +u64 val;int err; - err =rdmsr_safe_on_cpu (data->id, data->msr_vid, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_vid, &val);if (err)return -EAGAIN ; -return sprintf (buf,"%d\n" ,vid_from_reg (~edx &0x7f , data->vrm)); +return sprintf (buf,"%d\n" ,vid_from_reg (~(val >>32 ) &0x7f , data->vrm)); } static SENSOR_DEVICE_ATTR_RO(temp1_input, temp, SHOW_TEMP);
@@ -112,7 +112,7 @@ static int via_cputemp_probe(struct platform_device *pdev)struct via_cputemp_data *data;struct cpuinfo_x86 *c = &cpu_data (pdev->id);int err; -u32 eax, edx; +u64 val; data =devm_kzalloc (&pdev->dev,sizeof (struct via_cputemp_data ),GFP_KERNEL );
@@ -143,7 +143,7 @@ static int via_cputemp_probe(struct platform_device *pdev) }/* test if we can access the TEMPERATURE MSR */ - err =rdmsr_safe_on_cpu (data->id, data->msr_temp, &eax, &edx); + err =rdmsrq_safe_on_cpu (data->id, data->msr_temp, &val);if (err) {dev_err (&pdev->dev,"Unable to access TEMPERATURE MSR, giving up\n" );
drivers/thermal/intel/intel_tcc.c +22 -21
112 lines not on this page · raw message
PATCH v3 9/11 x86/msr: Remove rdmsr_safe_on_cpu()
In reply to Juergen Grossrdmsr_safe_on_cpu() has no users left. Delete it.
---
V2:
- delete rdmsr_safe_on_cpu() instead of rdmsrq_safe_on_cpu() (Ingo Molnar)
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 24 ------------------------ 2 files changed, 30 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -260,7 +260,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);void wrmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs); -int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q);
@@ -287,11 +286,6 @@ static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no, {wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); } -static inline int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no, -u32 *l,u32 *h) -{ -return rdmsr_safe (msr_no, l, h); -}static inline int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {return wrmsr_safe (msr_no, l, h);
arch/x86/lib/msr-smp.c +0 -24
@@ -132,30 +132,6 @@ static void __wrmsr_safe_on_cpu(void *info) rv->err =wrmsr_safe (rv->msr_no, rv->reg.l, rv->reg.h); } -int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -struct msr_info_completion rv; -call_single_data_t csd; -int err; - -INIT_CSD (&csd, __rdmsr_safe_on_cpu, &rv); - -memset (&rv,0 ,sizeof (rv)); -init_completion (&rv.done); - rv.msr.msr_no = msr_no; - - err =smp_call_function_single_async (cpu, &csd); -if (!err) { -wait_for_completion (&rv.done); - err = rv.msr.err; - } - *l = rv.msr.reg.l; - *h = rv.msr.reg.h; - -return err; -} -EXPORT_SYMBOL (rdmsr_safe_on_cpu); -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {int err;
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Remove rdmsr_safe_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: d2eb65a9aa061a3ee1f42bc0cdfe9ecffaf267fb Gitweb: https://git.kernel.org/tip/d2eb65a9aa061a3ee1f42bc0cdfe9ecffaf267fb Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:39 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Remove rdmsr_safe_on_cpu()
rdmsr_safe_on_cpu() has no users left. Delete it.
--- arch/x86/include/asm/msr.h | 6 ------ arch/x86/lib/msr-smp.c | 24 ------------------------ 2 files changed, 30 deletions(-)
arch/x86/include/asm/msr.h +0 -6
@@ -260,7 +260,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);void wrmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs); -int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h);int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q);
@@ -287,11 +286,6 @@ static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no, {wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); } -static inline int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no, -u32 *l,u32 *h) -{ -return rdmsr_safe (msr_no, l, h); -}static inline int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {return wrmsr_safe (msr_no, l, h);
arch/x86/lib/msr-smp.c +0 -24
@@ -132,30 +132,6 @@ static void __wrmsr_safe_on_cpu(void *info) rv->err =wrmsr_safe (rv->msr_no, rv->reg.l, rv->reg.h); } -int rdmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 *l,u32 *h) -{ -struct msr_info_completion rv; -call_single_data_t csd; -int err; - -INIT_CSD (&csd, __rdmsr_safe_on_cpu, &rv); - -memset (&rv,0 ,sizeof (rv)); -init_completion (&rv.done); - rv.msr.msr_no = msr_no; - - err =smp_call_function_single_async (cpu, &csd); -if (!err) { -wait_for_completion (&rv.done); - err = rv.msr.err; - } - *l = rv.msr.reg.l; - *h = rv.msr.reg.h; - -return err; -} -EXPORT_SYMBOL (rdmsr_safe_on_cpu); -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) {int err;
PATCH v3 10/11 x86/msr: Switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu()
In reply to Juergen GrossIn order to prepare retiring wrmsr_safe_on_cpu() switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu().
---
V2:
- instead of changing wrmsr_safe_on_cpu(), use wrmsrq_safe_on_cpu() (Ingo Molnar)
--- arch/x86/kernel/msr.c | 4 ++-- drivers/thermal/intel/intel_tcc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/msr.c +2 -2
@@ -109,7 +109,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { const u32 __user *tmp = (const u32 __user *)buf; -u32 data[2 ]; +u64 data;u32 reg = *ppos;int cpu =iminor (file_inode (file));int err =0 ;
@@ -134,7 +134,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,add_taint (TAINT_CPU_OUT_OF_SPEC ,LOCKDEP_STILL_OK ); - err =wrmsr_safe_on_cpu (cpu, reg, data[0 ], data[1 ]); + err =wrmsrq_safe_on_cpu (cpu, reg, data);if (err)break ;
drivers/thermal/intel/intel_tcc.c +1 -1
@@ -261,7 +261,7 @@ int intel_tcc_set_offset(int cpu, int offset)if (cpu <0 )return wrmsr_safe (MSR_IA32_TEMPERATURE_TARGET , val.l, val.h);else -return wrmsr_safe_on_cpu (cpu,MSR_IA32_TEMPERATURE_TARGET , val.l, val.h); +return wrmsrq_safe_on_cpu (cpu,MSR_IA32_TEMPERATURE_TARGET , val.q); }EXPORT_SYMBOL_NS_GPL (intel_tcc_set_offset,"INTEL_TCC" );
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: 840b4014346442647354ad12a894d6d4ae3cb510 Gitweb: https://git.kernel.org/tip/840b4014346442647354ad12a894d6d4ae3cb510 Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:40 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu()
In order to prepare retiring wrmsr_safe_on_cpu() switch wrmsr_safe_on_cpu() users to wrmsrq_safe_on_cpu().
--- arch/x86/kernel/msr.c | 4 ++-- drivers/thermal/intel/intel_tcc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/msr.c +2 -2
@@ -109,7 +109,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { const u32 __user *tmp = (const u32 __user *)buf; -u32 data[2 ]; +u64 data;u32 reg = *ppos;int cpu =iminor (file_inode (file));int err =0 ;
@@ -134,7 +134,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,add_taint (TAINT_CPU_OUT_OF_SPEC ,LOCKDEP_STILL_OK ); - err =wrmsr_safe_on_cpu (cpu, reg, data[0 ], data[1 ]); + err =wrmsrq_safe_on_cpu (cpu, reg, data);if (err)break ;
drivers/thermal/intel/intel_tcc.c +1 -1
@@ -261,7 +261,7 @@ int intel_tcc_set_offset(int cpu, int offset)if (cpu <0 )return wrmsr_safe (MSR_IA32_TEMPERATURE_TARGET , val.l, val.h);else -return wrmsr_safe_on_cpu (cpu,MSR_IA32_TEMPERATURE_TARGET , val.l, val.h); +return wrmsrq_safe_on_cpu (cpu,MSR_IA32_TEMPERATURE_TARGET , val.q); }EXPORT_SYMBOL_NS_GPL (intel_tcc_set_offset,"INTEL_TCC" );
PATCH v3 11/11 x86/msr: Remove wrmsr_safe_on_cpu()
In reply to Juergen Grosswrmsr_safe_on_cpu() has no users left. Delete it.
---
V2:
- delete wrmsr_safe_on_cpu() instead of wrmsrq_safe_on_cpu() (Ingo Molnar)
--- arch/x86/include/asm/msr.h | 5 ----- arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 21 deletions(-)
arch/x86/include/asm/msr.h +0 -5
@@ -260,7 +260,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);void wrmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs); -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);
@@ -286,10 +285,6 @@ static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no, {wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); } -static inline int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -return wrmsr_safe (msr_no, l, h); -}static inline int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {return rdmsrq_safe (msr_no, q);
arch/x86/lib/msr-smp.c +0 -16
@@ -132,22 +132,6 @@ static void __wrmsr_safe_on_cpu(void *info) rv->err =wrmsr_safe (rv->msr_no, rv->reg.l, rv->reg.h); } -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - rv.reg.l = l; - rv.reg.h = h; - err =smp_call_function_single (cpu, __wrmsr_safe_on_cpu, &rv,1 ); - -return err ? err : rv.err; -} -EXPORT_SYMBOL (wrmsr_safe_on_cpu); -int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q) {int err;
Signature · 1 line
2.54.0
[tip: x86/msr] x86/msr: Remove wrmsr_safe_on_cpu()
The following commit has been merged into the x86/msr branch of tip:
The following commit has been merged into the x86/msr branch of tip:
Commit-ID: cdd2c4133ad2f5b655fa47ac43e6bcaa5b48434d Gitweb: https://git.kernel.org/tip/cdd2c4133ad2f5b655fa47ac43e6bcaa5b48434d Author: Juergen Gross <[email protected]> AuthorDate: Mon, 08 Jun 2026 07:17:41 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Mon, 08 Jun 2026 10:01:49 +02:00
x86/msr: Remove wrmsr_safe_on_cpu()
wrmsr_safe_on_cpu() has no users left. Delete it.
--- arch/x86/include/asm/msr.h | 5 ----- arch/x86/lib/msr-smp.c | 16 ---------------- 2 files changed, 21 deletions(-)
arch/x86/include/asm/msr.h +0 -5
@@ -260,7 +260,6 @@ int rdmsrq_on_cpu(unsigned int cpu, u32 msr_no, u64 *q);int wrmsrq_on_cpu (unsigned int cpu,u32 msr_no,u64 q);void rdmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs);void wrmsr_on_cpus (const struct cpumask *mask,u32 msr_no,struct msr __percpu *msrs); -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h);int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q);int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q);int rdmsr_safe_regs_on_cpu (unsigned int cpu,u32 regs[8 ]);
@@ -286,10 +285,6 @@ static inline void wrmsr_on_cpus(const struct cpumask *m, u32 msr_no, {wrmsrq_on_cpu (0 , msr_no,raw_cpu_read (msrs->q)); } -static inline int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -return wrmsr_safe (msr_no, l, h); -}static inline int rdmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 *q) {return rdmsrq_safe (msr_no, q);
arch/x86/lib/msr-smp.c +0 -16
@@ -132,22 +132,6 @@ static void __wrmsr_safe_on_cpu(void *info) rv->err =wrmsr_safe (rv->msr_no, rv->reg.l, rv->reg.h); } -int wrmsr_safe_on_cpu (unsigned int cpu,u32 msr_no,u32 l,u32 h) -{ -int err; -struct msr_info rv; - -memset (&rv,0 ,sizeof (rv)); - - rv.msr_no = msr_no; - rv.reg.l = l; - rv.reg.h = h; - err =smp_call_function_single (cpu, __wrmsr_safe_on_cpu, &rv,1 ); - -return err ? err : rv.err; -} -EXPORT_SYMBOL (wrmsr_safe_on_cpu); -int wrmsrq_safe_on_cpu (unsigned int cpu,u32 msr_no,u64 q) {int err;
Hello Juergen,
Quoted 9 lines · Juergen Gross
Drop the variants using 2 32-bit values instead of a single 64-bit one of the
*_on_cpu()MSR access functions.Changes in V2:
- patches 1+2 split out from other patch
- keep the*q()variants instead of those without suffixChanges in V3:
- V3 patch 7 split out from V2 patch 7
I've taken this series for a spin on top of tip/master and haven't notices anything unusual on both baremetal and on an i386 QEMU guest. Feel free to include:
Signature · 2 lines
Thanks and Regards, Prateek