no_pci_serial
PATCH 1/1 no_pci_serial
From: Milan Svoboda <[email protected]>
This patch allows to compile 8250 driver on systems without pci bus.
Feedback and comments are highly appreciated.
This patch is against 2.6.17-rc5.
Please CC me, I'm not subscribed to the mailing list.
Signed-off-by Milan Svoboda <[email protected]>
---
drivers/serial/8250.c +35 -18
@@ -303,23 +303,23 @@ static unsigned int serial_in(struct uar offset =map_8250_in_reg (up, offset) << up->port.regshift;switch (up->port.iotype) { +#ifdef CONFIG_PCI case UPIO_HUB6 :outb (up->port.hub6 -1 + offset, up->port.iobase);return inb (up->port.iobase +1 ); - -case UPIO_MEM : -return readb (up->port.membase + offset); - +#endif case UPIO_MEM32 :return readl (up->port.membase + offset); -#ifdef CONFIG_SERIAL_8250_AU1X00 case UPIO_AU :return __raw_readl (up->port.membase + offset);#endif - -default : +#ifdef CONFIG_PCI +case UPIO_PORT :return inb (up->port.iobase + offset); +#endif +default : +return readb (up->port.membase + offset); } }
@@ -329,15 +329,12 @@ serial_out(struct uart_8250_port *up, in offset =map_8250_out_reg (up, offset) << up->port.regshift;switch (up->port.iotype) { +#ifdef CONFIG_PCI case UPIO_HUB6 :outb (up->port.hub6 -1 + offset, up->port.iobase);outb (value, up->port.iobase +1 );break ; - -case UPIO_MEM : -writeb (value, up->port.membase + offset); -break ; - +#endif case UPIO_MEM32 :writel (value, up->port.membase + offset);break ;
@@ -347,9 +344,13 @@ serial_out(struct uart_8250_port *up, in__raw_writel (value, up->port.membase + offset);break ;#endif - -default : +#ifdef CONFIG_PCI +case UPIO_PORT :outb (value, up->port.iobase + offset); +break ; +#endif +default : +writeb (value, up->port.membase + offset); } }
@@ -1045,17 +1046,20 @@ static void autoconfig(struct uart_8250_static void autoconfig_irq (struct uart_8250_port *up) {unsigned char save_mcr, save_ier; -unsigned char save_ICP =0 ; -unsigned int ICP =0 ;unsigned long irqs;int irq; +#ifdef CONFIG_SERIAL_8250_FOURPORT +unsigned char save_ICP =0 ; +unsigned int ICP =0 ; +if (up->port.flags &UPF_FOURPORT ) {ICP = (up->port.iobase &0xfe0 ) |0x1f ; save_ICP =inb_p (ICP );outb_p (0x80 ,ICP ); (void )inb_p (ICP ); } +#endif /* forget possible initially masked and pending IRQ */ probe_irq_off (probe_irq_on ());
@@ -1066,13 +1070,16 @@ static void autoconfig_irq(struct uart_8 irqs =probe_irq_on ();serial_outp (up,UART_MCR ,0 );udelay (10 ); + +#ifdef CONFIG_SERIAL_8250_FOURPORT if (up->port.flags &UPF_FOURPORT ) {serial_outp (up,UART_MCR ,UART_MCR_DTR |UART_MCR_RTS ); - }else { + } else +#endif serial_outp (up,UART_MCR ,UART_MCR_DTR |UART_MCR_RTS |UART_MCR_OUT2 ); - } +serial_outp (up,UART_IER ,0x0f );/* enable all intrs */ (void )serial_inp (up,UART_LSR ); (void )serial_inp (up,UART_RX );
@@ -1085,8 +1092,10 @@ static void autoconfig_irq(struct uart_8serial_outp (up,UART_MCR , save_mcr);serial_outp (up,UART_IER , save_ier); +#ifdef CONFIG_SERIAL_8250_FOURPORT if (up->port.flags &UPF_FOURPORT )outb_p (save_ICP,ICP ); +#endif up->port.irq = (irq >0 ) ? irq :0 ; }
@@ -1622,10 +1631,13 @@ static int serial8250_startup(struct uarserial_outp (up,UART_LCR ,UART_LCR_WLEN8 );spin_lock_irqsave (&up->port.lock, flags); + +#ifdef CONFIG_SERIAL_8250_FOURPORT if (up->port.flags &UPF_FOURPORT ) {if (!is_real_interrupt (up->port.irq)) up->port.mctrl |=TIOCM_OUT1 ; } else +#endif /* * Most PC uarts need OUT2 raised to enable interrupts. */
@@ -1663,6 +1675,7 @@ static int serial8250_startup(struct uar up->ier =UART_IER_RLSI |UART_IER_RDI ;serial_outp (up,UART_IER , up->ier); +#ifdef CONFIG_SERIAL_8250_FOURPORT if (up->port.flags &UPF_FOURPORT ) {unsigned int icp;/*
@@ -1672,6 +1685,7 @@ static int serial8250_startup(struct uaroutb_p (0x80 , icp); (void) inb_p(icp); } +#endif /* * And clear the interrupt registers again for luck.
@@ -1696,11 +1710,14 @@ static void serial8250_shutdown(struct userial_outp (up,UART_IER ,0 );spin_lock_irqsave (&up->port.lock, flags); + +#ifdef CONFIG_SERIAL_8250_FOURPORT if (up->port.flags &UPF_FOURPORT ) {/* reset interrupts on the AST Fourport board */ inb ((up->port.iobase &0xfe0 ) |0x1f ); up->port.mctrl |=TIOCM_OUT1 ; } else +#endif up->port.mctrl &= ~TIOCM_OUT2 ;serial8250_set_mctrl (&up->port, up->port.mctrl);
drivers/serial/8250_early.c +10 -6
@@ -46,18 +46,22 @@ static int early_uart_registered __initdstatic unsigned int __init serial_in (struct uart_port *port,int offset) { -if (port->iotype ==UPIO_MEM ) -return readb (port->membase + offset); -else +#ifdef CONFIG_PCI +if (port->iotype !=UPIO_MEM )return inb (port->iobase + offset); + else +#endif +return readb (port->membase + offset); }static void __init serial_out (struct uart_port *port,int offset,int value) { -if (port->iotype ==UPIO_MEM ) -writeb (value, port->membase + offset); -else +#ifdef CONFIG_PCI +if (port->iotype !=UPIO_MEM )outb (value, port->iobase + offset); + else +#endif +writeb (value, port->membase + offset); }#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
Quoted 1 line · Milan Svoboda
This patch allows to compile 8250 driver on systems without pci bus.
inb/outb/readb/writeb methods have nothing to do with the presence of a PCI bus or not, so the patch is wrong - and it actually breaks a lot of machine implementations which use this.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core