Commit 35798123 authored Apr 06, 2012 by Dan Williams Committed by Greg Kroah-Hartman Apr 09, 2012

Revert "serial/8250_pci: init-quirk msi support for kt serial controller"



This reverts commit e86ff4a6.

This tried to enforce the semantics of one interrupt per iir read of the
THRE (transmit-hold empty) status, but events from other sources
(particularly modem status) defeat this guarantee.

This change also broke 8250_pci suspend/resume support as
pciserial_resume_ports() re-runs .init() quirks, but does not run
.exit() quirks in pciserial_suspend_ports() leading to reports like:

  sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:16.3/msi_irqs'

...and a subsequent crash.  The mismatch of init/exit at suspend/resume
seems like a bug in its own right.

[stable: 3.3.x]
Cc: stable <stable@vger.kernel.org>
Acked-by: Alan Cox <alan@linux.intel.com>
Cc: Sudhakar Mamillapalli <sudhakar@fb.com>
Reported-by: Nhan H Mai <nhan.h.mai@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d8c4019b

drivers/tty/serial/8250/8250_pci.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1118,18 +1118,6 @@ pci_xr17c154_setup(struct serial_private *priv,
		return pci_default_setup(priv, board, port, idx);
		}

		static int try_enable_msi(struct pci_dev *dev)
		{
		/* use msi if available, but fallback to legacy otherwise */
		pci_enable_msi(dev);
		return 0;
		}

		static void disable_msi(struct pci_dev *dev)
		{
		pci_disable_msi(dev);
		}

		#define PCI_VENDOR_ID_SBSMODULARIO 0x124B
		#define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B
		#define PCI_DEVICE_ID_OCTPRO 0x0001
		@@ -1249,9 +1237,7 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = {
		.device = PCI_DEVICE_ID_INTEL_PATSBURG_KT,
		.subvendor = PCI_ANY_ID,
		.subdevice = PCI_ANY_ID,
		.init = try_enable_msi,
		.setup = kt_serial_setup,
		.exit = disable_msi,
		},
		/*
		* ITE