mei: me: add cannon point device ids for 4th device

[mirror_ubuntu-hirsute-kernel.git] / drivers / misc / mei / pci-me.c

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index f4f17552c9b804c3667c6d3a7c702ac30a4eaac0..ea4e152270a3b0270b1dc23edd8c3620af0ffd26 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -98,6 +98,11 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
        {MEI_PCI_DEVICE(MEI_DEV_ID_KBP, MEI_ME_PCH8_CFG)},
        {MEI_PCI_DEVICE(MEI_DEV_ID_KBP_2, MEI_ME_PCH8_CFG)},
 
+       {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP, MEI_ME_PCH8_CFG)},
+       {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_LP_4, MEI_ME_PCH8_CFG)},
+       {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH8_CFG)},
+       {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
+
        /* required last entry */
        {0, }
 };
@@ -238,8 +243,11 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
        mei_me_set_pm_domain(dev);
 
-       if (mei_pg_is_enabled(dev))
+       if (mei_pg_is_enabled(dev)) {
                pm_runtime_put_noidle(&pdev->dev);
+               if (hw->d0i3_supported)
+                       pm_runtime_allow(&pdev->dev);
+       }
 
        dev_dbg(&pdev->dev, "initialization successful.\n");