From: Andre Przywara <andre.przywara@arm.com> To: Russell King <linux@arm.linux.org.uk>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.cz> Cc: rob.herring@linaro.org, linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann <arnd@arndb.de> Subject: [RFC PATCH 03/10] drivers: PL011: refactor pl011_shutdown() Date: Fri, 19 Sep 2014 13:21:16 +0100 [thread overview] Message-ID: <1411129283-17219-4-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1411129283-17219-1-git-send-email-andre.przywara@arm.com> Split the pl011_shutdown() function into smaller chunks to allow easier reuse later when adding SBSA support. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/tty/serial/amba-pl011.c | 57 ++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 22f113c..17ba997 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1625,33 +1625,15 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap, writew(val, uap->port.membase + lcrh); } -static void pl011_shutdown(struct uart_port *port) +/* + * disable the port. It should not disable RTS and DTR. + * Also RTS and DTR state should be preserved to restore + * it during startup(). + */ +static void pl011_disable_uart(struct uart_amba_port *uap) { - struct uart_amba_port *uap = (struct uart_amba_port *)port; unsigned int cr; - /* - * disable all interrupts - */ - spin_lock_irq(&uap->port.lock); - uap->im = 0; - writew(uap->im, uap->port.membase + UART011_IMSC); - writew(0xffff, uap->port.membase + UART011_ICR); - spin_unlock_irq(&uap->port.lock); - - pl011_dma_shutdown(uap); - - /* - * Free the interrupt - */ - free_irq(uap->port.irq, uap); - - /* - * disable the port - * disable the port. It should not disable RTS and DTR. - * Also RTS and DTR state should be preserved to restore - * it during startup(). - */ uap->autorts = false; spin_lock_irq(&uap->port.lock); cr = readw(uap->port.membase + UART011_CR); @@ -1667,6 +1649,33 @@ static void pl011_shutdown(struct uart_port *port) pl011_shutdown_channel(uap, uap->lcrh_rx); if (uap->lcrh_rx != uap->lcrh_tx) pl011_shutdown_channel(uap, uap->lcrh_tx); +} + +static void pl011_disable_interrupts(struct uart_amba_port *uap) +{ + spin_lock_irq(&uap->port.lock); + + /* + * mask all interrupts and clear all pending ones + */ + uap->im = 0; + writew(uap->im, uap->port.membase + UART011_IMSC); + writew(0xffff, uap->port.membase + UART011_ICR); + + spin_unlock_irq(&uap->port.lock); +} + +static void pl011_shutdown(struct uart_port *port) +{ + struct uart_amba_port *uap = (struct uart_amba_port *)port; + + pl011_disable_interrupts(uap); + + pl011_dma_shutdown(uap); + + free_irq(uap->port.irq, uap); + + pl011_disable_uart(uap); /* * Shut down the clock producer -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: andre.przywara@arm.com (Andre Przywara) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 03/10] drivers: PL011: refactor pl011_shutdown() Date: Fri, 19 Sep 2014 13:21:16 +0100 [thread overview] Message-ID: <1411129283-17219-4-git-send-email-andre.przywara@arm.com> (raw) In-Reply-To: <1411129283-17219-1-git-send-email-andre.przywara@arm.com> Split the pl011_shutdown() function into smaller chunks to allow easier reuse later when adding SBSA support. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/tty/serial/amba-pl011.c | 57 ++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 22f113c..17ba997 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1625,33 +1625,15 @@ static void pl011_shutdown_channel(struct uart_amba_port *uap, writew(val, uap->port.membase + lcrh); } -static void pl011_shutdown(struct uart_port *port) +/* + * disable the port. It should not disable RTS and DTR. + * Also RTS and DTR state should be preserved to restore + * it during startup(). + */ +static void pl011_disable_uart(struct uart_amba_port *uap) { - struct uart_amba_port *uap = (struct uart_amba_port *)port; unsigned int cr; - /* - * disable all interrupts - */ - spin_lock_irq(&uap->port.lock); - uap->im = 0; - writew(uap->im, uap->port.membase + UART011_IMSC); - writew(0xffff, uap->port.membase + UART011_ICR); - spin_unlock_irq(&uap->port.lock); - - pl011_dma_shutdown(uap); - - /* - * Free the interrupt - */ - free_irq(uap->port.irq, uap); - - /* - * disable the port - * disable the port. It should not disable RTS and DTR. - * Also RTS and DTR state should be preserved to restore - * it during startup(). - */ uap->autorts = false; spin_lock_irq(&uap->port.lock); cr = readw(uap->port.membase + UART011_CR); @@ -1667,6 +1649,33 @@ static void pl011_shutdown(struct uart_port *port) pl011_shutdown_channel(uap, uap->lcrh_rx); if (uap->lcrh_rx != uap->lcrh_tx) pl011_shutdown_channel(uap, uap->lcrh_tx); +} + +static void pl011_disable_interrupts(struct uart_amba_port *uap) +{ + spin_lock_irq(&uap->port.lock); + + /* + * mask all interrupts and clear all pending ones + */ + uap->im = 0; + writew(uap->im, uap->port.membase + UART011_IMSC); + writew(0xffff, uap->port.membase + UART011_ICR); + + spin_unlock_irq(&uap->port.lock); +} + +static void pl011_shutdown(struct uart_port *port) +{ + struct uart_amba_port *uap = (struct uart_amba_port *)port; + + pl011_disable_interrupts(uap); + + pl011_dma_shutdown(uap); + + free_irq(uap->port.irq, uap); + + pl011_disable_uart(uap); /* * Shut down the clock producer -- 1.7.9.5
next prev parent reply other threads:[~2014-09-19 12:22 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-09-19 12:21 [RFC PATCH 00/10] drivers: PL011: add SBSA subset support Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 01/10] drivers: PL011: avoid potential unregister_driver call Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 02/10] drivers: PL011: refactor pl011_startup() Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` Andre Przywara [this message] 2014-09-19 12:21 ` [RFC PATCH 03/10] drivers: PL011: refactor pl011_shutdown() Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 04/10] drivers: PL011: refactor pl011_set_termios() Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 05/10] drivers: PL011: refactor pl011_probe() Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:40 ` Russell King - ARM Linux 2014-09-19 12:40 ` Russell King - ARM Linux 2014-09-19 12:21 ` [RFC PATCH 06/10] drivers: PL011: replace UART_MIS reading with _RIS & _IMSC Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 07/10] drivers: PL011: move cts_event workaround into separate function Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 08/10] drivers: PL011: allow avoiding UART enabling/disabling Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 09/10] drivers: PL011: allow to supply fixed option string Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-19 12:21 ` [RFC PATCH 10/10] drivers: PL011: add support for the ARM SBSA generic UART Andre Przywara 2014-09-19 12:21 ` Andre Przywara 2014-09-29 15:27 ` [RFC PATCH 00/10] drivers: PL011: add SBSA subset support Andre Przywara 2014-09-29 15:27 ` Andre Przywara 2014-09-30 10:11 ` Graeme Gregory 2014-09-30 10:11 ` Graeme Gregory
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1411129283-17219-4-git-send-email-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=arnd@arndb.de \ --cc=gregkh@linuxfoundation.org \ --cc=jslaby@suse.cz \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-serial@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=rob.herring@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.