lynxpoint: Move ACPI NVS into separate CBMEM table
The ACPI NVS region was setup in place and there was a CBMEM table that pointed to it. In order to be able to use NVS earlier the CBMEM region is allocated for NVS itself during the LPC device init and the ACPI tables point to it in CBMEM. The current cbmem region is renamed to ACPI_GNVS_PTR to indicate that it is really a pointer to the GNVS and does not actually contain the GNVS. Change-Id: I31ace432411c7f825d86ca75c63dd79cd658e891 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/2970 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
		
				
					committed by
					
						 Ronald G. Minnich
						Ronald G. Minnich
					
				
			
			
				
	
			
			
			
						parent
						
							ebf142a12c
						
					
				
				
					commit
					9c07c8f53d
				
			| @@ -630,7 +630,7 @@ void suspend_resume(void) | ||||
| 	wake_vec = acpi_find_wakeup_vector(); | ||||
| 	if (wake_vec) { | ||||
| #if CONFIG_HAVE_SMI_HANDLER | ||||
| 		u32 *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS); | ||||
| 		u32 *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS_PTR); | ||||
|  | ||||
| 		/* Restore GNVS pointer in SMM if found */ | ||||
| 		if (gnvs_address && *gnvs_address) { | ||||
| @@ -798,7 +798,7 @@ void acpi_jump_to_wakeup(void *vector) | ||||
|  | ||||
| void acpi_save_gnvs(u32 gnvs_address) | ||||
| { | ||||
| 	u32 *gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(*gnvs)); | ||||
| 	u32 *gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS_PTR, sizeof(*gnvs)); | ||||
| 	if (gnvs) | ||||
| 		*gnvs = gnvs_address; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user