[coreboot-gerrit] Change in coreboot[master]: nb/intel/fsp_sandybridge/gma: Set ASLS on S3 resume

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/20286


Change subject: nb/intel/fsp_sandybridge/gma: Set ASLS on S3 resume
......................................................................

nb/intel/fsp_sandybridge/gma: Set ASLS on S3 resume

Set ASLS on S3 resume, too.
Use new GMA driver method to set ASLS.

Change-Id: I772d680774890c32ca6dc9b1e2143b3ab3bf6513
Signed-off-by: Patrick Rudolph <siro at das-labor.org>
---
M src/northbridge/intel/fsp_sandybridge/gma.c
1 file changed, 20 insertions(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/20286/1

diff --git a/src/northbridge/intel/fsp_sandybridge/gma.c b/src/northbridge/intel/fsp_sandybridge/gma.c
index 8e2d968..9cf2537 100644
--- a/src/northbridge/intel/fsp_sandybridge/gma.c
+++ b/src/northbridge/intel/fsp_sandybridge/gma.c
@@ -104,6 +104,25 @@
 	outw(DEFAULT_PMBASE + GPE0_EN, reg16);
 }
 
+static void gma_init(struct device *dev)
+{
+	pci_dev_init(dev);
+
+	if (acpi_is_wakeup_s3()) {
+		/* GNVS has been already set up */
+		const global_nvs_t *gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
+
+		if (gnvs && gnvs->aslb) {
+			gma_enable_swsci();
+
+			/* Provide ACPI OpRegion address */
+			intel_gma_opregion_register((uintptr_t)gnvs->aslb);
+		} else {
+			printk(BIOS_ERR, "Error: GNVS table not found.\n");
+		}
+	}
+}
+
 static unsigned long
 gma_write_acpi_tables(struct device *const dev,
 		      unsigned long current,
@@ -141,7 +160,7 @@
 	.set_resources		= pci_dev_set_resources,
 	.enable_resources	= pci_dev_enable_resources,
 	.acpi_fill_ssdt_generator = gma_ssdt,
-	.init			= pci_dev_init,
+	.init			= gma_init,
 	.scan_bus		= 0,
 	.enable			= 0,
 	.ops_pci		= &gma_pci_ops,

-- 
To view, visit https://review.coreboot.org/20286
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I772d680774890c32ca6dc9b1e2143b3ab3bf6513
Gerrit-Change-Number: 20286
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Rudolph <siro at das-labor.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170620/9d671e69/attachment.html>