Furquan Shaikh submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Tim Wawrzynczak: Looks good to me, approved Rob Barnes: Looks good to me, but someone else must approve
drivers/intel/wifi: Use newly added pci_dev_is_wake_source

This change uses the newly added `pci_dev_is_wake_source()` helper function
to determine and log WiFi wake source instead of assuming a hard-coded
register value to check. This is done in preparation to merge the
generic WiFi and Intel WiFi drivers in coreboot in follow-up changes.

BUG=b:169802515
BRANCH=zork

Change-Id: I9bdb453092b4ce7bdab2969f13e0c0aa8166dc0a
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46031
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
---
M src/drivers/intel/wifi/wifi.c
1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index e117ec0..cc58ac6 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -10,9 +10,6 @@
#include "chip.h"
#include "drivers/wifi/generic/chip.h"

-#define PMCS_DR 0xcc
-#define PME_STS (1 << 15)
-
#if CONFIG(GENERATE_SMBIOS_TABLES)
static int smbios_write_wifi(struct device *dev, int *handle,
unsigned long *current)
@@ -63,12 +60,8 @@

static void wifi_pci_dev_init(struct device *dev)
{
- if (CONFIG(ELOG)) {
- uint32_t val;
- val = pci_read_config16(dev, PMCS_DR);
- if (val & PME_STS)
- elog_add_event_wake(ELOG_WAKE_SOURCE_PME_WIFI, 0);
- }
+ if (pci_dev_is_wake_source(dev))
+ elog_add_event_wake(ELOG_WAKE_SOURCE_PME_WIFI, 0);
}

struct device_operations device_ops = {

To view, visit change 46031. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I9bdb453092b4ce7bdab2969f13e0c0aa8166dc0a
Gerrit-Change-Number: 46031
Gerrit-PatchSet: 3
Gerrit-Owner: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub@google.com>
Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: Rob Barnes <robbarnes@google.com>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged