Re: [PATCH v4 09/11] serial: 8250_lpss: move Quark code from PCI driver

[Andy Shevchenko]

On Wed, 2016-05-04 at 16:14 +0100, Bryan O'Donoghue wrote:
> On Wed, 2016-05-04 at 17:32 +0300, Andy Shevchenko wrote:
> > 
> > Intel Quark has DesignWare UART. Move the code from 8250_pci to
> > 8250_lpss.
> > 
> > Reviewed-by: Bryan O'Donoghue <pure.logic@xxxxxxxxxxxxxxxxx>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> > ---
> > Âdrivers/tty/serial/8250/8250_lpss.c | 11 +++++++++++
> > Âdrivers/tty/serial/8250/8250_pci.cÂÂ| 15 +--------------
> > Â2 files changed, 12 insertions(+), 14 deletions(-)
> > 
> > diff --git a/drivers/tty/serial/8250/8250_lpss.c
> > b/drivers/tty/serial/8250/8250_lpss.c
> > index 77cf7e3..3beb3aa 100644
> > --- a/drivers/tty/serial/8250/8250_lpss.c
> > +++ b/drivers/tty/serial/8250/8250_lpss.c
> > @@ -25,6 +25,8 @@
> > Â#define PCI_DEVICE_ID_INTEL_BSW_UART1	0x228a
> > Â#define PCI_DEVICE_ID_INTEL_BSW_UART2	0x228c
> > Â
> > +#define PCI_DEVICE_ID_INTEL_QRK_UARTx	0x0936
> > +
> > Â#define PCI_DEVICE_ID_INTEL_BDW_UART1	0x9ce3
> > Â#define PCI_DEVICE_ID_INTEL_BDW_UART2	0x9ce4
> > Â
> > @@ -165,6 +167,9 @@ static int lpss8250_dma_setup(struct lpss8250
> > *lpss, struct uart_8250_port *port
> > Â	struct dw_dma_slave *rx_param, *tx_param;
> > Â	struct device *dev = port->port.dev;
> > Â
> > +	if (!lpss->dma_param.dma_dev)
> > +		return 0;
> > +
> > Â	rx_param = devm_kzalloc(dev, sizeof(*rx_param),
> > GFP_KERNEL);
> > Â	if (!rx_param)
> > Â		return -ENOMEM;
> > @@ -252,6 +257,11 @@ static const struct lpss8250_board byt_board =
> > {
> > Â	.setup = byt_serial_setup,
> > Â};
> > Â
> > +static const struct lpss8250_board qrk_board = {
> > +	.freq = 44236800,
> > +	.base_baud = 2764800,
> > +};
> > +
> > Â#define LPSS_DEVICE(id, board) { PCI_VDEVICE(INTEL, id),
> > (kernel_ulong_t)&board }
> > Â
> > Âstatic const struct pci_device_id pci_ids[] = {
> > @@ -259,6 +269,7 @@ static const struct pci_device_id pci_ids[] = {
> > Â	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BYT_UART2, byt_board),
> > Â	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BSW_UART1, byt_board),
> > Â	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BSW_UART2, byt_board),
> > +	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_QRK_UARTx, qrk_board),
> > Â	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BDW_UART1, byt_board),
> > Â	LPSS_DEVICE(PCI_DEVICE_ID_INTEL_BDW_UART2, byt_board),
> > Â	{ },
> > diff --git a/drivers/tty/serial/8250/8250_pci.c
> > b/drivers/tty/serial/8250/8250_pci.c
> > index bb4df5d..b94b1ee 100644
> > --- a/drivers/tty/serial/8250/8250_pci.c
> > +++ b/drivers/tty/serial/8250/8250_pci.c
> > @@ -1765,7 +1765,6 @@ pci_wch_ch38x_setup(struct serial_private
> > *priv,
> > Â#define PCI_DEVICE_ID_COMMTECH_4222PCIE	0x0022
> > Â#define PCI_DEVICE_ID_BROADCOM_TRUMANAGE 0x160a
> > Â#define PCI_DEVICE_ID_AMCC_ADDIDATA_APCI7800 0x818e
> > -#define PCI_DEVICE_ID_INTEL_QRK_UART	0x0936
> > Â
> > Â#define PCI_VENDOR_ID_SUNIX		0x1fd4
> > Â#define PCI_DEVICE_ID_SUNIX_1999	0x1999
> > @@ -2736,7 +2735,6 @@ enum pci_board_num_t {
> > Â	pbn_ADDIDATA_PCIe_4_3906250,
> > Â	pbn_ADDIDATA_PCIe_8_3906250,
> > Â	pbn_ce4100_1_115200,
> > -	pbn_qrk,
> > Â	pbn_omegapci,
> > Â	pbn_NETMOS9900_2s_115200,
> > Â	pbn_brcm_trumanage,
> > @@ -3512,12 +3510,6 @@ static struct pciserial_board pci_boards[] =
> > {
> > Â		.base_baud	= 921600,
> > Â		.reg_shiftÂÂÂÂÂÂ= 2,
> > Â	},
> > -	[pbn_qrk] = {
> > -		.flags		= FL_BASE0,
> > -		.num_ports	= 1,
> > -		.base_baud	= 2764800,
> > -		.reg_shift	= 2,
> > -	},
> > Â	[pbn_omegapci] = {
> > Â		.flags		= FL_BASE0,
> > Â		.num_ports	= 8,
> > @@ -3634,6 +3626,7 @@ static const struct pci_device_id blacklist[]
> > =
> > {
> > Â	{ PCI_VDEVICE(INTEL, 0x0f0c), },
> > Â	{ PCI_VDEVICE(INTEL, 0x228a), },
> > Â	{ PCI_VDEVICE(INTEL, 0x228c), },
> > +	{ PCI_VDEVICE(INTEL, 0x0936), },
> > Â	{ PCI_VDEVICE(INTEL, 0x9ce3), },
> > Â	{ PCI_VDEVICE(INTEL, 0x9ce4), },
> > Â};
> > @@ -5303,12 +5296,6 @@ static struct pci_device_id serial_pci_tbl[]
> > =
> > {
> > Â		pbn_ce4100_1_115200 },
> > Â
> > Â	/*
> > -	Â* Intel Quark x1000
> > -	Â*/
> > -	{	PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QRK_UART,
> > -		PCI_ANY_ID, PCI_ANY_ID, 0, 0,
> > -		pbn_qrk },
> > -	/*
> > Â	Â* Cronyx Omega PCI
> > Â	Â*/
> > Â	{	PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_CRONYX_OMEGA,
> Andy.
> 
> Could you please add CONFIG_SERIAL_8250_LPSS when
> ÂCONFIG_X86_INTEL_QUARK is true for my "Reviewed-by" to this patch ?
> 
> I don't see that

Wait, what you are proposing here is a new behaviour, right?
Or can you explain how it works now (w/o this series being applied)?

-- 
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy