Merge branch 'suspend' into release
This commit is contained in:
commit
3cc8a5f4ba
|
@ -150,16 +150,20 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
default: 0
|
default: 0
|
||||||
|
|
||||||
acpi_sleep= [HW,ACPI] Sleep options
|
acpi_sleep= [HW,ACPI] Sleep options
|
||||||
Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig, old_ordering }
|
Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,
|
||||||
See Documentation/power/video.txt for s3_bios and s3_mode.
|
old_ordering, s4_nonvs }
|
||||||
|
See Documentation/power/video.txt for information on
|
||||||
|
s3_bios and s3_mode.
|
||||||
s3_beep is for debugging; it makes the PC's speaker beep
|
s3_beep is for debugging; it makes the PC's speaker beep
|
||||||
as soon as the kernel's real-mode entry point is called.
|
as soon as the kernel's real-mode entry point is called.
|
||||||
s4_nohwsig prevents ACPI hardware signature from being
|
s4_nohwsig prevents ACPI hardware signature from being
|
||||||
used during resume from hibernation.
|
used during resume from hibernation.
|
||||||
old_ordering causes the ACPI 1.0 ordering of the _PTS
|
old_ordering causes the ACPI 1.0 ordering of the _PTS
|
||||||
control method, wrt putting devices into low power
|
control method, with respect to putting devices into
|
||||||
states, to be enforced (the ACPI 2.0 ordering of _PTS is
|
low power states, to be enforced (the ACPI 2.0 ordering
|
||||||
used by default).
|
of _PTS is used by default).
|
||||||
|
s4_nonvs prevents the kernel from saving/restoring the
|
||||||
|
ACPI NVS memory during hibernation.
|
||||||
|
|
||||||
acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
|
acpi_sci= [HW,ACPI] ACPI System Control Interrupt trigger mode
|
||||||
Format: { level | edge | high | low }
|
Format: { level | edge | high | low }
|
||||||
|
@ -194,7 +198,7 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
acpi_skip_timer_override [HW,ACPI]
|
acpi_skip_timer_override [HW,ACPI]
|
||||||
Recognize and ignore IRQ0/pin2 Interrupt Override.
|
Recognize and ignore IRQ0/pin2 Interrupt Override.
|
||||||
For broken nForce2 BIOS resulting in XT-PIC timer.
|
For broken nForce2 BIOS resulting in XT-PIC timer.
|
||||||
acpi_use_timer_override [HW,ACPI}
|
acpi_use_timer_override [HW,ACPI]
|
||||||
Use timer override. For some broken Nvidia NF5 boards
|
Use timer override. For some broken Nvidia NF5 boards
|
||||||
that require a timer override, but don't have
|
that require a timer override, but don't have
|
||||||
HPET
|
HPET
|
||||||
|
@ -861,17 +865,19 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
See Documentation/ide/ide.txt.
|
See Documentation/ide/ide.txt.
|
||||||
|
|
||||||
idle= [X86]
|
idle= [X86]
|
||||||
Format: idle=poll or idle=mwait, idle=halt, idle=nomwait
|
Format: idle=poll, idle=mwait, idle=halt, idle=nomwait
|
||||||
Poll forces a polling idle loop that can slightly improves the performance
|
Poll forces a polling idle loop that can slightly
|
||||||
of waking up a idle CPU, but will use a lot of power and make the system
|
improve the performance of waking up a idle CPU, but
|
||||||
run hot. Not recommended.
|
will use a lot of power and make the system run hot.
|
||||||
idle=mwait. On systems which support MONITOR/MWAIT but the kernel chose
|
Not recommended.
|
||||||
to not use it because it doesn't save as much power as a normal idle
|
idle=mwait: On systems which support MONITOR/MWAIT but
|
||||||
loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
|
the kernel chose to not use it because it doesn't save
|
||||||
as idle=poll.
|
as much power as a normal idle loop, use the
|
||||||
idle=halt. Halt is forced to be used for CPU idle.
|
MONITOR/MWAIT idle loop anyways. Performance should be
|
||||||
|
the same as idle=poll.
|
||||||
|
idle=halt: Halt is forced to be used for CPU idle.
|
||||||
In such case C2/C3 won't be used again.
|
In such case C2/C3 won't be used again.
|
||||||
idle=nomwait. Disable mwait for CPU C-states
|
idle=nomwait: Disable mwait for CPU C-states
|
||||||
|
|
||||||
ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
|
ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem
|
||||||
Claim all unknown PCI IDE storage controllers.
|
Claim all unknown PCI IDE storage controllers.
|
||||||
|
@ -1053,8 +1059,8 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
lapic [X86-32,APIC] Enable the local APIC even if BIOS
|
lapic [X86-32,APIC] Enable the local APIC even if BIOS
|
||||||
disabled it.
|
disabled it.
|
||||||
|
|
||||||
lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer in
|
lapic_timer_c2_ok [X86-32,x86-64,APIC] trust the local apic timer
|
||||||
C2 power state.
|
in C2 power state.
|
||||||
|
|
||||||
libata.dma= [LIBATA] DMA control
|
libata.dma= [LIBATA] DMA control
|
||||||
libata.dma=0 Disable all PATA and SATA DMA
|
libata.dma=0 Disable all PATA and SATA DMA
|
||||||
|
@ -2242,7 +2248,8 @@ and is between 256 and 4096 characters. It is defined in the file
|
||||||
|
|
||||||
thermal.psv= [HW,ACPI]
|
thermal.psv= [HW,ACPI]
|
||||||
-1: disable all passive trip points
|
-1: disable all passive trip points
|
||||||
<degrees C>: override all passive trip points to this value
|
<degrees C>: override all passive trip points to this
|
||||||
|
value
|
||||||
|
|
||||||
thermal.tzp= [HW,ACPI]
|
thermal.tzp= [HW,ACPI]
|
||||||
Specify global default ACPI thermal zone polling rate
|
Specify global default ACPI thermal zone polling rate
|
||||||
|
|
|
@ -159,6 +159,8 @@ static int __init acpi_sleep_setup(char *str)
|
||||||
#endif
|
#endif
|
||||||
if (strncmp(str, "old_ordering", 12) == 0)
|
if (strncmp(str, "old_ordering", 12) == 0)
|
||||||
acpi_old_suspend_ordering();
|
acpi_old_suspend_ordering();
|
||||||
|
if (strncmp(str, "s4_nonvs", 8) == 0)
|
||||||
|
acpi_s4_no_nvs();
|
||||||
str = strchr(str, ',');
|
str = strchr(str, ',');
|
||||||
if (str != NULL)
|
if (str != NULL)
|
||||||
str += strspn(str, ", \t");
|
str += strspn(str, ", \t");
|
||||||
|
|
|
@ -665,6 +665,27 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_HIBERNATION
|
||||||
|
/**
|
||||||
|
* Mark ACPI NVS memory region, so that we can save/restore it during
|
||||||
|
* hibernation and the subsequent resume.
|
||||||
|
*/
|
||||||
|
static int __init e820_mark_nvs_memory(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < e820.nr_map; i++) {
|
||||||
|
struct e820entry *ei = &e820.map[i];
|
||||||
|
|
||||||
|
if (ei->type == E820_NVS)
|
||||||
|
hibernate_nvs_register(ei->addr, ei->size);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
core_initcall(e820_mark_nvs_memory);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Early reserved memory areas.
|
* Early reserved memory areas.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -101,6 +101,19 @@ void __init acpi_old_suspend_ordering(void)
|
||||||
* cases.
|
* cases.
|
||||||
*/
|
*/
|
||||||
static bool set_sci_en_on_resume;
|
static bool set_sci_en_on_resume;
|
||||||
|
/*
|
||||||
|
* The ACPI specification wants us to save NVS memory regions during hibernation
|
||||||
|
* and to restore them during the subsequent resume. However, it is not certain
|
||||||
|
* if this mechanism is going to work on all machines, so we allow the user to
|
||||||
|
* disable this mechanism using the 'acpi_sleep=s4_nonvs' kernel command line
|
||||||
|
* option.
|
||||||
|
*/
|
||||||
|
static bool s4_no_nvs;
|
||||||
|
|
||||||
|
void __init acpi_s4_no_nvs(void)
|
||||||
|
{
|
||||||
|
s4_no_nvs = true;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* acpi_pm_disable_gpes - Disable the GPEs.
|
* acpi_pm_disable_gpes - Disable the GPEs.
|
||||||
|
@ -394,9 +407,25 @@ void __init acpi_no_s4_hw_signature(void)
|
||||||
|
|
||||||
static int acpi_hibernation_begin(void)
|
static int acpi_hibernation_begin(void)
|
||||||
{
|
{
|
||||||
acpi_target_sleep_state = ACPI_STATE_S4;
|
int error;
|
||||||
acpi_sleep_tts_switch(acpi_target_sleep_state);
|
|
||||||
return 0;
|
error = s4_no_nvs ? 0 : hibernate_nvs_alloc();
|
||||||
|
if (!error) {
|
||||||
|
acpi_target_sleep_state = ACPI_STATE_S4;
|
||||||
|
acpi_sleep_tts_switch(acpi_target_sleep_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int acpi_hibernation_pre_snapshot(void)
|
||||||
|
{
|
||||||
|
int error = acpi_pm_prepare();
|
||||||
|
|
||||||
|
if (!error)
|
||||||
|
hibernate_nvs_save();
|
||||||
|
|
||||||
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_hibernation_enter(void)
|
static int acpi_hibernation_enter(void)
|
||||||
|
@ -417,6 +446,12 @@ static int acpi_hibernation_enter(void)
|
||||||
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
|
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void acpi_hibernation_finish(void)
|
||||||
|
{
|
||||||
|
hibernate_nvs_free();
|
||||||
|
acpi_pm_finish();
|
||||||
|
}
|
||||||
|
|
||||||
static void acpi_hibernation_leave(void)
|
static void acpi_hibernation_leave(void)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -432,6 +467,8 @@ static void acpi_hibernation_leave(void)
|
||||||
"cannot resume!\n");
|
"cannot resume!\n");
|
||||||
panic("ACPI S4 hardware signature mismatch");
|
panic("ACPI S4 hardware signature mismatch");
|
||||||
}
|
}
|
||||||
|
/* Restore the NVS memory area */
|
||||||
|
hibernate_nvs_restore();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void acpi_pm_enable_gpes(void)
|
static void acpi_pm_enable_gpes(void)
|
||||||
|
@ -442,8 +479,8 @@ static void acpi_pm_enable_gpes(void)
|
||||||
static struct platform_hibernation_ops acpi_hibernation_ops = {
|
static struct platform_hibernation_ops acpi_hibernation_ops = {
|
||||||
.begin = acpi_hibernation_begin,
|
.begin = acpi_hibernation_begin,
|
||||||
.end = acpi_pm_end,
|
.end = acpi_pm_end,
|
||||||
.pre_snapshot = acpi_pm_prepare,
|
.pre_snapshot = acpi_hibernation_pre_snapshot,
|
||||||
.finish = acpi_pm_finish,
|
.finish = acpi_hibernation_finish,
|
||||||
.prepare = acpi_pm_prepare,
|
.prepare = acpi_pm_prepare,
|
||||||
.enter = acpi_hibernation_enter,
|
.enter = acpi_hibernation_enter,
|
||||||
.leave = acpi_hibernation_leave,
|
.leave = acpi_hibernation_leave,
|
||||||
|
@ -469,8 +506,22 @@ static int acpi_hibernation_begin_old(void)
|
||||||
|
|
||||||
error = acpi_sleep_prepare(ACPI_STATE_S4);
|
error = acpi_sleep_prepare(ACPI_STATE_S4);
|
||||||
|
|
||||||
|
if (!error) {
|
||||||
|
if (!s4_no_nvs)
|
||||||
|
error = hibernate_nvs_alloc();
|
||||||
|
if (!error)
|
||||||
|
acpi_target_sleep_state = ACPI_STATE_S4;
|
||||||
|
}
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int acpi_hibernation_pre_snapshot_old(void)
|
||||||
|
{
|
||||||
|
int error = acpi_pm_disable_gpes();
|
||||||
|
|
||||||
if (!error)
|
if (!error)
|
||||||
acpi_target_sleep_state = ACPI_STATE_S4;
|
hibernate_nvs_save();
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -481,8 +532,8 @@ static int acpi_hibernation_begin_old(void)
|
||||||
static struct platform_hibernation_ops acpi_hibernation_ops_old = {
|
static struct platform_hibernation_ops acpi_hibernation_ops_old = {
|
||||||
.begin = acpi_hibernation_begin_old,
|
.begin = acpi_hibernation_begin_old,
|
||||||
.end = acpi_pm_end,
|
.end = acpi_pm_end,
|
||||||
.pre_snapshot = acpi_pm_disable_gpes,
|
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
|
||||||
.finish = acpi_pm_finish,
|
.finish = acpi_hibernation_finish,
|
||||||
.prepare = acpi_pm_disable_gpes,
|
.prepare = acpi_pm_disable_gpes,
|
||||||
.enter = acpi_hibernation_enter,
|
.enter = acpi_hibernation_enter,
|
||||||
.leave = acpi_hibernation_leave,
|
.leave = acpi_hibernation_leave,
|
||||||
|
|
|
@ -270,6 +270,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
void __init acpi_no_s4_hw_signature(void);
|
void __init acpi_no_s4_hw_signature(void);
|
||||||
void __init acpi_old_suspend_ordering(void);
|
void __init acpi_old_suspend_ordering(void);
|
||||||
|
void __init acpi_s4_no_nvs(void);
|
||||||
#endif /* CONFIG_PM_SLEEP */
|
#endif /* CONFIG_PM_SLEEP */
|
||||||
#else /* CONFIG_ACPI */
|
#else /* CONFIG_ACPI */
|
||||||
|
|
||||||
|
|
|
@ -232,6 +232,11 @@ extern unsigned long get_safe_page(gfp_t gfp_mask);
|
||||||
|
|
||||||
extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
|
extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
|
||||||
extern int hibernate(void);
|
extern int hibernate(void);
|
||||||
|
extern int hibernate_nvs_register(unsigned long start, unsigned long size);
|
||||||
|
extern int hibernate_nvs_alloc(void);
|
||||||
|
extern void hibernate_nvs_free(void);
|
||||||
|
extern void hibernate_nvs_save(void);
|
||||||
|
extern void hibernate_nvs_restore(void);
|
||||||
#else /* CONFIG_HIBERNATION */
|
#else /* CONFIG_HIBERNATION */
|
||||||
static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
|
static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
|
||||||
static inline void swsusp_set_page_free(struct page *p) {}
|
static inline void swsusp_set_page_free(struct page *p) {}
|
||||||
|
@ -239,6 +244,14 @@ static inline void swsusp_unset_page_free(struct page *p) {}
|
||||||
|
|
||||||
static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
|
static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
|
||||||
static inline int hibernate(void) { return -ENOSYS; }
|
static inline int hibernate(void) { return -ENOSYS; }
|
||||||
|
static inline int hibernate_nvs_register(unsigned long a, unsigned long b)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
static inline int hibernate_nvs_alloc(void) { return 0; }
|
||||||
|
static inline void hibernate_nvs_free(void) {}
|
||||||
|
static inline void hibernate_nvs_save(void) {}
|
||||||
|
static inline void hibernate_nvs_restore(void) {}
|
||||||
#endif /* CONFIG_HIBERNATION */
|
#endif /* CONFIG_HIBERNATION */
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
#ifdef CONFIG_PM_SLEEP
|
||||||
|
|
|
@ -259,12 +259,12 @@ int hibernation_snapshot(int platform_mode)
|
||||||
{
|
{
|
||||||
int error, ftrace_save;
|
int error, ftrace_save;
|
||||||
|
|
||||||
/* Free memory before shutting down devices. */
|
error = platform_begin(platform_mode);
|
||||||
error = swsusp_shrink_memory();
|
|
||||||
if (error)
|
if (error)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
error = platform_begin(platform_mode);
|
/* Free memory before shutting down devices. */
|
||||||
|
error = swsusp_shrink_memory();
|
||||||
if (error)
|
if (error)
|
||||||
goto Close;
|
goto Close;
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include <linux/syscalls.h>
|
#include <linux/syscalls.h>
|
||||||
#include <linux/console.h>
|
#include <linux/console.h>
|
||||||
#include <linux/highmem.h>
|
#include <linux/highmem.h>
|
||||||
|
#include <linux/list.h>
|
||||||
|
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
|
@ -192,12 +193,6 @@ static void *chain_alloc(struct chain_allocator *ca, unsigned int size)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void chain_free(struct chain_allocator *ca, int clear_page_nosave)
|
|
||||||
{
|
|
||||||
free_list_of_pages(ca->chain, clear_page_nosave);
|
|
||||||
memset(ca, 0, sizeof(struct chain_allocator));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Data types related to memory bitmaps.
|
* Data types related to memory bitmaps.
|
||||||
*
|
*
|
||||||
|
@ -233,7 +228,7 @@ static void chain_free(struct chain_allocator *ca, int clear_page_nosave)
|
||||||
#define BM_BITS_PER_BLOCK (PAGE_SIZE << 3)
|
#define BM_BITS_PER_BLOCK (PAGE_SIZE << 3)
|
||||||
|
|
||||||
struct bm_block {
|
struct bm_block {
|
||||||
struct bm_block *next; /* next element of the list */
|
struct list_head hook; /* hook into a list of bitmap blocks */
|
||||||
unsigned long start_pfn; /* pfn represented by the first bit */
|
unsigned long start_pfn; /* pfn represented by the first bit */
|
||||||
unsigned long end_pfn; /* pfn represented by the last bit plus 1 */
|
unsigned long end_pfn; /* pfn represented by the last bit plus 1 */
|
||||||
unsigned long *data; /* bitmap representing pages */
|
unsigned long *data; /* bitmap representing pages */
|
||||||
|
@ -244,24 +239,15 @@ static inline unsigned long bm_block_bits(struct bm_block *bb)
|
||||||
return bb->end_pfn - bb->start_pfn;
|
return bb->end_pfn - bb->start_pfn;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct zone_bitmap {
|
|
||||||
struct zone_bitmap *next; /* next element of the list */
|
|
||||||
unsigned long start_pfn; /* minimal pfn in this zone */
|
|
||||||
unsigned long end_pfn; /* maximal pfn in this zone plus 1 */
|
|
||||||
struct bm_block *bm_blocks; /* list of bitmap blocks */
|
|
||||||
struct bm_block *cur_block; /* recently used bitmap block */
|
|
||||||
};
|
|
||||||
|
|
||||||
/* strcut bm_position is used for browsing memory bitmaps */
|
/* strcut bm_position is used for browsing memory bitmaps */
|
||||||
|
|
||||||
struct bm_position {
|
struct bm_position {
|
||||||
struct zone_bitmap *zone_bm;
|
|
||||||
struct bm_block *block;
|
struct bm_block *block;
|
||||||
int bit;
|
int bit;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct memory_bitmap {
|
struct memory_bitmap {
|
||||||
struct zone_bitmap *zone_bm_list; /* list of zone bitmaps */
|
struct list_head blocks; /* list of bitmap blocks */
|
||||||
struct linked_page *p_list; /* list of pages used to store zone
|
struct linked_page *p_list; /* list of pages used to store zone
|
||||||
* bitmap objects and bitmap block
|
* bitmap objects and bitmap block
|
||||||
* objects
|
* objects
|
||||||
|
@ -273,11 +259,7 @@ struct memory_bitmap {
|
||||||
|
|
||||||
static void memory_bm_position_reset(struct memory_bitmap *bm)
|
static void memory_bm_position_reset(struct memory_bitmap *bm)
|
||||||
{
|
{
|
||||||
struct zone_bitmap *zone_bm;
|
bm->cur.block = list_entry(bm->blocks.next, struct bm_block, hook);
|
||||||
|
|
||||||
zone_bm = bm->zone_bm_list;
|
|
||||||
bm->cur.zone_bm = zone_bm;
|
|
||||||
bm->cur.block = zone_bm->bm_blocks;
|
|
||||||
bm->cur.bit = 0;
|
bm->cur.bit = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -285,151 +267,184 @@ static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* create_bm_block_list - create a list of block bitmap objects
|
* create_bm_block_list - create a list of block bitmap objects
|
||||||
|
* @nr_blocks - number of blocks to allocate
|
||||||
|
* @list - list to put the allocated blocks into
|
||||||
|
* @ca - chain allocator to be used for allocating memory
|
||||||
*/
|
*/
|
||||||
|
static int create_bm_block_list(unsigned long pages,
|
||||||
static inline struct bm_block *
|
struct list_head *list,
|
||||||
create_bm_block_list(unsigned int nr_blocks, struct chain_allocator *ca)
|
struct chain_allocator *ca)
|
||||||
{
|
{
|
||||||
struct bm_block *bblist = NULL;
|
unsigned int nr_blocks = DIV_ROUND_UP(pages, BM_BITS_PER_BLOCK);
|
||||||
|
|
||||||
while (nr_blocks-- > 0) {
|
while (nr_blocks-- > 0) {
|
||||||
struct bm_block *bb;
|
struct bm_block *bb;
|
||||||
|
|
||||||
bb = chain_alloc(ca, sizeof(struct bm_block));
|
bb = chain_alloc(ca, sizeof(struct bm_block));
|
||||||
if (!bb)
|
if (!bb)
|
||||||
return NULL;
|
return -ENOMEM;
|
||||||
|
list_add(&bb->hook, list);
|
||||||
bb->next = bblist;
|
}
|
||||||
bblist = bb;
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct mem_extent {
|
||||||
|
struct list_head hook;
|
||||||
|
unsigned long start;
|
||||||
|
unsigned long end;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* free_mem_extents - free a list of memory extents
|
||||||
|
* @list - list of extents to empty
|
||||||
|
*/
|
||||||
|
static void free_mem_extents(struct list_head *list)
|
||||||
|
{
|
||||||
|
struct mem_extent *ext, *aux;
|
||||||
|
|
||||||
|
list_for_each_entry_safe(ext, aux, list, hook) {
|
||||||
|
list_del(&ext->hook);
|
||||||
|
kfree(ext);
|
||||||
}
|
}
|
||||||
return bblist;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* create_zone_bm_list - create a list of zone bitmap objects
|
* create_mem_extents - create a list of memory extents representing
|
||||||
|
* contiguous ranges of PFNs
|
||||||
|
* @list - list to put the extents into
|
||||||
|
* @gfp_mask - mask to use for memory allocations
|
||||||
*/
|
*/
|
||||||
|
static int create_mem_extents(struct list_head *list, gfp_t gfp_mask)
|
||||||
static inline struct zone_bitmap *
|
|
||||||
create_zone_bm_list(unsigned int nr_zones, struct chain_allocator *ca)
|
|
||||||
{
|
{
|
||||||
struct zone_bitmap *zbmlist = NULL;
|
struct zone *zone;
|
||||||
|
|
||||||
while (nr_zones-- > 0) {
|
INIT_LIST_HEAD(list);
|
||||||
struct zone_bitmap *zbm;
|
|
||||||
|
|
||||||
zbm = chain_alloc(ca, sizeof(struct zone_bitmap));
|
for_each_zone(zone) {
|
||||||
if (!zbm)
|
unsigned long zone_start, zone_end;
|
||||||
return NULL;
|
struct mem_extent *ext, *cur, *aux;
|
||||||
|
|
||||||
zbm->next = zbmlist;
|
if (!populated_zone(zone))
|
||||||
zbmlist = zbm;
|
continue;
|
||||||
|
|
||||||
|
zone_start = zone->zone_start_pfn;
|
||||||
|
zone_end = zone->zone_start_pfn + zone->spanned_pages;
|
||||||
|
|
||||||
|
list_for_each_entry(ext, list, hook)
|
||||||
|
if (zone_start <= ext->end)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (&ext->hook == list || zone_end < ext->start) {
|
||||||
|
/* New extent is necessary */
|
||||||
|
struct mem_extent *new_ext;
|
||||||
|
|
||||||
|
new_ext = kzalloc(sizeof(struct mem_extent), gfp_mask);
|
||||||
|
if (!new_ext) {
|
||||||
|
free_mem_extents(list);
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
new_ext->start = zone_start;
|
||||||
|
new_ext->end = zone_end;
|
||||||
|
list_add_tail(&new_ext->hook, &ext->hook);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Merge this zone's range of PFNs with the existing one */
|
||||||
|
if (zone_start < ext->start)
|
||||||
|
ext->start = zone_start;
|
||||||
|
if (zone_end > ext->end)
|
||||||
|
ext->end = zone_end;
|
||||||
|
|
||||||
|
/* More merging may be possible */
|
||||||
|
cur = ext;
|
||||||
|
list_for_each_entry_safe_continue(cur, aux, list, hook) {
|
||||||
|
if (zone_end < cur->start)
|
||||||
|
break;
|
||||||
|
if (zone_end < cur->end)
|
||||||
|
ext->end = cur->end;
|
||||||
|
list_del(&cur->hook);
|
||||||
|
kfree(cur);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return zbmlist;
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* memory_bm_create - allocate memory for a memory bitmap
|
* memory_bm_create - allocate memory for a memory bitmap
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int
|
static int
|
||||||
memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
|
memory_bm_create(struct memory_bitmap *bm, gfp_t gfp_mask, int safe_needed)
|
||||||
{
|
{
|
||||||
struct chain_allocator ca;
|
struct chain_allocator ca;
|
||||||
struct zone *zone;
|
struct list_head mem_extents;
|
||||||
struct zone_bitmap *zone_bm;
|
struct mem_extent *ext;
|
||||||
struct bm_block *bb;
|
int error;
|
||||||
unsigned int nr;
|
|
||||||
|
|
||||||
chain_init(&ca, gfp_mask, safe_needed);
|
chain_init(&ca, gfp_mask, safe_needed);
|
||||||
|
INIT_LIST_HEAD(&bm->blocks);
|
||||||
|
|
||||||
/* Compute the number of zones */
|
error = create_mem_extents(&mem_extents, gfp_mask);
|
||||||
nr = 0;
|
if (error)
|
||||||
for_each_zone(zone)
|
return error;
|
||||||
if (populated_zone(zone))
|
|
||||||
nr++;
|
|
||||||
|
|
||||||
/* Allocate the list of zones bitmap objects */
|
list_for_each_entry(ext, &mem_extents, hook) {
|
||||||
zone_bm = create_zone_bm_list(nr, &ca);
|
struct bm_block *bb;
|
||||||
bm->zone_bm_list = zone_bm;
|
unsigned long pfn = ext->start;
|
||||||
if (!zone_bm) {
|
unsigned long pages = ext->end - ext->start;
|
||||||
chain_free(&ca, PG_UNSAFE_CLEAR);
|
|
||||||
return -ENOMEM;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Initialize the zone bitmap objects */
|
bb = list_entry(bm->blocks.prev, struct bm_block, hook);
|
||||||
for_each_zone(zone) {
|
|
||||||
unsigned long pfn;
|
|
||||||
|
|
||||||
if (!populated_zone(zone))
|
error = create_bm_block_list(pages, bm->blocks.prev, &ca);
|
||||||
continue;
|
if (error)
|
||||||
|
goto Error;
|
||||||
|
|
||||||
zone_bm->start_pfn = zone->zone_start_pfn;
|
list_for_each_entry_continue(bb, &bm->blocks, hook) {
|
||||||
zone_bm->end_pfn = zone->zone_start_pfn + zone->spanned_pages;
|
bb->data = get_image_page(gfp_mask, safe_needed);
|
||||||
/* Allocate the list of bitmap block objects */
|
if (!bb->data) {
|
||||||
nr = DIV_ROUND_UP(zone->spanned_pages, BM_BITS_PER_BLOCK);
|
error = -ENOMEM;
|
||||||
bb = create_bm_block_list(nr, &ca);
|
goto Error;
|
||||||
zone_bm->bm_blocks = bb;
|
}
|
||||||
zone_bm->cur_block = bb;
|
|
||||||
if (!bb)
|
|
||||||
goto Free;
|
|
||||||
|
|
||||||
nr = zone->spanned_pages;
|
|
||||||
pfn = zone->zone_start_pfn;
|
|
||||||
/* Initialize the bitmap block objects */
|
|
||||||
while (bb) {
|
|
||||||
unsigned long *ptr;
|
|
||||||
|
|
||||||
ptr = get_image_page(gfp_mask, safe_needed);
|
|
||||||
bb->data = ptr;
|
|
||||||
if (!ptr)
|
|
||||||
goto Free;
|
|
||||||
|
|
||||||
bb->start_pfn = pfn;
|
bb->start_pfn = pfn;
|
||||||
if (nr >= BM_BITS_PER_BLOCK) {
|
if (pages >= BM_BITS_PER_BLOCK) {
|
||||||
pfn += BM_BITS_PER_BLOCK;
|
pfn += BM_BITS_PER_BLOCK;
|
||||||
nr -= BM_BITS_PER_BLOCK;
|
pages -= BM_BITS_PER_BLOCK;
|
||||||
} else {
|
} else {
|
||||||
/* This is executed only once in the loop */
|
/* This is executed only once in the loop */
|
||||||
pfn += nr;
|
pfn += pages;
|
||||||
}
|
}
|
||||||
bb->end_pfn = pfn;
|
bb->end_pfn = pfn;
|
||||||
bb = bb->next;
|
|
||||||
}
|
}
|
||||||
zone_bm = zone_bm->next;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bm->p_list = ca.chain;
|
bm->p_list = ca.chain;
|
||||||
memory_bm_position_reset(bm);
|
memory_bm_position_reset(bm);
|
||||||
return 0;
|
Exit:
|
||||||
|
free_mem_extents(&mem_extents);
|
||||||
|
return error;
|
||||||
|
|
||||||
Free:
|
Error:
|
||||||
bm->p_list = ca.chain;
|
bm->p_list = ca.chain;
|
||||||
memory_bm_free(bm, PG_UNSAFE_CLEAR);
|
memory_bm_free(bm, PG_UNSAFE_CLEAR);
|
||||||
return -ENOMEM;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* memory_bm_free - free memory occupied by the memory bitmap @bm
|
* memory_bm_free - free memory occupied by the memory bitmap @bm
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free)
|
static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free)
|
||||||
{
|
{
|
||||||
struct zone_bitmap *zone_bm;
|
struct bm_block *bb;
|
||||||
|
|
||||||
/* Free the list of bit blocks for each zone_bitmap object */
|
list_for_each_entry(bb, &bm->blocks, hook)
|
||||||
zone_bm = bm->zone_bm_list;
|
if (bb->data)
|
||||||
while (zone_bm) {
|
free_image_page(bb->data, clear_nosave_free);
|
||||||
struct bm_block *bb;
|
|
||||||
|
|
||||||
bb = zone_bm->bm_blocks;
|
|
||||||
while (bb) {
|
|
||||||
if (bb->data)
|
|
||||||
free_image_page(bb->data, clear_nosave_free);
|
|
||||||
bb = bb->next;
|
|
||||||
}
|
|
||||||
zone_bm = zone_bm->next;
|
|
||||||
}
|
|
||||||
free_list_of_pages(bm->p_list, clear_nosave_free);
|
free_list_of_pages(bm->p_list, clear_nosave_free);
|
||||||
bm->zone_bm_list = NULL;
|
|
||||||
|
INIT_LIST_HEAD(&bm->blocks);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -437,38 +452,33 @@ static void memory_bm_free(struct memory_bitmap *bm, int clear_nosave_free)
|
||||||
* to given pfn. The cur_zone_bm member of @bm and the cur_block member
|
* to given pfn. The cur_zone_bm member of @bm and the cur_block member
|
||||||
* of @bm->cur_zone_bm are updated.
|
* of @bm->cur_zone_bm are updated.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
|
static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,
|
||||||
void **addr, unsigned int *bit_nr)
|
void **addr, unsigned int *bit_nr)
|
||||||
{
|
{
|
||||||
struct zone_bitmap *zone_bm;
|
|
||||||
struct bm_block *bb;
|
struct bm_block *bb;
|
||||||
|
|
||||||
/* Check if the pfn is from the current zone */
|
/*
|
||||||
zone_bm = bm->cur.zone_bm;
|
* Check if the pfn corresponds to the current bitmap block and find
|
||||||
if (pfn < zone_bm->start_pfn || pfn >= zone_bm->end_pfn) {
|
* the block where it fits if this is not the case.
|
||||||
zone_bm = bm->zone_bm_list;
|
*/
|
||||||
/* We don't assume that the zones are sorted by pfns */
|
bb = bm->cur.block;
|
||||||
while (pfn < zone_bm->start_pfn || pfn >= zone_bm->end_pfn) {
|
|
||||||
zone_bm = zone_bm->next;
|
|
||||||
|
|
||||||
if (!zone_bm)
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
bm->cur.zone_bm = zone_bm;
|
|
||||||
}
|
|
||||||
/* Check if the pfn corresponds to the current bitmap block */
|
|
||||||
bb = zone_bm->cur_block;
|
|
||||||
if (pfn < bb->start_pfn)
|
if (pfn < bb->start_pfn)
|
||||||
bb = zone_bm->bm_blocks;
|
list_for_each_entry_continue_reverse(bb, &bm->blocks, hook)
|
||||||
|
if (pfn >= bb->start_pfn)
|
||||||
|
break;
|
||||||
|
|
||||||
while (pfn >= bb->end_pfn) {
|
if (pfn >= bb->end_pfn)
|
||||||
bb = bb->next;
|
list_for_each_entry_continue(bb, &bm->blocks, hook)
|
||||||
|
if (pfn >= bb->start_pfn && pfn < bb->end_pfn)
|
||||||
|
break;
|
||||||
|
|
||||||
BUG_ON(!bb);
|
if (&bb->hook == &bm->blocks)
|
||||||
}
|
return -EFAULT;
|
||||||
zone_bm->cur_block = bb;
|
|
||||||
|
/* The block has been found */
|
||||||
|
bm->cur.block = bb;
|
||||||
pfn -= bb->start_pfn;
|
pfn -= bb->start_pfn;
|
||||||
|
bm->cur.bit = pfn + 1;
|
||||||
*bit_nr = pfn;
|
*bit_nr = pfn;
|
||||||
*addr = bb->data;
|
*addr = bb->data;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -519,6 +529,14 @@ static int memory_bm_test_bit(struct memory_bitmap *bm, unsigned long pfn)
|
||||||
return test_bit(bit, addr);
|
return test_bit(bit, addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool memory_bm_pfn_present(struct memory_bitmap *bm, unsigned long pfn)
|
||||||
|
{
|
||||||
|
void *addr;
|
||||||
|
unsigned int bit;
|
||||||
|
|
||||||
|
return !memory_bm_find_bit(bm, pfn, &addr, &bit);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* memory_bm_next_pfn - find the pfn that corresponds to the next set bit
|
* memory_bm_next_pfn - find the pfn that corresponds to the next set bit
|
||||||
* in the bitmap @bm. If the pfn cannot be found, BM_END_OF_MAP is
|
* in the bitmap @bm. If the pfn cannot be found, BM_END_OF_MAP is
|
||||||
|
@ -530,29 +548,21 @@ static int memory_bm_test_bit(struct memory_bitmap *bm, unsigned long pfn)
|
||||||
|
|
||||||
static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm)
|
static unsigned long memory_bm_next_pfn(struct memory_bitmap *bm)
|
||||||
{
|
{
|
||||||
struct zone_bitmap *zone_bm;
|
|
||||||
struct bm_block *bb;
|
struct bm_block *bb;
|
||||||
int bit;
|
int bit;
|
||||||
|
|
||||||
|
bb = bm->cur.block;
|
||||||
do {
|
do {
|
||||||
bb = bm->cur.block;
|
bit = bm->cur.bit;
|
||||||
do {
|
bit = find_next_bit(bb->data, bm_block_bits(bb), bit);
|
||||||
bit = bm->cur.bit;
|
if (bit < bm_block_bits(bb))
|
||||||
bit = find_next_bit(bb->data, bm_block_bits(bb), bit);
|
goto Return_pfn;
|
||||||
if (bit < bm_block_bits(bb))
|
|
||||||
goto Return_pfn;
|
bb = list_entry(bb->hook.next, struct bm_block, hook);
|
||||||
|
bm->cur.block = bb;
|
||||||
|
bm->cur.bit = 0;
|
||||||
|
} while (&bb->hook != &bm->blocks);
|
||||||
|
|
||||||
bb = bb->next;
|
|
||||||
bm->cur.block = bb;
|
|
||||||
bm->cur.bit = 0;
|
|
||||||
} while (bb);
|
|
||||||
zone_bm = bm->cur.zone_bm->next;
|
|
||||||
if (zone_bm) {
|
|
||||||
bm->cur.zone_bm = zone_bm;
|
|
||||||
bm->cur.block = zone_bm->bm_blocks;
|
|
||||||
bm->cur.bit = 0;
|
|
||||||
}
|
|
||||||
} while (zone_bm);
|
|
||||||
memory_bm_position_reset(bm);
|
memory_bm_position_reset(bm);
|
||||||
return BM_END_OF_MAP;
|
return BM_END_OF_MAP;
|
||||||
|
|
||||||
|
@ -808,8 +818,7 @@ static unsigned int count_free_highmem_pages(void)
|
||||||
* We should save the page if it isn't Nosave or NosaveFree, or Reserved,
|
* We should save the page if it isn't Nosave or NosaveFree, or Reserved,
|
||||||
* and it isn't a part of a free chunk of pages.
|
* and it isn't a part of a free chunk of pages.
|
||||||
*/
|
*/
|
||||||
|
static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
|
||||||
static struct page *saveable_highmem_page(unsigned long pfn)
|
|
||||||
{
|
{
|
||||||
struct page *page;
|
struct page *page;
|
||||||
|
|
||||||
|
@ -817,6 +826,8 @@ static struct page *saveable_highmem_page(unsigned long pfn)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
page = pfn_to_page(pfn);
|
page = pfn_to_page(pfn);
|
||||||
|
if (page_zone(page) != zone)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
BUG_ON(!PageHighMem(page));
|
BUG_ON(!PageHighMem(page));
|
||||||
|
|
||||||
|
@ -846,13 +857,16 @@ unsigned int count_highmem_pages(void)
|
||||||
mark_free_pages(zone);
|
mark_free_pages(zone);
|
||||||
max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
|
max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
|
||||||
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
|
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
|
||||||
if (saveable_highmem_page(pfn))
|
if (saveable_highmem_page(zone, pfn))
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
|
static inline void *saveable_highmem_page(struct zone *z, unsigned long p)
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
#endif /* CONFIG_HIGHMEM */
|
#endif /* CONFIG_HIGHMEM */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -863,8 +877,7 @@ static inline void *saveable_highmem_page(unsigned long pfn) { return NULL; }
|
||||||
* of pages statically defined as 'unsaveable', and it isn't a part of
|
* of pages statically defined as 'unsaveable', and it isn't a part of
|
||||||
* a free chunk of pages.
|
* a free chunk of pages.
|
||||||
*/
|
*/
|
||||||
|
static struct page *saveable_page(struct zone *zone, unsigned long pfn)
|
||||||
static struct page *saveable_page(unsigned long pfn)
|
|
||||||
{
|
{
|
||||||
struct page *page;
|
struct page *page;
|
||||||
|
|
||||||
|
@ -872,6 +885,8 @@ static struct page *saveable_page(unsigned long pfn)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
page = pfn_to_page(pfn);
|
page = pfn_to_page(pfn);
|
||||||
|
if (page_zone(page) != zone)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
BUG_ON(PageHighMem(page));
|
BUG_ON(PageHighMem(page));
|
||||||
|
|
||||||
|
@ -903,7 +918,7 @@ unsigned int count_data_pages(void)
|
||||||
mark_free_pages(zone);
|
mark_free_pages(zone);
|
||||||
max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
|
max_zone_pfn = zone->zone_start_pfn + zone->spanned_pages;
|
||||||
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
|
for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++)
|
||||||
if(saveable_page(pfn))
|
if (saveable_page(zone, pfn))
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
|
@ -944,7 +959,7 @@ static inline struct page *
|
||||||
page_is_saveable(struct zone *zone, unsigned long pfn)
|
page_is_saveable(struct zone *zone, unsigned long pfn)
|
||||||
{
|
{
|
||||||
return is_highmem(zone) ?
|
return is_highmem(zone) ?
|
||||||
saveable_highmem_page(pfn) : saveable_page(pfn);
|
saveable_highmem_page(zone, pfn) : saveable_page(zone, pfn);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
||||||
|
@ -966,7 +981,7 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
||||||
* data modified by kmap_atomic()
|
* data modified by kmap_atomic()
|
||||||
*/
|
*/
|
||||||
safe_copy_page(buffer, s_page);
|
safe_copy_page(buffer, s_page);
|
||||||
dst = kmap_atomic(pfn_to_page(dst_pfn), KM_USER0);
|
dst = kmap_atomic(d_page, KM_USER0);
|
||||||
memcpy(dst, buffer, PAGE_SIZE);
|
memcpy(dst, buffer, PAGE_SIZE);
|
||||||
kunmap_atomic(dst, KM_USER0);
|
kunmap_atomic(dst, KM_USER0);
|
||||||
} else {
|
} else {
|
||||||
|
@ -975,7 +990,7 @@ static void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define page_is_saveable(zone, pfn) saveable_page(pfn)
|
#define page_is_saveable(zone, pfn) saveable_page(zone, pfn)
|
||||||
|
|
||||||
static inline void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
static inline void copy_data_page(unsigned long dst_pfn, unsigned long src_pfn)
|
||||||
{
|
{
|
||||||
|
@ -1459,9 +1474,7 @@ load_header(struct swsusp_info *info)
|
||||||
* unpack_orig_pfns - for each element of @buf[] (1 page at a time) set
|
* unpack_orig_pfns - for each element of @buf[] (1 page at a time) set
|
||||||
* the corresponding bit in the memory bitmap @bm
|
* the corresponding bit in the memory bitmap @bm
|
||||||
*/
|
*/
|
||||||
|
static int unpack_orig_pfns(unsigned long *buf, struct memory_bitmap *bm)
|
||||||
static inline void
|
|
||||||
unpack_orig_pfns(unsigned long *buf, struct memory_bitmap *bm)
|
|
||||||
{
|
{
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
|
@ -1469,8 +1482,13 @@ unpack_orig_pfns(unsigned long *buf, struct memory_bitmap *bm)
|
||||||
if (unlikely(buf[j] == BM_END_OF_MAP))
|
if (unlikely(buf[j] == BM_END_OF_MAP))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
memory_bm_set_bit(bm, buf[j]);
|
if (memory_bm_pfn_present(bm, buf[j]))
|
||||||
|
memory_bm_set_bit(bm, buf[j]);
|
||||||
|
else
|
||||||
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* List of "safe" pages that may be used to store data loaded from the suspend
|
/* List of "safe" pages that may be used to store data loaded from the suspend
|
||||||
|
@ -1608,7 +1626,7 @@ get_highmem_page_buffer(struct page *page, struct chain_allocator *ca)
|
||||||
pbe = chain_alloc(ca, sizeof(struct highmem_pbe));
|
pbe = chain_alloc(ca, sizeof(struct highmem_pbe));
|
||||||
if (!pbe) {
|
if (!pbe) {
|
||||||
swsusp_free();
|
swsusp_free();
|
||||||
return NULL;
|
return ERR_PTR(-ENOMEM);
|
||||||
}
|
}
|
||||||
pbe->orig_page = page;
|
pbe->orig_page = page;
|
||||||
if (safe_highmem_pages > 0) {
|
if (safe_highmem_pages > 0) {
|
||||||
|
@ -1677,7 +1695,7 @@ prepare_highmem_image(struct memory_bitmap *bm, unsigned int *nr_highmem_p)
|
||||||
static inline void *
|
static inline void *
|
||||||
get_highmem_page_buffer(struct page *page, struct chain_allocator *ca)
|
get_highmem_page_buffer(struct page *page, struct chain_allocator *ca)
|
||||||
{
|
{
|
||||||
return NULL;
|
return ERR_PTR(-EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void copy_last_highmem_page(void) {}
|
static inline void copy_last_highmem_page(void) {}
|
||||||
|
@ -1788,8 +1806,13 @@ prepare_image(struct memory_bitmap *new_bm, struct memory_bitmap *bm)
|
||||||
static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
|
static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
|
||||||
{
|
{
|
||||||
struct pbe *pbe;
|
struct pbe *pbe;
|
||||||
struct page *page = pfn_to_page(memory_bm_next_pfn(bm));
|
struct page *page;
|
||||||
|
unsigned long pfn = memory_bm_next_pfn(bm);
|
||||||
|
|
||||||
|
if (pfn == BM_END_OF_MAP)
|
||||||
|
return ERR_PTR(-EFAULT);
|
||||||
|
|
||||||
|
page = pfn_to_page(pfn);
|
||||||
if (PageHighMem(page))
|
if (PageHighMem(page))
|
||||||
return get_highmem_page_buffer(page, ca);
|
return get_highmem_page_buffer(page, ca);
|
||||||
|
|
||||||
|
@ -1805,7 +1828,7 @@ static void *get_buffer(struct memory_bitmap *bm, struct chain_allocator *ca)
|
||||||
pbe = chain_alloc(ca, sizeof(struct pbe));
|
pbe = chain_alloc(ca, sizeof(struct pbe));
|
||||||
if (!pbe) {
|
if (!pbe) {
|
||||||
swsusp_free();
|
swsusp_free();
|
||||||
return NULL;
|
return ERR_PTR(-ENOMEM);
|
||||||
}
|
}
|
||||||
pbe->orig_address = page_address(page);
|
pbe->orig_address = page_address(page);
|
||||||
pbe->address = safe_pages_list;
|
pbe->address = safe_pages_list;
|
||||||
|
@ -1868,7 +1891,10 @@ int snapshot_write_next(struct snapshot_handle *handle, size_t count)
|
||||||
return error;
|
return error;
|
||||||
|
|
||||||
} else if (handle->prev <= nr_meta_pages) {
|
} else if (handle->prev <= nr_meta_pages) {
|
||||||
unpack_orig_pfns(buffer, ©_bm);
|
error = unpack_orig_pfns(buffer, ©_bm);
|
||||||
|
if (error)
|
||||||
|
return error;
|
||||||
|
|
||||||
if (handle->prev == nr_meta_pages) {
|
if (handle->prev == nr_meta_pages) {
|
||||||
error = prepare_image(&orig_bm, ©_bm);
|
error = prepare_image(&orig_bm, ©_bm);
|
||||||
if (error)
|
if (error)
|
||||||
|
@ -1879,12 +1905,14 @@ int snapshot_write_next(struct snapshot_handle *handle, size_t count)
|
||||||
restore_pblist = NULL;
|
restore_pblist = NULL;
|
||||||
handle->buffer = get_buffer(&orig_bm, &ca);
|
handle->buffer = get_buffer(&orig_bm, &ca);
|
||||||
handle->sync_read = 0;
|
handle->sync_read = 0;
|
||||||
if (!handle->buffer)
|
if (IS_ERR(handle->buffer))
|
||||||
return -ENOMEM;
|
return PTR_ERR(handle->buffer);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
copy_last_highmem_page();
|
copy_last_highmem_page();
|
||||||
handle->buffer = get_buffer(&orig_bm, &ca);
|
handle->buffer = get_buffer(&orig_bm, &ca);
|
||||||
|
if (IS_ERR(handle->buffer))
|
||||||
|
return PTR_ERR(handle->buffer);
|
||||||
if (handle->buffer != buffer)
|
if (handle->buffer != buffer)
|
||||||
handle->sync_read = 0;
|
handle->sync_read = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -262,3 +262,125 @@ int swsusp_shrink_memory(void)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Platforms, like ACPI, may want us to save some memory used by them during
|
||||||
|
* hibernation and to restore the contents of this memory during the subsequent
|
||||||
|
* resume. The code below implements a mechanism allowing us to do that.
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct nvs_page {
|
||||||
|
unsigned long phys_start;
|
||||||
|
unsigned int size;
|
||||||
|
void *kaddr;
|
||||||
|
void *data;
|
||||||
|
struct list_head node;
|
||||||
|
};
|
||||||
|
|
||||||
|
static LIST_HEAD(nvs_list);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hibernate_nvs_register - register platform NVS memory region to save
|
||||||
|
* @start - physical address of the region
|
||||||
|
* @size - size of the region
|
||||||
|
*
|
||||||
|
* The NVS region need not be page-aligned (both ends) and we arrange
|
||||||
|
* things so that the data from page-aligned addresses in this region will
|
||||||
|
* be copied into separate RAM pages.
|
||||||
|
*/
|
||||||
|
int hibernate_nvs_register(unsigned long start, unsigned long size)
|
||||||
|
{
|
||||||
|
struct nvs_page *entry, *next;
|
||||||
|
|
||||||
|
while (size > 0) {
|
||||||
|
unsigned int nr_bytes;
|
||||||
|
|
||||||
|
entry = kzalloc(sizeof(struct nvs_page), GFP_KERNEL);
|
||||||
|
if (!entry)
|
||||||
|
goto Error;
|
||||||
|
|
||||||
|
list_add_tail(&entry->node, &nvs_list);
|
||||||
|
entry->phys_start = start;
|
||||||
|
nr_bytes = PAGE_SIZE - (start & ~PAGE_MASK);
|
||||||
|
entry->size = (size < nr_bytes) ? size : nr_bytes;
|
||||||
|
|
||||||
|
start += entry->size;
|
||||||
|
size -= entry->size;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
Error:
|
||||||
|
list_for_each_entry_safe(entry, next, &nvs_list, node) {
|
||||||
|
list_del(&entry->node);
|
||||||
|
kfree(entry);
|
||||||
|
}
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hibernate_nvs_free - free data pages allocated for saving NVS regions
|
||||||
|
*/
|
||||||
|
void hibernate_nvs_free(void)
|
||||||
|
{
|
||||||
|
struct nvs_page *entry;
|
||||||
|
|
||||||
|
list_for_each_entry(entry, &nvs_list, node)
|
||||||
|
if (entry->data) {
|
||||||
|
free_page((unsigned long)entry->data);
|
||||||
|
entry->data = NULL;
|
||||||
|
if (entry->kaddr) {
|
||||||
|
iounmap(entry->kaddr);
|
||||||
|
entry->kaddr = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hibernate_nvs_alloc - allocate memory necessary for saving NVS regions
|
||||||
|
*/
|
||||||
|
int hibernate_nvs_alloc(void)
|
||||||
|
{
|
||||||
|
struct nvs_page *entry;
|
||||||
|
|
||||||
|
list_for_each_entry(entry, &nvs_list, node) {
|
||||||
|
entry->data = (void *)__get_free_page(GFP_KERNEL);
|
||||||
|
if (!entry->data) {
|
||||||
|
hibernate_nvs_free();
|
||||||
|
return -ENOMEM;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hibernate_nvs_save - save NVS memory regions
|
||||||
|
*/
|
||||||
|
void hibernate_nvs_save(void)
|
||||||
|
{
|
||||||
|
struct nvs_page *entry;
|
||||||
|
|
||||||
|
printk(KERN_INFO "PM: Saving platform NVS memory\n");
|
||||||
|
|
||||||
|
list_for_each_entry(entry, &nvs_list, node)
|
||||||
|
if (entry->data) {
|
||||||
|
entry->kaddr = ioremap(entry->phys_start, entry->size);
|
||||||
|
memcpy(entry->data, entry->kaddr, entry->size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* hibernate_nvs_restore - restore NVS memory regions
|
||||||
|
*
|
||||||
|
* This function is going to be called with interrupts disabled, so it
|
||||||
|
* cannot iounmap the virtual addresses used to access the NVS region.
|
||||||
|
*/
|
||||||
|
void hibernate_nvs_restore(void)
|
||||||
|
{
|
||||||
|
struct nvs_page *entry;
|
||||||
|
|
||||||
|
printk(KERN_INFO "PM: Restoring platform NVS memory\n");
|
||||||
|
|
||||||
|
list_for_each_entry(entry, &nvs_list, node)
|
||||||
|
if (entry->data)
|
||||||
|
memcpy(entry->kaddr, entry->data, entry->size);
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue