Skip to content

atmel_serial tweaks/systemd compability #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marekr wants to merge 3 commits into from
Closed

atmel_serial tweaks/systemd compability #4

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a368fd0
Serial: AT91: Handle shutdown more safely
marekr Nov 18, 2013
a575aae
serial: at91: fix race condition in atmel_serial_remove
marekr Dec 9, 2013
048e42b
serial: at91: disable uart timer at start of shutdown
marekr Jan 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions drivers/tty/serial/atmel_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,12 +1763,31 @@ static int atmel_startup(struct uart_port *port)
static void atmel_shutdown(struct uart_port *port)
{
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);

/*
* Prevent any tasklets being scheduled during
* cleanup
*/
if (!atmel_port->is_usart)
del_timer_sync(&atmel_port->uart_timer);

/*
* Ensure everything is stopped.
* Clear out any scheduled tasklets before
* we destroy the buffers
*/
tasklet_kill(&atmel_port->tasklet);

/*
* Ensure everything is stopped and
* disable all interrupts, port and break condition.
*/
atmel_stop_rx(port);
atmel_stop_tx(port);

UART_PUT_CR(port, ATMEL_US_RSTSTA);
UART_PUT_IDR(port, -1);


/*
* Shut-down the DMA.
*/
Expand All @@ -1784,9 +1803,6 @@ static void atmel_shutdown(struct uart_port *port)
DMA_FROM_DEVICE);
kfree(pdc->buf);
}

if (!atmel_port->is_usart)
del_timer_sync(&atmel_port->uart_timer);
}
if (atmel_use_pdc_tx(port)) {
struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
Expand All @@ -1802,12 +1818,6 @@ static void atmel_shutdown(struct uart_port *port)
if (atmel_use_dma_tx(port))
atmel_tx_dma_release(atmel_port);

/*
* Disable all interrupts, port and break condition.
*/
UART_PUT_CR(port, ATMEL_US_RSTSTA);
UART_PUT_IDR(port, -1);

/*
* Free the interrupt
*/
Expand Down Expand Up @@ -2670,12 +2680,13 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
int ret = 0;

tasklet_kill(&atmel_port->tasklet);

device_init_wakeup(&pdev->dev, 0);
platform_set_drvdata(pdev, NULL);

ret = uart_remove_one_port(&atmel_uart, port);

tasklet_kill(&atmel_port->tasklet);
kfree(atmel_port->rx_ring.buf);

/* "port" is allocated statically, so we shouldn't free it */
Expand Down