LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
@ 2008-03-09  1:48 Andres Salomon
  2008-03-10 20:14 ` Andrew Morton
  0 siblings, 1 reply; 5+ messages in thread
From: Andres Salomon @ 2008-03-09  1:48 UTC (permalink / raw)
  To: adaplas
  Cc: linux-kernel, linux-fbdev-devel, info-linux, Jordan Crouse,
	Andrew Morton

>From bee7242cf04c4a060b311b11985efb495f308355 Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@debian.org>
Date: Mon, 25 Feb 2008 15:29:36 -0500
Subject: [PATCH] gxfb: move MSR bit fields into gxfb.h

This continues the gxfb header cleanups.  MSRs are defined in geode.h;
the specific bits we care about are defined in gxfb.h.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 drivers/video/geode/display_gx.h |    3 ---
 drivers/video/geode/gxfb.h       |   16 ++++++++++++++++
 drivers/video/geode/gxfb_core.c  |    2 +-
 drivers/video/geode/video_gx.c   |    4 ++--
 drivers/video/geode/video_gx.h   |   14 --------------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index 56e9d2e..ad556d3 100644
--- a/drivers/video/geode/display_gx.h
+++ b/drivers/video/geode/display_gx.h
@@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp);
 
 extern struct geode_dc_ops gx_dc_ops;
 
-/* MSR that tells us if a TFT or CRT is attached */
-#define GLD_MSR_CONFIG_DM_FP 0x40
-
 #endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
index 3367fdc..19cf8ca 100644
--- a/drivers/video/geode/gxfb.h
+++ b/drivers/video/geode/gxfb.h
@@ -231,4 +231,20 @@ enum fp_registers {
 #define write_fp(reg, val)	writel((uint32_t) (val), \
 					par->vid_regs + 8*(reg) + VP_FP_START)
 
+
+/* MSRs are defined in asm/geode.h; their bitfields are here */
+
+#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3	(1 << 3)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2	(1 << 2)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2	(1 << 1)
+
+#define MSR_GLCP_DOTPLL_LOCK		(1 << 25)	/* r/o */
+#define MSR_GLCP_DOTPLL_BYPASS		(1 << 15)
+#define MSR_GLCP_DOTPLL_DOTRESET	(1 << 0)
+
+#define MSR_GX_MSR_PADSEL_MASK		0x3FFFFFFF	/* undocumented? */
+#define MSR_GX_MSR_PADSEL_TFT		0x1FFFFFFF	/* undocumented? */
+
+#define MSR_GX_GLD_MSR_CONFIG_FP	(1 << 3)
+
 #endif
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index 2e49a5e..ee25774 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
 	rdmsrl(MSR_GX_GLD_MSR_CONFIG, val);
 
-	if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
+	if ((val & MSR_GX_GLD_MSR_CONFIG_FP) == MSR_GX_GLD_MSR_CONFIG_FP)
 		par->enable_crt = 0;
 	else
 		par->enable_crt = 1;
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 51b03b7..bb77ccc 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -187,8 +187,8 @@ gx_configure_tft(struct fb_info *info)
 	/* Set up the DF pad select MSR */
 
 	rdmsrl(MSR_GX_MSR_PADSEL, val);
-	val &= ~GX_VP_PAD_SELECT_MASK;
-	val |= GX_VP_PAD_SELECT_TFT;
+	val &= ~MSR_GX_MSR_PADSEL_MASK;
+	val |= MSR_GX_MSR_PADSEL_TFT;
 	wrmsrl(MSR_GX_MSR_PADSEL, val);
 
 	/* Turn off the panel */
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 5457bd0..79f6e81 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -13,18 +13,4 @@
 
 extern struct geode_vid_ops gx_vid_ops;
 
-/* GX Flatpanel control MSR */
-#define GX_VP_PAD_SELECT_MASK          0x3FFFFFFF
-#define GX_VP_PAD_SELECT_TFT           0x1FFFFFFF
-
-/* Geode GX clock control MSRs */
-
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2	(0x0000000000000002ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2	(0x0000000000000004ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3	(0x0000000000000008ull)
-
-#  define MSR_GLCP_DOTPLL_DOTRESET		(0x0000000000000001ull)
-#  define MSR_GLCP_DOTPLL_BYPASS		(0x0000000000008000ull)
-#  define MSR_GLCP_DOTPLL_LOCK			(0x0000000002000000ull)
-
 #endif /* !__VIDEO_GX_H__ */
-- 
1.5.3.7


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
  2008-03-09  1:48 [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h Andres Salomon
@ 2008-03-10 20:14 ` Andrew Morton
  2008-03-10 20:28   ` Andres Salomon
  0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2008-03-10 20:14 UTC (permalink / raw)
  To: Andres Salomon
  Cc: adaplas, linux-kernel, linux-fbdev-devel, info-linux, jordan.crouse

On Sat, 8 Mar 2008 20:48:40 -0500
Andres Salomon <dilinger@queued.net> wrote:

> >From bee7242cf04c4a060b311b11985efb495f308355 Mon Sep 17 00:00:00 2001
> From: Andres Salomon <dilinger@debian.org>
> Date: Mon, 25 Feb 2008 15:29:36 -0500
> Subject: [PATCH] gxfb: move MSR bit fields into gxfb.h
> 
> This continues the gxfb header cleanups.  MSRs are defined in geode.h;
> the specific bits we care about are defined in gxfb.h.
> 
> Signed-off-by: Andres Salomon <dilinger@debian.org>
> ---
>  drivers/video/geode/display_gx.h |    3 ---
>  drivers/video/geode/gxfb.h       |   16 ++++++++++++++++
>  drivers/video/geode/gxfb_core.c  |    2 +-
>  drivers/video/geode/video_gx.c   |    4 ++--
>  drivers/video/geode/video_gx.h   |   14 --------------
>  5 files changed, 19 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
> index 56e9d2e..ad556d3 100644
> --- a/drivers/video/geode/display_gx.h
> +++ b/drivers/video/geode/display_gx.h
> @@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp);
>  
>  extern struct geode_dc_ops gx_dc_ops;
>  
> -/* MSR that tells us if a TFT or CRT is attached */
> -#define GLD_MSR_CONFIG_DM_FP 0x40
> -
>  #endif /* !__DISPLAY_GX1_H__ */

Something has gone wrong here.  The code in current mainline is



extern struct geode_dc_ops gx_dc_ops;

/* MSR that tells us if a TFT or CRT is attached */
#define GLD_MSR_CONFIG   0xC0002001
#define GLD_MSR_CONFIG_DM_FP 0x40

/* Display controller registers */


whereas you're patching something else.


In [1/6] you refer to "the MSR cleanup patch".  I don't know what that is.


Please clean up the changelogs - remove those email headers from the
email-forwarding operation and remove the additional little commentary on
top: if there's actually anything in there which is needed then it should
be integrated into the changelog proper, thanks.


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
  2008-03-10 20:14 ` Andrew Morton
@ 2008-03-10 20:28   ` Andres Salomon
  2008-03-10 21:26     ` Andrew Morton
  0 siblings, 1 reply; 5+ messages in thread
From: Andres Salomon @ 2008-03-10 20:28 UTC (permalink / raw)
  To: Andrew Morton
  Cc: adaplas, linux-kernel, linux-fbdev-devel, info-linux, jordan.crouse

On Mon, 10 Mar 2008 13:14:32 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:

> On Sat, 8 Mar 2008 20:48:40 -0500
> Andres Salomon <dilinger@queued.net> wrote:
> 
> > >From bee7242cf04c4a060b311b11985efb495f308355 Mon Sep 17 00:00:00 2001
> > From: Andres Salomon <dilinger@debian.org>
> > Date: Mon, 25 Feb 2008 15:29:36 -0500
> > Subject: [PATCH] gxfb: move MSR bit fields into gxfb.h
> > 
> > This continues the gxfb header cleanups.  MSRs are defined in geode.h;
> > the specific bits we care about are defined in gxfb.h.
> > 
> > Signed-off-by: Andres Salomon <dilinger@debian.org>
> > ---
> >  drivers/video/geode/display_gx.h |    3 ---
> >  drivers/video/geode/gxfb.h       |   16 ++++++++++++++++
> >  drivers/video/geode/gxfb_core.c  |    2 +-
> >  drivers/video/geode/video_gx.c   |    4 ++--
> >  drivers/video/geode/video_gx.h   |   14 --------------
> >  5 files changed, 19 insertions(+), 20 deletions(-)
> > 
> > diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
> > index 56e9d2e..ad556d3 100644
> > --- a/drivers/video/geode/display_gx.h
> > +++ b/drivers/video/geode/display_gx.h
> > @@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp);
> >  
> >  extern struct geode_dc_ops gx_dc_ops;
> >  
> > -/* MSR that tells us if a TFT or CRT is attached */
> > -#define GLD_MSR_CONFIG_DM_FP 0x40
> > -
> >  #endif /* !__DISPLAY_GX1_H__ */
> 
> Something has gone wrong here.  The code in current mainline is
> 
> 
> 
> extern struct geode_dc_ops gx_dc_ops;
> 
> /* MSR that tells us if a TFT or CRT is attached */
> #define GLD_MSR_CONFIG   0xC0002001
> #define GLD_MSR_CONFIG_DM_FP 0x40
> 
> /* Display controller registers */
> 
> 
> whereas you're patching something else.
> 
> 
> In [1/6] you refer to "the MSR cleanup patch".  I don't know what that is.
> 

That would be this:

http://thread.gmane.org/gmane.linux.kernel/645387/focus=645636


> 
> Please clean up the changelogs - remove those email headers from the
> email-forwarding operation and remove the additional little commentary on
> top: if there's actually anything in there which is needed then it should
> be integrated into the changelog proper, thanks.
> 

For future requests, or should I resend these to you?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
  2008-03-10 20:28   ` Andres Salomon
@ 2008-03-10 21:26     ` Andrew Morton
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Morton @ 2008-03-10 21:26 UTC (permalink / raw)
  To: Andres Salomon
  Cc: adaplas, linux-kernel, linux-fbdev-devel, info-linux, jordan.crouse

On Mon, 10 Mar 2008 16:28:44 -0400
Andres Salomon <dilinger@queued.net> wrote:

> > 
> > In [1/6] you refer to "the MSR cleanup patch".  I don't know what that is.
> > 
> 
> That would be this:
> 
> http://thread.gmane.org/gmane.linux.kernel/645387/focus=645636
> 

Oh, that.  OK, I found that and it still applies and it makes these new
patches apply.

> 
> > 
> > Please clean up the changelogs - remove those email headers from the
> > email-forwarding operation and remove the additional little commentary on
> > top: if there's actually anything in there which is needed then it should
> > be integrated into the changelog proper, thanks.
> > 
> 
> For future requests, or should I resend these to you?

Well I cleaned these up and was ready to go, but I think some updates are
needed, please.  So please consider, redo and resend everything, including
the already-acked-by-Jordan MSR cleanup.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h
@ 2008-03-11 22:14 Andres Salomon
  0 siblings, 0 replies; 5+ messages in thread
From: Andres Salomon @ 2008-03-11 22:14 UTC (permalink / raw)
  To: Andrew Morton
  Cc: adaplas, linux-kernel, linux-fbdev-devel, info-linux, jordan.crouse


This continues the gxfb header cleanups.  MSRs are defined in geode.h;
the specific bits we care about are defined in gxfb.h.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 drivers/video/geode/display_gx.h |    3 ---
 drivers/video/geode/gxfb.h       |   16 ++++++++++++++++
 drivers/video/geode/gxfb_core.c  |    2 +-
 drivers/video/geode/video_gx.c   |    4 ++--
 drivers/video/geode/video_gx.h   |   14 --------------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/video/geode/display_gx.h b/drivers/video/geode/display_gx.h
index 56e9d2e..ad556d3 100644
--- a/drivers/video/geode/display_gx.h
+++ b/drivers/video/geode/display_gx.h
@@ -16,7 +16,4 @@ int gx_line_delta(int xres, int bpp);
 
 extern struct geode_dc_ops gx_dc_ops;
 
-/* MSR that tells us if a TFT or CRT is attached */
-#define GLD_MSR_CONFIG_DM_FP 0x40
-
 #endif /* !__DISPLAY_GX1_H__ */
diff --git a/drivers/video/geode/gxfb.h b/drivers/video/geode/gxfb.h
index d408ad3..c21f9dc 100644
--- a/drivers/video/geode/gxfb.h
+++ b/drivers/video/geode/gxfb.h
@@ -252,4 +252,20 @@ static inline void write_fp(struct geodefb_par *par, int reg, uint32_t val)
 	writel(val, par->vid_regs + 8*reg + VP_FP_START);
 }
 
+
+/* MSRs are defined in asm/geode.h; their bitfields are here */
+
+#define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3	(1 << 3)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2	(1 << 2)
+#define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2	(1 << 1)
+
+#define MSR_GLCP_DOTPLL_LOCK		(1 << 25)	/* r/o */
+#define MSR_GLCP_DOTPLL_BYPASS		(1 << 15)
+#define MSR_GLCP_DOTPLL_DOTRESET	(1 << 0)
+
+#define MSR_GX_MSR_PADSEL_MASK		0x3FFFFFFF	/* undocumented? */
+#define MSR_GX_MSR_PADSEL_TFT		0x1FFFFFFF	/* undocumented? */
+
+#define MSR_GX_GLD_MSR_CONFIG_FP	(1 << 3)
+
 #endif
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c
index fd58dcc..0913251 100644
--- a/drivers/video/geode/gxfb_core.c
+++ b/drivers/video/geode/gxfb_core.c
@@ -328,7 +328,7 @@ static int __init gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *i
 
 	rdmsrl(MSR_GX_GLD_MSR_CONFIG, val);
 
-	if ((val & GLD_MSR_CONFIG_DM_FP) == GLD_MSR_CONFIG_DM_FP)
+	if ((val & MSR_GX_GLD_MSR_CONFIG_FP) == MSR_GX_GLD_MSR_CONFIG_FP)
 		par->enable_crt = 0;
 	else
 		par->enable_crt = 1;
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 1b98b7b..1e26bc4 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -187,8 +187,8 @@ gx_configure_tft(struct fb_info *info)
 	/* Set up the DF pad select MSR */
 
 	rdmsrl(MSR_GX_MSR_PADSEL, val);
-	val &= ~GX_VP_PAD_SELECT_MASK;
-	val |= GX_VP_PAD_SELECT_TFT;
+	val &= ~MSR_GX_MSR_PADSEL_MASK;
+	val |= MSR_GX_MSR_PADSEL_TFT;
 	wrmsrl(MSR_GX_MSR_PADSEL, val);
 
 	/* Turn off the panel */
diff --git a/drivers/video/geode/video_gx.h b/drivers/video/geode/video_gx.h
index 5457bd0..79f6e81 100644
--- a/drivers/video/geode/video_gx.h
+++ b/drivers/video/geode/video_gx.h
@@ -13,18 +13,4 @@
 
 extern struct geode_vid_ops gx_vid_ops;
 
-/* GX Flatpanel control MSR */
-#define GX_VP_PAD_SELECT_MASK          0x3FFFFFFF
-#define GX_VP_PAD_SELECT_TFT           0x1FFFFFFF
-
-/* Geode GX clock control MSRs */
-
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREDIV2	(0x0000000000000002ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPREMULT2	(0x0000000000000004ull)
-#  define MSR_GLCP_SYS_RSTPLL_DOTPOSTDIV3	(0x0000000000000008ull)
-
-#  define MSR_GLCP_DOTPLL_DOTRESET		(0x0000000000000001ull)
-#  define MSR_GLCP_DOTPLL_BYPASS		(0x0000000000008000ull)
-#  define MSR_GLCP_DOTPLL_LOCK			(0x0000000002000000ull)
-
 #endif /* !__VIDEO_GX_H__ */
-- 
1.5.3.7


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-03-11 22:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-09  1:48 [PATCH 3/6] gxfb: move MSR bit fields into gxfb.h Andres Salomon
2008-03-10 20:14 ` Andrew Morton
2008-03-10 20:28   ` Andres Salomon
2008-03-10 21:26     ` Andrew Morton
2008-03-11 22:14 Andres Salomon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).