From 44281956928348bb5df14a8257921c49991dace5 Mon Sep 17 00:00:00 2001 From: Robert Zieba Date: Wed, 10 Aug 2022 16:31:27 -0600 Subject: device/xhci: Factor out common PORTSC code This commit factors out some code for XHCI port status values. BUG=b:186792595 TEST=Built coreboot for volteer device Change-Id: I045405ed224aa8f48f6f628b7d49ec6bafb450d7 Signed-off-by: Robert Zieba Reviewed-on: https://review.coreboot.org/c/coreboot/+/67933 Tested-by: build bot (Jenkins) Reviewed-by: Subrata Banik Reviewed-by: Angel Pons --- src/soc/intel/common/block/xhci/elog.c | 43 ++++------------------------------ 1 file changed, 5 insertions(+), 38 deletions(-) (limited to 'src/soc/intel/common') diff --git a/src/soc/intel/common/block/xhci/elog.c b/src/soc/intel/common/block/xhci/elog.c index e6a1c0f5da..8acefba40c 100644 --- a/src/soc/intel/common/block/xhci/elog.c +++ b/src/soc/intel/common/block/xhci/elog.c @@ -2,45 +2,12 @@ #include #include +#include #include #include #include #include -/* Wake on disconnect enable */ -#define XHCI_STATUS_WDE (1 << 26) -/* Wake on connect enable */ -#define XHCI_STATUS_WCE (1 << 25) -/* Port link status change */ -#define XHCI_STATUS_PLC (1 << 22) -/* Connect status change */ -#define XHCI_STATUS_CSC (1 << 17) -/* Port link status */ -#define XHCI_STATUS_PLS_SHIFT (5) -#define XHCI_STATUS_PLS_MASK (0xF << XHCI_STATUS_PLS_SHIFT) -#define XHCI_STATUS_PLS_RESUME (15 << XHCI_STATUS_PLS_SHIFT) - -static bool xhci_csc_set(uint32_t port_status) -{ - return !!(port_status & XHCI_STATUS_CSC); -} - -static bool xhci_wake_capable(uint32_t port_status) -{ - return !!((port_status & XHCI_STATUS_WCE) | - (port_status & XHCI_STATUS_WDE)); -} - -static bool xhci_plc_set(uint32_t port_status) -{ - return !!(port_status & XHCI_STATUS_PLC); -} - -static bool xhci_resume(uint32_t port_status) -{ - return (port_status & XHCI_STATUS_PLS_MASK) == XHCI_STATUS_PLS_RESUME; -} - /* * Check if a particular USB port caused wake by: * 1. Change in connect/disconnect status (if enabled) @@ -73,8 +40,8 @@ static bool xhci_port_wake_check(uintptr_t base, uint8_t num, uint8_t host_event * connect/disconnect to identify if the port caused wake * event for USB attach/detach. */ - if (xhci_csc_set(port_status) && - xhci_wake_capable(port_status)) { + if (xhci_portsc_csc(port_status) && + xhci_portsc_wake_capable(port_status)) { elog_add_event_wake(host_event, 0); elog_add_event_wake(event, i + 1); found = true; @@ -85,8 +52,8 @@ static bool xhci_port_wake_check(uintptr_t base, uint8_t num, uint8_t host_event * Check if PLC is set and PLS indicates resume to identify if * the port caused wake event for USB activity. */ - if (xhci_plc_set(port_status) && - xhci_resume(port_status)) { + if (xhci_portsc_plc(port_status) && + xhci_portsc_resume(port_status)) { elog_add_event_wake(host_event, 0); elog_add_event_wake(event, i + 1); found = true; -- cgit v1.2.3