diff options
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/alderlake/elog.c | 28 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/elog.c | 14 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/elog.c | 29 |
3 files changed, 20 insertions, 51 deletions
diff --git a/src/soc/intel/alderlake/elog.c b/src/soc/intel/alderlake/elog.c index 1efba25eed..84765d9b58 100644 --- a/src/soc/intel/alderlake/elog.c +++ b/src/soc/intel/alderlake/elog.c @@ -48,11 +48,8 @@ static void pch_log_rp_wake_source(void) }; for (i = 0; i < MIN(CONFIG_MAX_ROOT_PORTS, ARRAY_SIZE(pme_map)); ++i) { - const struct device *dev = pcidev_path_on_root(pme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(pme_map[i].devfn), + PCI_FUNC(pme_map[i].devfn)))) elog_add_event_wake(pme_map[i].wake_source, 0); } } @@ -77,11 +74,8 @@ static void pch_log_pme_internal_wake_source(void) size_t i; for (i = 0; i < ARRAY_SIZE(ipme_map); i++) { - const struct device *dev = pcidev_path_on_root(ipme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + unsigned int devfn = ipme_map[i].devfn; + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn)))) { elog_add_event_wake(ipme_map[i].wake_source, 0); dev_found = true; } @@ -89,11 +83,8 @@ static void pch_log_pme_internal_wake_source(void) /* Check Thunderbolt ports */ for (i = 0; i < NUM_TBT_FUNCTIONS; i++) { - const struct device *dev = pcidev_path_on_root(SA_DEVFN_TBT(i)); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + unsigned int devfn = SA_DEVFN_TBT(i); + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn)))) { elog_add_event_wake(ELOG_WAKE_SOURCE_PME_TBT, i); dev_found = true; } @@ -101,11 +92,8 @@ static void pch_log_pme_internal_wake_source(void) /* Check DMA devices */ for (i = 0; i < NUM_TCSS_DMA_FUNCTIONS; i++) { - const struct device *dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA(i)); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + unsigned int devfn = SA_DEVFN_TCSS_DMA(i); + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn)))) { elog_add_event_wake(ELOG_WAKE_SOURCE_PME_TCSS_DMA, i); dev_found = true; } diff --git a/src/soc/intel/jasperlake/elog.c b/src/soc/intel/jasperlake/elog.c index ccf6fd048b..858b3714d4 100644 --- a/src/soc/intel/jasperlake/elog.c +++ b/src/soc/intel/jasperlake/elog.c @@ -48,11 +48,8 @@ static void pch_log_rp_wake_source(void) }; for (i = 0; i < MIN(CONFIG_MAX_ROOT_PORTS, ARRAY_SIZE(pme_map)); ++i) { - const struct device *dev = pcidev_path_on_root(pme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(pme_map[i].devfn), + PCI_FUNC(pme_map[i].devfn)))) elog_add_event_wake(pme_map[i].wake_source, 0); } } @@ -75,11 +72,8 @@ static void pch_log_pme_internal_wake_source(void) }; for (i = 0; i < ARRAY_SIZE(ipme_map); i++) { - const struct device *dev = pcidev_path_on_root(ipme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(ipme_map[i].devfn), + PCI_FUNC(ipme_map[i].devfn)))) { elog_add_event_wake(ipme_map[i].wake_source, 0); dev_found = true; } diff --git a/src/soc/intel/tigerlake/elog.c b/src/soc/intel/tigerlake/elog.c index 878959a9b5..0fccf84d5c 100644 --- a/src/soc/intel/tigerlake/elog.c +++ b/src/soc/intel/tigerlake/elog.c @@ -48,11 +48,8 @@ static void pch_log_rp_wake_source(void) }; for (i = 0; i < MIN(CONFIG_MAX_ROOT_PORTS, ARRAY_SIZE(pme_map)); ++i) { - const struct device *dev = pcidev_path_on_root(pme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(pme_map[i].devfn), + PCI_FUNC(pme_map[i].devfn)))) elog_add_event_wake(pme_map[i].wake_source, 0); } } @@ -76,12 +73,8 @@ static void pch_log_pme_internal_wake_source(void) size_t i; for (i = 0; i < ARRAY_SIZE(ipme_map); i++) { - const struct device *dev = - pcidev_path_on_root(ipme_map[i].devfn); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(ipme_map[i].devfn), + PCI_FUNC(ipme_map[i].devfn)))) { elog_add_event_wake(ipme_map[i].wake_source, 0); dev_found = true; } @@ -89,11 +82,8 @@ static void pch_log_pme_internal_wake_source(void) /* Check Thunderbolt ports */ for (i = 0; i < NUM_TBT_FUNCTIONS; i++) { - const struct device *dev = pcidev_path_on_root(SA_DEVFN_TBT(i)); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + const unsigned int devfn = SA_DEVFN_TBT(i); + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn)))) { elog_add_event_wake(ELOG_WAKE_SOURCE_PME_TBT, i); dev_found = true; } @@ -101,11 +91,8 @@ static void pch_log_pme_internal_wake_source(void) /* Check DMA devices */ for (i = 0; i < NUM_TCSS_DMA_FUNCTIONS; i++) { - const struct device *dev = pcidev_path_on_root(SA_DEVFN_TCSS_DMA(i)); - if (!dev) - continue; - - if (pci_dev_is_wake_source(dev)) { + const unsigned int devfn = SA_DEVFN_TCSS_DMA(i); + if (pci_dev_is_wake_source(PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn)))) { elog_add_event_wake(ELOG_WAKE_SOURCE_PME_TCSS_DMA, i); dev_found = true; } |