Commit ab2375f2 authored by Sonic Zhang's avatar Sonic Zhang Committed by Linus Torvalds
Browse files

Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode 



Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b3ef5aba

arch/blackfin/kernel/bfin_dma_5xx.c

+6 −7
Original line number Diff line number Diff line
@@ -117,16 +117,15 @@ int request_dma(unsigned int channel, char *device_id) 


#ifdef CONFIG_BF54x

	if (channel >= CH_UART2_RX && channel <= CH_UART3_TX) {

		if (strncmp(device_id, "BFIN_UART", 9) == 0) {

			dma_ch[channel].regs->peripheral_map &= 0x0FFF;

			dma_ch[channel].regs->peripheral_map |=

		unsigned int per_map;

		per_map = dma_ch[channel].regs->peripheral_map & 0xFFF;

		if (strncmp(device_id, "BFIN_UART", 9) == 0)

			dma_ch[channel].regs->peripheral_map = per_map |

				((channel - CH_UART2_RX + 0xC)<<12);

		} else {

			dma_ch[channel].regs->peripheral_map &= 0x0FFF;

			dma_ch[channel].regs->peripheral_map |=

		else

			dma_ch[channel].regs->peripheral_map = per_map |

				((channel - CH_UART2_RX + 0x6)<<12);

	}

	}

#endif



	dma_ch[channel].device_id = device_id;

drivers/serial/bfin_5xx.c

+50 −0
Original line number Diff line number Diff line
@@ -649,6 +649,42 @@ static int bfin_serial_startup(struct uart_port *port) 
		free_irq(uart->port.irq, uart);

		return -EBUSY;

	}



# ifdef CONFIG_BF54x

	{

		unsigned uart_dma_ch_rx, uart_dma_ch_tx;



		switch (uart->port.irq) {

		case IRQ_UART3_RX:

			uart_dma_ch_rx = CH_UART3_RX;

			uart_dma_ch_tx = CH_UART3_TX;

			break;

		case IRQ_UART2_RX:

			uart_dma_ch_rx = CH_UART2_RX;

			uart_dma_ch_tx = CH_UART2_TX;

			break;

		default:

			uart_dma_ch_rx = uart_dma_ch_tx = 0;

			break;

		};



		if (uart_dma_ch_rx &&

			request_dma(uart_dma_ch_rx, "BFIN_UART_RX") < 0) {

			printk(KERN_NOTICE"Fail to attach UART interrupt\n");

			free_irq(uart->port.irq, uart);

			free_irq(uart->port.irq + 1, uart);

			return -EBUSY;

		}

		if (uart_dma_ch_tx &&

			request_dma(uart_dma_ch_tx, "BFIN_UART_TX") < 0) {

			printk(KERN_NOTICE "Fail to attach UART interrupt\n");

			free_dma(uart_dma_ch_rx);

			free_irq(uart->port.irq, uart);

			free_irq(uart->port.irq + 1, uart);

			return -EBUSY;

		}

	}

# endif

#endif

	UART_SET_IER(uart, ERBFI);

	return 0;
@@ -666,6 +702,20 @@ static void bfin_serial_shutdown(struct uart_port *port) 
	del_timer(&(uart->rx_dma_timer));

	dma_free_coherent(NULL, PAGE_SIZE, uart->rx_dma_buf.buf, 0);

#else

#ifdef CONFIG_BF54x

	switch (uart->port.irq) {

	case IRQ_UART3_RX:

		free_dma(CH_UART3_RX);

		free_dma(CH_UART3_TX);

		break;

	case IRQ_UART2_RX:

		free_dma(CH_UART2_RX);

		free_dma(CH_UART2_TX);

		break;

	default:

		break;

	};

#endif

#ifdef	CONFIG_KGDB_UART

	if (uart->port.line != CONFIG_KGDB_UART_PORT)

#endif