by Soeren Grunewald

[permalink] [raw]

Subject: Re: [PATCH 3.14 35/37] serial: 8250_pci: Add support for 16 port Exar boards

Dear Greg,

Could you please also add upstream commit
899f0c1c7dbcc487fdc8756a49ff70b1d5d75f89

There was a merge conflict in the 4-1.y tree with another back-ported
patch. But in 3.14 this shouldn't be the case.
--
Thanks & regrads,
Soeren

On 11/06/2015 08:24 PM, Greg Kroah-Hartman wrote:
> 3.14-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Soeren Grunewald <[email protected]>
>
> commit 96a5d18bc1338786fecac73599f1681f59a59a8e upstream.
>
> The Exar XR17V358 chip usually provides only 8 ports. But two chips can be
> combined to act as a single 16 port chip. Therefor one chip is configured
> as master the second as slave by connecting the mode pin to VCC (master)
> or GND (slave).
>
> Then the master chip is reporting a different device-id depending on
> whether a slave is detected or not. The UARTs 8-15 are addressed from
> 0x2000-0x3fff. So the offset of 0x400 from UART to UART can be used to
> address all 16 ports as before.
>
> See: https://www.exar.com/common/content/document.ashx?id=1587 page 11
>
> Signed-off-by: Soeren Grunewald <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> ---
> drivers/tty/serial/8250/8250_pci.c | 25 +++++++++++++++++++++++--
> 1 file changed, 23 insertions(+), 2 deletions(-)
>
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
> @@ -1772,6 +1772,8 @@ pci_wch_ch353_setup(struct serial_privat
> #define PCI_DEVICE_ID_SUNIX_1999 0x1999
>
>
> +#define PCI_DEVICE_ID_EXAR_XR17V8358 0x8358
> +
> /* Unknown vendors/cards - this should not be in linux/pci_ids.h */
> #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584 0x1584
> #define PCI_SUBDEVICE_ID_UNKNOWN_0x1588 0x1588
> @@ -2266,6 +2268,13 @@ static struct pci_serial_quirk pci_seria
> .subdevice = PCI_ANY_ID,
> .setup = pci_xr17v35x_setup,
> },
> + {
> + .vendor = PCI_VENDOR_ID_EXAR,
> + .device = PCI_DEVICE_ID_EXAR_XR17V8358,
> + .subvendor = PCI_ANY_ID,
> + .subdevice = PCI_ANY_ID,
> + .setup = pci_xr17v35x_setup,
> + },
> /*
> * Xircom cards
> */
> @@ -2706,6 +2715,7 @@ enum pci_board_num_t {
> pbn_exar_XR17V352,
> pbn_exar_XR17V354,
> pbn_exar_XR17V358,
> + pbn_exar_XR17V8358,
> pbn_exar_ibm_saturn,
> pbn_pasemi_1682M,
> pbn_ni8430_2,
> @@ -3375,6 +3385,14 @@ static struct pciserial_board pci_boards
> .reg_shift = 0,
> .first_offset = 0,
> },
> + [pbn_exar_XR17V8358] = {
> + .flags = FL_BASE0,
> + .num_ports = 16,
> + .base_baud = 7812500,
> + .uart_offset = 0x400,
> + .reg_shift = 0,
> + .first_offset = 0,
> + },
> [pbn_exar_ibm_saturn] = {
> .flags = FL_BASE0,
> .num_ports = 1,
> @@ -4731,7 +4749,7 @@ static struct pci_device_id serial_pci_t
> 0,
> 0, pbn_exar_XR17C158 },
> /*
> - * Exar Corp. XR17V35[248] Dual/Quad/Octal PCIe UARTs
> + * Exar Corp. XR17V[48]35[248] Dual/Quad/Octal/Hexa PCIe UARTs
> */
> { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V352,
> PCI_ANY_ID, PCI_ANY_ID,
> @@ -4745,7 +4763,10 @@ static struct pci_device_id serial_pci_t
> PCI_ANY_ID, PCI_ANY_ID,
> 0,
> 0, pbn_exar_XR17V358 },
> -
> + { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17V8358,
> + PCI_ANY_ID, PCI_ANY_ID,
> + 0,
> + 0, pbn_exar_XR17V8358 },
> /*
> * Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke)
> */
>
>