Patchwork Add SB700 suspend/resume code

login
register
about
Submitter Rudolf Marek
Date 2010-12-04 21:55:04
Message ID <4CFAB8B8.1040609@assembler.cz>
Download mbox | patch
Permalink /patch/2395/
State Superseded
Headers show

Comments

Rudolf Marek - 2010-12-04 21:55:04
Hello,

Following patch adds support for suspend/resume functions. I had to change the 
get_cbmem_toc because macro magic did not work well.

The writes to NVRAM are not used in asrock board (k8 pre rev f) but they should 
work when used with am2 boards. In fact maybe the suspend will work on mahogany 
or others ;) - with some  simple patch which follows for asrock.

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>

Thanks,
Rudolf

Patch

Index: coreboot/src/southbridge/amd/sb700/sb700.h
===================================================================
--- coreboot.orig/src/southbridge/amd/sb700/sb700.h	2010-12-04 21:01:59.000000000 +0100
+++ coreboot/src/southbridge/amd/sb700/sb700.h	2010-12-04 22:21:45.000000000 +0100
@@ -24,6 +24,8 @@ 
 #include "chip.h"
 
 /* Power management index/data registers */
+#define BIOSRAM_INDEX	0xcd4
+#define BIOSRAM_DATA	0xcd5
 #define PM_INDEX	0xcd6
 #define PM_DATA		0xcd7
 #define PM2_INDEX	0xcd0
@@ -68,5 +70,8 @@ 
 
 #endif
 
+int s3_save_nvram_early(u32 dword, int size, int  nvram_pos);
+int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
+
 void sb700_enable_usbdebug(unsigned int port);
 #endif /* SB700_H */
Index: coreboot/src/southbridge/amd/sb700/sb700_early_setup.c
===================================================================
--- coreboot.orig/src/southbridge/amd/sb700/sb700_early_setup.c	2010-12-04 21:02:23.000000000 +0100
+++ coreboot/src/southbridge/amd/sb700/sb700_early_setup.c	2010-12-04 22:22:12.000000000 +0100
@@ -22,6 +22,7 @@ 
 
 #include <reset.h>
 #include <arch/cpu.h>
+#include <cbmem.h>
 #include "sb700.h"
 #include "sb700_smbus.c"
 
@@ -40,6 +41,33 @@ 
 	return inb(PM_INDEX + 1);
 }
 
+static void sb700_acpi_init(void) {
+	pmio_write(0x20, ACPI_PM_EVT_BLK & 0xFF);
+	pmio_write(0x21, ACPI_PM_EVT_BLK >> 8);
+	pmio_write(0x22, ACPI_PM1_CNT_BLK & 0xFF);
+	pmio_write(0x23, ACPI_PM1_CNT_BLK >> 8);
+	pmio_write(0x24, ACPI_PM_TMR_BLK & 0xFF);
+	pmio_write(0x25, ACPI_PM_TMR_BLK >> 8);
+	pmio_write(0x28, ACPI_GPE0_BLK & 0xFF);
+	pmio_write(0x29, ACPI_GPE0_BLK >> 8);
+
+	/* CpuControl is in \_PR.CPU0, 6 bytes */
+	pmio_write(0x26, ACPI_CPU_CONTROL & 0xFF);
+	pmio_write(0x27, ACPI_CPU_CONTROL >> 8);
+
+	pmio_write(0x2A, 0);	/* AcpiSmiCmdLo */
+	pmio_write(0x2B, 0);	/* AcpiSmiCmdHi */
+
+	pmio_write(0x2C, ACPI_PMA_CNT_BLK & 0xFF);
+	pmio_write(0x2D, ACPI_PMA_CNT_BLK >> 8);
+
+	pmio_write(0x0E, 1<<3 | 0<<2); /* AcpiDecodeEnable, When set, SB uses
+					* the contents of the PM registers at
+					* index 20-2B to decode ACPI I/O address.
+					* AcpiSmiEn & SmiCmdEn*/
+	pmio_write(0x10, 1<<1 | 1<<3| 1<<5); /* RTC_En_En, TMR_En_En, GBL_EN_EN */
+}
+
 /* RPR 2.28: Get SB ASIC Revision. */
 static u8 set_sb700_revision(void)
 {
@@ -610,10 +638,61 @@ 
 {
 	printk(BIOS_INFO, "sb700_early_setup()\n");
 	sb700_por_init();
+	sb700_acpi_init();
 }
 
 static int smbus_read_byte(u32 device, u32 address)
 {
 	return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
 }
+
+int s3_save_nvram_early(u32 dword, int size, int  nvram_pos) {
+	int i;
+	printk(BIOS_DEBUG, "Writing %x of size %d to nvram pos: %d\n", dword, size, nvram_pos);
+
+	for (i = 0; i<size; i++) {
+		outb(nvram_pos, BIOSRAM_INDEX);
+		outb((dword >>(8 * i)) & 0xff , BIOSRAM_DATA);
+		nvram_pos++;
+	}
+
+	return nvram_pos;
+}
+
+int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) {
+	u32 data = *old_dword;
+	int i;
+	for (i = 0; i<size; i++) {
+		outb(nvram_pos, BIOSRAM_INDEX);
+		data &= ~(0xff << (i * 8));
+		data |= inb(BIOSRAM_DATA) << (i *8);
+		nvram_pos++;
+	}
+	*old_dword = data;
+	printk(BIOS_DEBUG, "Loading %x of size %d to nvram pos:%d\n", *old_dword, size,
+		nvram_pos-size);
+	return nvram_pos;
+}
+
+#if CONFIG_HAVE_ACPI_RESUME == 1
+static int acpi_is_wakeup_early(void) {
+	u16 tmp;
+	tmp = inw(ACPI_PM1_CNT_BLK);
+	printk(BIOS_DEBUG, "IN TEST WAKEUP %x\n", tmp);
+	return ((tmp & (7 << 10)) >> 10);
+}
+#endif
+
+struct cbmem_entry *get_cbmem_toc(void) {
+	uint32_t xdata = 0;
+	int xnvram_pos = 0xfc, xi;
+	for (xi = 0; xi<4; xi++) {
+		outb(xnvram_pos, BIOSRAM_INDEX);
+		xdata &= ~(0xff << (xi * 8));
+		xdata |= inb(BIOSRAM_DATA) << (xi *8);
+		xnvram_pos++;
+	}
+	return (struct cbmem_entry *) xdata;
+}
+
 #endif
Index: coreboot/src/southbridge/amd/sb700/sb700_lpc.c
===================================================================
--- coreboot.orig/src/southbridge/amd/sb700/sb700_lpc.c	2010-12-04 21:02:56.000000000 +0100
+++ coreboot/src/southbridge/amd/sb700/sb700_lpc.c	2010-12-04 21:12:29.000000000 +0100
@@ -28,6 +28,7 @@ 
 #include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
+#include <cbmem.h>
 #include "sb700.h"
 
 static void lpc_init(device_t dev)
@@ -63,6 +64,27 @@ 
 	byte = pci_read_config8(dev, 0x78);
 	byte &= ~(1 << 1);
 	pci_write_config8(dev, 0x78, byte);
+
+	/* hack, but the whole sb700 startup lacks any device which
+	   is doing the acpi init */
+#if CONFIG_HAVE_ACPI_RESUME == 1
+	{
+	extern u8 acpi_slp_type;
+	u16 tmp = inw(ACPI_PM1_CNT_BLK);
+	acpi_slp_type = ((tmp & (7 << 10)) >> 10);
+	printk(BIOS_DEBUG, "SLP_TYP type was %x\n", acpi_slp_type);
+	}
+#endif
+}
+
+void set_cbmem_toc(struct cbmem_entry *toc) {
+	u32 dword = (u32) toc;
+	int nvram_pos = 0xfc, i;
+	for (i = 0; i<4; i++) {
+		outb(nvram_pos, BIOSRAM_INDEX);
+		outb((dword >>(8 * i)) & 0xff , BIOSRAM_DATA);
+		nvram_pos++;
+	}
 }
 
 static void sb700_lpc_read_resources(device_t dev)
Index: coreboot/src/southbridge/amd/sb700/sb700_fadt.c
===================================================================
--- coreboot.orig/src/southbridge/amd/sb700/sb700_fadt.c	2010-12-04 21:05:34.000000000 +0100
+++ coreboot/src/southbridge/amd/sb700/sb700_fadt.c	2010-12-04 21:05:56.000000000 +0100
@@ -55,33 +55,6 @@ 
 	fadt->acpi_disable = 0xf1;
 	fadt->s4bios_req = 0x0;
 	fadt->pstate_cnt = 0xe2;
-
-	pm_iowrite(0x20, ACPI_PM_EVT_BLK & 0xFF);
-	pm_iowrite(0x21, ACPI_PM_EVT_BLK >> 8);
-	pm_iowrite(0x22, ACPI_PM1_CNT_BLK & 0xFF);
-	pm_iowrite(0x23, ACPI_PM1_CNT_BLK >> 8);
-	pm_iowrite(0x24, ACPI_PM_TMR_BLK & 0xFF);
-	pm_iowrite(0x25, ACPI_PM_TMR_BLK >> 8);
-	pm_iowrite(0x28, ACPI_GPE0_BLK & 0xFF);
-	pm_iowrite(0x29, ACPI_GPE0_BLK >> 8);
-
-	/* CpuControl is in \_PR.CPU0, 6 bytes */
-	pm_iowrite(0x26, ACPI_CPU_CONTROL & 0xFF);
-	pm_iowrite(0x27, ACPI_CPU_CONTROL >> 8);
-
-	pm_iowrite(0x2A, 0);	/* AcpiSmiCmdLo */
-	pm_iowrite(0x2B, 0);	/* AcpiSmiCmdHi */
-
-	pm_iowrite(0x2C, ACPI_PMA_CNT_BLK & 0xFF);
-	pm_iowrite(0x2D, ACPI_PMA_CNT_BLK >> 8);
-
-	pm_iowrite(0x0E, 1<<3 | 0<<2); /* AcpiDecodeEnable, When set, SB uses
-					* the contents of the PM registers at
-					* index 20-2B to decode ACPI I/O address.
-					* AcpiSmiEn & SmiCmdEn*/
-	pm_iowrite(0x10, 1<<1 | 1<<3| 1<<5); /* RTC_En_En, TMR_En_En, GBL_EN_EN */
-	outl(0x1, ACPI_PM1_CNT_BLK);		  /* set SCI_EN */
-
 	fadt->pm1a_evt_blk = ACPI_PM_EVT_BLK;
 	fadt->pm1b_evt_blk = 0x0000;
 	fadt->pm1a_cnt_blk = ACPI_PM1_CNT_BLK;
Index: coreboot/src/lib/cbmem.c
===================================================================
--- coreboot.orig/src/lib/cbmem.c	2010-12-04 21:34:01.000000000 +0100
+++ coreboot/src/lib/cbmem.c	2010-12-04 21:46:14.000000000 +0100
@@ -37,18 +37,7 @@ 
 } __attribute__((packed));
 
 
-#ifdef __PRE_RAM__
-
-/* note this should be done as weak function but we do #include
-   of C files in the romstage breaking this (in same compile
-   unit is weak and non weak function
-struct cbmem_entry *__attribute__((weak)) get_cbmem_toc(void)
-*/
-//#ifndef get_cbmem_toc
-//	#define get_cbmem_toc()	(struct cbmem_entry *)(get_top_of_ram() - HIGH_MEMORY_SIZE)
-//#endif
-
-#else
+#ifndef __PRE_RAM__
 
 static struct cbmem_entry *bss_cbmem_toc;
 
Index: coreboot/src/southbridge/via/k8t890/k8t890_early_car.c
===================================================================
--- coreboot.orig/src/southbridge/via/k8t890/k8t890_early_car.c	2010-12-04 21:46:34.000000000 +0100
+++ coreboot/src/southbridge/via/k8t890/k8t890_early_car.c	2010-12-04 21:56:47.000000000 +0100
@@ -154,8 +154,6 @@ 
 	return nvram_pos;
 }
 
-/* this should be a function
 struct cbmem_entry *get_cbmem_toc(void) {
-*/
-
-#define get_cbmem_toc() ((struct cbmem_entry *) inl(K8T890_NVRAM_IO_BASE+K8T890_NVRAM_CBMEM_TOC))
+	return (struct cbmem_entry *) inl(K8T890_NVRAM_IO_BASE+K8T890_NVRAM_CBMEM_TOC);
+}
Index: coreboot/src/northbridge/intel/i945/raminit.h
===================================================================
--- coreboot.orig/src/northbridge/intel/i945/raminit.h	2010-12-04 21:59:51.000000000 +0100
+++ coreboot/src/northbridge/intel/i945/raminit.h	2010-12-04 22:08:24.000000000 +0100
@@ -71,5 +71,4 @@ 
 unsigned long get_top_of_ram(void);
 int fixup_i945_errata(void);
 void udelay(u32 us);
-
 #endif				/* RAMINIT_H */
Index: coreboot/src/northbridge/intel/i945/raminit.c
===================================================================
--- coreboot.orig/src/northbridge/intel/i945/raminit.c	2010-12-04 22:06:35.000000000 +0100
+++ coreboot/src/northbridge/intel/i945/raminit.c	2010-12-04 22:07:07.000000000 +0100
@@ -26,6 +26,11 @@ 
 #include <arch/romcc_io.h>
 #include "raminit.h"
 #include "i945.h"
+#include <cbmem.h>
+
+struct cbmem_entry *get_cbmem_toc(void) {
+	return (struct cbmem_entry *)(get_top_of_ram() - HIGH_MEMORY_SIZE);
+}
 
 /* Debugging macros. */
 #if CONFIG_DEBUG_RAM_SETUP