Re: [PATCH 01/16 v3] pmac_zilog: fix unexpected irq
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2011-12-12 20:06:35
Also in:
linux-m68k, linux-serial
On Tue, 2011-12-13 at 00:34 +1100, Finn Thain wrote:
On Mon, 12 Dec 2011, Benjamin Herrenschmidt wrote:quoted
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 ? In the later case it's probably just a matter of finding the right GPIO bit in Apple ASIC to turn the power on :-)
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. Cheers, Ben.
quoted hunk ↗ jump to hunk
Finn Index: linux-git/drivers/tty/serial/pmac_zilog.c ===================================================================--- linux-git.orig/drivers/tty/serial/pmac_zilog.c 2011-12-13 00:18:02.000000000 +1100 +++ linux-git/drivers/tty/serial/pmac_zilog.c 2011-12-13 00:23:55.000000000 +1100@@ -1705,8 +1705,8 @@ static int __init pmz_init_port(struct u struct resource *r_ports; int irq; - r_ports = platform_get_resource(uap->node, IORESOURCE_MEM, 0); - irq = platform_get_irq(uap->node, 0); + r_ports = platform_get_resource(uap->pdev, IORESOURCE_MEM, 0); + irq = platform_get_irq(uap->pdev, 0); if (!r_ports || !irq) return -ENODEV;@@ -1763,8 +1763,10 @@ static void pmz_dispose_port(struct uart static int __init pmz_attach(struct platform_device *pdev) { + struct uart_pmac_port *uap; int i; + /* Iterate the pmz_ports array to find a matching entry */ for (i = 0; i < pmz_ports_count; i++) if (pmz_ports[i].pdev == pdev) break;@@ -1773,15 +1775,23 @@ static int __init pmz_attach(struct plat uap = &pmz_ports[i]; uap->port.dev = &pdev->dev; - dev_set_drvdata(&mdev->ofdev.dev, uap); + platform_set_drvdata(pdev, uap); - return uart_add_one_port(&pmz_uart_reg, - &pmz_ports[i]->port); + return uart_add_one_port(&pmz_uart_reg, &uap->port); } static int __exit pmz_detach(struct platform_device *pdev) { + struct uart_pmac_port *uap = platform_get_drvdata(pdev); + + if (!uap) + return -ENODEV; + uart_remove_one_port(&pmz_uart_reg, &uap->port); + + platform_set_drvdata(pdev, NULL); + uap->port.dev = NULL; + return 0; }@@ -1918,8 +1928,13 @@ static void __exit exit_pmz(void) for (i = 0; i < pmz_ports_count; i++) { struct uart_pmac_port *uport = &pmz_ports[i]; +#ifdef CONFIG_PPC_PMAC if (uport->node != NULL) pmz_dispose_port(uport); +#else + if (uport->pdev != NULL) + pmz_dispose_port(uport); +#endif } /* Unregister UART driver */ uart_unregister_driver(&pmz_uart_reg);@@ -1993,6 +2008,9 @@ static int __init pmz_console_setup(stru #ifdef CONFIG_PPC_PMAC if (uap->node == NULL) return -ENODEV; +#else + if (uap->pdev == NULL) + return -ENODEV; #endif port = &uap->port;Index: linux-git/drivers/tty/serial/pmac_zilog.h ===================================================================--- linux-git.orig/drivers/tty/serial/pmac_zilog.h 2011-12-13 00:18:02.000000000 +1100 +++ linux-git/drivers/tty/serial/pmac_zilog.h 2011-12-13 00:23:55.000000000 +1100@@ -1,18 +1,9 @@ #ifndef __PMAC_ZILOG_H__ #define __PMAC_ZILOG_H__ -#ifdef CONFIG_PPC_PMAC -/* We cannot use dev_* because this can be called early, way before - * we are matched with a device (when using it as a kernel console) - */ #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) -#else -#define pmz_debug(fmt, arg...) dev_dbg(&uap->node->dev, fmt, ## arg) -#define pmz_error(fmt, arg...) dev_err(&uap->node->dev, fmt, ## arg) -#define pmz_info(fmt, arg...) dev_info(&uap->node->dev, fmt, ## arg) -#endif /* * At most 2 ESCCs with 2 ports each