Skip to contentSkip to conversation

Patch "serial: 8250_lpss: Unconditionally set PCI master for Quark" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

serial: 8250_lpss: Unconditionally set PCI master for Quark

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
serial-8250_lpss-unconditionally-set-pci-master-for-quark.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 7cd3e9dbdd4c0025d0e37c8c73a2ac8641fc55bc Mon Sep 17 00:00:00 2001

From: Jan Kiszka <[email protected]>
Date: Thu, 23 Mar 2017 09:26:42 +0100
Subject: serial: 8250_lpss: Unconditionally set PCI master for Quark

From: Jan Kiszka <[email protected]>

commit 7cd3e9dbdd4c0025d0e37c8c73a2ac8641fc55bc upstream.

MSI needs it as well.

Should have no practical impact, though, as DMA is always available on the Quark. But given the few users of pci_alloc_irq_vectors so far, this incorrect pattern may spread otherwise.

Fixes 3f3a46951e02 ("serial: 8250_lpss: set PCI master only for private DMA")
---
 drivers/tty/serial/8250/8250_lpss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/tty/serial/8250/8250_lpss.c +2 -1
@@ -183,7 +183,6 @@ static void qrk_serial_setup_dma(struct
 	if (ret)
 		return;
 
-	pci_set_master(pdev);
 	pci_try_set_mwi(pdev);
 
 	/* Special DMA address for UART */
@@ -216,6 +215,8 @@ static int qrk_serial_setup(struct lpss8
 	struct pci_dev *pdev = to_pci_dev(port->dev);
 	int ret;
 
+	pci_set_master(pdev);
+
 	ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
 	if (ret < 0)
 		return ret;

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/serial-8250_lpss-unconditionally-set-pci-master-for-quark.patch