[coreboot-gerrit] Patch set updated for coreboot: soc/intel/{sky, apollo}lake: Wait until GPE is clear when reading

[Duncan Laurie (dlaurie@chromium.org)]

Duncan Laurie (dlaurie at chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17212

-gerrit

commit 66fe38ce9e5886b008cd6d8abdf83071e1f8284c
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Thu Nov 3 10:33:43 2016 -0700

    soc/intel/{sky,apollo}lake: Wait until GPE is clear when reading
    
    When reading+clearing a GPE for use as an interrupt we need to
    re-read the status register and keep setting the clear bit until
    it actually reads back clear.  Also add a 1ms timeout in case the
    status never clears.
    
    This is needed if a device sends a longer interrupt pulse and it
    is still asserted when the "ISR" goes to clear the status.
    
    BUG=chrome-os-partner:59299
    TEST=test cr50 TPM with 20us pulse to ensure it can successfully
    communicate with the TPM and does not get confused due to seeing
    interrupts that it should not.
    
    Change-Id: I384f484a1728038d3a355586146deee089b22dd9
    Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
---
 src/soc/intel/apollolake/pmutil.c | 23 +++++++++++++++++------
 src/soc/intel/skylake/pmutil.c    | 23 +++++++++++++++++------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index 80aaf71..c88e5ae 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -29,6 +29,7 @@
 #include <soc/pm.h>
 #include <device/device.h>
 #include <device/pci.h>
+#include <timer.h>
 #include <vboot/vboot_common.h>
 #include "chip.h"
 
@@ -306,6 +307,8 @@ int acpi_get_gpe(int gpe)
 {
 	int bank;
 	uint32_t mask, sts;
+	struct stopwatch sw;
+	int rc = 0;
 
 	if (gpe < 0 || gpe > GPE0_DW3_31)
 		return -1;
@@ -313,12 +316,20 @@ int acpi_get_gpe(int gpe)
 	bank = gpe / 32;
 	mask = 1 << (gpe % 32);
 
-	sts = inl(ACPI_PMIO_BASE + GPE0_STS(bank));
-	if (sts & mask) {
-		outl(mask, ACPI_PMIO_BASE + GPE0_STS(bank));
-		return 1;
-	}
-	return 0;
+	/* Wait up to 1ms for GPE status to clear */
+	stopwatch_init_msecs_expire(&sw, 1);
+	do {
+		if (stopwatch_expired(&sw))
+			return rc;
+
+		sts = inl(ACPI_PMIO_BASE + GPE0_STS(bank));
+		if (sts & mask) {
+			outl(mask, ACPI_PMIO_BASE + GPE0_STS(bank));
+			rc = 1;
+		}
+	} while (sts & mask);
+
+	return rc;
 }
 
 void clear_pmc_status(void)
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index 203a430..73dc117 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -37,6 +37,7 @@
 #include <soc/pm.h>
 #include <soc/pmc.h>
 #include <soc/smbus.h>
+#include <timer.h>
 #include "chip.h"
 
 /* Print status bits with descriptive names */
@@ -361,6 +362,8 @@ int acpi_get_gpe(int gpe)
 {
 	int bank;
 	uint32_t mask, sts;
+	struct stopwatch sw;
+	int rc = 0;
 
 	if (gpe < 0 || gpe > GPE0_WADT)
 		return -1;
@@ -368,12 +371,20 @@ int acpi_get_gpe(int gpe)
 	bank = gpe / 32;
 	mask = 1 << (gpe % 32);
 
-	sts = inl(ACPI_BASE_ADDRESS + GPE0_STS(bank));
-	if (sts & mask) {
-		outl(mask, ACPI_BASE_ADDRESS + GPE0_STS(bank));
-		return 1;
-	}
-	return 0;
+	/* Wait up to 1ms for GPE status to clear */
+	stopwatch_init_msecs_expire(&sw, 1);
+	do {
+		if (stopwatch_expired(&sw))
+			return rc;
+
+		sts = inl(ACPI_BASE_ADDRESS + GPE0_STS(bank));
+		if (sts & mask) {
+			outl(mask, ACPI_BASE_ADDRESS + GPE0_STS(bank));
+			rc = 1;
+		}
+	} while (sts & mask);
+
+	return rc;
 }
 
 /* Enable all requested GPE */