Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26370fc6 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Don't print anything while decoding is disabled 



If the console is a PCI device, and we try to print to it while its
decoding is disabled, the system will hang.  This particular printk hasn't
caused a problem yet, but it could, so this fixes it.

See also 0ff9514b ("PCI: Don't print anything while decoding is
disabled").

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 31e9dd25

drivers/pci/probe.c

+6 −4
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
	u64 l64, sz64, mask64;

	u16 orig_cmd;

	struct pci_bus_region region, inverted_region;

	bool bar_too_big = false, bar_too_high = false;

	bool bar_too_big = false, bar_too_high = false, bar_invalid = false;



	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
@@ -289,11 +289,10 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
	 * be claimed by the device.

	 */

	if (inverted_region.start != region.start) {

		dev_info(&dev->dev, "reg 0x%x: initial BAR value %pa invalid; forcing reassignment\n",

			 pos, &region.start);

		res->flags |= IORESOURCE_UNSET;

		res->end -= res->start;

		res->start = 0;

		res->end = region.end - region.start;

		bar_invalid = true;

	}



	goto out;
@@ -312,6 +311,9 @@ out: 
	if (bar_too_high)

		dev_info(&dev->dev, "reg 0x%x: can't handle BAR above 4G (bus address %#010llx)\n",

			 pos, (unsigned long long) l64);

	if (bar_invalid)

		dev_info(&dev->dev, "reg 0x%x: initial BAR value %#010llx invalid\n",

			 pos, (unsigned long long) region.start);

	if (res->flags)

		dev_printk(KERN_DEBUG, &dev->dev, "reg 0x%x: %pR\n", pos, res);