Message ID | 20200428011429.1852081-2-jiaxun.yang@flygoat.com (mailing list archive) |
---|---|
State | Superseded, archived |
Delegated to: | Lorenzo Pieralisi |
Headers | show |
Series | Loongson PCI Generic Driver | expand |
On Tue, Apr 28, 2020 at 09:14:16AM +0800, Jiaxun Yang wrote: > 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 <bhelgaas@google.com> > --- > 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 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"); > -- > 2.26.0.rc2 >
On Tue, 28 Apr 2020 09:14:16 +0800, Jiaxun Yang wrote: > 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> > --- > drivers/pci/probe.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Acked-by: Rob Herring <robh@kernel.org>
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");
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> --- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)