Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef8b03fa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Thomas Gleixner
Browse files

x86 PM: consolidate suspend and hibernation code 



Move the hibernation-specific code from arch/x86/power/suspend_64.c
to a separate file (hibernate_64.c) and the CPU-handling code to
cpu_64.c (in line with the corresponding 32-bit code).

Simplify arch/x86/power/Makefile .

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c5759124

arch/x86/power/Makefile

+2 −7
Original line number Diff line number Diff line 
ifeq ($(CONFIG_X86_64),y)

        obj-$(CONFIG_PM)		+= suspend_64.o

        obj-$(CONFIG_HIBERNATION)	+= hibernate_asm_64.o

else

	obj-$(CONFIG_PM)		+= cpu_32.o

	obj-$(CONFIG_HIBERNATION)	+= hibernate_32.o hibernate_asm_32.o

endif
 
obj-$(CONFIG_PM_SLEEP)		+= cpu_$(BITS).o

obj-$(CONFIG_HIBERNATION)	+= hibernate_$(BITS).o hibernate_asm_$(BITS).o

arch/x86/power/suspend_64.c→arch/x86/power/cpu_64.c

+0 −155
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
#include <asm/pgtable.h>

#include <asm/mtrr.h>



/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



static void fix_processor_context(void);



struct saved_context saved_context;
@@ -167,155 +164,3 @@ static void fix_processor_context(void) 
                loaddebug(&current->thread, 7);

	}

}
 


#ifdef CONFIG_HIBERNATION

/* Defined in arch/x86_64/kernel/suspend_asm.S */

extern int restore_image(void);



/*

 * Address to jump to in the last phase of restore in order to get to the image

 * kernel's text (this value is passed in the image header).

 */

unsigned long restore_jump_address;



/*

 * Value of the cr3 register from before the hibernation (this value is passed

 * in the image header).

 */

unsigned long restore_cr3;



pgd_t *temp_level4_pgt;



void *relocated_restore_code;



static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)

{

	long i, j;



	i = pud_index(address);

	pud = pud + i;

	for (; i < PTRS_PER_PUD; pud++, i++) {

		unsigned long paddr;

		pmd_t *pmd;



		paddr = address + i*PUD_SIZE;

		if (paddr >= end)

			break;



		pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);

		if (!pmd)

			return -ENOMEM;

		set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));

		for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) {

			unsigned long pe;



			if (paddr >= end)

				break;

			pe = __PAGE_KERNEL_LARGE_EXEC | paddr;

			pe &= __supported_pte_mask;

			set_pmd(pmd, __pmd(pe));

		}

	}

	return 0;

}



static int set_up_temporary_mappings(void)

{

	unsigned long start, end, next;

	int error;



	temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);

	if (!temp_level4_pgt)

		return -ENOMEM;



	/* It is safe to reuse the original kernel mapping */

	set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),

		init_level4_pgt[pgd_index(__START_KERNEL_map)]);



	/* Set up the direct mapping from scratch */

	start = (unsigned long)pfn_to_kaddr(0);

	end = (unsigned long)pfn_to_kaddr(end_pfn);



	for (; start < end; start = next) {

		pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);

		if (!pud)

			return -ENOMEM;

		next = start + PGDIR_SIZE;

		if (next > end)

			next = end;

		if ((error = res_phys_pud_init(pud, __pa(start), __pa(next))))

			return error;

		set_pgd(temp_level4_pgt + pgd_index(start),

			mk_kernel_pgd(__pa(pud)));

	}

	return 0;

}



int swsusp_arch_resume(void)

{

	int error;



	/* We have got enough memory and from now on we cannot recover */

	if ((error = set_up_temporary_mappings()))

		return error;



	relocated_restore_code = (void *)get_safe_page(GFP_ATOMIC);

	if (!relocated_restore_code)

		return -ENOMEM;

	memcpy(relocated_restore_code, &core_restore_code,

	       &restore_registers - &core_restore_code);



	restore_image();

	return 0;

}



/*

 *	pfn_is_nosave - check if given pfn is in the 'nosave' section

 */



int pfn_is_nosave(unsigned long pfn)

{

	unsigned long nosave_begin_pfn = __pa_symbol(&__nosave_begin) >> PAGE_SHIFT;

	unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT;

	return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);

}



struct restore_data_record {

	unsigned long jump_address;

	unsigned long cr3;

	unsigned long magic;

};



#define RESTORE_MAGIC	0x0123456789ABCDEFUL



/**

 *	arch_hibernation_header_save - populate the architecture specific part

 *		of a hibernation image header

 *	@addr: address to save the data at

 */

int arch_hibernation_header_save(void *addr, unsigned int max_size)

{

	struct restore_data_record *rdr = addr;



	if (max_size < sizeof(struct restore_data_record))

		return -EOVERFLOW;

	rdr->jump_address = restore_jump_address;

	rdr->cr3 = restore_cr3;

	rdr->magic = RESTORE_MAGIC;

	return 0;

}



/**

 *	arch_hibernation_header_restore - read the architecture specific data

 *		from the hibernation image header

 *	@addr: address to read the data from

 */

int arch_hibernation_header_restore(void *addr)

{

	struct restore_data_record *rdr = addr;



	restore_jump_address = rdr->jump_address;

	restore_cr3 = rdr->cr3;

	return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;

}

#endif /* CONFIG_HIBERNATION */

arch/x86/power/hibernate_64.c

0 → 100644
+169 −0
Original line number Diff line number Diff line 
/*

 * Hibernation support for x86-64

 *

 * Distribute under GPLv2

 *

 * Copyright (c) 2007 Rafael J. Wysocki <rjw@sisk.pl>

 * Copyright (c) 2002 Pavel Machek <pavel@suse.cz>

 * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>

 */



#include <linux/smp.h>

#include <linux/suspend.h>

#include <asm/proto.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/mtrr.h>



/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



/* Defined in arch/x86_64/kernel/suspend_asm.S */

extern int restore_image(void);



/*

 * Address to jump to in the last phase of restore in order to get to the image

 * kernel's text (this value is passed in the image header).

 */

unsigned long restore_jump_address;



/*

 * Value of the cr3 register from before the hibernation (this value is passed

 * in the image header).

 */

unsigned long restore_cr3;



pgd_t *temp_level4_pgt;



void *relocated_restore_code;



static int res_phys_pud_init(pud_t *pud, unsigned long address, unsigned long end)

{

	long i, j;



	i = pud_index(address);

	pud = pud + i;

	for (; i < PTRS_PER_PUD; pud++, i++) {

		unsigned long paddr;

		pmd_t *pmd;



		paddr = address + i*PUD_SIZE;

		if (paddr >= end)

			break;



		pmd = (pmd_t *)get_safe_page(GFP_ATOMIC);

		if (!pmd)

			return -ENOMEM;

		set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));

		for (j = 0; j < PTRS_PER_PMD; pmd++, j++, paddr += PMD_SIZE) {

			unsigned long pe;



			if (paddr >= end)

				break;

			pe = __PAGE_KERNEL_LARGE_EXEC | paddr;

			pe &= __supported_pte_mask;

			set_pmd(pmd, __pmd(pe));

		}

	}

	return 0;

}



static int set_up_temporary_mappings(void)

{

	unsigned long start, end, next;

	int error;



	temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);

	if (!temp_level4_pgt)

		return -ENOMEM;



	/* It is safe to reuse the original kernel mapping */

	set_pgd(temp_level4_pgt + pgd_index(__START_KERNEL_map),

		init_level4_pgt[pgd_index(__START_KERNEL_map)]);



	/* Set up the direct mapping from scratch */

	start = (unsigned long)pfn_to_kaddr(0);

	end = (unsigned long)pfn_to_kaddr(end_pfn);



	for (; start < end; start = next) {

		pud_t *pud = (pud_t *)get_safe_page(GFP_ATOMIC);

		if (!pud)

			return -ENOMEM;

		next = start + PGDIR_SIZE;

		if (next > end)

			next = end;

		if ((error = res_phys_pud_init(pud, __pa(start), __pa(next))))

			return error;

		set_pgd(temp_level4_pgt + pgd_index(start),

			mk_kernel_pgd(__pa(pud)));

	}

	return 0;

}



int swsusp_arch_resume(void)

{

	int error;



	/* We have got enough memory and from now on we cannot recover */

	if ((error = set_up_temporary_mappings()))

		return error;



	relocated_restore_code = (void *)get_safe_page(GFP_ATOMIC);

	if (!relocated_restore_code)

		return -ENOMEM;

	memcpy(relocated_restore_code, &core_restore_code,

	       &restore_registers - &core_restore_code);



	restore_image();

	return 0;

}



/*

 *	pfn_is_nosave - check if given pfn is in the 'nosave' section

 */



int pfn_is_nosave(unsigned long pfn)

{

	unsigned long nosave_begin_pfn = __pa_symbol(&__nosave_begin) >> PAGE_SHIFT;

	unsigned long nosave_end_pfn = PAGE_ALIGN(__pa_symbol(&__nosave_end)) >> PAGE_SHIFT;

	return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn);

}



struct restore_data_record {

	unsigned long jump_address;

	unsigned long cr3;

	unsigned long magic;

};



#define RESTORE_MAGIC	0x0123456789ABCDEFUL



/**

 *	arch_hibernation_header_save - populate the architecture specific part

 *		of a hibernation image header

 *	@addr: address to save the data at

 */

int arch_hibernation_header_save(void *addr, unsigned int max_size)

{

	struct restore_data_record *rdr = addr;



	if (max_size < sizeof(struct restore_data_record))

		return -EOVERFLOW;

	rdr->jump_address = restore_jump_address;

	rdr->cr3 = restore_cr3;

	rdr->magic = RESTORE_MAGIC;

	return 0;

}



/**

 *	arch_hibernation_header_restore - read the architecture specific data

 *		from the hibernation image header

 *	@addr: address to read the data from

 */

int arch_hibernation_header_restore(void *addr)

{

	struct restore_data_record *rdr = addr;



	restore_jump_address = rdr->jump_address;

	restore_cr3 = rdr->cr3;

	return (rdr->magic == RESTORE_MAGIC) ? 0 : -EINVAL;

}