From 0ebbb37978292f034b1ce15848e37594aa2ac3df Mon Sep 17 00:00:00 2001 From: Jiaxun Yang Date: Tue, 22 Sep 2020 10:21:34 +0800 Subject: [PATCH] PCI: Don't disable decoding when mmio_always_on is set stable inclusion from linux-4.19.129 commit 40a94a1ac783b878ec083b87242450949ae26eaf -------------------------------- [ Upstream commit b6caa1d8c80cb71b6162cb1f1ec13aa655026c9f ] 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 Acked-by: Bjorn Helgaas Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang --- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 95d7a5fb8ffc..b67bff0bd40d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1690,7 +1690,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"); -- GitLab