Re: [PATCH 3.12 25/72] serial: 8250_pci: Add support for 16 port Exar boards

[Soeren Grunewald <soeren.grunewald@desy.de>]

Dear Jiri,

You should also add upstream commit 899f0c1c7dbcc487fdc8756a49ff70b1d5d75f89

Greg had a merge conflict in 4-1.y with another back-ported patch. But 
in 3.12 this shouldn't be the case.
-- 
Cheers,
Soeren


On 11/23/2015 02:08 PM, Jiri Slaby wrote:
> From: Soeren Grunewald <soeren.grunewald@desy.de>
>
> 3.12-stable review patch.  If anyone has any objections, please let me know.
>
> ===============
>
> 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 <soeren.grunewald@desy.de>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---
>   drivers/tty/serial/8250/8250_pci.c | 25 +++++++++++++++++++++++--
>   1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
> index eac50ec4c70d..bdbfb25ace6d 100644
> --- a/drivers/tty/serial/8250/8250_pci.c
> +++ b/drivers/tty/serial/8250/8250_pci.c
> @@ -1574,6 +1574,8 @@ pci_wch_ch353_setup(struct serial_private *priv,
>   #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
> @@ -2029,6 +2031,13 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
>   		.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
>   	 */
> @@ -2456,6 +2465,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,
> @@ -3121,6 +3131,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,
> @@ -4454,7 +4472,7 @@ static struct pci_device_id serial_pci_tbl[] = {
>   		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,
> @@ -4468,7 +4486,10 @@ static struct pci_device_id serial_pci_tbl[] = {
>   		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)
>   	 */
>