Commit 663544b5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/vmd' 

- Fix disable of bridge windows during domain reset; previously we cleared
  the base/limit registers, which left the windows enabled (Nirmal Patel)

* pci/controller/vmd:
  PCI: vmd: Disable bridge window for domain reset
parents 5ffe43c0 f73eedc9

drivers/pci/controller/vmd.c

+17 −2
Original line number Diff line number Diff line
@@ -541,8 +541,23 @@ static void vmd_domain_reset(struct vmd_dev *vmd) 
				     PCI_CLASS_BRIDGE_PCI))

					continue;



				memset_io(base + PCI_IO_BASE, 0,

					  PCI_ROM_ADDRESS1 - PCI_IO_BASE);

				/*

				 * Temporarily disable the I/O range before updating

				 * PCI_IO_BASE.

				 */

				writel(0x0000ffff, base + PCI_IO_BASE_UPPER16);

				/* Update lower 16 bits of I/O base/limit */

				writew(0x00f0, base + PCI_IO_BASE);

				/* Update upper 16 bits of I/O base/limit */

				writel(0, base + PCI_IO_BASE_UPPER16);



				/* MMIO Base/Limit */

				writel(0x0000fff0, base + PCI_MEMORY_BASE);



				/* Prefetchable MMIO Base/Limit */

				writel(0, base + PCI_PREF_LIMIT_UPPER32);

				writel(0x0000fff0, base + PCI_PREF_MEMORY_BASE);

				writel(0xffffffff, base + PCI_PREF_BASE_UPPER32);

			}

		}

	}