Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

serial: mctrl_gpio: implement interrupt handling

This allows to reduce the per-driver boiler plate considerably.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Uwe Kleine-König and committed by
Greg Kroah-Hartman
ce59e48f 7d8c70d8

+171 -3
+9 -1
Documentation/serial/driver
··· 439 439 440 440 Some helpers are provided in order to set/get modem control lines via GPIO. 441 441 442 - mctrl_gpio_init(dev, idx): 442 + mctrl_gpio_init(port, idx): 443 443 This will get the {cts,rts,...}-gpios from device tree if they are 444 444 present and request them, set direction etc, and return an 445 445 allocated structure. devm_* functions are used, so there's no need 446 446 to call mctrl_gpio_free(). 447 + As this sets up the irq handling make sure to not handle changes to the 448 + gpio input lines in your driver, too. 447 449 448 450 mctrl_gpio_free(dev, gpios): 449 451 This will free the requested gpios in mctrl_gpio_init(). ··· 460 458 461 459 mctrl_gpio_get(gpios, mctrl): 462 460 This will update mctrl with the gpios values. 461 + 462 + mctrl_gpio_enable_ms(gpios): 463 + Enables irqs and handling of changes to the ms lines. 464 + 465 + mctrl_gpio_disable_ms(gpios): 466 + Disables irqs and handling of changes to the ms lines.
+127 -2
drivers/tty/serial/serial_mctrl_gpio.c
··· 12 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 14 * GNU General Public License for more details. 15 - * 16 15 */ 17 16 18 17 #include <linux/err.h> 19 18 #include <linux/device.h> 19 + #include <linux/irq.h> 20 20 #include <linux/gpio/consumer.h> 21 21 #include <linux/termios.h> 22 + #include <linux/serial_core.h> 22 23 23 24 #include "serial_mctrl_gpio.h" 24 25 25 26 struct mctrl_gpios { 27 + struct uart_port *port; 26 28 struct gpio_desc *gpio[UART_GPIO_MAX]; 29 + int irq[UART_GPIO_MAX]; 30 + unsigned int mctrl_prev; 31 + bool mctrl_on; 27 32 }; 28 33 29 34 static const struct { ··· 117 112 } 118 113 EXPORT_SYMBOL_GPL(mctrl_gpio_init_noauto); 119 114 115 + #define MCTRL_ANY_DELTA (TIOCM_RI | TIOCM_DSR | TIOCM_CD | TIOCM_CTS) 116 + static irqreturn_t mctrl_gpio_irq_handle(int irq, void *context) 117 + { 118 + struct mctrl_gpios *gpios = context; 119 + struct uart_port *port = gpios->port; 120 + u32 mctrl = gpios->mctrl_prev; 121 + u32 mctrl_diff; 122 + 123 + mctrl_gpio_get(gpios, &mctrl); 124 + 125 + mctrl_diff = mctrl ^ gpios->mctrl_prev; 126 + gpios->mctrl_prev = mctrl; 127 + 128 + if (mctrl_diff & MCTRL_ANY_DELTA && port->state != NULL) { 129 + if ((mctrl_diff & mctrl) & TIOCM_RI) 130 + port->icount.rng++; 131 + 132 + if ((mctrl_diff & mctrl) & TIOCM_DSR) 133 + port->icount.dsr++; 134 + 135 + if (mctrl_diff & TIOCM_CD) 136 + uart_handle_dcd_change(port, mctrl & TIOCM_CD); 137 + 138 + if (mctrl_diff & TIOCM_CTS) 139 + uart_handle_cts_change(port, mctrl & TIOCM_CTS); 140 + 141 + wake_up_interruptible(&port->state->port.delta_msr_wait); 142 + } 143 + 144 + return IRQ_HANDLED; 145 + } 146 + 147 + struct mctrl_gpios *mctrl_gpio_init(struct uart_port *port, unsigned int idx) 148 + { 149 + struct mctrl_gpios *gpios; 150 + enum mctrl_gpio_idx i; 151 + 152 + gpios = mctrl_gpio_init_noauto(port->dev, idx); 153 + if (IS_ERR(gpios)) 154 + return gpios; 155 + 156 + gpios->port = port; 157 + 158 + for (i = 0; i < UART_GPIO_MAX; ++i) { 159 + int ret; 160 + 161 + if (!gpios->gpio[i] || mctrl_gpios_desc[i].dir_out) 162 + continue; 163 + 164 + ret = gpiod_to_irq(gpios->gpio[i]); 165 + if (ret <= 0) { 166 + dev_err(port->dev, 167 + "failed to find corresponding irq for %s (idx=%d, err=%d)\n", 168 + mctrl_gpios_desc[i].name, idx, ret); 169 + return ERR_PTR(ret); 170 + } 171 + gpios->irq[i] = ret; 172 + 173 + /* irqs should only be enabled in .enable_ms */ 174 + irq_set_status_flags(gpios->irq[i], IRQ_NOAUTOEN); 175 + 176 + ret = devm_request_irq(port->dev, gpios->irq[i], 177 + mctrl_gpio_irq_handle, 178 + IRQ_TYPE_EDGE_BOTH, dev_name(port->dev), 179 + gpios); 180 + if (ret) { 181 + /* alternatively implement polling */ 182 + dev_err(port->dev, 183 + "failed to request irq for %s (idx=%d, err=%d)\n", 184 + mctrl_gpios_desc[i].name, idx, ret); 185 + return ERR_PTR(ret); 186 + } 187 + } 188 + 189 + return gpios; 190 + } 191 + 120 192 void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios) 121 193 { 122 194 enum mctrl_gpio_idx i; 123 195 124 - for (i = 0; i < UART_GPIO_MAX; i++) 196 + for (i = 0; i < UART_GPIO_MAX; i++) { 197 + if (gpios->irq[i]) 198 + devm_free_irq(gpios->port->dev, gpios->irq[i], gpios); 199 + 125 200 if (gpios->gpio[i]) 126 201 devm_gpiod_put(dev, gpios->gpio[i]); 202 + } 127 203 devm_kfree(dev, gpios); 128 204 } 129 205 EXPORT_SYMBOL_GPL(mctrl_gpio_free); 206 + 207 + void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios) 208 + { 209 + enum mctrl_gpio_idx i; 210 + 211 + /* .enable_ms may be called multiple times */ 212 + if (gpios->mctrl_on) 213 + return; 214 + 215 + gpios->mctrl_on = true; 216 + 217 + /* get initial status of modem lines GPIOs */ 218 + mctrl_gpio_get(gpios, &gpios->mctrl_prev); 219 + 220 + for (i = 0; i < UART_GPIO_MAX; ++i) { 221 + if (!gpios->irq[i]) 222 + continue; 223 + 224 + enable_irq(gpios->irq[i]); 225 + } 226 + } 227 + EXPORT_SYMBOL_GPL(mctrl_gpio_enable_ms); 228 + 229 + void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios) 230 + { 231 + enum mctrl_gpio_idx i; 232 + 233 + if (!gpios->mctrl_on) 234 + return; 235 + 236 + gpios->mctrl_on = false; 237 + 238 + for (i = 0; i < UART_GPIO_MAX; ++i) { 239 + if (!gpios->irq[i]) 240 + continue; 241 + 242 + disable_irq(gpios->irq[i]); 243 + } 244 + }
+35
drivers/tty/serial/serial_mctrl_gpio.h
··· 22 22 #include <linux/device.h> 23 23 #include <linux/gpio/consumer.h> 24 24 25 + struct uart_port; 26 + 25 27 enum mctrl_gpio_idx { 26 28 UART_GPIO_CTS, 27 29 UART_GPIO_DSR, ··· 62 60 enum mctrl_gpio_idx gidx); 63 61 64 62 /* 63 + * Request and set direction of modem control lines GPIOs and sets up irq 64 + * handling. 65 + * devm_* functions are used, so there's no need to call mctrl_gpio_free(). 66 + * Returns a pointer to the allocated mctrl structure if ok, -ENOMEM on 67 + * allocation error. 68 + */ 69 + struct mctrl_gpios *mctrl_gpio_init(struct uart_port *port, unsigned int idx); 70 + 71 + /* 65 72 * Request and set direction of modem control lines GPIOs. 66 73 * devm_* functions are used, so there's no need to call mctrl_gpio_free(). 67 74 * Returns a pointer to the allocated mctrl structure if ok, -ENOMEM on ··· 85 74 * be disposed of by the resource management code. 86 75 */ 87 76 void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios); 77 + 78 + /* 79 + * Enable gpio interrupts to report status line changes. 80 + */ 81 + void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios); 82 + 83 + /* 84 + * Disable gpio interrupts to report status line changes. 85 + */ 86 + void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios); 88 87 89 88 #else /* GPIOLIB */ 90 89 ··· 117 96 } 118 97 119 98 static inline 99 + struct mctrl_gpios *mctrl_gpio_init(struct uart_port *port, unsigned int idx) 100 + { 101 + return ERR_PTR(-ENOSYS); 102 + } 103 + 104 + static inline 120 105 struct mctrl_gpios *mctrl_gpio_init_noauto(struct device *dev, unsigned int idx) 121 106 { 122 107 return ERR_PTR(-ENOSYS); ··· 130 103 131 104 static inline 132 105 void mctrl_gpio_free(struct device *dev, struct mctrl_gpios *gpios) 106 + { 107 + } 108 + 109 + void mctrl_gpio_enable_ms(struct mctrl_gpios *gpios) 110 + { 111 + } 112 + 113 + void mctrl_gpio_disable_ms(struct mctrl_gpios *gpios) 133 114 { 134 115 } 135 116