AGESA: Common agesawrapper for S3 resume

Change-Id: I27cd073331659e47d241a0ce249b2d080b4bab5c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7162
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Tested-by: build bot (Jenkins)
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index a98d1e9..54a5c69 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -698,9 +698,12 @@
 		AGESAWRAPPER(fchs3laterestore);
 
 	/* Must be called after PCI enumeration and resource allocation */
-	if (!acpi_is_wakeup_s3())
-		AGESAWRAPPER(amdinitmid);
+	if (!acpi_is_wakeup_s3()) {
+		/* Enable MMIO on AMD CPU Address Map Controller */
+		agesawrapper_amdinitcpuio();
 
+		AGESAWRAPPER(amdinitmid);
+	}
 	printk(BIOS_DEBUG, "  ader - leaving %s.\n", __func__);
 }