Merge branch 'pci/controller/vmd'

- Add 0xb60b and 0xb06f Device IDs for client SKUs (Nirmal Patel)

* pci/controller/vmd:
  PCI: vmd: Add DID 8086:B06F and 8086:B60B for Intel client SKUs

diff --combined drivers/pci/controller/vmd.c
index 11870d1fc8189abfd9929cb4939a8af212c0bbf6,8a036d6b7d497e2bcdd12a9a97657f7973e283d0..9d9596947350f5e7a31fa9f8db87147651d37344
--- 1/drivers/pci/controller/vmd.c
--- 2/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@@ -740,9 -740,11 +740,9 @@@ static int vmd_pm_enable_quirk(struct p
        if (!(features & VMD_FEAT_BIOS_PM_QUIRK))
                return 0;
  
 -      pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL);
 -
        pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_LTR);
        if (!pos)
 -              return 0;
 +              goto out_state_change;
  
        /*
         * Skip if the max snoop LTR is non-zero, indicating BIOS has set it
@@@ -750,7 -752,7 +750,7 @@@
         */
        pci_read_config_dword(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, &ltr_reg);
        if (!!(ltr_reg & (PCI_LTR_VALUE_MASK | PCI_LTR_SCALE_MASK)))
 -              return 0;
 +              goto out_state_change;
  
        /*
         * Set the default values to the maximum required by the platform to
@@@ -762,13 -764,6 +762,13 @@@
        pci_write_config_dword(pdev, pos + PCI_LTR_MAX_SNOOP_LAT, ltr_reg);
        pci_info(pdev, "VMD: Default LTR value set by driver\n");
  
 +out_state_change:
 +      /*
 +       * Ensure devices are in D0 before enabling PCI-PM L1 PM Substates, per
 +       * PCIe r6.0, sec 5.5.4.
 +       */
 +      pci_set_power_state_locked(pdev, PCI_D0);
 +      pci_enable_link_state_locked(pdev, PCIE_LINK_STATE_ALL);
        return 0;
  }
  
@@@ -1105,6 -1100,10 +1105,10 @@@ static const struct pci_device_id vmd_i
                .driver_data = VMD_FEATS_CLIENT,},
        {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
                .driver_data = VMD_FEATS_CLIENT,},
+       {PCI_VDEVICE(INTEL, 0xb60b),
+                 .driver_data = VMD_FEATS_CLIENT,},
+       {PCI_VDEVICE(INTEL, 0xb06f),
+                 .driver_data = VMD_FEATS_CLIENT,},
        {0,}
  };
  MODULE_DEVICE_TABLE(pci, vmd_ids);