[PATCH] fix xmon input on 440

[PATCH] fix xmon input on 440

[Hollis Blanchard]

Implement udbg_getc() for 440, which fixes xmon input.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>

diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -206,11 +206,22 @@ static void udbg_44x_as1_putc(char c)
        }
 }
 
+static int udbg_44x_as1_getc(void)
+{
+       if (udbg_comport) {
+               while ((as1_readb(&udbg_comport->lsr) & LSR_DR) == 0)
+                       /* wait for char */;
+               return as1_readb(&udbg_comport->rbr);
+       }
+       return -1;
+}
+
 void __init udbg_init_44x_as1(void)
 {
        udbg_comport =
                (volatile struct NS16550 __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR;
 
        udbg_putc = udbg_44x_as1_putc;
+       udbg_getc = udbg_44x_as1_getc;
 }
 #endif /* CONFIG_PPC_EARLY_DEBUG_44x */

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH] fix xmon input on 440

[David Gibson]

On Fri, Sep 14, 2007 at 03:44:47PM -0500, Hollis Blanchard wrote:
> Implement udbg_getc() for 440, which fixes xmon input.
> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

Re: [PATCH] fix xmon input on 440

[Josh Boyer]

On Mon, 2007-09-17 at 12:52 +1000, David Gibson wrote:
> On Fri, Sep 14, 2007 at 03:44:47PM -0500, Hollis Blanchard wrote:
> > Implement udbg_getc() for 440, which fixes xmon input.
> > Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> 

I fixed up the whitespace issues and applied it to my tree.  Oh, and
comments don't need semi-colons ;)

josh

Re: [PATCH] fix xmon input on 440

[Olof Johansson]

On Sun, Sep 16, 2007 at 10:26:37PM -0500, Josh Boyer wrote:
> On Mon, 2007-09-17 at 12:52 +1000, David Gibson wrote:
> > On Fri, Sep 14, 2007 at 03:44:47PM -0500, Hollis Blanchard wrote:
> > > Implement udbg_getc() for 440, which fixes xmon input.
> > > Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
> > Acked-by: David Gibson <david@gibson.dropbear.id.au>
> > 
> 
> I fixed up the whitespace issues and applied it to my tree.  Oh, and
> comments don't need semi-colons ;)

Well, there's a big difference between:

	while (foo)
		/* moof */;
	return bar;

and:
	while (foo)
		/* moof */
	return bar;

:-)

Re: [PATCH] fix xmon input on 440

[Hollis Blanchard]

On Sun, 2007-09-16 at 22:39 -0500, Olof Johansson wrote:
> On Sun, Sep 16, 2007 at 10:26:37PM -0500, Josh Boyer wrote:
> > On Mon, 2007-09-17 at 12:52 +1000, David Gibson wrote:
> > > On Fri, Sep 14, 2007 at 03:44:47PM -0500, Hollis Blanchard wrote:
> > > > Implement udbg_getc() for 440, which fixes xmon input.
> > > > Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
> > > Acked-by: David Gibson <david@gibson.dropbear.id.au>
> > > 
> > 
> > I fixed up the whitespace issues and applied it to my tree.  Oh, and
> > comments don't need semi-colons ;)
> 
> Well, there's a big difference between:
> 
> 	while (foo)
> 		/* moof */;
> 	return bar;
> 
> and:
> 	while (foo)
> 		/* moof */
> 	return bar;

Right, so this commit is broken:
http://git.infradead.org/?p=users/jwboyer/powerpc.git;a=commitdiff;h=81ec428065c01e37fb143ad31dc04fea27fddcac

-- 
Hollis Blanchard
IBM Linux Technology Center

Re: [PATCH] fix xmon input on 440

[Josh Boyer]

On Sun, 2007-09-16 at 23:15 -0500, Hollis Blanchard wrote:
> On Sun, 2007-09-16 at 22:39 -0500, Olof Johansson wrote:
> > On Sun, Sep 16, 2007 at 10:26:37PM -0500, Josh Boyer wrote:
> > > On Mon, 2007-09-17 at 12:52 +1000, David Gibson wrote:
> > > > On Fri, Sep 14, 2007 at 03:44:47PM -0500, Hollis Blanchard wrote:
> > > > > Implement udbg_getc() for 440, which fixes xmon input.
> > > > > Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
> > > > Acked-by: David Gibson <david@gibson.dropbear.id.au>
> > > > 
> > > 
> > > I fixed up the whitespace issues and applied it to my tree.  Oh, and
> > > comments don't need semi-colons ;)
> > 
> > Well, there's a big difference between:
> > 
> > 	while (foo)
> > 		/* moof */;
> > 	return bar;
> > 
> > and:
> > 	while (foo)
> > 		/* moof */
> > 	return bar;
> 
> Right, so this commit is broken:
> http://git.infradead.org/?p=users/jwboyer/powerpc.git;a=commitdiff;h=81ec428065c01e37fb143ad31dc04fea27fddcac

Yes, it is.  I realized that right as I was going to bed.  I've pushed a
new commit instead.

http://git.infradead.org/?p=users/jwboyer/powerpc.git;a=commitdiff;h=88305119ccab262897ddbbceeb5a1f725f2b60fa

josh

Re: [PATCH] fix xmon input on 440

[Milton Miller]

On Sat Sep 15 06:44:47 EST 2007, Hollis Blanchard wrote:

> Implement udbg_getc() for 440, which fixes xmon input.
> Signed-off-by: Hollis Blanchard <hollisb at us.ibm.com>

>         udbg_putc = udbg_44x_as1_putc;
> +       udbg_getc = udbg_44x_as1_getc;

How about adding udbg_getc_poll as well?

While there are no in-tree users, we can use it for console input later.

milton