From: Jiaxun Yang <jiaxun.yang@flygoat.com>
Date: Tue, 26 May 2020 09:21:12 +0000 (+0800)
Subject: PCI: Don't disable decoding when mmio_always_on is set
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~2062^2~23
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=b6caa1d8c80cb71b6162cb1f1ec13aa655026c9f;p=linux.git

PCI: Don't disable decoding when mmio_always_on is set

Don't disable MEM/IO decoding when a device have both non_compliant_bars
and mmio_always_on.

That would allow us quirk devices with junk in BARs but can't disable
their decoding.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Acked-by: Bjorn Helgaas <helgaas@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 77b8a145c39b..d9c2c3301a8a 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1822,7 +1822,7 @@ int pci_setup_device(struct pci_dev *dev)
 	/* Device class may be changed after fixup */
 	class = dev->class >> 8;
 
-	if (dev->non_compliant_bars) {
+	if (dev->non_compliant_bars && !dev->mmio_always_on) {
 		pci_read_config_word(dev, PCI_COMMAND, &cmd);
 		if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
 			pci_info(dev, "device has non-compliant BARs; disabling IO/MEM decoding\n");