FreeCalypso > hg > freecalypso-hwlab
diff linux-patch/minpatch-4.9.240/0002-USB-serial-ftdi_sio-pass-port-to-quirk-port_probe-fu.patch @ 83:d7a1e7a6d6ba
linux-patch: current best offering of minpatch-*
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Sun, 06 Dec 2020 02:55:40 +0000 |
parents | |
children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linux-patch/minpatch-4.9.240/0002-USB-serial-ftdi_sio-pass-port-to-quirk-port_probe-fu.patch Sun Dec 06 02:55:40 2020 +0000 @@ -0,0 +1,85 @@ +From 214b1d2da22e380b05ecf6e546962ca867e3a60e Mon Sep 17 00:00:00 2001 +From: "Mychaela N. Falconia" <falcon@freecalypso.org> +Date: Fri, 2 Oct 2020 17:38:56 +0000 +Subject: [PATCH 2/3] USB: serial: ftdi_sio: pass port to quirk port_probe + functions + +The original code passed only the pointer to the ftdi_private struct +to quirk port_probe functions. However, some quirks may need to be +applied conditionally only to some channels of a multichannel FT2232x +or FT4232H device, and if a given quirk's port_probe function needs +to figure out which channel of a multichannel device is currently +being considered, it needs access to the port pointer passed to the +ftdi_sio_port_probe() function, so it can traverse USB data structures +from there. + +Signed-off-by: Mychaela N. Falconia <falcon@freecalypso.org> +--- + drivers/usb/serial/ftdi_sio.c | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c +index c9f979063af1..878ab4e5625c 100644 +--- a/drivers/usb/serial/ftdi_sio.c ++++ b/drivers/usb/serial/ftdi_sio.c +@@ -83,15 +83,15 @@ struct ftdi_private { + struct ftdi_sio_quirk { + int (*probe)(struct usb_serial *); + /* Special settings for probed ports. */ +- void (*port_probe)(struct ftdi_private *); ++ void (*port_probe)(struct usb_serial_port *); + }; + + static int ftdi_jtag_probe(struct usb_serial *serial); + static int ftdi_NDI_device_setup(struct usb_serial *serial); + static int ftdi_stmclite_probe(struct usb_serial *serial); + static int ftdi_8u2232c_probe(struct usb_serial *serial); +-static void ftdi_USB_UIRT_setup(struct ftdi_private *priv); +-static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv); ++static void ftdi_USB_UIRT_setup(struct usb_serial_port *port); ++static void ftdi_HE_TIRA1_setup(struct usb_serial_port *port); + + static const struct ftdi_sio_quirk ftdi_jtag_quirk = { + .probe = ftdi_jtag_probe, +@@ -1833,11 +1833,11 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port) + + mutex_init(&priv->cfg_lock); + +- if (quirk && quirk->port_probe) +- quirk->port_probe(priv); +- + usb_set_serial_port_data(port, priv); + ++ if (quirk && quirk->port_probe) ++ quirk->port_probe(port); ++ + ftdi_determine_type(port); + ftdi_set_max_packet_size(port); + if (read_latency_timer(port) < 0) +@@ -1850,8 +1850,10 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port) + /* Setup for the USB-UIRT device, which requires hardwired + * baudrate (38400 gets mapped to 312500) */ + /* Called from usbserial:serial_probe */ +-static void ftdi_USB_UIRT_setup(struct ftdi_private *priv) ++static void ftdi_USB_UIRT_setup(struct usb_serial_port *port) + { ++ struct ftdi_private *priv = usb_get_serial_port_data(port); ++ + priv->flags |= ASYNC_SPD_CUST; + priv->custom_divisor = 77; + priv->force_baud = 38400; +@@ -1860,8 +1862,10 @@ static void ftdi_USB_UIRT_setup(struct ftdi_private *priv) + /* Setup for the HE-TIRA1 device, which requires hardwired + * baudrate (38400 gets mapped to 100000) and RTS-CTS enabled. */ + +-static void ftdi_HE_TIRA1_setup(struct ftdi_private *priv) ++static void ftdi_HE_TIRA1_setup(struct usb_serial_port *port) + { ++ struct ftdi_private *priv = usb_get_serial_port_data(port); ++ + priv->flags |= ASYNC_SPD_CUST; + priv->custom_divisor = 240; + priv->force_baud = 38400; +-- +2.9.0 +