Patchwork [01/16,v3] pmac_zilog: fix unexpected irq

login
register
mail settings
Submitter Finn Thain
Date Dec. 13, 2011, 1:24 a.m.
Message ID <alpine.LNX.2.00.1112131224330.2562@nippy.intranet>
Download mbox | patch
Permalink /patch/130966/
State Superseded
Headers show

Comments

Finn Thain - Dec. 13, 2011, 1:24 a.m.
On Tue, 13 Dec 2011, Benjamin Herrenschmidt wrote:

> On Tue, 2011-12-13 at 00:34 +1100, Finn Thain wrote:
> > On Mon, 12 Dec 2011, Benjamin Herrenschmidt wrote:
> > 
> > > Any chance you can test this patch ? I would not be surprised if it 
> > > broke m68k since I had to do some of the changes in there "blind", 
> > > so let me know... with this, I can again suspend/resume properly on 
> > > a Pismo while using the internal modem among other things.
> > 
> > The patch works on a PowerBook 520 given a few changes (below). This 
> > PowerBook only has one serial port that I can test (the internal modem 
> > is not supported on 68k Macs).
> 
> Interesting. The modem is a soft-modem "geoport" or a hw serial modem ? 

It's the latter.

> In the later case it's probably just a matter of finding the right GPIO 
> bit in Apple ASIC to turn the power on :-)

Surely feasible, but not high on the list of missing hardware support.

> 
> >  Can you test a machine with two ports? The rest of my Mac hardware is 
> > in storage since I moved house last week.
> 
> I tried on 2 port powermacs, but I only have one adapter, so I've 
> basically been running with one serial port open and shooting irda frame 
> on the other (with nothing to check wether I got the frames on the other 
> hand), oh well ...
> 
> I'll apply your patch and commit via my tree.

I forgot to include this fix for your logging change.

Finn

Patch

Index: linux-git/drivers/tty/serial/pmac_zilog.c
===================================================================
--- linux-git.orig/drivers/tty/serial/pmac_zilog.c	2011-12-13 12:12:05.000000000 +1100
+++ linux-git/drivers/tty/serial/pmac_zilog.c	2011-12-13 12:13:29.000000000 +1100
@@ -99,6 +99,10 @@  MODULE_LICENSE("GPL");
 #define PMACZILOG_NAME		"ttyPZ"
 #endif
 
+#define pmz_debug(fmt, arg...)	pr_debug(PMACZILOG_NAME "%d: " fmt, uap->port.line, ## arg)
+#define pmz_error(fmt, arg...)	pr_err(PMACZILOG_NAME "%d: " fmt, uap->port.line, ## arg)
+#define pmz_info(fmt, arg...)	pr_info(PMACZILOG_NAME "%d: " fmt, uap->port.line, ## arg)
+
 
 /*
  * For the sake of early serial console, we can do a pre-probe
Index: linux-git/drivers/tty/serial/pmac_zilog.h
===================================================================
--- linux-git.orig/drivers/tty/serial/pmac_zilog.h	2011-12-13 12:12:05.000000000 +1100
+++ linux-git/drivers/tty/serial/pmac_zilog.h	2011-12-13 12:12:28.000000000 +1100
@@ -1,10 +1,6 @@ 
 #ifndef __PMAC_ZILOG_H__
 #define __PMAC_ZILOG_H__
 
-#define pmz_debug(fmt, arg...)	pr_debug("ttyPZ%d: " fmt, uap->port.line, ## arg)
-#define pmz_error(fmt, arg...)	pr_err("ttyPZ%d: " fmt, uap->port.line, ## arg)
-#define pmz_info(fmt, arg...)	pr_info("ttyPZ%d: " fmt, uap->port.line, ## arg)
-
 /*
  * At most 2 ESCCs with 2 ports each
  */