Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: fix for 4.11 rc4

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABAgAGBQJY1R3+AAoJELDendYovxMvw9sIAIGwXhdN9hh7vxIj8seVQyky
 3Cr58C9kVfZfWSeZt8g/SEvswo45E64QprggoaMJZwMXVVltJhBhd2jnFkMgtTks
 08gk1O3/bMxHd9lXfUBVNwuRpWLVn/r8i4D94j3mJvC6EX7BBZ/aR0Nmm7jRbL0t
 RK6U1TpyKdVJmlZT7hwk+oQht56Ohfay+74Kh/Bww0YixjRB1xwedHHy5AHi9lRh
 T8WXIFj8SRk7azhY42q383L1lbVzU1hIMLqQoLvsmtDTbFmliBJtvELWAduZJ99j
 zUCr6QqJw2GgJ+YHGlI0XJVRbPA484B3ufl1AwQ6H2byeHq+ZxlUI1Bh7YHkLGc=
 =3HTs
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-4.11b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:
 "Fixes for PM under Xen"

* tag 'for-linus-4.11b-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/acpi: upload PM state from init-domain to Xen
  xen/acpi: Replace hard coded "ACPI0007"
This commit is contained in:
Linus Torvalds 2017-03-24 14:29:23 -07:00
commit 42ea16f815
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/xen/xen-acpi-processor.c
View File

@ -27,10 +27,10 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/syscore_ops.h>
#include <linux/acpi.h>
#include <acpi/processor.h>
#include <xen/xen.h>
#include <xen/xen-ops.h>
#include <xen/interface/platform.h>
#include <asm/xen/hypercall.h>
@ -408,7 +408,7 @@ static int check_acpi_ids(struct acpi_processor *pr_backup)
acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX,
read_acpi_id, NULL, NULL, NULL);
acpi_get_devices("ACPI0007", read_acpi_id, NULL, NULL);
acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID, read_acpi_id, NULL, NULL);
upload:
if (!bitmap_equal(acpi_id_present, acpi_ids_done, nr_acpi_bits)) {
@ -466,15 +466,33 @@ static int xen_upload_processor_pm_data(void)
return rc;
}
static int xen_acpi_processor_resume(struct notifier_block *nb,
unsigned long action, void *data)
static void xen_acpi_processor_resume_worker(struct work_struct *dummy)
{
int rc;
bitmap_zero(acpi_ids_done, nr_acpi_bits);
return xen_upload_processor_pm_data();
rc = xen_upload_processor_pm_data();
if (rc != 0)
pr_info("ACPI data upload failed, error = %d\n", rc);
}
struct notifier_block xen_acpi_processor_resume_nb = {
.notifier_call = xen_acpi_processor_resume,
static void xen_acpi_processor_resume(void)
{
static DECLARE_WORK(wq, xen_acpi_processor_resume_worker);
/*
* xen_upload_processor_pm_data() calls non-atomic code.
* However, the context for xen_acpi_processor_resume is syscore
* with only the boot CPU online and in an atomic context.
*
* So defer the upload for some point safer.
*/
schedule_work(&wq);
}
static struct syscore_ops xap_syscore_ops = {
.resume = xen_acpi_processor_resume,
};
static int __init xen_acpi_processor_init(void)
@ -527,7 +545,7 @@ static int __init xen_acpi_processor_init(void)
if (rc)
goto err_unregister;
xen_resume_notifier_register(&xen_acpi_processor_resume_nb);
register_syscore_ops(&xap_syscore_ops);
return 0;
err_unregister:
@ -544,7 +562,7 @@ static void __exit xen_acpi_processor_exit(void)
{
int i;
xen_resume_notifier_unregister(&xen_acpi_processor_resume_nb);
unregister_syscore_ops(&xap_syscore_ops);
kfree(acpi_ids_done);
kfree(acpi_id_present);
kfree(acpi_id_cst_present);