Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
target
/
linux
/
ixp4xx
/
patches-4.4
/
160-delayed_uart_io.patch

160-delayed_uart_io.patch 4.4 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133 
  1. --- a/drivers/tty/serial/8250/8250_core.c
    2. 

  2. +++ b/drivers/tty/serial/8250/8250_core.c
    3. 

  3. @@ -825,6 +825,7 @@ static int serial8250_probe(struct platf
    4. 

  4.  		uart.port.set_termios	= p->set_termios;
    5. 

  5.  		uart.port.pm		= p->pm;
    6. 

  6.  		uart.port.dev		= &dev->dev;
    7. 

  7. +		uart.port.rw_delay	= p->rw_delay;
    8. 

  8.  		uart.port.irqflags	|= irqflag;
    9. 

  9.  		ret = serial8250_register_8250_port(&uart);
    10. 

  10.  		if (ret < 0) {
    11. 

  11. @@ -981,6 +982,7 @@ int serial8250_register_8250_port(struct
    12. 

  12.  		uart->bugs		= up->bugs;
    13. 

  13.  		uart->port.mapbase      = up->port.mapbase;
    14. 

  14.  		uart->port.mapsize      = up->port.mapsize;
    15. 

  15. +		uart->port.rw_delay	= up->port.rw_delay;
    16. 

  16.  		uart->port.private_data = up->port.private_data;
    17. 

  17.  		uart->tx_loadsz		= up->tx_loadsz;
    18. 

  18.  		uart->capabilities	= up->capabilities;
    19. 

  19. --- a/drivers/tty/serial/serial_core.c
    20. 

  20. +++ b/drivers/tty/serial/serial_core.c
    21. 

  21. @@ -2185,6 +2185,7 @@ uart_report_port(struct uart_driver *drv
    22. 

  22.  		snprintf(address, sizeof(address),
    23. 

  23.  			 "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
    24. 

  24.  		break;
    25. 

  25. +	case UPIO_MEM_DELAY:
    26. 

  26.  	case UPIO_MEM:
    27. 

  27.  	case UPIO_MEM32:
    28. 

  28.  	case UPIO_MEM32BE:
    29. 

  29. @@ -2830,6 +2831,7 @@ int uart_match_port(struct uart_port *po
    30. 

  30.  	case UPIO_HUB6:
    31. 

  31.  		return (port1->iobase == port2->iobase) &&
    32. 

  32.  		       (port1->hub6   == port2->hub6);
    33. 

  33. +	case UPIO_MEM_DELAY:
    34. 

  34.  	case UPIO_MEM:
    35. 

  35.  	case UPIO_MEM32:
    36. 

  36.  	case UPIO_MEM32BE:
    37. 

  37. --- a/include/linux/serial_8250.h
    38. 

  38. +++ b/include/linux/serial_8250.h
    39. 

  39. @@ -28,6 +28,7 @@ struct plat_serial8250_port {
    40. 

  40.  	void            *private_data;
    41. 

  41.  	unsigned char	regshift;	/* register shift */
    42. 

  42.  	unsigned char	iotype;		/* UPIO_* */
    43. 

  43. +	unsigned int rw_delay;	/* udelay for slower busses IXP4XX Expansion Bus */
    44. 

  44.  	unsigned char	hub6;
    45. 

  45.  	upf_t		flags;		/* UPF_* flags */
    46. 

  46.  	unsigned int	type;		/* If UPF_FIXED_TYPE */
    47. 

  47. --- a/include/linux/serial_core.h
    48. 

  48. +++ b/include/linux/serial_core.h
    49. 

  49. @@ -150,6 +150,7 @@ struct uart_port {
    50. 

  50.  #define UPIO_AU			(SERIAL_IO_AU)		/* Au1x00 and RT288x type IO */
    51. 

  51.  #define UPIO_TSI		(SERIAL_IO_TSI)		/* Tsi108/109 type IO */
    52. 

  52.  #define UPIO_MEM32BE		(SERIAL_IO_MEM32BE)	/* 32b big endian */
    53. 

  53. +#define UPIO_MEM_DELAY		(SERIAL_IO_MEM_DELAY)
    54. 

  54.  
    55. 

  55.  	unsigned int		read_status_mask;	/* driver specific */
    56. 

  56.  	unsigned int		ignore_status_mask;	/* driver specific */
    57. 

  57. @@ -231,6 +232,7 @@ struct uart_port {
    58. 

  58.  	int			hw_stopped;		/* sw-assisted CTS flow state */
    59. 

  59.  	unsigned int		mctrl;			/* current modem ctrl settings */
    60. 

  60.  	unsigned int		timeout;		/* character-based timeout */
    61. 

  61. +	unsigned int		rw_delay;		/* udelay for slow busses, IXP4XX Expansion Bus */
    62. 

  62.  	unsigned int		type;			/* port type */
    63. 

  63.  	const struct uart_ops	*ops;
    64. 

  64.  	unsigned int		custom_divisor;
    65. 

  65. --- a/include/uapi/linux/serial.h
    66. 

  66. +++ b/include/uapi/linux/serial.h
    67. 

  67. @@ -69,6 +69,7 @@ struct serial_struct {
    68. 

  68.  #define SERIAL_IO_AU	  4
    69. 

  69.  #define SERIAL_IO_TSI	  5
    70. 

  70.  #define SERIAL_IO_MEM32BE 6
    71. 

  71. +#define SERIAL_IO_MEM_DELAY 7
    72. 

  72.  
    73. 

  73.  #define UART_CLEAR_FIFO		0x01
    74. 

  74.  #define UART_USE_FIFO		0x02
    75. 

  75. --- a/drivers/tty/serial/8250/8250_port.c
    76. 

  76. +++ b/drivers/tty/serial/8250/8250_port.c
    77. 

  77. @@ -368,6 +368,20 @@ static void mem_serial_out(struct uart_p
    78. 

  78.  	writeb(value, p->membase + offset);
    79. 

  79.  }
    80. 

  80.  
    81. 

  81. +static unsigned int memdelay_serial_in(struct uart_port *p, int offset)
    82. 

  82. +{
    83. 

  83. +	struct uart_8250_port *up = (struct uart_8250_port *)p;
    84. 

  84. +	udelay(up->port.rw_delay);
    85. 

  85. +	return mem_serial_in(p, offset);
    86. 

  86. +}
    87. 

  87. +
    88. 

  88. +static void memdelay_serial_out(struct uart_port *p, int offset, int value)
    89. 

  89. +{
    90. 

  90. +	struct uart_8250_port *up = (struct uart_8250_port *)p;
    91. 

  91. +	udelay(up->port.rw_delay);
    92. 

  92. +	mem_serial_out(p, offset, value);
    93. 

  93. +}
    94. 

  94. +
    95. 

  95.  static void mem32_serial_out(struct uart_port *p, int offset, int value)
    96. 

  96.  {
    97. 

  97.  	offset = offset << p->regshift;
    98. 

  98. @@ -435,6 +449,11 @@ static void set_io_from_upio(struct uart
    99. 

  99.  		p->serial_out = mem32be_serial_out;
    100. 

  100.  		break;
    101. 

  101.  
    102. 

  102. +	case UPIO_MEM_DELAY:
    103. 

  103. +		p->serial_in = memdelay_serial_in;
    104. 

  104. +		p->serial_out = memdelay_serial_out;
    105. 

  105. +		break;
    106. 

  106. +
    107. 

  107.  #ifdef CONFIG_SERIAL_8250_RT288X
    108. 

  108.  	case UPIO_AU:
    109. 

  109.  		p->serial_in = au_serial_in;
    110. 

  110. @@ -461,6 +480,7 @@ serial_port_out_sync(struct uart_port *p
    111. 

  111.  	case UPIO_MEM:
    112. 

  112.  	case UPIO_MEM32:
    113. 

  113.  	case UPIO_MEM32BE:
    114. 

  114. +	case UPIO_MEM_DELAY:
    115. 

  115.  	case UPIO_AU:
    116. 

  116.  		p->serial_out(p, offset, value);
    117. 

  117.  		p->serial_in(p, UART_LCR);	/* safe, no side-effects */
    118. 

  118. @@ -2457,6 +2477,7 @@ static int serial8250_request_std_resour
    119. 

  119.  	case UPIO_MEM32:
    120. 

  120.  	case UPIO_MEM32BE:
    121. 

  121.  	case UPIO_MEM:
    122. 

  122. +	case UPIO_MEM_DELAY:
    123. 

  123.  		if (!port->mapbase)
    124. 

  124.  			break;
    125. 

  125.  
    126. 

  126. @@ -2494,6 +2515,7 @@ static void serial8250_release_std_resou
    127. 

  127.  	case UPIO_MEM32:
    128. 

  128.  	case UPIO_MEM32BE:
    129. 

  129.  	case UPIO_MEM:
    130. 

  130. +	case UPIO_MEM_DELAY:
    131. 

  131.  		if (!port->mapbase)
    132. 

  132.  			break;
    133. 

  133.  
    134.