fixup debug warnings during ACPI S3 resume from ram

During the wakeup from suspend-to-ram I get several warnings (see below). This patch fixes the warnings for me, but I am not an expert in ACPI. Please read the patch and consider to apply it.

@@ -145,7 +145,7 @@
 void *
 acpi_os_allocate(acpi_size size)
 {
-	return kmalloc(size, GFP_KERNEL);
+	return kmalloc(size, GFP_ATOMIC);
 }
 
 void

@@ -905,7 +905,7 @@
 
 	ACPI_DEBUG_PRINT ((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n", 

handle, units, timeout));

- if (in_atomic())
+ if (in_atomic() || irqs_disabled())
timeout = 0;

switch (timeout)

@@ -315,7 +315,7 @@
 	if (!link || !irq)
 		return_VALUE(-EINVAL);
 
-	resource = kmalloc( sizeof(*resource)+1, GFP_KERNEL);
+	resource = kmalloc( sizeof(*resource)+1, GFP_ATOMIC);
 	if(!resource)
 		return_VALUE(-ENOMEM);
 

-------------------

Warning messages:

Debug: sleeping function called from invalid context at /usr/src/bk/linux-bk/mm/slab.c:2085 in_atomic():0, irqs_disabled():1

 [<c0103ef7>] dump_stack+0x17/0x20
 [<c01176b6>] __might_sleep+0xa6/0xb0
 [<c01400f2>] kmem_cache_alloc+0x82/0x90
 [<c0220ad1>] acpi_pci_link_set+0x7a/0x24e
 [<c022116a>] acpi_pci_link_resume+0x47/0x7d
 [<c02211e5>] irqrouter_resume+0x45/0x6d
 [<c0252d47>] sysdev_resume+0xe7/0xec
 [<c0256a68>] device_power_up+0x8/0xe
 [<c01331c3>] suspend_enter+0x33/0x50
 [<c013324f>] enter_state+0x3f/0x70
 [<c01333b3>] state_store+0xa3/0xaa
 [<c0187ee5>] subsys_attr_store+0x35/0x40
 [<c018813e>] flush_write_buffer+0x2e/0x40
 [<c01881b7>] sysfs_write_file+0x67/0x80
 [<c015515f>] vfs_write+0xbf/0x140
 [<c0155291>] sys_write+0x41/0x70
 [<c01030fb>] syscall_call+0x7/0xb

Debug: sleeping function called from invalid context at /usr/src/bk/linux-bk/mm/slab.c:2085 in_atomic():0, irqs_disabled():1

 [<c0103ef7>] dump_stack+0x17/0x20
 [<c01176b6>] __might_sleep+0xa6/0xb0
 [<c0140203>] __kmalloc+0xb3/0xc0
 [<c01f3350>] acpi_os_allocate+0xd/0xf
 [<c021437e>] acpi_ut_callocate+0x6b/0xd4
 [<c0214460>] acpi_ut_callocate_and_track+0x1c/0x7d
 [<c021421f>] acpi_ut_initialize_buffer+0x4e/0x98
 [<c020f704>] acpi_rs_create_byte_stream+0x93/0xfb
 [<c02114a4>] acpi_rs_set_srs_method_data+0x44/0xf4
 [<c02105b5>] acpi_set_current_resources+0x67/0x81
 [<c0220bbc>] acpi_pci_link_set+0x165/0x24e
 [<c022116a>] acpi_pci_link_resume+0x47/0x7d
 [<c02211e5>] irqrouter_resume+0x45/0x6d
 [<c0252d47>] sysdev_resume+0xe7/0xec
 [<c0256a68>] device_power_up+0x8/0xe
 [<c01331c3>] suspend_enter+0x33/0x50
 [<c013324f>] enter_state+0x3f/0x70
 [<c01333b3>] state_store+0xa3/0xaa
 [<c0187ee5>] subsys_attr_store+0x35/0x40
 [<c018813e>] flush_write_buffer+0x2e/0x40
 [<c01881b7>] sysfs_write_file+0x67/0x80
 [<c015515f>] vfs_write+0xbf/0x140
 [<c0155291>] sys_write+0x41/0x70
 [<c01030fb>] syscall_call+0x7/0xb

Debug: sleeping function called from invalid context at include2/asm/semaphore.h:107
in_atomic():0, irqs_disabled():1

 [<c0103ef7>] dump_stack+0x17/0x20
 [<c01176b6>] __might_sleep+0xa6/0xb0
 [<c01f3eaa>] acpi_os_wait_semaphore+0xef/0x1b7
 [<c0215fdf>] acpi_ut_acquire_mutex+0xc3/0x159
 [<c0214641>] acpi_ut_track_allocation+0x6c/0x14a
 [<c0214495>] acpi_ut_callocate_and_track+0x51/0x7d
 [<c021421f>] acpi_ut_initialize_buffer+0x4e/0x98
 [<c020f704>] acpi_rs_create_byte_stream+0x93/0xfb
 [<c02114a4>] acpi_rs_set_srs_method_data+0x44/0xf4
 [<c02105b5>] acpi_set_current_resources+0x67/0x81
 [<c0220bbc>] acpi_pci_link_set+0x165/0x24e
 [<c022116a>] acpi_pci_link_resume+0x47/0x7d
 [<c02211e5>] irqrouter_resume+0x45/0x6d
 [<c0252d47>] sysdev_resume+0xe7/0xec
 [<c0256a68>] device_power_up+0x8/0xe
 [<c01331c3>] suspend_enter+0x33/0x50
 [<c013324f>] enter_state+0x3f/0x70
 [<c01333b3>] state_store+0xa3/0xaa
 [<c0187ee5>] subsys_attr_store+0x35/0x40
 [<c018813e>] flush_write_buffer+0x2e/0x40
 [<c01881b7>] sysfs_write_file+0x67/0x80
 [<c015515f>] vfs_write+0xbf/0x140
 [<c0155291>] sys_write+0x41/0x70
 [<c01030fb>] syscall_call+0x7/0xb

Thanks looking at this issue. We (intel ACPI team) have many discussions about this issue. Actually this problem isn't so easy. The warning is when doing resume PCI link device with interrupt disabled. A more important issue is suspend/resume is doing with all processes frozen, which will cause many issues such as semaphore, memory mapping, kmalloc. The real solution is on going. I'll let you know when it's ready.

Thanks,
Shaohua