All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] serial: 8250_pci: Fintek products patches
@ 2015-03-13  2:00 Peter Hung
  2015-03-13  2:00 ` [PATCH 1/2] serial: 8250_pci: remove non-used var for F81504 Peter Hung
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Peter Hung @ 2015-03-13  2:00 UTC (permalink / raw)
  To: gregkh, jslaby; +Cc: linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

These series patches works for Fintek F81504/F81508/F81512 PCI to Serial Port.
and patch 0002 is following with patch 0001.

patch 0001 is just cleanup non-used source code.
patch 0002 is major patch.

The serial port of our product will failed after wakeup from S3(STR).

It's due to when the system wakeup from S3(STR), this PCI device's
configuration space from 0x40 to 0x40 + max_port * 0x08 should be
re-configured. If had no re-configure, It's will all zero.

We move all initialization from pci_fintek_setup() to pci_fintek_init() and
set it to pci_serial_quirks struct .init section. It's will re-init this 
device when system wakeup from pciserial_resume_ports().

Peter Hung (2):
  serial: 8250_pci: remove non-used var for F81504
  serial: 8250_pci: port failed after wakeup from S3

 drivers/tty/serial/8250/8250_pci.c | 121 +++++++++++++++----------------------
 1 file changed, 50 insertions(+), 71 deletions(-)

-- 
1.9.1


^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/2] serial: 8250_pci: remove non-used var for F81504
  2015-03-13  2:00 [PATCH 0/2] serial: 8250_pci: Fintek products patches Peter Hung
@ 2015-03-13  2:00 ` Peter Hung
  2015-03-13  2:00 ` [PATCH 2/2] serial: 8250_pci: port failed after wakeup from S3 Peter Hung
  2015-03-15  9:25 ` [PATCH 0/2] serial: 8250_pci: Fintek products patches Greg KH
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Hung @ 2015-03-13  2:00 UTC (permalink / raw)
  To: gregkh, jslaby; +Cc: linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

Remove pci_fintek_setup() non-used var with calculation ciobase

Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
 drivers/tty/serial/8250/8250_pci.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 892eb32..701b7b1 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1550,9 +1550,7 @@ static int pci_fintek_setup(struct serial_private *priv,
 			    struct uart_8250_port *port, int idx)
 {
 	struct pci_dev *pdev = priv->dev;
-	unsigned long base;
 	unsigned long iobase;
-	unsigned long ciobase = 0;
 	u8 config_base;
 	u32 bar_data[3];
 
@@ -1601,11 +1599,6 @@ static int pci_fintek_setup(struct serial_private *priv,
 		return -EINVAL;
 	}
 
-	if (idx < 4) {
-		base = pci_resource_start(priv->dev, 3);
-		ciobase = (int)(base + (0x8 * idx));
-	}
-
 	/* Get the io address dispatch from the BIOS */
 	pci_read_config_dword(pdev, 0x24, &bar_data[0]);
 	pci_read_config_dword(pdev, 0x20, &bar_data[1]);
@@ -1614,8 +1607,8 @@ static int pci_fintek_setup(struct serial_private *priv,
 	/* Calculate Real IO Port */
 	iobase = (bar_data[idx/4] & 0xffffffe0) + (idx % 4) * 8;
 
-	dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%lx ciobase=0x%lx config_base=0x%2x\n",
-		__func__, idx, iobase, ciobase, config_base);
+	dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%lx config_base=0x%2x\n",
+		__func__, idx, iobase, config_base);
 
 	/* Enable UART I/O port */
 	pci_write_config_byte(pdev, config_base + 0x00, 0x01);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH 2/2] serial: 8250_pci: port failed after wakeup from S3
  2015-03-13  2:00 [PATCH 0/2] serial: 8250_pci: Fintek products patches Peter Hung
  2015-03-13  2:00 ` [PATCH 1/2] serial: 8250_pci: remove non-used var for F81504 Peter Hung
@ 2015-03-13  2:00 ` Peter Hung
  2015-03-15  9:25 ` [PATCH 0/2] serial: 8250_pci: Fintek products patches Greg KH
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Hung @ 2015-03-13  2:00 UTC (permalink / raw)
  To: gregkh, jslaby; +Cc: linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

Serial ports of F81504/F81508/F81512 will failed when wakeup from S3(STR).

It's due to when the system wakeup from S3(STR), this PCI device's
configuration space from 0x40 to 0x40 + max_port * 0x08 should be
re-configured.

We move all initialization from pci_fintek_setup() to pci_fintek_init() and
set it to pci_serial_quirks .init section. It's will re-init this device when
system wakeup from pciserial_resume_ports().

Signed-off-by: Peter Hung <hpeter+linux_kernel@gmail.com>
---
 drivers/tty/serial/8250/8250_pci.c | 114 ++++++++++++++++---------------------
 1 file changed, 50 insertions(+), 64 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 701b7b1..cfa477f 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1545,91 +1545,74 @@ pci_brcm_trumanage_setup(struct serial_private *priv,
 	return ret;
 }
 
-static int pci_fintek_setup(struct serial_private *priv,
-			    const struct pciserial_board *board,
-			    struct uart_8250_port *port, int idx)
+static int pci_fintek_init(struct pci_dev *dev)
 {
-	struct pci_dev *pdev = priv->dev;
 	unsigned long iobase;
-	u8 config_base;
+	u32 max_port, i;
 	u32 bar_data[3];
+	u8 config_base;
 
-	/*
-	 * Find each UARTs offset in PCI configuraion space
-	 */
-	switch (idx) {
-	case 0:
-		config_base = 0x40;
-		break;
-	case 1:
-		config_base = 0x48;
-		break;
-	case 2:
-		config_base = 0x50;
-		break;
-	case 3:
-		config_base = 0x58;
-		break;
-	case 4:
-		config_base = 0x60;
-		break;
-	case 5:
-		config_base = 0x68;
+	switch (dev->device) {
+	case 0x1104: /* 4 ports */
+	case 0x1108: /* 8 ports */
+		max_port = dev->device & 0xff;
 		break;
-	case 6:
-		config_base = 0x70;
-		break;
-	case 7:
-		config_base = 0x78;
-		break;
-	case 8:
-		config_base = 0x80;
-		break;
-	case 9:
-		config_base = 0x88;
-		break;
-	case 10:
-		config_base = 0x90;
-		break;
-	case 11:
-		config_base = 0x98;
+	case 0x1112: /* 12 ports */
+		max_port = 12;
 		break;
 	default:
-		/* Unknown number of ports, get out of here */
 		return -EINVAL;
 	}
 
 	/* Get the io address dispatch from the BIOS */
-	pci_read_config_dword(pdev, 0x24, &bar_data[0]);
-	pci_read_config_dword(pdev, 0x20, &bar_data[1]);
-	pci_read_config_dword(pdev, 0x1c, &bar_data[2]);
+	pci_read_config_dword(dev, 0x24, &bar_data[0]);
+	pci_read_config_dword(dev, 0x20, &bar_data[1]);
+	pci_read_config_dword(dev, 0x1c, &bar_data[2]);
+
+	for (i = 0; i < max_port; ++i) {
+		/* UART0 configuration offset start from 0x40 */
+		config_base = 0x40 + 0x08 * i;
+
+		/* Calculate Real IO Port */
+		iobase = (bar_data[i / 4] & 0xffffffe0) + (i % 4) * 8;
+
+		/* Enable UART I/O port */
+		pci_write_config_byte(dev, config_base + 0x00, 0x01);
+
+		/* Select 128-byte FIFO and 8x FIFO threshold */
+		pci_write_config_byte(dev, config_base + 0x01, 0x33);
 
-	/* Calculate Real IO Port */
-	iobase = (bar_data[idx/4] & 0xffffffe0) + (idx % 4) * 8;
+		/* LSB UART */
+		pci_write_config_byte(dev, config_base + 0x04,
+				(u8)(iobase & 0xff));
 
-	dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%lx config_base=0x%2x\n",
-		__func__, idx, iobase, config_base);
+		/* MSB UART */
+		pci_write_config_byte(dev, config_base + 0x05,
+				(u8)((iobase & 0xff00) >> 8));
 
-	/* Enable UART I/O port */
-	pci_write_config_byte(pdev, config_base + 0x00, 0x01);
+		pci_write_config_byte(dev, config_base + 0x06, dev->irq);
+	}
+
+	return max_port;
+}
 
-	/* Select 128-byte FIFO and 8x FIFO threshold */
-	pci_write_config_byte(pdev, config_base + 0x01, 0x33);
+static int pci_fintek_setup(struct serial_private *priv,
+			    const struct pciserial_board *board,
+			    struct uart_8250_port *port, int idx)
+{
+	struct pci_dev *pdev = priv->dev;
+	u8 config_base;
+	u16 iobase;
 
-	/* LSB UART */
-	pci_write_config_byte(pdev, config_base + 0x04, (u8)(iobase & 0xff));
+	config_base = 0x40 + 0x08 * idx;
 
-	/* MSB UART */
-	pci_write_config_byte(pdev, config_base + 0x05, (u8)((iobase & 0xff00) >> 8));
+	/* Get the io address from configuration space */
+	pci_read_config_word(pdev, config_base + 4, &iobase);
 
-	/* irq number, this usually fails, but the spec says to do it anyway. */
-	pci_write_config_byte(pdev, config_base + 0x06, pdev->irq);
+	dev_dbg(&pdev->dev, "%s: idx=%d iobase=0x%x", __func__, idx, iobase);
 
 	port->port.iotype = UPIO_PORT;
 	port->port.iobase = iobase;
-	port->port.mapbase = 0;
-	port->port.membase = NULL;
-	port->port.regshift = 0;
 
 	return 0;
 }
@@ -2646,6 +2629,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 		.setup		= pci_fintek_setup,
+		.init		= pci_fintek_init,
 	},
 	{
 		.vendor		= 0x1c29,
@@ -2653,6 +2637,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 		.setup		= pci_fintek_setup,
+		.init		= pci_fintek_init,
 	},
 	{
 		.vendor		= 0x1c29,
@@ -2660,6 +2645,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
 		.subvendor	= PCI_ANY_ID,
 		.subdevice	= PCI_ANY_ID,
 		.setup		= pci_fintek_setup,
+		.init		= pci_fintek_init,
 	},
 
 	/*
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] serial: 8250_pci: Fintek products patches
  2015-03-13  2:00 [PATCH 0/2] serial: 8250_pci: Fintek products patches Peter Hung
  2015-03-13  2:00 ` [PATCH 1/2] serial: 8250_pci: remove non-used var for F81504 Peter Hung
  2015-03-13  2:00 ` [PATCH 2/2] serial: 8250_pci: port failed after wakeup from S3 Peter Hung
@ 2015-03-15  9:25 ` Greg KH
  2015-03-16  1:35   ` Peter Hung
  2 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2015-03-15  9:25 UTC (permalink / raw)
  To: Peter Hung
  Cc: jslaby, linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

On Fri, Mar 13, 2015 at 10:00:11AM +0800, Peter Hung wrote:
> These series patches works for Fintek F81504/F81508/F81512 PCI to Serial Port.
> and patch 0002 is following with patch 0001.
> 
> patch 0001 is just cleanup non-used source code.
> patch 0002 is major patch.
> 
> The serial port of our product will failed after wakeup from S3(STR).
> 
> It's due to when the system wakeup from S3(STR), this PCI device's
> configuration space from 0x40 to 0x40 + max_port * 0x08 should be
> re-configured. If had no re-configure, It's will all zero.
> 
> We move all initialization from pci_fintek_setup() to pci_fintek_init() and
> set it to pci_serial_quirks struct .init section. It's will re-init this 
> device when system wakeup from pciserial_resume_ports().
> 
> Peter Hung (2):
>   serial: 8250_pci: remove non-used var for F81504
>   serial: 8250_pci: port failed after wakeup from S3
> 
>  drivers/tty/serial/8250/8250_pci.c | 121 +++++++++++++++----------------------
>  1 file changed, 50 insertions(+), 71 deletions(-)

Why did you cc: the linux-usb@vger mailing list on these?  Don't you
mean linux-serial@vger?

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] serial: 8250_pci: Fintek products patches
  2015-03-15  9:25 ` [PATCH 0/2] serial: 8250_pci: Fintek products patches Greg KH
@ 2015-03-16  1:35   ` Peter Hung
  2015-03-18 15:08     ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Peter Hung @ 2015-03-16  1:35 UTC (permalink / raw)
  To: Greg KH; +Cc: jslaby, linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

Hello,

Greg KH 於 2015/3/15 下午 05:25 寫道:
> Why did you cc: the linux-usb@vger mailing list on these?  Don't you
> mean linux-serial@vger?
>

Sorry for my fault. Should I resend it with correct mail-list with V2 ??
or just send this series patches ?

Thanks
-- 
With Best Regards,
Peter Hung

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] serial: 8250_pci: Fintek products patches
  2015-03-16  1:35   ` Peter Hung
@ 2015-03-18 15:08     ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2015-03-18 15:08 UTC (permalink / raw)
  To: Peter Hung
  Cc: jslaby, linux-usb, linux-kernel, tom_tsai, peter_hong, Peter Hung

On Mon, Mar 16, 2015 at 09:35:34AM +0800, Peter Hung wrote:
> Hello,
> 
> Greg KH 於 2015/3/15 下午 05:25 寫道:
> >Why did you cc: the linux-usb@vger mailing list on these?  Don't you
> >mean linux-serial@vger?
> >
> 
> Sorry for my fault. Should I resend it with correct mail-list with V2 ??
> or just send this series patches ?

Please resend the whole thing, as v2, to not confuse those of us who are
on both lists.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-18 15:08 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-13  2:00 [PATCH 0/2] serial: 8250_pci: Fintek products patches Peter Hung
2015-03-13  2:00 ` [PATCH 1/2] serial: 8250_pci: remove non-used var for F81504 Peter Hung
2015-03-13  2:00 ` [PATCH 2/2] serial: 8250_pci: port failed after wakeup from S3 Peter Hung
2015-03-15  9:25 ` [PATCH 0/2] serial: 8250_pci: Fintek products patches Greg KH
2015-03-16  1:35   ` Peter Hung
2015-03-18 15:08     ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.