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

Commit 49c3df6a authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen
Browse files

[PATCH] x86: Move swsusp __pa() dependent code to arch portion 



o __pa() should be used only on kernel linearly mapped virtual addresses
  and not on kernel text and data addresses.

o Hibernation code needs to determine the physical address associated
  with kernel symbol to mark a section boundary which contains pages which
  don't have to be saved and restored during hibernate/resume operation.

o Move this piece of code in arch dependent section. So that architectures
  which don't have kernel text/data mapped into kernel linearly mapped
  region can come up with their own ways of determining physical addresses
  associated with a kernel text.

Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent cfd243d4

arch/i386/power/suspend.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ 
/* Defined in arch/i386/power/swsusp.S */

/* Defined in arch/i386/power/swsusp.S */

extern int restore_image(void);

extern int restore_image(void);





/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



/* Pointer to the temporary resume page tables */

/* Pointer to the temporary resume page tables */

pgd_t *resume_pg_dir;

pgd_t *resume_pg_dir;
@@ -156,3 +159,14 @@ int swsusp_arch_resume(void) 
	restore_image();

	restore_image();

	return 0;

	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);

}

arch/powerpc/kernel/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o 
obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o

obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o

obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o

obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o

obj32-$(CONFIG_MODULES)		+= module_32.o

obj32-$(CONFIG_MODULES)		+= module_32.o





ifeq ($(CONFIG_PPC_MERGE),y)

ifeq ($(CONFIG_PPC_MERGE),y)

arch/powerpc/kernel/suspend.c

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

 * Suspend support specific for power.

 *

 * Distribute under GPLv2

 *

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

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

 */



#include <asm/page.h>



/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



/*

 *	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(&__nosave_begin) >> PAGE_SHIFT;

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

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

}

arch/x86_64/kernel/suspend.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ 
#include <asm/page.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/pgtable.h>





/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



struct saved_context saved_context;

struct saved_context saved_context;





unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_context_edx;

unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_context_edx;
@@ -220,4 +223,15 @@ int swsusp_arch_resume(void) 
	restore_image();

	restore_image();

	return 0;

	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);

}

#endif /* CONFIG_SOFTWARE_SUSPEND */
 
#endif /* CONFIG_SOFTWARE_SUSPEND */

kernel/power/power.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -23,6 +23,8 @@ static inline int pm_suspend_disk(void) 
}

}

#endif

#endif





extern int pfn_is_nosave(unsigned long);



extern struct mutex pm_mutex;

extern struct mutex pm_mutex;





#define power_attr(_name) \

#define power_attr(_name) \
@@ -37,9 +39,6 @@ static struct subsys_attribute _name##_attr = { \ 




extern struct subsystem power_subsys;

extern struct subsystem power_subsys;





/* References to section boundaries */

extern const void __nosave_begin, __nosave_end;



/* Preferred image size in bytes (default 500 MB) */

/* Preferred image size in bytes (default 500 MB) */

extern unsigned long image_size;

extern unsigned long image_size;

extern int in_suspend;

extern int in_suspend;