| @@ -31,7 +31,6 @@ · 30 unmodified lines |
| 31 | 31 | #include <linux/tty.h> |
| 32 | 32 | #include <linux/ratelimit.h> |
| 33 | 33 | #include <linux/tty_flip.h> |
| 34 | | −#include <linux/serial_reg.h> |
| 35 | 34 | #include <linux/serial_core.h> |
| 36 | 35 | #include <linux/serial.h> |
| 37 | 36 | #include <linux/serial_8250.h> |
| @@ -161,6 +160,7 @@ static const struct serial8250_config uart_config[] = { · 123 unmodified lines |
| 161 | 160 | .fifo_size = 16, |
| 162 | 161 | .tx_loadsz = 16, |
| 163 | 162 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, |
| 163 | + .rxtrig_bytes = {1, 4, 8, 14}, |
| 164 | 164 | .flags = UART_CAP_FIFO, |
| 165 | 165 | }, |
| 166 | 166 | [PORT_CIRRUS] = { |
| @@ -180,6 +180,7 @@ static const struct serial8250_config uart_config[] = { · 13 unmodified lines |
| 180 | 180 | .tx_loadsz = 16, |
| 181 | 181 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 | |
| 182 | 182 | UART_FCR_T_TRIG_00, |
| 183 | + .rxtrig_bytes = {8, 16, 24, 28}, |
| 183 | 184 | .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP, |
| 184 | 185 | }, |
| 185 | 186 | [PORT_16750] = { |
| @@ -188,6 +189,7 @@ static const struct serial8250_config uart_config[] = { · 2 unmodified lines |
| 188 | 189 | .tx_loadsz = 64, |
| 189 | 190 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10 | |
| 190 | 191 | UART_FCR7_64BYTE, |
| 192 | + .rxtrig_bytes = {1, 16, 32, 56}, |
| 191 | 193 | .flags = UART_CAP_FIFO | UART_CAP_SLEEP | UART_CAP_AFE, |
| 192 | 194 | }, |
| 193 | 195 | [PORT_STARTECH] = { |
| @@ -209,6 +211,7 @@ static const struct serial8250_config uart_config[] = { · 15 unmodified lines |
| 209 | 211 | .tx_loadsz = 32, |
| 210 | 212 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 | |
| 211 | 213 | UART_FCR_T_TRIG_10, |
| 214 | + .rxtrig_bytes = {8, 16, 56, 60}, |
| 212 | 215 | .flags = UART_CAP_FIFO | UART_CAP_EFR | UART_CAP_SLEEP, |
| 213 | 216 | }, |
| 214 | 217 | [PORT_16850] = { |
| @@ -266,6 +269,7 @@ static const struct serial8250_config uart_config[] = { · 51 unmodified lines |
| 266 | 269 | .tx_loadsz = 8, |
| 267 | 270 | .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_01 | |
| 268 | 271 | UART_FCR_T_TRIG_01, |
| 272 | + .rxtrig_bytes = {1, 4, 8, 14}, |
| 269 | 273 | .flags = UART_CAP_FIFO | UART_CAP_RTOIE, |
| 270 | 274 | }, |
| 271 | 275 | [PORT_XR17D15X] = { |
| @@ -530,11 +534,8 @@ static void serial8250_clear_fifos(struct uart_8250_port *p) · 258 unmodified lines |
| 530 | 534 | |
| 531 | 535 | void serial8250_clear_and_reinit_fifos(struct uart_8250_port *p) |
| 532 | 536 | { |
| 533 | | − unsigned char fcr; |
| 534 | | − |
| 535 | 537 | serial8250_clear_fifos(p); |
| 536 | | − fcr = uart_config[p->port.type].fcr; |
| 537 | | − serial_out(p, UART_FCR, fcr); |
| 538 | + serial_out(p, UART_FCR, p->fcr); |
| 538 | 539 | } |
| 539 | 540 | EXPORT_SYMBOL_GPL(serial8250_clear_and_reinit_fifos); |
| 540 | 541 | |
| @@ -2256,10 +2257,9 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, · 1715 unmodified lines |
| 2256 | 2257 | struct ktermios *old) |
| 2257 | 2258 | { |
| 2258 | 2259 | struct uart_8250_port *up = up_to_u8250p(port); |
| 2259 | | − unsigned char cval, fcr = 0; |
| 2260 | + unsigned char cval; |
| 2260 | 2261 | unsigned long flags; |
| 2261 | 2262 | unsigned int baud, quot; |
| 2262 | | − int fifo_bug = 0; |
| 2263 | 2263 | |
| 2264 | 2264 | switch (termios->c_cflag & CSIZE) { |
| 2265 | 2265 | case CS5: |
| @@ -2282,7 +2282,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, · 16 unmodified lines |
| 2282 | 2282 | if (termios->c_cflag & PARENB) { |
| 2283 | 2283 | cval |= UART_LCR_PARITY; |
| 2284 | 2284 | if (up->bugs & UART_BUG_PARITY) |
| 2285 | | − fifo_bug = 1; |
| 2285 | + up->fifo_bug = true; |
| 2286 | 2286 | } |
| 2287 | 2287 | if (!(termios->c_cflag & PARODD)) |
| 2288 | 2288 | cval |= UART_LCR_EPAR; |
| @@ -2306,10 +2306,10 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, · 17 unmodified lines |
| 2306 | 2306 | quot++; |
| 2307 | 2307 | |
| 2308 | 2308 | if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) { |
| 2309 | | − fcr = uart_config[port->type].fcr; |
| 2310 | | − if ((baud < 2400 && !up->dma) || fifo_bug) { |
| 2311 | | − fcr &= ~UART_FCR_TRIGGER_MASK; |
| 2312 | | − fcr |= UART_FCR_TRIGGER_1; |
| 2309 | + /* NOTE: If fifo_bug is not set, a user can set RX_trigger. */ |
| 2310 | + if ((baud < 2400 && !up->dma) || up->fifo_bug) { |
| 2311 | + up->fcr &= ~UART_FCR_TRIGGER_MASK; |
| 2312 | + up->fcr |= UART_FCR_TRIGGER_1; |
| 2313 | 2313 | } |
| 2314 | 2314 | } |
| 2315 | 2315 | |
| @@ -2442,15 +2442,15 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, · 126 unmodified lines |
| 2442 | 2442 | * is written without DLAB set, this mode will be disabled. |
| 2443 | 2443 | */ |
| 2444 | 2444 | if (port->type == PORT_16750) |
| 2445 | | − serial_port_out(port, UART_FCR, fcr); |
| 2445 | + serial_port_out(port, UART_FCR, up->fcr); |
| 2446 | 2446 | |
| 2447 | 2447 | serial_port_out(port, UART_LCR, cval); /* reset DLAB */ |
| 2448 | 2448 | up->lcr = cval; /* Save LCR */ |
| 2449 | 2449 | if (port->type != PORT_16750) { |
| 2450 | 2450 | /* emulated UARTs (Lucent Venus 167x) need two steps */ |
| 2451 | | − if (fcr & UART_FCR_ENABLE_FIFO) |
| 2451 | + if (up->fcr & UART_FCR_ENABLE_FIFO) |
| 2452 | 2452 | serial_port_out(port, UART_FCR, UART_FCR_ENABLE_FIFO); |
| 2453 | | − serial_port_out(port, UART_FCR, fcr); /* set fcr */ |
| 2453 | + serial_port_out(port, UART_FCR, up->fcr); /* set fcr */ |
| 2454 | 2454 | } |
| 2455 | 2455 | serial8250_set_mctrl(port, port->mctrl); |
| 2456 | 2456 | spin_unlock_irqrestore(&port->lock, flags); |
| @@ -2640,6 +2640,146 @@ static int serial8250_request_port(struct uart_port *port) · 183 unmodified lines |
| 2640 | 2640 | return ret; |
| 2641 | 2641 | } |
| 2642 | 2642 | |
| 2643 | +static int fcr_get_rxtrig_bytes(struct uart_8250_port *up) |
| 2644 | +{ |
| 2645 | + const struct serial8250_config *conf_type = &uart_config[up->port.type]; |
| 2646 | + unsigned char bytes; |
| 2647 | + |
| 2648 | + bytes = conf_type->rxtrig_bytes[UART_FCR_R_TRIG_BITS(up->fcr)]; |
| 2649 | + |
| 2650 | + return bytes ? bytes : -EOPNOTSUPP; |
| 2651 | +} |
| 2652 | + |
| 2653 | +static int bytes_to_fcr_rxtrig(struct uart_8250_port *up, unsigned char bytes) |
| 2654 | +{ |
| 2655 | + const struct serial8250_config *conf_type = &uart_config[up->port.type]; |
| 2656 | + int i; |
| 2657 | + |
| 2658 | + if (!conf_type->rxtrig_bytes[UART_FCR_R_TRIG_BITS(UART_FCR_R_TRIG_00)]) |
| 2659 | + return -EOPNOTSUPP; |
| 2660 | + |
| 2661 | + for (i = 1; i < UART_FCR_R_TRIG_MAX_STATE; i++) { |
| 2662 | + if (bytes < conf_type->rxtrig_bytes[i]) |
| 2663 | + /* Use the nearest lower value */ |
| 2664 | + return (--i) << UART_FCR_R_TRIG_SHIFT; |
| 2665 | + } |
| 2666 | + |
| 2667 | + return UART_FCR_R_TRIG_11; |
| 2668 | +} |
| 2669 | + |
| 2670 | +static int do_get_rxtrig(struct tty_port *port) |
| 2671 | +{ |
| 2672 | + struct uart_state *state = container_of(port, struct uart_state, port); |
| 2673 | + struct uart_port *uport = state->uart_port; |
| 2674 | + struct uart_8250_port *up = |
| 2675 | + container_of(uport, struct uart_8250_port, port); |
| 2676 | + |
| 2677 | + if (!(up->capabilities & UART_CAP_FIFO) || uport->fifosize <= 1) |
| 2678 | + return -EINVAL; |
| 2679 | + |
| 2680 | + return fcr_get_rxtrig_bytes(up); |
| 2681 | +} |
| 2682 | + |
| 2683 | +static int do_serial8250_get_rxtrig(struct tty_port *port) |
| 2684 | +{ |
| 2685 | + int rxtrig_bytes; |
| 2686 | + |
| 2687 | + mutex_lock(&port->mutex); |
| 2688 | + rxtrig_bytes = do_get_rxtrig(port); |
| 2689 | + mutex_unlock(&port->mutex); |
| 2690 | + |
| 2691 | + return rxtrig_bytes; |
| 2692 | +} |
| 2693 | + |
| 2694 | +static ssize_t serial8250_get_attr_rx_trig_bytes(struct device *dev, |
| 2695 | + struct device_attribute *attr, char *buf) |
| 2696 | +{ |
| 2697 | + struct tty_port *port = dev_get_drvdata(dev); |
| 2698 | + int rxtrig_bytes; |
| 2699 | + |
| 2700 | + rxtrig_bytes = do_serial8250_get_rxtrig(port); |
| 2701 | + if (rxtrig_bytes < 0) |
| 2702 | + return rxtrig_bytes; |
| 2703 | + |
| 2704 | + return snprintf(buf, PAGE_SIZE, "%d\n", rxtrig_bytes); |
| 2705 | +} |
| 2706 | + |
| 2707 | +static int do_set_rxtrig(struct tty_port *port, unsigned char bytes) |
| 2708 | +{ |
| 2709 | + struct uart_state *state = container_of(port, struct uart_state, port); |
| 2710 | + struct uart_port *uport = state->uart_port; |
| 2711 | + struct uart_8250_port *up = |
| 2712 | + container_of(uport, struct uart_8250_port, port); |
| 2713 | + int rxtrig; |
| 2714 | + |
| 2715 | + if (!(up->capabilities & UART_CAP_FIFO) || uport->fifosize <= 1 || |
| 2716 | + up->fifo_bug) |
| 2717 | + return -EINVAL; |
| 2718 | + |
| 2719 | + rxtrig = bytes_to_fcr_rxtrig(up, bytes); |
| 2720 | + if (rxtrig < 0) |
| 2721 | + return rxtrig; |
| 2722 | + |
| 2723 | + serial8250_clear_fifos(up); |
| 2724 | + up->fcr &= ~UART_FCR_TRIGGER_MASK; |
| 2725 | + up->fcr |= (unsigned char)rxtrig; |
| 2726 | + serial_out(up, UART_FCR, up->fcr); |
| 2727 | + return 0; |
| 2728 | +} |
| 2729 | + |
| 2730 | +static int do_serial8250_set_rxtrig(struct tty_port *port, unsigned char bytes) |
| 2731 | +{ |
| 2732 | + int ret; |
| 2733 | + |
| 2734 | + mutex_lock(&port->mutex); |
| 2735 | + ret = do_set_rxtrig(port, bytes); |
| 2736 | + mutex_unlock(&port->mutex); |
| 2737 | + |
| 2738 | + return ret; |
| 2739 | +} |
| 2740 | + |
| 2741 | +static ssize_t serial8250_set_attr_rx_trig_bytes(struct device *dev, |
| 2742 | + struct device_attribute *attr, const char *buf, size_t count) |
| 2743 | +{ |
| 2744 | + struct tty_port *port = dev_get_drvdata(dev); |
| 2745 | + unsigned char bytes; |
| 2746 | + int ret; |
| 2747 | + |
| 2748 | + if (!count) |
| 2749 | + return -EINVAL; |
| 2750 | + |
| 2751 | + ret = kstrtou8(buf, 10, &bytes); |
| 2752 | + if (ret < 0) |
| 2753 | + return ret; |
| 2754 | + |
| 2755 | + ret = do_serial8250_set_rxtrig(port, bytes); |
| 2756 | + if (ret < 0) |
| 2757 | + return ret; |
| 2758 | + |
| 2759 | + return count; |
| 2760 | +} |
| 2761 | + |
| 2762 | +static DEVICE_ATTR(rx_trig_bytes, S_IRUSR | S_IWUSR | S_IRGRP, |
| 2763 | + serial8250_get_attr_rx_trig_bytes, |
| 2764 | + serial8250_set_attr_rx_trig_bytes); |
| 2765 | + |
| 2766 | +static struct attribute *serial8250_dev_attrs[] = { |
| 2767 | + &dev_attr_rx_trig_bytes.attr, |
| 2768 | + NULL, |
| 2769 | + }; |
| 2770 | + |
| 2771 | +static struct attribute_group serial8250_dev_attr_group = { |
| 2772 | + .attrs = serial8250_dev_attrs, |
| 2773 | + }; |
| 2774 | + |
| 2775 | +static void register_dev_spec_attr_grp(struct uart_8250_port *up) |
| 2776 | +{ |
| 2777 | + const struct serial8250_config *conf_type = &uart_config[up->port.type]; |
| 2778 | + |
| 2779 | + if (conf_type->rxtrig_bytes[0]) |
| 2780 | + up->port.attr_group = &serial8250_dev_attr_group; |
| 2781 | +} |
| 2782 | + |
| 2643 | 2783 | static void serial8250_config_port(struct uart_port *port, int flags) |
| 2644 | 2784 | { |
| 2645 | 2785 | struct uart_8250_port *up = up_to_u8250p(port); |
| @@ -2687,6 +2827,9 @@ static void serial8250_config_port(struct uart_port *port, int flags) · 41 unmodified lines |
| 2687 | 2827 | if ((port->type == PORT_XR17V35X) || |
| 2688 | 2828 | (port->type == PORT_XR17D15X)) |
| 2689 | 2829 | port->handle_irq = exar_handle_irq; |
| 2830 | + |
| 2831 | + register_dev_spec_attr_grp(up); |
| 2832 | + up->fcr = uart_config[up->port.type].fcr; |
| 2690 | 2833 | } |
| 2691 | 2834 | |
| 2692 | 2835 | static int |