From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, linux-fbdev@vger.kernel.org,
dri-devel@lists.freedesktop.org
Cc: Juergen Gross <jgross@suse.com>, Helge Deller <deller@gmx.de>,
linux-geode@lists.infradead.org
Subject: [PATCH 22/32] fbdev/geode: Stop using 32-bit MSR interfaces
Date: Mon, 29 Jun 2026 08:05:13 +0200 [thread overview]
Message-ID: <20260629060526.3638272-23-jgross@suse.com> (raw)
In-Reply-To: <20260629060526.3638272-1-jgross@suse.com>
The 32-bit MSR interfaces rdmsr() and wrmsr() are planned to be
removed. Use the related 64-bit variants instead.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
drivers/video/fbdev/geode/display_gx.c | 8 +++---
drivers/video/fbdev/geode/lxfb_ops.c | 38 +++++++++++++-------------
drivers/video/fbdev/geode/suspend_gx.c | 20 ++++++++------
3 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/drivers/video/fbdev/geode/display_gx.c b/drivers/video/fbdev/geode/display_gx.c
index 099322cefce0..b93aa21a1d2b 100644
--- a/drivers/video/fbdev/geode/display_gx.c
+++ b/drivers/video/fbdev/geode/display_gx.c
@@ -23,15 +23,15 @@ unsigned int gx_frame_buffer_size(void)
unsigned int val;
if (!cs5535_has_vsa2()) {
- uint32_t hi, lo;
+ struct msr msr;
/* The number of pages is (PMAX - PMIN)+1 */
- rdmsr(MSR_GLIU_P2D_RO0, lo, hi);
+ rdmsrq(MSR_GLIU_P2D_RO0, msr.q);
/* PMAX */
- val = ((hi & 0xff) << 12) | ((lo & 0xfff00000) >> 20);
+ val = ((msr.h & 0xff) << 12) | ((msr.l & 0xfff00000) >> 20);
/* PMIN */
- val -= (lo & 0x000fffff);
+ val -= (msr.l & 0x000fffff);
val += 1;
/* The page size is 4k */
diff --git a/drivers/video/fbdev/geode/lxfb_ops.c b/drivers/video/fbdev/geode/lxfb_ops.c
index 2e33da9849b0..f5f1134cae9a 100644
--- a/drivers/video/fbdev/geode/lxfb_ops.c
+++ b/drivers/video/fbdev/geode/lxfb_ops.c
@@ -124,19 +124,19 @@ static const struct {
static void lx_set_dotpll(u32 pllval)
{
- u32 dotpll_lo, dotpll_hi;
+ struct msr dotpll;
int i;
- rdmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+ rdmsrq(MSR_GLCP_DOTPLL, dotpll.q);
- if ((dotpll_lo & MSR_GLCP_DOTPLL_LOCK) && (dotpll_hi == pllval))
+ if ((dotpll.l & MSR_GLCP_DOTPLL_LOCK) && (dotpll.h == pllval))
return;
- dotpll_hi = pllval;
- dotpll_lo &= ~(MSR_GLCP_DOTPLL_BYPASS | MSR_GLCP_DOTPLL_HALFPIX);
- dotpll_lo |= MSR_GLCP_DOTPLL_DOTRESET;
+ dotpll.h = pllval;
+ dotpll.l &= ~(MSR_GLCP_DOTPLL_BYPASS | MSR_GLCP_DOTPLL_HALFPIX);
+ dotpll.l |= MSR_GLCP_DOTPLL_DOTRESET;
- wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+ wrmsrq(MSR_GLCP_DOTPLL, dotpll.q);
/* Wait 100us for the PLL to lock */
@@ -145,15 +145,15 @@ static void lx_set_dotpll(u32 pllval)
/* Now, loop for the lock bit */
for (i = 0; i < 1000; i++) {
- rdmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
- if (dotpll_lo & MSR_GLCP_DOTPLL_LOCK)
+ rdmsrq(MSR_GLCP_DOTPLL, dotpll.q);
+ if (dotpll.l & MSR_GLCP_DOTPLL_LOCK)
break;
}
/* Clear the reset bit */
- dotpll_lo &= ~MSR_GLCP_DOTPLL_DOTRESET;
- wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+ dotpll.l &= ~MSR_GLCP_DOTPLL_DOTRESET;
+ wrmsrq(MSR_GLCP_DOTPLL, dotpll.q);
}
/* Set the clock based on the frequency specified by the current mode */
@@ -268,7 +268,7 @@ static void lx_graphics_enable(struct fb_info *info)
config |= VP_DCFG_CRT_VSYNC_POL;
if (par->output & OUTPUT_PANEL) {
- u32 msrlo, msrhi;
+ struct msr val;
write_fp(par, FP_PT1, 0);
temp = FP_PT2_SCRC;
@@ -282,10 +282,10 @@ static void lx_graphics_enable(struct fb_info *info)
write_fp(par, FP_PT2, temp);
write_fp(par, FP_DFC, FP_DFC_BC);
- msrlo = MSR_LX_MSR_PADSEL_TFT_SEL_LOW;
- msrhi = MSR_LX_MSR_PADSEL_TFT_SEL_HIGH;
+ val.l = MSR_LX_MSR_PADSEL_TFT_SEL_LOW;
+ val.h = MSR_LX_MSR_PADSEL_TFT_SEL_HIGH;
- wrmsr(MSR_LX_MSR_PADSEL, msrlo, msrhi);
+ wrmsrq(MSR_LX_MSR_PADSEL, val.q);
}
if (par->output & OUTPUT_CRT) {
@@ -313,15 +313,15 @@ unsigned int lx_framebuffer_size(void)
unsigned int val;
if (!cs5535_has_vsa2()) {
- uint32_t hi, lo;
+ struct msr msr;
/* The number of pages is (PMAX - PMIN)+1 */
- rdmsr(MSR_GLIU_P2D_RO0, lo, hi);
+ rdmsrq(MSR_GLIU_P2D_RO0, msr.q);
/* PMAX */
- val = ((hi & 0xff) << 12) | ((lo & 0xfff00000) >> 20);
+ val = ((msr.h & 0xff) << 12) | ((msr.l & 0xfff00000) >> 20);
/* PMIN */
- val -= (lo & 0x000fffff);
+ val -= (msr.l & 0x000fffff);
val += 1;
/* The page size is 4k */
diff --git a/drivers/video/fbdev/geode/suspend_gx.c b/drivers/video/fbdev/geode/suspend_gx.c
index 73307f42e343..6c0a526ee8a2 100644
--- a/drivers/video/fbdev/geode/suspend_gx.c
+++ b/drivers/video/fbdev/geode/suspend_gx.c
@@ -40,25 +40,27 @@ static void gx_save_regs(struct gxfb_par *par)
static void gx_set_dotpll(uint32_t dotpll_hi)
{
- uint32_t dotpll_lo;
+ struct msr dotpll;
int i;
- rdmsrq(MSR_GLCP_DOTPLL, dotpll_lo);
- dotpll_lo |= MSR_GLCP_DOTPLL_DOTRESET;
- dotpll_lo &= ~MSR_GLCP_DOTPLL_BYPASS;
- wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+ rdmsrq(MSR_GLCP_DOTPLL, dotpll.q);
+ dotpll.l |= MSR_GLCP_DOTPLL_DOTRESET;
+ dotpll.l &= ~MSR_GLCP_DOTPLL_BYPASS;
+ dotpll.h = dotpll_hi;
+ wrmsrq(MSR_GLCP_DOTPLL, dotpll.q);
/* wait for the PLL to lock */
for (i = 0; i < 200; i++) {
- rdmsrq(MSR_GLCP_DOTPLL, dotpll_lo);
- if (dotpll_lo & MSR_GLCP_DOTPLL_LOCK)
+ rdmsrq(MSR_GLCP_DOTPLL, dotpll.q);
+ if (dotpll.l & MSR_GLCP_DOTPLL_LOCK)
break;
udelay(1);
}
/* PLL set, unlock */
- dotpll_lo &= ~MSR_GLCP_DOTPLL_DOTRESET;
- wrmsr(MSR_GLCP_DOTPLL, dotpll_lo, dotpll_hi);
+ dotpll.l &= ~MSR_GLCP_DOTPLL_DOTRESET;
+ dotpll.h = dotpll_hi;
+ wrmsrq(MSR_GLCP_DOTPLL, dotpll.q);
}
static void gx_restore_gfx_proc(struct gxfb_par *par)
--
2.54.0
next prev parent reply other threads:[~2026-06-29 6:07 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 6:04 [PATCH 00/32] x86/msr: Drop " Juergen Gross
2026-06-29 6:04 ` [PATCH 01/32] thermal/intel: Stop using " Juergen Gross
2026-07-02 9:31 ` Ingo Molnar
2026-07-02 11:18 ` Jürgen Groß
2026-07-03 11:22 ` [PATCH v2 " Juergen Gross
2026-07-06 12:47 ` Rafael J. Wysocki (Intel)
2026-07-17 9:26 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 02/32] powercap: " Juergen Gross
2026-06-29 11:25 ` Ingo Molnar
2026-06-29 11:33 ` Jürgen Groß
2026-06-29 12:31 ` Ingo Molnar
2026-06-29 12:52 ` Jürgen Groß
2026-07-06 12:48 ` Rafael J. Wysocki (Intel)
2026-07-17 9:26 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 03/32] edac: " Juergen Gross
2026-06-30 1:50 ` Zhuo, Qiuxu
2026-07-02 10:15 ` [tip: x86/msr] EDAC: " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 04/32] acpi: " Juergen Gross
2026-06-30 12:30 ` Rafael J. Wysocki (Intel)
2026-06-30 12:42 ` Jürgen Groß
2026-07-02 9:17 ` Ingo Molnar
2026-07-02 11:33 ` Rafael J. Wysocki (Intel)
2026-07-04 8:26 ` Ingo Molnar
2026-07-06 12:50 ` Rafael J. Wysocki (Intel)
2026-07-17 9:26 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 05/32] x86/mtrr: " Juergen Gross
2026-06-29 11:33 ` Ingo Molnar
2026-06-29 11:41 ` Jürgen Groß
2026-06-29 12:27 ` Ingo Molnar
2026-06-29 13:04 ` Jürgen Groß
2026-07-02 9:15 ` Ingo Molnar
2026-07-03 11:23 ` [PATCH v2 " Juergen Gross
2026-07-17 9:42 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 06/32] x86/msr: Stop using 32-bit MSR interfaces in lib/msr-smp.c Juergen Gross
2026-07-02 10:16 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:04 ` [PATCH 07/32] x86/msr: Remove wrmsr_safe() Juergen Gross
2026-06-29 6:04 ` [PATCH 08/32] x86/mce: Stop using 32-bit MSR interfaces Juergen Gross
2026-07-02 10:16 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-07-03 10:55 ` [PATCH] x86/mce: Fix build warning after MSR-interface switch Juergen Gross
2026-07-17 9:28 ` Ingo Molnar
2026-07-17 10:18 ` Jürgen Groß
2026-07-17 10:25 ` Ingo Molnar
2026-07-17 11:03 ` Jürgen Groß
2026-07-19 9:44 ` [tip: x86/msr] x86/mce: Work around " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 09/32] KVM/x86: Stop using 32-bit MSR interfaces Juergen Gross
2026-07-17 9:42 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 10/32] x86/hygon: " Juergen Gross
2026-07-02 10:16 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 11/32] x86/pci: " Juergen Gross
2026-07-02 10:16 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 12/32] x86/amd: " Juergen Gross
2026-07-02 10:16 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 13/32] x86/featctl: " Juergen Gross
2026-07-02 9:39 ` Ingo Molnar
2026-07-02 11:19 ` Jürgen Groß
2026-07-03 11:24 ` [PATCH v2 " Juergen Gross
2026-07-17 9:42 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 14/32] x86/tsc: " Juergen Gross
2026-07-02 10:15 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 15/32] x86/msr: Remove rdmsr_safe() Juergen Gross
2026-06-29 6:05 ` [PATCH 16/32] cpufreq: Stop using 32-bit MSR interfaces Juergen Gross
2026-06-29 14:55 ` Zhongqiu Han
2026-06-30 6:38 ` Juergen Gross
2026-07-03 11:24 ` [PATCH v2 " Juergen Gross
2026-07-05 4:51 ` Zhongqiu Han
2026-07-17 9:42 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 17/32] x86/resctrl: " Juergen Gross
2026-07-01 16:49 ` Reinette Chatre
2026-07-02 10:15 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 18/32] x86/apic: " Juergen Gross
2026-07-02 10:15 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 19/32] x86/cpu: " Juergen Gross
2026-07-02 10:15 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-07-03 21:48 ` Borislav Petkov
2026-07-06 8:30 ` Juergen Gross
2026-07-06 14:26 ` Borislav Petkov
2026-07-06 14:39 ` Jürgen Groß
2026-07-17 9:36 ` Ingo Molnar
2026-07-17 10:18 ` Jürgen Groß
2026-07-17 10:26 ` Ingo Molnar
2026-06-29 6:05 ` [PATCH 20/32] drivers/ata: " Juergen Gross
2026-07-03 11:25 ` [PATCH v2 " Juergen Gross
2026-06-29 6:05 ` [PATCH 21/32] agp/nvidia: " Juergen Gross
2026-06-29 6:05 ` Juergen Gross [this message]
2026-06-29 6:05 ` [PATCH 23/32] hw_random/via-rng: " Juergen Gross
2026-06-29 6:05 ` [PATCH 24/32] drivers/gpio: " Juergen Gross
2026-06-29 10:33 ` Bartosz Golaszewski
2026-07-01 8:13 ` Linus Walleij
2026-07-01 8:32 ` Juergen Gross
2026-06-29 6:05 ` [PATCH 25/32] drivers/misc: " Juergen Gross
2026-06-29 6:05 ` [PATCH 26/32] x86/msr: Remove wrmsr() Juergen Gross
2026-06-29 6:05 ` [PATCH 27/32] x86/hyperv: Stop using 32-bit MSR interfaces Juergen Gross
2026-07-03 9:39 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 28/32] x86/olpc: " Juergen Gross
2026-07-03 9:39 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 29/32] hwmon: " Juergen Gross
2026-06-29 15:05 ` Guenter Roeck
2026-07-03 9:39 ` [tip: x86/msr] " tip-bot2 for Juergen Gross
2026-06-29 6:05 ` [PATCH 30/32] x86/msr: Remove rdmsr() Juergen Gross
2026-06-29 6:05 ` [PATCH 31/32] treewide: convert rdmsrq() from a macro to an inline function Juergen Gross
2026-06-29 6:05 ` [PATCH 32/32] x86/msr: Simplify some rdmsrq() use cases Juergen Gross
2026-06-29 6:52 ` [PATCH 00/32] x86/msr: Drop 32-bit MSR interfaces Arnd Bergmann
2026-06-29 7:01 ` Jürgen Groß
2026-06-29 8:06 ` Arnd Bergmann
2026-06-29 8:15 ` Jürgen Groß
2026-06-29 8:30 ` Jan Beulich
2026-06-29 8:38 ` Arnd Bergmann
2026-06-30 20:06 ` H. Peter Anvin
2026-06-29 11:19 ` Ingo Molnar
2026-06-30 18:59 ` Sean Christopherson
2026-07-01 8:33 ` Jürgen Groß
2026-07-02 10:07 ` Ingo Molnar
2026-07-02 11:03 ` Juergen Gross
2026-07-17 9:38 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260629060526.3638272-23-jgross@suse.com \
--to=jgross@suse.com \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-geode@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®