* [PATCH 2/4] serial: pmac_zilog: remove unused uart_pmac_port::termios_cache
2022-05-19 7:56 [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Jiri Slaby
@ 2022-05-19 7:56 ` Jiri Slaby
2022-05-19 7:56 ` [PATCH 3/4] serial: pmac_zilog: remove tracing prints Jiri Slaby
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Jiri Slaby @ 2022-05-19 7:56 UTC (permalink / raw)
To: gregkh
Cc: linux-serial, linux-kernel, Jiri Slaby, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
struct uart_pmac_port contains termios_cache. It is only written and
never read. Remove it as it only occupies space.
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/serial/pmac_zilog.c | 2 --
drivers/tty/serial/pmac_zilog.h | 2 --
2 files changed, 4 deletions(-)
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 2953ff64a892..9a2150bf477a 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -1231,8 +1231,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
pmz_debug("pmz: set_termios()\n");
- memcpy(&uap->termios_cache, termios, sizeof(struct ktermios));
-
/* XXX Check which revs of machines actually allow 1 and 4Mb speeds
* on the IR dongle. Note that the IRTTY driver currently doesn't know
* about the FIR mode and high speed modes. So these are unused. For
diff --git a/drivers/tty/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h
index 87337b748d6d..837b97ca0a90 100644
--- a/drivers/tty/serial/pmac_zilog.h
+++ b/drivers/tty/serial/pmac_zilog.h
@@ -55,8 +55,6 @@ struct uart_pmac_port {
volatile u8 __iomem *data_reg;
unsigned char irq_name[8];
-
- struct ktermios termios_cache;
};
#define to_pmz(p) ((struct uart_pmac_port *)(p))
--
2.36.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] serial: pmac_zilog: remove tracing prints
2022-05-19 7:56 [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Jiri Slaby
2022-05-19 7:56 ` [PATCH 2/4] serial: pmac_zilog: remove unused uart_pmac_port::termios_cache Jiri Slaby
@ 2022-05-19 7:56 ` Jiri Slaby
2022-05-19 7:56 ` [PATCH 4/4] serial: pmac_zilog: remove initial print Jiri Slaby
2022-05-19 8:56 ` [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Ilpo Järvinen
3 siblings, 0 replies; 8+ messages in thread
From: Jiri Slaby @ 2022-05-19 7:56 UTC (permalink / raw)
To: gregkh
Cc: linux-serial, linux-kernel, Jiri Slaby, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
Remove debug printouts upon function enter/exit. This can be achieved
better by tracing.
Remove also the one protected by DEBUG_HARD which is not defined anyway.
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/serial/pmac_zilog.c | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index 9a2150bf477a..c6961f299f3b 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -24,7 +24,6 @@
*/
#undef DEBUG
-#undef DEBUG_HARD
#undef USE_CTRL_O_SYSRQ
#include <linux/module.h>
@@ -442,9 +441,6 @@ static irqreturn_t pmz_interrupt(int irq, void *dev_id)
spin_lock(&uap_a->port.lock);
r3 = read_zsreg(uap_a, R3);
-#ifdef DEBUG_HARD
- pmz_debug("irq, r3: %x\n", r3);
-#endif
/* Channel A */
push = false;
if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
@@ -609,8 +605,6 @@ static void pmz_start_tx(struct uart_port *port)
struct uart_pmac_port *uap = to_pmz(port);
unsigned char status;
- pmz_debug("pmz: start_tx()\n");
-
uap->flags |= PMACZILOG_FLAG_TX_ACTIVE;
uap->flags &= ~PMACZILOG_FLAG_TX_STOPPED;
@@ -632,7 +626,7 @@ static void pmz_start_tx(struct uart_port *port)
struct circ_buf *xmit = &port->state->xmit;
if (uart_circ_empty(xmit))
- goto out;
+ return;
write_zsdata(uap, xmit->buf[xmit->tail]);
zssync(uap);
xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
@@ -641,8 +635,6 @@ static void pmz_start_tx(struct uart_port *port)
if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
uart_write_wakeup(&uap->port);
}
- out:
- pmz_debug("pmz: start_tx() done.\n");
}
/*
@@ -655,13 +647,9 @@ static void pmz_stop_rx(struct uart_port *port)
{
struct uart_pmac_port *uap = to_pmz(port);
- pmz_debug("pmz: stop_rx()()\n");
-
/* Disable all RX interrupts. */
uap->curregs[R1] &= ~RxINT_MASK;
pmz_maybe_update_regs(uap);
-
- pmz_debug("pmz: stop_rx() done.\n");
}
/*
@@ -906,8 +894,6 @@ static int pmz_startup(struct uart_port *port)
unsigned long flags;
int pwr_delay = 0;
- pmz_debug("pmz: startup()\n");
-
uap->flags |= PMACZILOG_FLAG_IS_OPEN;
/* A console is never powered down. Else, power up and
@@ -943,8 +929,6 @@ static int pmz_startup(struct uart_port *port)
pmz_interrupt_control(uap, 1);
spin_unlock_irqrestore(&port->lock, flags);
- pmz_debug("pmz: startup() done.\n");
-
return 0;
}
@@ -953,8 +937,6 @@ static void pmz_shutdown(struct uart_port *port)
struct uart_pmac_port *uap = to_pmz(port);
unsigned long flags;
- pmz_debug("pmz: shutdown()\n");
-
spin_lock_irqsave(&port->lock, flags);
/* Disable interrupt requests for the channel */
@@ -983,8 +965,6 @@ static void pmz_shutdown(struct uart_port *port)
pmz_set_scc_power(uap, 0); /* Shut the chip down */
spin_unlock_irqrestore(&port->lock, flags);
-
- pmz_debug("pmz: shutdown() done.\n");
}
/* Shared by TTY driver and serial console setup. The port lock is held
@@ -1229,8 +1209,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
struct uart_pmac_port *uap = to_pmz(port);
unsigned long baud;
- pmz_debug("pmz: set_termios()\n");
-
/* XXX Check which revs of machines actually allow 1 and 4Mb speeds
* on the IR dongle. Note that the IRTTY driver currently doesn't know
* about the FIR mode and high speed modes. So these are unused. For
@@ -1264,8 +1242,6 @@ static void __pmz_set_termios(struct uart_port *port, struct ktermios *termios,
pmz_maybe_update_regs(uap);
}
uart_update_timeout(port, termios->c_cflag, baud);
-
- pmz_debug("pmz: set_termios() done.\n");
}
/* The port lock is not held. */
--
2.36.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] serial: pmac_zilog: remove initial print
2022-05-19 7:56 [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Jiri Slaby
2022-05-19 7:56 ` [PATCH 2/4] serial: pmac_zilog: remove unused uart_pmac_port::termios_cache Jiri Slaby
2022-05-19 7:56 ` [PATCH 3/4] serial: pmac_zilog: remove tracing prints Jiri Slaby
@ 2022-05-19 7:56 ` Jiri Slaby
2022-05-19 8:59 ` Ilpo Järvinen
2022-05-19 8:56 ` [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Ilpo Järvinen
3 siblings, 1 reply; 8+ messages in thread
From: Jiri Slaby @ 2022-05-19 7:56 UTC (permalink / raw)
To: gregkh
Cc: linux-serial, linux-kernel, Jiri Slaby, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
Don't report about the driver when loaded. It's unneeded and frowned
upon nowadays.
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/serial/pmac_zilog.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
index c6961f299f3b..3133446e806c 100644
--- a/drivers/tty/serial/pmac_zilog.c
+++ b/drivers/tty/serial/pmac_zilog.c
@@ -64,7 +64,6 @@
#include "pmac_zilog.h"
-static char version[] __initdata = "pmac_zilog: 0.6 (Benjamin Herrenschmidt <benh@kernel.crashing.org>)";
MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
MODULE_DESCRIPTION("Driver for the Mac and PowerMac serial ports.");
MODULE_LICENSE("GPL");
@@ -1812,7 +1811,6 @@ static struct platform_driver pmz_driver = {
static int __init init_pmz(void)
{
int rc, i;
- printk(KERN_INFO "%s\n", version);
/*
* First, we need to do a direct OF-based probe pass. We
--
2.36.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support
2022-05-19 7:56 [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Jiri Slaby
` (2 preceding siblings ...)
2022-05-19 7:56 ` [PATCH 4/4] serial: pmac_zilog: remove initial print Jiri Slaby
@ 2022-05-19 8:56 ` Ilpo Järvinen
2022-05-19 9:02 ` Jiri Slaby
3 siblings, 1 reply; 8+ messages in thread
From: Ilpo Järvinen @ 2022-05-19 8:56 UTC (permalink / raw)
To: Jiri Slaby
Cc: Greg Kroah-Hartman, linux-serial, LKML, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
On Thu, 19 May 2022, Jiri Slaby wrote:
> The support for DBDMA was never completed. Remove the the code that only
> maps spaces without real work.
>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
> drivers/tty/serial/pmac_zilog.c | 38 +--------------------------------
> drivers/tty/serial/pmac_zilog.h | 9 --------
> 2 files changed, 1 insertion(+), 46 deletions(-)
>
> diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
> index c903085acb8d..2953ff64a892 100644
> --- a/drivers/tty/serial/pmac_zilog.c
> +++ b/drivers/tty/serial/pmac_zilog.c
How about dropping this too:
#include <asm/dbdma.h>
--
i.
> @@ -65,9 +65,6 @@
>
> #include "pmac_zilog.h"
>
> -/* Not yet implemented */
> -#undef HAS_DBDMA
> -
> static char version[] __initdata = "pmac_zilog: 0.6 (Benjamin Herrenschmidt <benh@kernel.crashing.org>)";
> MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
> MODULE_DESCRIPTION("Driver for the Mac and PowerMac serial ports.");
> @@ -1399,7 +1396,7 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
> char name[1];
> } *slots;
> int len;
> - struct resource r_ports, r_rxdma, r_txdma;
> + struct resource r_ports;
>
> /*
> * Request & map chip registers
> @@ -1411,35 +1408,6 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
>
> uap->control_reg = uap->port.membase;
> uap->data_reg = uap->control_reg + 0x10;
> -
> - /*
> - * Request & map DBDMA registers
> - */
> -#ifdef HAS_DBDMA
> - if (of_address_to_resource(np, 1, &r_txdma) == 0 &&
> - of_address_to_resource(np, 2, &r_rxdma) == 0)
> - uap->flags |= PMACZILOG_FLAG_HAS_DMA;
> -#else
> - memset(&r_txdma, 0, sizeof(struct resource));
> - memset(&r_rxdma, 0, sizeof(struct resource));
> -#endif
> - if (ZS_HAS_DMA(uap)) {
> - uap->tx_dma_regs = ioremap(r_txdma.start, 0x100);
> - if (uap->tx_dma_regs == NULL) {
> - uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
> - goto no_dma;
> - }
> - uap->rx_dma_regs = ioremap(r_rxdma.start, 0x100);
> - if (uap->rx_dma_regs == NULL) {
> - iounmap(uap->tx_dma_regs);
> - uap->tx_dma_regs = NULL;
> - uap->flags &= ~PMACZILOG_FLAG_HAS_DMA;
> - goto no_dma;
> - }
> - uap->tx_dma_irq = irq_of_parse_and_map(np, 1);
> - uap->rx_dma_irq = irq_of_parse_and_map(np, 2);
> - }
> -no_dma:
>
> /*
> * Detect port type
> @@ -1505,8 +1473,6 @@ static int __init pmz_init_port(struct uart_pmac_port *uap)
> of_device_is_compatible(np->parent->parent, "gatwick")) {
> /* IRQs on gatwick are offset by 64 */
> uap->port.irq = irq_create_mapping(NULL, 64 + 15);
> - uap->tx_dma_irq = irq_create_mapping(NULL, 64 + 4);
> - uap->rx_dma_irq = irq_create_mapping(NULL, 64 + 5);
> }
>
> /* Setup some valid baud rate information in the register
> @@ -1526,8 +1492,6 @@ static void pmz_dispose_port(struct uart_pmac_port *uap)
> struct device_node *np;
>
> np = uap->node;
> - iounmap(uap->rx_dma_regs);
> - iounmap(uap->tx_dma_regs);
> iounmap(uap->control_reg);
> uap->node = NULL;
> of_node_put(np);
> diff --git a/drivers/tty/serial/pmac_zilog.h b/drivers/tty/serial/pmac_zilog.h
> index fa85b0de5c2f..87337b748d6d 100644
> --- a/drivers/tty/serial/pmac_zilog.h
> +++ b/drivers/tty/serial/pmac_zilog.h
> @@ -43,7 +43,6 @@ struct uart_pmac_port {
> #define PMACZILOG_FLAG_TX_ACTIVE 0x00000040
> #define PMACZILOG_FLAG_IS_IRDA 0x00000100
> #define PMACZILOG_FLAG_IS_INTMODEM 0x00000200
> -#define PMACZILOG_FLAG_HAS_DMA 0x00000400
> #define PMACZILOG_FLAG_RSRC_REQUESTED 0x00000800
> #define PMACZILOG_FLAG_IS_OPEN 0x00002000
> #define PMACZILOG_FLAG_IS_EXTCLK 0x00008000
> @@ -55,13 +54,6 @@ struct uart_pmac_port {
> volatile u8 __iomem *control_reg;
> volatile u8 __iomem *data_reg;
>
> -#ifdef CONFIG_PPC_PMAC
> - unsigned int tx_dma_irq;
> - unsigned int rx_dma_irq;
> - volatile struct dbdma_regs __iomem *tx_dma_regs;
> - volatile struct dbdma_regs __iomem *rx_dma_regs;
> -#endif
> -
> unsigned char irq_name[8];
>
> struct ktermios termios_cache;
> @@ -377,7 +369,6 @@ static inline void zssync(struct uart_pmac_port *port)
> #define ZS_WANTS_MODEM_STATUS(UP) ((UP)->flags & PMACZILOG_FLAG_MODEM_STATUS)
> #define ZS_IS_IRDA(UP) ((UP)->flags & PMACZILOG_FLAG_IS_IRDA)
> #define ZS_IS_INTMODEM(UP) ((UP)->flags & PMACZILOG_FLAG_IS_INTMODEM)
> -#define ZS_HAS_DMA(UP) ((UP)->flags & PMACZILOG_FLAG_HAS_DMA)
> #define ZS_IS_OPEN(UP) ((UP)->flags & PMACZILOG_FLAG_IS_OPEN)
> #define ZS_IS_EXTCLK(UP) ((UP)->flags & PMACZILOG_FLAG_IS_EXTCLK)
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support
2022-05-19 8:56 ` [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support Ilpo Järvinen
@ 2022-05-19 9:02 ` Jiri Slaby
2022-05-19 16:23 ` Greg Kroah-Hartman
0 siblings, 1 reply; 8+ messages in thread
From: Jiri Slaby @ 2022-05-19 9:02 UTC (permalink / raw)
To: Ilpo Järvinen
Cc: Greg Kroah-Hartman, linux-serial, LKML, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
On 19. 05. 22, 10:56, Ilpo Järvinen wrote:
> On Thu, 19 May 2022, Jiri Slaby wrote:
>
>> The support for DBDMA was never completed. Remove the the code that only
>> maps spaces without real work.
>>
>> Cc: Michael Ellerman <mpe@ellerman.id.au>
>> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>> Cc: Paul Mackerras <paulus@samba.org>
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>> ---
>> drivers/tty/serial/pmac_zilog.c | 38 +--------------------------------
>> drivers/tty/serial/pmac_zilog.h | 9 --------
>> 2 files changed, 1 insertion(+), 46 deletions(-)
>>
>> diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
>> index c903085acb8d..2953ff64a892 100644
>> --- a/drivers/tty/serial/pmac_zilog.c
>> +++ b/drivers/tty/serial/pmac_zilog.c
>
> How about dropping this too:
> #include <asm/dbdma.h>
Good point, fixed, will send v2 eventually.
thanks,
--
js
suse labs
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] serial: pmac_zilog: remove unfinished DBDMA support
2022-05-19 9:02 ` Jiri Slaby
@ 2022-05-19 16:23 ` Greg Kroah-Hartman
0 siblings, 0 replies; 8+ messages in thread
From: Greg Kroah-Hartman @ 2022-05-19 16:23 UTC (permalink / raw)
To: Jiri Slaby
Cc: Ilpo Järvinen, linux-serial, LKML, Michael Ellerman,
Benjamin Herrenschmidt, Paul Mackerras
On Thu, May 19, 2022 at 11:02:23AM +0200, Jiri Slaby wrote:
> On 19. 05. 22, 10:56, Ilpo Järvinen wrote:
> > On Thu, 19 May 2022, Jiri Slaby wrote:
> >
> > > The support for DBDMA was never completed. Remove the the code that only
> > > maps spaces without real work.
> > >
> > > Cc: Michael Ellerman <mpe@ellerman.id.au>
> > > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > > Cc: Paul Mackerras <paulus@samba.org>
> > > Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> > > ---
> > > drivers/tty/serial/pmac_zilog.c | 38 +--------------------------------
> > > drivers/tty/serial/pmac_zilog.h | 9 --------
> > > 2 files changed, 1 insertion(+), 46 deletions(-)
> > >
> > > diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c
> > > index c903085acb8d..2953ff64a892 100644
> > > --- a/drivers/tty/serial/pmac_zilog.c
> > > +++ b/drivers/tty/serial/pmac_zilog.c
> >
> > How about dropping this too:
> > #include <asm/dbdma.h>
>
> Good point, fixed, will send v2 eventually.
Add-on patch is fine, thanks!
greg k-h
^ permalink raw reply [flat|nested] 8+ messages in thread