x86 PM: Consolidate suspend and hibernation code
Subsystems (2)
cover x86 PM: Consolidate suspend and hibernation code
Hi,
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files to arch/x86/power (under different names)
- rename 32-bit files in arch/x86/power in line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify the Makefile
- fix up comments
Details are in the changelogs.
These patches don't introduce any functional changes.
Please review (and consider for merging if they look good :-)).
Thanks,
Rafael
Signature · 1 line
"Premature optimization is the root of all evil." - Donald Knuth
PATCH 1/4 x86 PM: Move 64-bit hibernation files to arch/x86/power
From: Rafael J. Wysocki <[email protected]>
Move arch/x86/kernel/suspend_64.c to arch/x86/power .
Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power as hibernate_asm_64.S .
Update purpose and copyright information inarch/x86/power/suspend_64.c andarch/x86/power/hibernate_asm_64.S .
Update the Makefiles in arch/x86, arch/x86/kernel and arch/x86/power to reflect the above changes.
--- arch/x86/Makefile | 4 arch/x86/kernel/Makefile | 2 arch/x86/kernel/suspend_64.c | 320 ------------------------------------- arch/x86/kernel/suspend_asm_64.S | 141 ---------------- arch/x86/power/Makefile | 9 - arch/x86/power/hibernate_asm_64.S | 146 +++++++++++++++++ arch/x86/power/suspend_64.c | 321 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 477 insertions(+), 466 deletions(-)
arch/x86/kernel/suspend_64.c deleted +0 -320
@@ -1,320 +0,0 @@ -/* -* Suspend support specific for i386. -* -* Distribute under GPLv2 -* -* Copyright (c) 2002 Pavel Machek <[email protected]> -* Copyright (c) 2001 Patrick Mochel <[email protected]> -*/ - -#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; - -static void fix_processor_context (void ); - -struct saved_context saved_context; - -/** -* __save_processor_state - save CPU registers before creating a -* hibernation image and before restoring the memory state from it -* @ctxt - structure to store the registers contents in -* -* NOTE: If there is a CPU register the modification of which by the -* boot kernel (ie. the kernel used for loading the hibernation image) -* might affect the operations of the restored target kernel (ie. the one -* saved in the hibernation image), then its contents must be saved by this -* function. In other words, if kernel A is hibernated and different -* kernel B is used for loading the hibernation image into memory, the -* kernel A's __save_processor_state() function must save all registers -* needed by kernel A, so that it can operate correctly after the resume -* regardless of what kernel B does in the meantime. -*/ -static void __save_processor_state (struct saved_context *ctxt) -{ -kernel_fpu_begin (); - -/* -* descriptor tables -*/ -store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); -store_idt ((struct desc_ptr *)&ctxt->idt_limit); -store_tr (ctxt->tr); - -/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ -/* -* segment registers -*/ - asmvolatile ("movw %%ds, %0" :"=m" (ctxt->ds)); - asmvolatile ("movw %%es, %0" :"=m" (ctxt->es)); - asmvolatile ("movw %%fs, %0" :"=m" (ctxt->fs)); - asmvolatile ("movw %%gs, %0" :"=m" (ctxt->gs)); - asmvolatile ("movw %%ss, %0" :"=m" (ctxt->ss)); - -rdmsrl (MSR_FS_BASE , ctxt->fs_base); -rdmsrl (MSR_GS_BASE , ctxt->gs_base); -rdmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); -mtrr_save_fixed_ranges (NULL ); - -/* -* control registers -*/ -rdmsrl (MSR_EFER , ctxt->efer); - ctxt->cr0 =read_cr0 (); - ctxt->cr2 =read_cr2 (); - ctxt->cr3 =read_cr3 (); - ctxt->cr4 =read_cr4 (); - ctxt->cr8 =read_cr8 (); -} - -void save_processor_state (void ) -{ -__save_processor_state (&saved_context); -} - -static void do_fpu_end (void ) -{ -/* -* Restore FPU regs if necessary -*/ -kernel_fpu_end (); -} - -/** -* __restore_processor_state - restore the contents of CPU registers saved -* by __save_processor_state() -* @ctxt - structure to load the registers contents from -*/ -static void __restore_processor_state (struct saved_context *ctxt) -{ -/* -* control registers -*/ -wrmsrl (MSR_EFER , ctxt->efer); -write_cr8 (ctxt->cr8); -write_cr4 (ctxt->cr4); -write_cr3 (ctxt->cr3); -write_cr2 (ctxt->cr2); -write_cr0 (ctxt->cr0); - -/* -* now restore the descriptor tables to their proper values -* ltr is done i fix_processor_context(). -*/ -load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); -load_idt ((const struct desc_ptr *)&ctxt->idt_limit); - - -/* -* segment registers -*/ - asmvolatile ("movw %0, %%ds" ::"r" (ctxt->ds)); - asmvolatile ("movw %0, %%es" ::"r" (ctxt->es)); - asmvolatile ("movw %0, %%fs" ::"r" (ctxt->fs)); -load_gs_index (ctxt->gs); - asmvolatile ("movw %0, %%ss" ::"r" (ctxt->ss)); - -wrmsrl (MSR_FS_BASE , ctxt->fs_base); -wrmsrl (MSR_GS_BASE , ctxt->gs_base); -wrmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); - -fix_processor_context (); - -do_fpu_end (); -mtrr_ap_init (); -} - -void restore_processor_state (void ) -{ -__restore_processor_state (&saved_context); -} - -static void fix_processor_context (void ) -{ -int cpu =smp_processor_id (); -struct tss_struct *t = &per_cpu (init_tss, cpu); - -/* -* This just modifies memory; should not be necessary. But... This -* is necessary, because 386 hardware has concept of busy TSS or some -* similar stupidity. -*/ -set_tss_desc (cpu, t); - -get_cpu_gdt_table (cpu)[GDT_ENTRY_TSS ].type =9 ; - -syscall_init ();/* This sets MSR_*STAR and related */ -load_TR_desc ();/* This does ltr */ -load_LDT (¤t->active_mm->context);/* This does lldt */ - -/* -* Now maybe reload the debug registers -*/ -if (current->thread.debugreg7){ -loaddebug (¤t->thread,0 ); -loaddebug (¤t->thread,1 ); -loaddebug (¤t->thread,2 ); -loaddebug (¤t->thread,3 ); -/* no 4 and 5 */ -loaddebug (¤t->thread,6 ); -loaddebug (¤t->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/kernel/suspend_asm_64.S deleted +0 -141
141 lines not on this page · raw message
arch/x86/power/hibernate_asm_64.S new file +146 -0
146 lines not on this page · raw message
arch/x86/power/suspend_64.c new file +321 -0
321 lines not on this page · raw message
arch/x86/kernel/Makefile +0 -2
@@ -82,8 +82,6 @@ ifeq ($(CONFIG_X86_64),y) obj-y += genapic_64.o genapic_flat_64.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_AUDIT) += audit_64.o - obj-$(CONFIG_PM) += suspend_64.o - obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
arch/x86/power/Makefile +7 -2
@@ -1,2 +1,7 @@ -obj-$(CONFIG_PM) += cpu.o -obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o +ifeq ($(CONFIG_X86_64),y) + obj-$(CONFIG_PM) += suspend_64.o + obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o +else + obj-$(CONFIG_PM) += cpu.o + obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o +endif
arch/x86/Makefile +3 -1
@@ -192,8 +192,10 @@ drivers-$(CONFIG_PCI) += arch # must be linked after kernel/ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ -ifeq ($(CONFIG_X86_32),y) +# suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/ + +ifeq ($(CONFIG_X86_32),y) drivers-$(CONFIG_FB) += arch/x86/video/ endif
PATCH 1/4 x86 PM: Move 64-bit hibernation files to arch/x86/power
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Move arch/x86/kernel/suspend_64.c to arch/x86/power .
Move arch/x86/kernel/suspend_asm_64.S to arch/x86/power as hibernate_asm_64.S .
Update purpose and copyright information inarch/x86/power/suspend_64.c andarch/x86/power/hibernate_asm_64.S .
Update the Makefiles in arch/x86, arch/x86/kernel and arch/x86/power to reflect the above changes.
--- arch/x86/Makefile | 4 arch/x86/kernel/Makefile | 2 arch/x86/kernel/suspend_64.c | 320 ------------------------------------- arch/x86/kernel/suspend_asm_64.S | 141 ---------------- arch/x86/power/Makefile | 9 - arch/x86/power/hibernate_asm_64.S | 146 +++++++++++++++++ arch/x86/power/suspend_64.c | 321 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 477 insertions(+), 466 deletions(-)
arch/x86/kernel/suspend_64.c deleted +0 -320
@@ -1,320 +0,0 @@ -/* -* Suspend support specific for i386. -* -* Distribute under GPLv2 -* -* Copyright (c) 2002 Pavel Machek <[email protected]> -* Copyright (c) 2001 Patrick Mochel <[email protected]> -*/ - -#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; - -static void fix_processor_context (void ); - -struct saved_context saved_context; - -/** -* __save_processor_state - save CPU registers before creating a -* hibernation image and before restoring the memory state from it -* @ctxt - structure to store the registers contents in -* -* NOTE: If there is a CPU register the modification of which by the -* boot kernel (ie. the kernel used for loading the hibernation image) -* might affect the operations of the restored target kernel (ie. the one -* saved in the hibernation image), then its contents must be saved by this -* function. In other words, if kernel A is hibernated and different -* kernel B is used for loading the hibernation image into memory, the -* kernel A's __save_processor_state() function must save all registers -* needed by kernel A, so that it can operate correctly after the resume -* regardless of what kernel B does in the meantime. -*/ -static void __save_processor_state (struct saved_context *ctxt) -{ -kernel_fpu_begin (); - -/* -* descriptor tables -*/ -store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); -store_idt ((struct desc_ptr *)&ctxt->idt_limit); -store_tr (ctxt->tr); - -/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ -/* -* segment registers -*/ - asmvolatile ("movw %%ds, %0" :"=m" (ctxt->ds)); - asmvolatile ("movw %%es, %0" :"=m" (ctxt->es)); - asmvolatile ("movw %%fs, %0" :"=m" (ctxt->fs)); - asmvolatile ("movw %%gs, %0" :"=m" (ctxt->gs)); - asmvolatile ("movw %%ss, %0" :"=m" (ctxt->ss)); - -rdmsrl (MSR_FS_BASE , ctxt->fs_base); -rdmsrl (MSR_GS_BASE , ctxt->gs_base); -rdmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); -mtrr_save_fixed_ranges (NULL ); - -/* -* control registers -*/ -rdmsrl (MSR_EFER , ctxt->efer); - ctxt->cr0 =read_cr0 (); - ctxt->cr2 =read_cr2 (); - ctxt->cr3 =read_cr3 (); - ctxt->cr4 =read_cr4 (); - ctxt->cr8 =read_cr8 (); -} - -void save_processor_state (void ) -{ -__save_processor_state (&saved_context); -} - -static void do_fpu_end (void ) -{ -/* -* Restore FPU regs if necessary -*/ -kernel_fpu_end (); -} - -/** -* __restore_processor_state - restore the contents of CPU registers saved -* by __save_processor_state() -* @ctxt - structure to load the registers contents from -*/ -static void __restore_processor_state (struct saved_context *ctxt) -{ -/* -* control registers -*/ -wrmsrl (MSR_EFER , ctxt->efer); -write_cr8 (ctxt->cr8); -write_cr4 (ctxt->cr4); -write_cr3 (ctxt->cr3); -write_cr2 (ctxt->cr2); -write_cr0 (ctxt->cr0); - -/* -* now restore the descriptor tables to their proper values -* ltr is done i fix_processor_context(). -*/ -load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); -load_idt ((const struct desc_ptr *)&ctxt->idt_limit); - - -/* -* segment registers -*/ - asmvolatile ("movw %0, %%ds" ::"r" (ctxt->ds)); - asmvolatile ("movw %0, %%es" ::"r" (ctxt->es)); - asmvolatile ("movw %0, %%fs" ::"r" (ctxt->fs)); -load_gs_index (ctxt->gs); - asmvolatile ("movw %0, %%ss" ::"r" (ctxt->ss)); - -wrmsrl (MSR_FS_BASE , ctxt->fs_base); -wrmsrl (MSR_GS_BASE , ctxt->gs_base); -wrmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); - -fix_processor_context (); - -do_fpu_end (); -mtrr_ap_init (); -} - -void restore_processor_state (void ) -{ -__restore_processor_state (&saved_context); -} - -static void fix_processor_context (void ) -{ -int cpu =smp_processor_id (); -struct tss_struct *t = &per_cpu (init_tss, cpu); - -/* -* This just modifies memory; should not be necessary. But... This -* is necessary, because 386 hardware has concept of busy TSS or some -* similar stupidity. -*/ -set_tss_desc (cpu, t); - -get_cpu_gdt_table (cpu)[GDT_ENTRY_TSS ].type =9 ; - -syscall_init ();/* This sets MSR_*STAR and related */ -load_TR_desc ();/* This does ltr */ -load_LDT (¤t->active_mm->context);/* This does lldt */ - -/* -* Now maybe reload the debug registers -*/ -if (current->thread.debugreg7){ -loaddebug (¤t->thread,0 ); -loaddebug (¤t->thread,1 ); -loaddebug (¤t->thread,2 ); -loaddebug (¤t->thread,3 ); -/* no 4 and 5 */ -loaddebug (¤t->thread,6 ); -loaddebug (¤t->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/kernel/suspend_asm_64.S deleted +0 -141
141 lines not on this page · raw message
arch/x86/power/hibernate_asm_64.S new file +146 -0
146 lines not on this page · raw message
arch/x86/power/suspend_64.c new file +321 -0
321 lines not on this page · raw message
arch/x86/kernel/Makefile +0 -2
@@ -82,8 +82,6 @@ ifeq ($(CONFIG_X86_64),y) obj-y += genapic_64.o genapic_flat_64.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_AUDIT) += audit_64.o - obj-$(CONFIG_PM) += suspend_64.o - obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
arch/x86/power/Makefile +7 -2
@@ -1,2 +1,7 @@ -obj-$(CONFIG_PM) += cpu.o -obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o +ifeq ($(CONFIG_X86_64),y) + obj-$(CONFIG_PM) += suspend_64.o + obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o +else + obj-$(CONFIG_PM) += cpu.o + obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o +endif
arch/x86/Makefile +3 -1
@@ -192,8 +192,10 @@ drivers-$(CONFIG_PCI) += arch # must be linked after kernel/ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ -ifeq ($(CONFIG_X86_32),y) +# suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/ + +ifeq ($(CONFIG_X86_32),y) drivers-$(CONFIG_FB) += arch/x86/video/ endif
PATCH 2/4 x86 PM: Rename 32-bit files in arch/x86/power
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Rename cpu.c, suspend.c and swsusp.S in arch/x86/power to cpu_32.c, hibernate_32.c and hibernate_asm_32.S, respectively, and update the purpose and copyright information in these files.
Update the Makefile in arch/x86/power to reflect the above changes.
--- arch/x86/power/Makefile | 4 arch/x86/power/cpu.c | 133 ----------------------------- arch/x86/power/cpu_32.c | 133 +++++++++++++++++++++++++++++ arch/x86/power/hibernate_32.c | 172 ++++++++++++++++++++++++++++++++++++++ arch/x86/power/hibernate_asm_32.S | 77 +++++++++++++++++ arch/x86/power/suspend.c | 172 -------------------------------------- arch/x86/power/swsusp.S | 78 ----------------- 7 files changed, 384 insertions(+), 385 deletions(-)
arch/x86/power/cpu.c deleted +0 -133
@@ -1,133 +0,0 @@ -/* -* Suspend support specific for i386. -* -* Distribute under GPLv2 -* -* Copyright (c) 2002 Pavel Machek <[email protected]> -* Copyright (c) 2001 Patrick Mochel <[email protected]> -*/ - -#include <linux/module.h> -#include <linux/suspend.h> -#include <asm/mtrr.h> -#include <asm/mce.h> - -static struct saved_context saved_context; - -unsigned long saved_context_ebx; -unsigned long saved_context_esp, saved_context_ebp; -unsigned long saved_context_esi, saved_context_edi; -unsigned long saved_context_eflags; - -static void __save_processor_state (struct saved_context *ctxt) -{ -mtrr_save_fixed_ranges (NULL ); -kernel_fpu_begin (); - -/* -* descriptor tables -*/ -store_gdt (&ctxt->gdt); -store_idt (&ctxt->idt); -store_tr (ctxt->tr); - -/* -* segment registers -*/ -savesegment (es, ctxt->es); -savesegment (fs, ctxt->fs); -savesegment (gs, ctxt->gs); -savesegment (ss, ctxt->ss); - -/* -* control registers -*/ - ctxt->cr0 =read_cr0 (); - ctxt->cr2 =read_cr2 (); - ctxt->cr3 =read_cr3 (); - ctxt->cr4 =read_cr4 (); -} - -void save_processor_state (void ) -{ -__save_processor_state (&saved_context); -} - -static void do_fpu_end (void ) -{ -/* -* Restore FPU regs if necessary. -*/ -kernel_fpu_end (); -} - -static void fix_processor_context (void ) -{ -int cpu =smp_processor_id (); -struct tss_struct * t = &per_cpu (init_tss, cpu); - -set_tss_desc (cpu,t);/* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ - -load_TR_desc ();/* This does ltr */ -load_LDT (¤t->active_mm->context);/* This does lldt */ - -/* -* Now maybe reload the debug registers -*/ -if (current->thread.debugreg7) { -set_debugreg (current->thread.debugreg0,0 ); -set_debugreg (current->thread.debugreg1,1 ); -set_debugreg (current->thread.debugreg2,2 ); -set_debugreg (current->thread.debugreg3,3 ); -/* no 4 and 5 */ -set_debugreg (current->thread.debugreg6,6 ); -set_debugreg (current->thread.debugreg7,7 ); - } - -} - -static void __restore_processor_state (struct saved_context *ctxt) -{ -/* -* control registers -*/ -write_cr4 (ctxt->cr4); -write_cr3 (ctxt->cr3); -write_cr2 (ctxt->cr2); -write_cr0 (ctxt->cr0); - -/* -* now restore the descriptor tables to their proper values -* ltr is done i fix_processor_context(). -*/ -load_gdt (&ctxt->gdt); -load_idt (&ctxt->idt); - -/* -* segment registers -*/ -loadsegment (es, ctxt->es); -loadsegment (fs, ctxt->fs); -loadsegment (gs, ctxt->gs); -loadsegment (ss, ctxt->ss); - -/* -* sysenter MSRs -*/ -if (boot_cpu_has (X86_FEATURE_SEP )) -enable_sep_cpu (); - -fix_processor_context (); -do_fpu_end (); -mtrr_ap_init (); -mcheck_init (&boot_cpu_data); -} - -void restore_processor_state (void ) -{ -__restore_processor_state (&saved_context); -} - -/* Needed by apm.c */ -EXPORT_SYMBOL (save_processor_state); -EXPORT_SYMBOL (restore_processor_state);
arch/x86/power/cpu_32.c new file +133 -0
133 lines not on this page · raw message
arch/x86/power/hibernate_32.c new file +172 -0
172 lines not on this page · raw message
arch/x86/power/hibernate_asm_32.S new file +77 -0
77 lines not on this page · raw message
arch/x86/power/suspend.c deleted +0 -172
172 lines not on this page · raw message
arch/x86/power/swsusp.S deleted +0 -78
78 lines not on this page · raw message
arch/x86/power/Makefile +2 -2
@@ -2,6 +2,6 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_PM) += suspend_64.o obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o else - obj-$(CONFIG_PM) += cpu.o - obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o + obj-$(CONFIG_PM) += cpu_32.o + obj-$(CONFIG_HIBERNATION) += hibernate_32.o hibernate_asm_32.o endif
PATCH 2/4 x86 PM: Rename 32-bit files in arch/x86/power
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
Rename cpu.c, suspend.c and swsusp.S in arch/x86/power to cpu_32.c, hibernate_32.c and hibernate_asm_32.S, respectively, and update the purpose and copyright information in these files.
Update the Makefile in arch/x86/power to reflect the above changes.
--- arch/x86/power/Makefile | 4 arch/x86/power/cpu.c | 133 ----------------------------- arch/x86/power/cpu_32.c | 133 +++++++++++++++++++++++++++++ arch/x86/power/hibernate_32.c | 172 ++++++++++++++++++++++++++++++++++++++ arch/x86/power/hibernate_asm_32.S | 77 +++++++++++++++++ arch/x86/power/suspend.c | 172 -------------------------------------- arch/x86/power/swsusp.S | 78 ----------------- 7 files changed, 384 insertions(+), 385 deletions(-)
arch/x86/power/cpu.c deleted +0 -133
@@ -1,133 +0,0 @@ -/* -* Suspend support specific for i386. -* -* Distribute under GPLv2 -* -* Copyright (c) 2002 Pavel Machek <[email protected]> -* Copyright (c) 2001 Patrick Mochel <[email protected]> -*/ - -#include <linux/module.h> -#include <linux/suspend.h> -#include <asm/mtrr.h> -#include <asm/mce.h> - -static struct saved_context saved_context; - -unsigned long saved_context_ebx; -unsigned long saved_context_esp, saved_context_ebp; -unsigned long saved_context_esi, saved_context_edi; -unsigned long saved_context_eflags; - -static void __save_processor_state (struct saved_context *ctxt) -{ -mtrr_save_fixed_ranges (NULL ); -kernel_fpu_begin (); - -/* -* descriptor tables -*/ -store_gdt (&ctxt->gdt); -store_idt (&ctxt->idt); -store_tr (ctxt->tr); - -/* -* segment registers -*/ -savesegment (es, ctxt->es); -savesegment (fs, ctxt->fs); -savesegment (gs, ctxt->gs); -savesegment (ss, ctxt->ss); - -/* -* control registers -*/ - ctxt->cr0 =read_cr0 (); - ctxt->cr2 =read_cr2 (); - ctxt->cr3 =read_cr3 (); - ctxt->cr4 =read_cr4 (); -} - -void save_processor_state (void ) -{ -__save_processor_state (&saved_context); -} - -static void do_fpu_end (void ) -{ -/* -* Restore FPU regs if necessary. -*/ -kernel_fpu_end (); -} - -static void fix_processor_context (void ) -{ -int cpu =smp_processor_id (); -struct tss_struct * t = &per_cpu (init_tss, cpu); - -set_tss_desc (cpu,t);/* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */ - -load_TR_desc ();/* This does ltr */ -load_LDT (¤t->active_mm->context);/* This does lldt */ - -/* -* Now maybe reload the debug registers -*/ -if (current->thread.debugreg7) { -set_debugreg (current->thread.debugreg0,0 ); -set_debugreg (current->thread.debugreg1,1 ); -set_debugreg (current->thread.debugreg2,2 ); -set_debugreg (current->thread.debugreg3,3 ); -/* no 4 and 5 */ -set_debugreg (current->thread.debugreg6,6 ); -set_debugreg (current->thread.debugreg7,7 ); - } - -} - -static void __restore_processor_state (struct saved_context *ctxt) -{ -/* -* control registers -*/ -write_cr4 (ctxt->cr4); -write_cr3 (ctxt->cr3); -write_cr2 (ctxt->cr2); -write_cr0 (ctxt->cr0); - -/* -* now restore the descriptor tables to their proper values -* ltr is done i fix_processor_context(). -*/ -load_gdt (&ctxt->gdt); -load_idt (&ctxt->idt); - -/* -* segment registers -*/ -loadsegment (es, ctxt->es); -loadsegment (fs, ctxt->fs); -loadsegment (gs, ctxt->gs); -loadsegment (ss, ctxt->ss); - -/* -* sysenter MSRs -*/ -if (boot_cpu_has (X86_FEATURE_SEP )) -enable_sep_cpu (); - -fix_processor_context (); -do_fpu_end (); -mtrr_ap_init (); -mcheck_init (&boot_cpu_data); -} - -void restore_processor_state (void ) -{ -__restore_processor_state (&saved_context); -} - -/* Needed by apm.c */ -EXPORT_SYMBOL (save_processor_state); -EXPORT_SYMBOL (restore_processor_state);
arch/x86/power/cpu_32.c new file +133 -0
133 lines not on this page · raw message
arch/x86/power/hibernate_32.c new file +172 -0
172 lines not on this page · raw message
arch/x86/power/hibernate_asm_32.S new file +77 -0
77 lines not on this page · raw message
arch/x86/power/suspend.c deleted +0 -172
172 lines not on this page · raw message
arch/x86/power/swsusp.S deleted +0 -78
78 lines not on this page · raw message
arch/x86/power/Makefile +2 -2
@@ -2,6 +2,6 @@ ifeq ($(CONFIG_X86_64),y) obj-$(CONFIG_PM) += suspend_64.o obj-$(CONFIG_HIBERNATION) += hibernate_asm_64.o else - obj-$(CONFIG_PM) += cpu.o - obj-$(CONFIG_HIBERNATION) += swsusp.o suspend.o + obj-$(CONFIG_PM) += cpu_32.o + obj-$(CONFIG_HIBERNATION) += hibernate_32.o hibernate_asm_32.o endif
PATCH 3/4 x86 PM: Consolidate suspend and hibernation code
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
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 .
--- arch/x86/power/Makefile | 9 - arch/x86/power/cpu_64.c | 166 +++++++++++++++++++++ arch/x86/power/hibernate_64.c | 169 ++++++++++++++++++++++ arch/x86/power/suspend_64.c | 321 ------------------------------------------ 4 files changed, 337 insertions(+), 328 deletions(-)
arch/x86/power/cpu_64.c new file +166 -0
@@ -0,0 +1,166 @@ +/* +* Suspend and hibernation support for x86-64 +* +* Distribute under GPLv2 +* +* Copyright (c) 2007 Rafael J. Wysocki <[email protected]> +* Copyright (c) 2002 Pavel Machek <[email protected]> +* Copyright (c) 2001 Patrick Mochel <[email protected]> +*/ + +#include <linux/smp.h> +#include <linux/suspend.h> +#include <asm/proto.h> +#include <asm/page.h> +#include <asm/pgtable.h> +#include <asm/mtrr.h> + +static void fix_processor_context (void ); + +struct saved_context saved_context; + +/** +* __save_processor_state - save CPU registers before creating a +* hibernation image and before restoring the memory state from it +* @ctxt - structure to store the registers contents in +* +* NOTE: If there is a CPU register the modification of which by the +* boot kernel (ie. the kernel used for loading the hibernation image) +* might affect the operations of the restored target kernel (ie. the one +* saved in the hibernation image), then its contents must be saved by this +* function. In other words, if kernel A is hibernated and different +* kernel B is used for loading the hibernation image into memory, the +* kernel A's __save_processor_state() function must save all registers +* needed by kernel A, so that it can operate correctly after the resume +* regardless of what kernel B does in the meantime. +*/ +static void __save_processor_state (struct saved_context *ctxt) +{ +kernel_fpu_begin (); + +/* +* descriptor tables +*/ +store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); +store_idt ((struct desc_ptr *)&ctxt->idt_limit); +store_tr (ctxt->tr); + +/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ +/* +* segment registers +*/ + asmvolatile ("movw %%ds, %0" :"=m" (ctxt->ds)); + asmvolatile ("movw %%es, %0" :"=m" (ctxt->es)); + asmvolatile ("movw %%fs, %0" :"=m" (ctxt->fs)); + asmvolatile ("movw %%gs, %0" :"=m" (ctxt->gs)); + asmvolatile ("movw %%ss, %0" :"=m" (ctxt->ss)); + +rdmsrl (MSR_FS_BASE , ctxt->fs_base); +rdmsrl (MSR_GS_BASE , ctxt->gs_base); +rdmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); +mtrr_save_fixed_ranges (NULL ); + +/* +* control registers +*/ +rdmsrl (MSR_EFER , ctxt->efer); + ctxt->cr0 =read_cr0 (); + ctxt->cr2 =read_cr2 (); + ctxt->cr3 =read_cr3 (); + ctxt->cr4 =read_cr4 (); + ctxt->cr8 =read_cr8 (); +} + +void save_processor_state (void ) +{ +__save_processor_state (&saved_context); +} + +static void do_fpu_end (void ) +{ +/* +* Restore FPU regs if necessary +*/ +kernel_fpu_end (); +} + +/** +* __restore_processor_state - restore the contents of CPU registers saved +* by __save_processor_state() +* @ctxt - structure to load the registers contents from +*/ +static void __restore_processor_state (struct saved_context *ctxt) +{ +/* +* control registers +*/ +wrmsrl (MSR_EFER , ctxt->efer); +write_cr8 (ctxt->cr8); +write_cr4 (ctxt->cr4); +write_cr3 (ctxt->cr3); +write_cr2 (ctxt->cr2); +write_cr0 (ctxt->cr0); + +/* +* now restore the descriptor tables to their proper values +* ltr is done i fix_processor_context(). +*/ +load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); +load_idt ((const struct desc_ptr *)&ctxt->idt_limit); + + +/* +* segment registers +*/ + asmvolatile ("movw %0, %%ds" ::"r" (ctxt->ds)); + asmvolatile ("movw %0, %%es" ::"r" (ctxt->es)); + asmvolatile ("movw %0, %%fs" ::"r" (ctxt->fs)); +load_gs_index (ctxt->gs); + asmvolatile ("movw %0, %%ss" ::"r" (ctxt->ss)); + +wrmsrl (MSR_FS_BASE , ctxt->fs_base); +wrmsrl (MSR_GS_BASE , ctxt->gs_base); +wrmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); + +fix_processor_context (); + +do_fpu_end (); +mtrr_ap_init (); +} + +void restore_processor_state (void ) +{ +__restore_processor_state (&saved_context); +} + +static void fix_processor_context (void ) +{ +int cpu =smp_processor_id (); +struct tss_struct *t = &per_cpu (init_tss, cpu); + +/* +* This just modifies memory; should not be necessary. But... This +* is necessary, because 386 hardware has concept of busy TSS or some +* similar stupidity. +*/ +set_tss_desc (cpu, t); + +get_cpu_gdt_table (cpu)[GDT_ENTRY_TSS ].type =9 ; + +syscall_init ();/* This sets MSR_*STAR and related */ +load_TR_desc ();/* This does ltr */ +load_LDT (¤t->active_mm->context);/* This does lldt */ + +/* +* Now maybe reload the debug registers +*/ +if (current->thread.debugreg7){ +loaddebug (¤t->thread,0 ); +loaddebug (¤t->thread,1 ); +loaddebug (¤t->thread,2 ); +loaddebug (¤t->thread,3 ); +/* no 4 and 5 */ +loaddebug (¤t->thread,6 ); +loaddebug (¤t->thread,7 ); + } +}
arch/x86/power/hibernate_64.c new file +169 -0
169 lines not on this page · raw message
arch/x86/power/suspend_64.c deleted +0 -321
321 lines not on this page · raw message
arch/x86/power/Makefile +2 -7
@@ -1,7 +1,2 @@ -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
PATCH 3/4 x86 PM: Consolidate suspend and hibernation code
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
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 .
--- arch/x86/power/Makefile | 9 - arch/x86/power/cpu_64.c | 166 +++++++++++++++++++++ arch/x86/power/hibernate_64.c | 169 ++++++++++++++++++++++ arch/x86/power/suspend_64.c | 321 ------------------------------------------ 4 files changed, 337 insertions(+), 328 deletions(-)
arch/x86/power/cpu_64.c new file +166 -0
@@ -0,0 +1,166 @@ +/* +* Suspend and hibernation support for x86-64 +* +* Distribute under GPLv2 +* +* Copyright (c) 2007 Rafael J. Wysocki <[email protected]> +* Copyright (c) 2002 Pavel Machek <[email protected]> +* Copyright (c) 2001 Patrick Mochel <[email protected]> +*/ + +#include <linux/smp.h> +#include <linux/suspend.h> +#include <asm/proto.h> +#include <asm/page.h> +#include <asm/pgtable.h> +#include <asm/mtrr.h> + +static void fix_processor_context (void ); + +struct saved_context saved_context; + +/** +* __save_processor_state - save CPU registers before creating a +* hibernation image and before restoring the memory state from it +* @ctxt - structure to store the registers contents in +* +* NOTE: If there is a CPU register the modification of which by the +* boot kernel (ie. the kernel used for loading the hibernation image) +* might affect the operations of the restored target kernel (ie. the one +* saved in the hibernation image), then its contents must be saved by this +* function. In other words, if kernel A is hibernated and different +* kernel B is used for loading the hibernation image into memory, the +* kernel A's __save_processor_state() function must save all registers +* needed by kernel A, so that it can operate correctly after the resume +* regardless of what kernel B does in the meantime. +*/ +static void __save_processor_state (struct saved_context *ctxt) +{ +kernel_fpu_begin (); + +/* +* descriptor tables +*/ +store_gdt ((struct desc_ptr *)&ctxt->gdt_limit); +store_idt ((struct desc_ptr *)&ctxt->idt_limit); +store_tr (ctxt->tr); + +/* XMM0..XMM15 should be handled by kernel_fpu_begin(). */ +/* +* segment registers +*/ + asmvolatile ("movw %%ds, %0" :"=m" (ctxt->ds)); + asmvolatile ("movw %%es, %0" :"=m" (ctxt->es)); + asmvolatile ("movw %%fs, %0" :"=m" (ctxt->fs)); + asmvolatile ("movw %%gs, %0" :"=m" (ctxt->gs)); + asmvolatile ("movw %%ss, %0" :"=m" (ctxt->ss)); + +rdmsrl (MSR_FS_BASE , ctxt->fs_base); +rdmsrl (MSR_GS_BASE , ctxt->gs_base); +rdmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); +mtrr_save_fixed_ranges (NULL ); + +/* +* control registers +*/ +rdmsrl (MSR_EFER , ctxt->efer); + ctxt->cr0 =read_cr0 (); + ctxt->cr2 =read_cr2 (); + ctxt->cr3 =read_cr3 (); + ctxt->cr4 =read_cr4 (); + ctxt->cr8 =read_cr8 (); +} + +void save_processor_state (void ) +{ +__save_processor_state (&saved_context); +} + +static void do_fpu_end (void ) +{ +/* +* Restore FPU regs if necessary +*/ +kernel_fpu_end (); +} + +/** +* __restore_processor_state - restore the contents of CPU registers saved +* by __save_processor_state() +* @ctxt - structure to load the registers contents from +*/ +static void __restore_processor_state (struct saved_context *ctxt) +{ +/* +* control registers +*/ +wrmsrl (MSR_EFER , ctxt->efer); +write_cr8 (ctxt->cr8); +write_cr4 (ctxt->cr4); +write_cr3 (ctxt->cr3); +write_cr2 (ctxt->cr2); +write_cr0 (ctxt->cr0); + +/* +* now restore the descriptor tables to their proper values +* ltr is done i fix_processor_context(). +*/ +load_gdt ((const struct desc_ptr *)&ctxt->gdt_limit); +load_idt ((const struct desc_ptr *)&ctxt->idt_limit); + + +/* +* segment registers +*/ + asmvolatile ("movw %0, %%ds" ::"r" (ctxt->ds)); + asmvolatile ("movw %0, %%es" ::"r" (ctxt->es)); + asmvolatile ("movw %0, %%fs" ::"r" (ctxt->fs)); +load_gs_index (ctxt->gs); + asmvolatile ("movw %0, %%ss" ::"r" (ctxt->ss)); + +wrmsrl (MSR_FS_BASE , ctxt->fs_base); +wrmsrl (MSR_GS_BASE , ctxt->gs_base); +wrmsrl (MSR_KERNEL_GS_BASE , ctxt->gs_kernel_base); + +fix_processor_context (); + +do_fpu_end (); +mtrr_ap_init (); +} + +void restore_processor_state (void ) +{ +__restore_processor_state (&saved_context); +} + +static void fix_processor_context (void ) +{ +int cpu =smp_processor_id (); +struct tss_struct *t = &per_cpu (init_tss, cpu); + +/* +* This just modifies memory; should not be necessary. But... This +* is necessary, because 386 hardware has concept of busy TSS or some +* similar stupidity. +*/ +set_tss_desc (cpu, t); + +get_cpu_gdt_table (cpu)[GDT_ENTRY_TSS ].type =9 ; + +syscall_init ();/* This sets MSR_*STAR and related */ +load_TR_desc ();/* This does ltr */ +load_LDT (¤t->active_mm->context);/* This does lldt */ + +/* +* Now maybe reload the debug registers +*/ +if (current->thread.debugreg7){ +loaddebug (¤t->thread,0 ); +loaddebug (¤t->thread,1 ); +loaddebug (¤t->thread,2 ); +loaddebug (¤t->thread,3 ); +/* no 4 and 5 */ +loaddebug (¤t->thread,6 ); +loaddebug (¤t->thread,7 ); + } +}
arch/x86/power/hibernate_64.c new file +169 -0
169 lines not on this page · raw message
arch/x86/power/suspend_64.c deleted +0 -321
321 lines not on this page · raw message
arch/x86/power/Makefile +2 -7
@@ -1,7 +1,2 @@ -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
PATCH 4/4 x86 PM: Update stale comments
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
In some suspend and hibernation files in arch/x86/power there are comments referring to arch/x86-64 and arch/i386 . Update them to reflect the current code layout.
--- arch/x86/power/hibernate_32.c | 4 ++-- arch/x86/power/hibernate_64.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/power/hibernate_32.c +2 -2
@@ -13,7 +13,7 @@#include <asm/page.h> #include <asm/pgtable.h> -/* Defined in arch/i386/power/swsusp.S */ +/* Defined in hibernate_asm_32.S */ extern int restore_image (void );/* References to section boundaries */
@@ -23,7 +23,7 @@ extern const void __nosave_begin, __nosapgd_t *resume_pg_dir;/* The following three functions are based on the analogous code in -* arch/i386/mm/init.c +* arch/x86/mm/init_32.c */ /*
arch/x86/power/hibernate_64.c +1 -1
@@ -18,7 +18,7 @@/* References to section boundaries */ extern const void __nosave_begin, __nosave_end; -/* Defined in arch/x86_64/kernel/suspend_asm.S */ +/* Defined in hibernate_asm_64.S */ extern int restore_image (void );/*
PATCH 4/4 x86 PM: Update stale comments
In reply to Rafael J. WysockiFrom: Rafael J. Wysocki <[email protected]>
In some suspend and hibernation files in arch/x86/power there are comments referring to arch/x86-64 and arch/i386 . Update them to reflect the current code layout.
--- arch/x86/power/hibernate_32.c | 4 ++-- arch/x86/power/hibernate_64.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/power/hibernate_32.c +2 -2
@@ -13,7 +13,7 @@#include <asm/page.h> #include <asm/pgtable.h> -/* Defined in arch/i386/power/swsusp.S */ +/* Defined in hibernate_asm_32.S */ extern int restore_image (void );/* References to section boundaries */
@@ -23,7 +23,7 @@ extern const void __nosave_begin, __nosapgd_t *resume_pg_dir;/* The following three functions are based on the analogous code in -* arch/i386/mm/init.c +* arch/x86/mm/init_32.c */ /*
arch/x86/power/hibernate_64.c +1 -1
@@ -18,7 +18,7 @@/* References to section boundaries */ extern const void __nosave_begin, __nosave_end; -/* Defined in arch/x86_64/kernel/suspend_asm.S */ +/* Defined in hibernate_asm_64.S */ extern int restore_image (void );/*
Quoted 11 lines · Rafael J. Wysocki
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.These patches don't introduce any functional changes.
looks sane to me - i've applied them to x86.git. Is it fine with you if we push them upstream (barring any test failures)?
Ingo
Quoted 11 lines · Rafael J. Wysocki
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.These patches don't introduce any functional changes.
looks sane to me - i've applied them to x86.git. Is it fine with you if we push them upstream (barring any test failures)?
Ingo
Quoted 13 lines · Ingo Molnar
Quoted 10 lines · Rafael J. Wysocki
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
Quoted 4 lines
Quoted 1 line
These patches don't introduce any functional changes.
looks sane to me - i've applied them to x86.git. Is it fine with you if we push them upstream (barring any test failures)?
Yes, it is. :-)
Thanks,
Rafael
Quoted 13 lines · Ingo Molnar
Quoted 10 lines · Rafael J. Wysocki
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
Quoted 4 lines
Quoted 1 line
These patches don't introduce any functional changes.
looks sane to me - i've applied them to x86.git. Is it fine with you if we push them upstream (barring any test failures)?
Yes, it is. :-)
Thanks,
Rafael
Quoted 12 lines · Rafael J. Wysocki
Hi,
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
Quoted 3 lines
These patches don't introduce any functional changes.
Please review (and consider for merging if they look good :-)).
ACK, and thanks... It would make merges easier if this could go in soon...
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 12 lines · Rafael J. Wysocki
Hi,
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
Quoted 3 lines
These patches don't introduce any functional changes.
Please review (and consider for merging if they look good :-)).
ACK, and thanks... It would make merges easier if this could go in soon...
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 11 lines · Rafael J. Wysocki
Hi,
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
All looks good from my angle.
I would have deferred first patch until step 3 but no need to change that now.
And I like the simplification of the arch/x86/Makefile and the resulting kernel/power/Makefile.
Sam
Quoted 11 lines · Rafael J. Wysocki
Hi,
This series of patches consolidates the x86 suspend and hibernation code. It does the following:
- move 64-bit hibernation/suspend files toarch/x86/power(under different names)
- rename 32-bit files inarch/x86/powerin line with the 64-bit files
- separate hibernation-specific 64-bit code from the code used for both suspend and hibernation and simplify theMakefile
- fix up comments
Details are in the changelogs.
All looks good from my angle.
I would have deferred first patch until step 3 but no need to change that now.
And I like the simplification of the arch/x86/Makefile and the resulting kernel/power/Makefile.
Sam