Commit 44556530 authored by Zhimin Gu's avatar Zhimin Gu Committed by Rafael J. Wysocki
Browse files

x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER on 32bit system 



Enable CONFIG_ARCH_HIBERNATION_HEADER for 32bit system so that

1. arch_hibernation_header_save/restore() are invoked across
   hibernation on 32bit system.

2. The checksum handling as well as 'magic' number checking
   for 32bit system are enabled.

Controlled by CONFIG_X86_64 in hibernate.c

Signed-off-by: default avatarZhimin Gu <kookoo.gu@intel.com>
Signed-off-by: default avatarChen Yu <yu.c.chen@intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 25862a04

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2422,7 +2422,7 @@ menu "Power management and ACPI options" 


config ARCH_HIBERNATION_HEADER

	def_bool y

	depends on X86_64 && HIBERNATION

	depends on HIBERNATION



source "kernel/power/Kconfig"

arch/x86/power/hibernate.c

+9 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ int pfn_is_nosave(unsigned long pfn) 
	return pfn >= nosave_begin_pfn && pfn < nosave_end_pfn;

}



#ifdef CONFIG_X86_64



#define MD5_DIGEST_SIZE 16
@@ -140,7 +139,11 @@ static bool hibernation_e820_mismatch(void *buf) 
}

#endif



#ifdef CONFIG_X86_64

#define RESTORE_MAGIC	0x23456789ABCDEF01UL

#else

#define RESTORE_MAGIC	0x12345678UL

#endif



/**

 *	arch_hibernation_header_save - populate the architecture specific part
@@ -154,6 +157,7 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) 
	if (max_size < sizeof(struct restore_data_record))

		return -EOVERFLOW;

	rdr->magic = RESTORE_MAGIC;

#ifdef CONFIG_X86_64

	rdr->jump_address = (unsigned long)restore_registers;

	rdr->jump_address_phys = __pa_symbol(restore_registers);
@@ -175,6 +179,7 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) 
	 * have any of the PCID bits set.

	 */

	rdr->cr3 = restore_cr3 & ~CR3_PCID_MASK;

#endif



	return hibernation_e820_save(rdr->e820_digest);

}
@@ -193,9 +198,11 @@ int arch_hibernation_header_restore(void *addr) 
		return -EINVAL;

	}



#ifdef CONFIG_X86_64

	restore_jump_address = rdr->jump_address;

	jump_address_phys = rdr->jump_address_phys;

	restore_cr3 = rdr->cr3;

#endif



	if (hibernation_e820_mismatch(rdr->e820_digest)) {

		pr_crit("Hibernate inconsistent memory map detected!\n");
@@ -205,6 +212,7 @@ int arch_hibernation_header_restore(void *addr) 
	return 0;

}



#ifdef CONFIG_X86_64

int relocate_restore_code(void)

{

	pgd_t *pgd;