diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-11-22 16:41:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-26 23:11:20 -0500 |
commit | e86ff4a63c9fdd875ba8492577cd1ad2252f525c (patch) | |
tree | b29d14f78331c8a2f3287b2451fa891a0d8447de /drivers/tty | |
parent | 448ac154c957c4580531fa0c8f2045816fe2f0e7 (diff) |
serial/8250_pci: init-quirk msi support for kt serial controller
The semantics of UPF_IIR_ONCE (once per serial irq) are only guaranteed
if the kt irq is not shared (once per serial isr in the shared case ==
potentially unwanted reads of the IIR).
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/8250_pci.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/tty/serial/8250_pci.c b/drivers/tty/serial/8250_pci.c index 8742ef5be6ba..2cbf78f77c4a 100644 --- a/drivers/tty/serial/8250_pci.c +++ b/drivers/tty/serial/8250_pci.c | |||
@@ -1118,6 +1118,18 @@ pci_xr17c154_setup(struct serial_private *priv, | |||
1118 | return pci_default_setup(priv, board, port, idx); | 1118 | return pci_default_setup(priv, board, port, idx); |
1119 | } | 1119 | } |
1120 | 1120 | ||
1121 | static int try_enable_msi(struct pci_dev *dev) | ||
1122 | { | ||
1123 | /* use msi if available, but fallback to legacy otherwise */ | ||
1124 | pci_enable_msi(dev); | ||
1125 | return 0; | ||
1126 | } | ||
1127 | |||
1128 | static void disable_msi(struct pci_dev *dev) | ||
1129 | { | ||
1130 | pci_disable_msi(dev); | ||
1131 | } | ||
1132 | |||
1121 | #define PCI_VENDOR_ID_SBSMODULARIO 0x124B | 1133 | #define PCI_VENDOR_ID_SBSMODULARIO 0x124B |
1122 | #define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B | 1134 | #define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B |
1123 | #define PCI_DEVICE_ID_OCTPRO 0x0001 | 1135 | #define PCI_DEVICE_ID_OCTPRO 0x0001 |
@@ -1233,7 +1245,9 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { | |||
1233 | .device = PCI_DEVICE_ID_INTEL_PATSBURG_KT, | 1245 | .device = PCI_DEVICE_ID_INTEL_PATSBURG_KT, |
1234 | .subvendor = PCI_ANY_ID, | 1246 | .subvendor = PCI_ANY_ID, |
1235 | .subdevice = PCI_ANY_ID, | 1247 | .subdevice = PCI_ANY_ID, |
1248 | .init = try_enable_msi, | ||
1236 | .setup = kt_serial_setup, | 1249 | .setup = kt_serial_setup, |
1250 | .exit = disable_msi, | ||
1237 | }, | 1251 | }, |
1238 | /* | 1252 | /* |
1239 | * ITE | 1253 | * ITE |