Commit 395a125c authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: re-add debug prints for unmodified BARs 



Print out for device BAR values before the kernel tries to update them.
Also make related output use KERN_DEBUG.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent a5827f40

drivers/pci/probe.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -304,6 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		} else {

		} else {

			res->start = l64;

			res->start = l64;

			res->end = l64 + sz64;

			res->end = l64 + sz64;

			printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",

				pci_name(dev), pos, (unsigned long long)res->start,

				(unsigned long long)res->end);

		}

		}

	} else {

	} else {

		sz = pci_size(l, sz, mask);

		sz = pci_size(l, sz, mask);
@@ -313,6 +316,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 




		res->start = l;

		res->start = l;

		res->end = l + sz;

		res->end = l + sz;

		printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),

			pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",

			(unsigned long long)res->start, (unsigned long long)res->end);

	}

	}





 out:

 out:
@@ -383,7 +389,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
			res->start = base;

			res->start = base;

		if (!res->end)

		if (!res->end)

			res->end = limit + 0xfff;

			res->end = limit + 0xfff;

		printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n",

		printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",

			pci_name(dev), (unsigned long long) res->start,

			pci_name(dev), (unsigned long long) res->start,

			(unsigned long long) res->end);

			(unsigned long long) res->end);

	}

	}
@@ -397,8 +403,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;

		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;

		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev),

		printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",

			(unsigned long long) res->start, (unsigned long long) res->end);

			pci_name(dev), (unsigned long long) res->start,

			(unsigned long long) res->end);

	}

	}





	res = child->resource[2];

	res = child->resource[2];
@@ -434,7 +441,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;

		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;

		res->start = base;

		res->start = base;

		res->end = limit + 0xfffff;

		res->end = limit + 0xfffff;

		printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",

		printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",

			pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",

			pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",

			(unsigned long long) res->start, (unsigned long long) res->end);

			(unsigned long long) res->start, (unsigned long long) res->end);

	}

	}