serial: 8250_mid: correct comment regarding Tangier HSU

[deliverable/linux.git] / drivers / tty / serial / 8250 / 8250_mid.c

diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c
index 88531a36b69ccd3752c5197bd1c8b9f7f5f87705..86379a79a6a33c6f728892a353454356bbbefb68 100644 (file)
--- a/drivers/tty/serial/8250/8250_mid.c
+++ b/drivers/tty/serial/8250/8250_mid.c
@@ -9,11 +9,13 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/rational.h>
+#include <linux/bitops.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/rational.h>
 
 #include <linux/dma/hsu.h>
+#include <linux/8250_pci.h>
 
 #include "8250.h"
 
@@ -24,6 +26,7 @@
 #define PCI_DEVICE_ID_INTEL_DNV_UART   0x19d8
 
 /* Intel MID Specific registers */
+#define INTEL_MID_UART_DNV_FISR                0x08
 #define INTEL_MID_UART_PS              0x30
 #define INTEL_MID_UART_MUL             0x34
 #define INTEL_MID_UART_DIV             0x38
@@ -31,6 +34,7 @@
 struct mid8250;
 
 struct mid8250_board {
+       unsigned int flags;
        unsigned long freq;
        unsigned int base_baud;
        int (*setup)(struct mid8250 *, struct uart_port *p);
@@ -76,7 +80,11 @@ static int tng_setup(struct mid8250 *mid, struct uart_port *p)
        struct pci_dev *pdev = to_pci_dev(p->dev);
        int index = PCI_FUNC(pdev->devfn);
 
-       /* Currently no support for HSU port0 */
+       /*
+        * Device 0000:00:04.0 is not a real HSU port. It provides a global
+        * register set for all HSU ports, although it has the same PCI ID.
+        * Skip it here.
+        */
        if (index-- == 0)
                return -ENODEV;
 
@@ -88,16 +96,16 @@ static int tng_setup(struct mid8250 *mid, struct uart_port *p)
 static int dnv_handle_irq(struct uart_port *p)
 {
        struct mid8250 *mid = p->private_data;
-       int ret;
-
-       ret = hsu_dma_irq(&mid->dma_chip, 0);
-       ret |= hsu_dma_irq(&mid->dma_chip, 1);
-
-       /* For now, letting the HW generate separate interrupt for the UART */
-       if (ret)
-               return ret;
-
-       return serial8250_handle_irq(p, serial_port_in(p, UART_IIR));
+       unsigned int fisr = serial_port_in(p, INTEL_MID_UART_DNV_FISR);
+       int ret = IRQ_NONE;
+
+       if (fisr & BIT(2))
+               ret |= hsu_dma_irq(&mid->dma_chip, 1);
+       if (fisr & BIT(1))
+               ret |= hsu_dma_irq(&mid->dma_chip, 0);
+       if (fisr & BIT(0))
+               ret |= serial8250_handle_irq(p, serial_port_in(p, UART_IIR));
+       return ret;
 }
 
 #define DNV_DMA_CHAN_OFFSET 0x80
@@ -106,12 +114,13 @@ static int dnv_setup(struct mid8250 *mid, struct uart_port *p)
 {
        struct hsu_dma_chip *chip = &mid->dma_chip;
        struct pci_dev *pdev = to_pci_dev(p->dev);
+       unsigned int bar = FL_GET_BASE(mid->board->flags);
        int ret;
 
        chip->dev = &pdev->dev;
        chip->irq = pdev->irq;
        chip->regs = p->membase;
-       chip->length = pci_resource_len(pdev, 0);
+       chip->length = pci_resource_len(pdev, bar);
        chip->offset = DNV_DMA_CHAN_OFFSET;
 
        /* Falling back to PIO mode if DMA probing fails */
@@ -217,6 +226,7 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
        struct uart_8250_port uart;
        struct mid8250 *mid;
+       unsigned int bar;
        int ret;
 
        ret = pcim_enable_device(pdev);
@@ -230,6 +240,7 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                return -ENOMEM;
 
        mid->board = (struct mid8250_board *)id->driver_data;
+       bar = FL_GET_BASE(mid->board->flags);
 
        memset(&uart, 0, sizeof(struct uart_8250_port));
 
@@ -242,8 +253,8 @@ static int mid8250_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        uart.port.flags = UPF_SHARE_IRQ | UPF_FIXED_PORT | UPF_FIXED_TYPE;
        uart.port.set_termios = mid8250_set_termios;
 
-       uart.port.mapbase = pci_resource_start(pdev, 0);
-       uart.port.membase = pcim_iomap(pdev, 0, 0);
+       uart.port.mapbase = pci_resource_start(pdev, bar);
+       uart.port.membase = pcim_iomap(pdev, bar, 0);
        if (!uart.port.membase)
                return -ENOMEM;
 
@@ -282,18 +293,21 @@ static void mid8250_remove(struct pci_dev *pdev)
 }
 
 static const struct mid8250_board pnw_board = {
+       .flags = FL_BASE0,
        .freq = 50000000,
        .base_baud = 115200,
        .setup = pnw_setup,
 };
 
 static const struct mid8250_board tng_board = {
+       .flags = FL_BASE0,
        .freq = 38400000,
        .base_baud = 1843200,
        .setup = tng_setup,
 };
 
 static const struct mid8250_board dnv_board = {
+       .flags = FL_BASE1,
        .freq = 133333333,
        .base_baud = 115200,
        .setup = dnv_setup,