x86: make sure wakeup code is below 1M

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Index: linux-2.6/arch/x86/include/asm/acpi.h
===================================================================

arch/x86/include/asm/acpi.h +0 -0

 /*
  * Check if the CPU can handle C2 and deeper

Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
===================================================================

arch/x86/kernel/acpi/sleep.c +4 -2

@@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
 
 
 /**
- * acpi_reserve_bootmem - do _very_ early ACPI initialisation
+ * acpi_reserve_memory - do _very_ early ACPI initialisation
  *
  * We allocate a page from the first 1MB of memory for the wakeup
  * routine for when we come back from a sleep state. The
  * runtime allocator allows specification of <16MB pages, but not
  * <1MB pages.
  */
-void __init acpi_reserve_bootmem(void)
+void __init acpi_reserve_memory(void)
 {
+	unsigned long mem;
+
 	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Index: linux-2.6/arch/x86/include/asm/acpi.h
===================================================================

arch/x86/include/asm/acpi.h +0 -0

 /*
  * Check if the CPU can handle C2 and deeper

Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
===================================================================

arch/x86/kernel/acpi/sleep.c +4 -2

@@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
 
 
 /**
- * acpi_reserve_bootmem - do _very_ early ACPI initialisation
+ * acpi_reserve_memory - do _very_ early ACPI initialisation
  *
  * We allocate a page from the first 1MB of memory for the wakeup
  * routine for when we come back from a sleep state. The
  * runtime allocator allows specification of <16MB pages, but not
  * <1MB pages.
  */
-void __init acpi_reserve_bootmem(void)
+void __init acpi_reserve_memory(void)
 {
+	unsigned long mem;
+
 	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Quoted 9 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

Quoted 5 lines

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Looks good. Rafael, Peter, does it look good to you too?

Quoted 9 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

Quoted 5 lines

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Looks good. Rafael, Peter, does it look good to you too?

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Index: linux-2.6/arch/x86/include/asm/acpi.h
===================================================================

arch/x86/include/asm/acpi.h +1 -1

@@ -118,7 +118,7 @@ extern void acpi_restore_state_mem(void)
 extern unsigned long acpi_wakeup_address;
 
 /* early initialization routine */
-extern void acpi_reserve_bootmem(void);
+extern void acpi_reserve_wakeup_memory(void);
 
 /*
  * Check if the CPU can handle C2 and deeper

Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
===================================================================

arch/x86/kernel/acpi/sleep.c +9 -6

@@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
 
 
 /**
- * acpi_reserve_bootmem - do _very_ early ACPI initialisation
+ * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
  *
  * We allocate a page from the first 1MB of memory for the wakeup
  * routine for when we come back from a sleep state. The
  * runtime allocator allows specification of <16MB pages, but not
  * <1MB pages.
  */
-void __init acpi_reserve_bootmem(void)
+void __init acpi_reserve_wakeup_memory(void)
 {
+	unsigned long mem;
+
 	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {
 		printk(KERN_ERR
 		       "ACPI: Wakeup code way too big, S3 disabled.\n");
 		return;
 	}
 
-	acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
+	mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);
 
-	if (!acpi_realmode) {
+	if (mem == -1L) {
 		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
 		return;
 	}
-
-	acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
+	acpi_realmode = (unsigned long) phys_to_virt(mem);
+	acpi_wakeup_address = mem;
+	reserve_early(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
 }
 
 

Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================

arch/x86/kernel/setup.c +7 -7

@@ -905,6 +905,13 @@ void __init setup_arch(char **cmdline_p)
 
 	reserve_brk();
 
+#ifdef CONFIG_ACPI_SLEEP
+	/*
+	 * Reserve low memory region for sleep support.
+	 * even before init_memory_mapping
+	 */
+	acpi_reserve_wakeup_memory();
+#endif
 	init_gbpages();
 
 	/* max_pfn_mapped is updated here */

@@ -956,12 +963,6 @@ void __init setup_arch(char **cmdline_p)
 
 	initmem_init(0, max_pfn, acpi, k8);
 
-#ifdef CONFIG_ACPI_SLEEP
-	/*
-	 * Reserve low memory region for sleep support.
-	 */
-	acpi_reserve_bootmem();
-#endif
 	/*
 	 * Find and reserve possible boot-time SMP configuration:
 	 */
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

Signed-off-by Yinghai Lu <[email protected]>

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Index: linux-2.6/arch/x86/include/asm/acpi.h
===================================================================

arch/x86/include/asm/acpi.h +1 -1

@@ -118,7 +118,7 @@ extern void acpi_restore_state_mem(void)
 extern unsigned long acpi_wakeup_address;
 
 /* early initialization routine */
-extern void acpi_reserve_bootmem(void);
+extern void acpi_reserve_wakeup_memory(void);
 
 /*
  * Check if the CPU can handle C2 and deeper

Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
===================================================================

arch/x86/kernel/acpi/sleep.c +9 -6

@@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
 
 
 /**
- * acpi_reserve_bootmem - do _very_ early ACPI initialisation
+ * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
  *
  * We allocate a page from the first 1MB of memory for the wakeup
  * routine for when we come back from a sleep state. The
  * runtime allocator allows specification of <16MB pages, but not
  * <1MB pages.
  */
-void __init acpi_reserve_bootmem(void)
+void __init acpi_reserve_wakeup_memory(void)
 {
+	unsigned long mem;
+
 	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {
 		printk(KERN_ERR
 		       "ACPI: Wakeup code way too big, S3 disabled.\n");
 		return;
 	}
 
-	acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
+	mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);
 
-	if (!acpi_realmode) {
+	if (mem == -1L) {
 		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
 		return;
 	}
-
-	acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
+	acpi_realmode = (unsigned long) phys_to_virt(mem);
+	acpi_wakeup_address = mem;
+	reserve_early(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
 }
 
 

Index: linux-2.6/arch/x86/kernel/setup.c
===================================================================

arch/x86/kernel/setup.c +7 -7

@@ -905,6 +905,13 @@ void __init setup_arch(char **cmdline_p)
 
 	reserve_brk();
 
+#ifdef CONFIG_ACPI_SLEEP
+	/*
+	 * Reserve low memory region for sleep support.
+	 * even before init_memory_mapping
+	 */
+	acpi_reserve_wakeup_memory();
+#endif
 	init_gbpages();
 
 	/* max_pfn_mapped is updated here */

@@ -956,12 +963,6 @@ void __init setup_arch(char **cmdline_p)
 
 	initmem_init(0, max_pfn, acpi, k8);
 
-#ifdef CONFIG_ACPI_SLEEP
-	/*
-	 * Reserve low memory region for sleep support.
-	 */
-	acpi_reserve_bootmem();
-#endif
 	/*
 	 * Find and reserve possible boot-time SMP configuration:
 	 */
--

To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 9 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

Quoted 5 lines

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Looks good. Rafael, Peter, does it look good to you too?

Quoted 9 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Signed-off-by Yinghai Lu <[email protected]>

Quoted 5 lines

---
 arch/x86/include/asm/acpi.h  |    2 +-
 arch/x86/kernel/acpi/sleep.c |   15 +++++++++------
 arch/x86/kernel/setup.c      |   13 +++++++------
 3 files changed, 17 insertions(+), 13 deletions(-)

Looks good. Rafael, Peter, does it look good to you too?

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Quoted 1 line

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Quoted 1 line

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

YH

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

YH

Quoted 12 lines · Yinghai Lu

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 3 lines

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

Quoted 12 lines · Yinghai Lu

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 3 lines

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

Quoted 15 lines · ykzhao

Quoted 14 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 5 lines

Quoted 1 line

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

also we could reserve_early there and let bootmem conversion to do that for us.

but for numa there is some chance to use other node bootmem to for that bootdata and bitmap. so make it simple just use reserve_bootmem there.

YH

Quoted 15 lines · ykzhao

Quoted 14 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 5 lines

Quoted 1 line

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

also we could reserve_early there and let bootmem conversion to do that for us.

but for numa there is some chance to use other node bootmem to for that bootdata and bitmap. so make it simple just use reserve_bootmem there.

YH

Quoted 16 lines · Yinghai Lu

Quoted 15 lines · ykzhao

Quoted 14 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 6 lines

Quoted 5 lines

Quoted 1 line

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

Quoted 16 lines · Yinghai Lu

Quoted 15 lines · ykzhao

Quoted 14 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

Quoted 6 lines

Quoted 5 lines

Quoted 1 line

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

Quoted 22 lines · ykzhao

Quoted 21 lines · Yinghai Lu

Quoted 20 lines · ykzhao

Quoted 7 lines · Yinghai Lu

Quoted 6 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Quoted 8 lines

Quoted 7 lines

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

Quoted 3 lines

Quoted 1 line

right after that will use reserve_bootmem for those range in initmem_init.

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

it is not needed anymore because bootmem for that node is ready at that point, could use reserve_bootmem_node directly. and before that early_res_to_bootmem will convert that early resource that fall into that node range to bootmem reserved too.

please check code setup_node_bootmem/early_node_mem/early_res_to_bootmem ...and reserve_bootmem_node...

YH

Quoted 22 lines · ykzhao

Quoted 21 lines · Yinghai Lu

Quoted 20 lines · ykzhao

Quoted 7 lines · Yinghai Lu

Quoted 6 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

Quoted 8 lines

Quoted 7 lines

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

Quoted 3 lines

Quoted 1 line

right after that will use reserve_bootmem for those range in initmem_init.

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

it is not needed anymore because bootmem for that node is ready at that point, could use reserve_bootmem_node directly. and before that early_res_to_bootmem will convert that early resource that fall into that node range to bootmem reserved too.

please check code setup_node_bootmem/early_node_mem/early_res_to_bootmem ...and reserve_bootmem_node...

YH

In this patch the find_e820_area is used in the acpi_reserve_wakeup_memory, which is called after initializing the bootmem allocator.
Can we still use the find_e820_area after the bootmem allocator is initialized?

It seems that the bootmem bitmap is also found by using the find_e820_area. But we don't update the reserved_early array any more. Maybe we will get the overlap address with the bootmem bitmap for the wakeup code.

In this patch the find_e820_area is used in the acpi_reserve_wakeup_memory, which is called after initializing the bootmem allocator.
Can we still use the find_e820_area after the bootmem allocator is initialized?

It seems that the bootmem bitmap is also found by using the find_e820_area. But we don't update the reserved_early array any more. Maybe we will get the overlap address with the bootmem bitmap for the wakeup code.

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Signed-off-by Yinghai Lu <[email protected]>

/*
* Check if the CPU can handle C2 and deeper
Index: linux-2.6/arch/x86/kernel/acpi/sleep.c
===================================================================

arch/x86/kernel/acpi/sleep.c +4 -2

@@ -119,29 +119,32 @@ void acpi_restore_state_mem(void)
 
 
 /**
- * acpi_reserve_bootmem - do _very_ early ACPI initialisation
+ * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
  *
  * We allocate a page from the first 1MB of memory for the wakeup
  * routine for when we come back from a sleep state. The
  * runtime allocator allows specification of <16MB pages, but not
  * <1MB pages.
  */
-void __init acpi_reserve_bootmem(void)
+void __init acpi_reserve_wakeup_memory(void)
 {
+	unsigned long mem;
+
 	if ((&wakeup_code_end - &wakeup_code_start) > WAKEUP_SIZE) {
 		printk(KERN_ERR
 		       "ACPI: Wakeup code way too big, S3 disabled.\n");
 		return;

Quoted 23 lines · ykzhao

Quoted 22 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 12 lines · Yinghai Lu

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 7 lines

Quoted 3 lines

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

Quoted 2 lines

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

it is not needed anymore because bootmem for that node is ready at that point, could use reserve_bootmem_node directly. and before that early_res_to_bootmem will convert that early resource that fall into that node range to bootmem reserved too.

please check code setup_node_bootmem/early_node_mem/early_res_to_bootmem ...and reserve_bootmem_node...

YH

Quoted 23 lines · ykzhao

Quoted 22 lines · Yinghai Lu

Quoted 13 lines · ykzhao

Quoted 12 lines · Yinghai Lu

Quoted 11 lines · ykzhao

Quoted 5 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

-v2: change function name to acpi_reserve_wakeup_memory according to Rafael

It seems that the function of find_e820_area is called in several places.

Quoted 1 line

Initmem_init: bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT,

bootmap_size, PAGE_SIZE);

Quoted 7 lines

Quoted 3 lines

Quoted 2 lines

If we also call it in the acpi_reserve_wakeup_memory, do we get the same base address as that obtained in initmem_init?

no. find_e820_area will check the reserve res array that could be updated by reserve_early.

It will check the reserved region array when calling the function of find_e820_area.
But it seems that the array is not updated when the find_e820_area is called in the function of initmem_init.

right after that will use reserve_bootmem for those range in initmem_init.

Quoted 2 lines

Yes. The reserve_bootmem is called for the range in initmem_init. But the reserved_early array is not updated.

it is not needed anymore because bootmem for that node is ready at that point, could use reserve_bootmem_node directly. and before that early_res_to_bootmem will convert that early resource that fall into that node range to bootmem reserved too.

please check code setup_node_bootmem/early_node_mem/early_res_to_bootmem ...and reserve_bootmem_node...

YH

Quoted 7 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

arch/x86/kernel/acpi/sleep.c +1 -1

-	acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
+	mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);

arch/x86/kernel/acpi/sleep.c void acpi_restore_state_mem(void) · line 144

Quoted 5 lines

arch/x86/kernel/acpi/sleep.c +1 -1

-	if (!acpi_realmode) {
+	if (mem == -1L) {
 		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
 		return;
 	}

How is it better then old code?

Quoted 7 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

arch/x86/kernel/acpi/sleep.c +1 -1

-	acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
+	mem = find_e820_area(0, 1<<20, WAKEUP_SIZE, PAGE_SIZE);

arch/x86/kernel/acpi/sleep.c void acpi_restore_state_mem(void) · line 144

Quoted 5 lines

arch/x86/kernel/acpi/sleep.c +1 -1

-	if (!acpi_realmode) {
+	if (mem == -1L) {
 		printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
 		return;
 	}

How is it better then old code?

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Does it fix anything? I can't tell from the changelog...

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Does it fix anything? I can't tell from the changelog...

Quoted 6 lines · Pavel Machek

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Quoted 1 line

Does it fix anything? I can't tell from the changelog...

Yes, it does. If the area is above 1M, we can't run real mode code from it.

This matters for NUMA machines supporting S3 (yes, there are a few models out there).

Quoted 6 lines · Pavel Machek

Quoted 4 lines · Yinghai Lu

try to find_e820_area/reserve_early, and call acpi_reserve_memory early

to get area is below 1M

Quoted 1 line

Does it fix anything? I can't tell from the changelog...

Yes, it does. If the area is above 1M, we can't run real mode code from it.

This matters for NUMA machines supporting S3 (yes, there are a few models out there).

Physical constraints to allocations (which this is) should be expressed early and with high priority, to make sure they can be met.

Physical constraints to allocations (which this is) should be expressed early and with high priority, to make sure they can be met.

Quoted 4 lines · Ingo Molnar

Physical constraints to allocations (which this is) should be expressed early and with high priority, to make sure they can be met.

Indeed, and in this case this means before bootmem allocator initialization.

Quoted 4 lines · Ingo Molnar

Physical constraints to allocations (which this is) should be expressed early and with high priority, to make sure they can be met.

Indeed, and in this case this means before bootmem allocator initialization.