summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2017-06-02 18:10:59 -0700
committerFurquan Shaikh <furquan@google.com>2017-06-14 01:15:20 +0200
commitef08545bff67c8b264e168117c39100566f26bfd (patch)
tree194916e56b62d4bb26e3654bfac2f6d4c2de74cc /src/soc
parent6bf13012c18a322122659aa91897471fcaf55b5d (diff)
soc/intel/skylake: Add USB port number information to wake source
USB port status register can be used to decide if a particular port was responsible for generating PME# resulting in device wake: 1. CSC bit is set and port is capable of waking on connect/disconnect 2. PLC bit is set and port is in resume state BUG=b:37088992 TEST=Verified with wake on USB2.0 port 3, mosys shows: 19 | 2017-06-08 15:43:30 | Wake Source | PME - XHCI (USB 2.0 port) | 3 Change-Id: Ie4fa87393d8f096c4b3dca5f7a97f194cb065468 Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/20122 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/skylake/elog.c148
1 files changed, 147 insertions, 1 deletions
diff --git a/src/soc/intel/skylake/elog.c b/src/soc/intel/skylake/elog.c
index d127fcc246..fde8be2f7d 100644
--- a/src/soc/intel/skylake/elog.c
+++ b/src/soc/intel/skylake/elog.c
@@ -23,6 +23,7 @@
#include <soc/pci_devs.h>
#include <soc/pm.h>
#include <soc/smbus.h>
+#include <stdint.h>
static void pch_log_gpio_gpe(u32 gpe0_sts, u32 gpe0_en, int start)
{
@@ -36,6 +37,138 @@ static void pch_log_gpio_gpe(u32 gpe0_sts, u32 gpe0_en, int start)
}
}
+#define XHCI_USB2_PORT_STATUS_REG 0x480
+#define XHCI_USB3_PORT_STATUS_REG 0x540
+#define XHCI_USB2_PORT_NUM 10
+#define XHCI_USB3_PORT_NUM 6
+/* 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 pch_xhci_csc_set(uint32_t port_status)
+{
+ return !!(port_status & XHCI_STATUS_CSC);
+}
+
+static bool pch_xhci_wake_capable(uint32_t port_status)
+{
+ return !!((port_status & XHCI_STATUS_WCE) |
+ (port_status & XHCI_STATUS_WDE));
+}
+
+static bool pch_xhci_plc_set(uint32_t port_status)
+{
+ return !!(port_status & XHCI_STATUS_PLC);
+}
+
+static bool pch_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)
+ * 2. USB device activity
+ *
+ * Params:
+ * base : MMIO address of first port.
+ * num : Number of ports.
+ * event : Event that needs to be added in case wake source is found.
+ *
+ * Return value:
+ * true : Wake source was found.
+ * false : Wake source was not found.
+ */
+static bool pch_xhci_port_wake_check(uintptr_t base, uint8_t num,
+ uint32_t event)
+{
+ uint8_t i;
+ uint32_t port_status;
+ bool found = false;
+
+ for (i = 0; i < num; i++, base += 0x10) {
+ /* Read port status and control register for the port. */
+ port_status = read32((void *)base);
+
+ /*
+ * Check if CSC bit is set and port is capable of wake on
+ * connect/disconnect to identify if the port caused wake
+ * event for usb attach/detach.
+ */
+ if (pch_xhci_csc_set(port_status) &&
+ pch_xhci_wake_capable(port_status)) {
+ elog_add_event_wake(event, i + 1);
+ found = true;
+ }
+
+ /*
+ * Check if PLC is set and PLS indicates resume to identify if
+ * the port caused wake event for usb activity.
+ */
+ if (pch_xhci_plc_set(port_status) &&
+ pch_xhci_resume(port_status)) {
+ elog_add_event_wake(event, i + 1);
+ found = true;
+ }
+ }
+ return found;
+}
+
+/*
+ * Update elog event and instance depending upon the USB2 port that caused
+ * the wake event.
+ *
+ * Return value:
+ * true = Indicates that USB2 wake event was found.
+ * false = Indicates that USB2 wake event was not found.
+ */
+static inline bool pch_xhci_usb2_update_wake_event(uintptr_t mmio_base)
+{
+ return pch_xhci_port_wake_check(mmio_base + XHCI_USB2_PORT_STATUS_REG,
+ XHCI_USB2_PORT_NUM,
+ ELOG_WAKE_SOURCE_PME_XHCI_USB_2);
+}
+
+/*
+ * Update elog event and instance depending upon the USB3 port that caused
+ * the wake event.
+ *
+ * Return value:
+ * true = Indicates that USB3 wake event was found.
+ * false = Indicates that USB3 wake event was not found.
+ */
+static inline bool pch_xhci_usb3_update_wake_event(uintptr_t mmio_base)
+{
+ return pch_xhci_port_wake_check(mmio_base + XHCI_USB3_PORT_STATUS_REG,
+ XHCI_USB3_PORT_NUM,
+ ELOG_WAKE_SOURCE_PME_XHCI_USB_3);
+}
+
+static bool pch_xhci_update_wake_event(device_t dev)
+{
+ uintptr_t mmio_base;
+ bool event_found = false;
+ mmio_base = ALIGN_DOWN(pci_read_config32(dev, PCI_BASE_ADDRESS_0), 16);
+
+ if (pch_xhci_usb2_update_wake_event(mmio_base))
+ event_found = true;
+
+ if (pch_xhci_usb3_update_wake_event(mmio_base))
+ event_found = true;
+
+ return event_found;
+}
+
struct pme_status_info {
int devfn;
uint8_t reg_offset;
@@ -44,6 +177,19 @@ struct pme_status_info {
#define PME_STS_BIT (1 << 15)
+static void pch_log_add_elog_event(const struct pme_status_info *info,
+ device_t dev)
+{
+ /*
+ * If wake source is XHCI, check for detailed wake source events on
+ * USB2/3 ports.
+ */
+ if ((info->devfn == PCH_DEVFN_XHCI) && pch_xhci_update_wake_event(dev))
+ return;
+
+ elog_add_event_wake(info->elog_event, 0);
+}
+
static void pch_log_pme_internal_wake_source(void)
{
size_t i;
@@ -87,7 +233,7 @@ static void pch_log_pme_internal_wake_source(void)
if ((val == 0xFFFF) || !(val & PME_STS_BIT))
continue;
- elog_add_event_wake(pme_status_info[i].elog_event, 0);
+ pch_log_add_elog_event(&pme_status_info[i], dev);
dev_found = true;
}