History

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"

Linus Torvalds committed 9 years ago

Commit 42ea16f2 parents 69917da 1914f0c1 file · +27 −9Browse files

Unified · Split

drivers/xen/xen-acpi-processor.c+27−9
@@ -27,10 +27,10 @@ · 26 unmodified lines
27#include <linux/init.h>27#include <linux/init.h>
28#include <linux/module.h>28#include <linux/module.h>
29#include <linux/types.h>29#include <linux/types.h>
30#include <linux/syscore_ops.h>
30#include <linux/acpi.h>31#include <linux/acpi.h>
31#include <acpi/processor.h>32#include <acpi/processor.h>
32#include <xen/xen.h>33#include <xen/xen.h>
33#include <xen/xen-ops.h>
34#include <xen/interface/platform.h>34#include <xen/interface/platform.h>
35#include <asm/xen/hypercall.h>35#include <asm/xen/hypercall.h>
36 36
@@ -408,7 +408,7 @@ static int check_acpi_ids(struct acpi_processor *pr_backup) · 371 unmodified lines
408 acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,408 acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
409 ACPI_UINT32_MAX,409 ACPI_UINT32_MAX,
410 read_acpi_id, NULL, NULL, NULL);410 read_acpi_id, NULL, NULL, NULL);
411 acpi_get_devices("ACPI0007", read_acpi_id, NULL, NULL);411 acpi_get_devices(ACPI_PROCESSOR_DEVICE_HID, read_acpi_id, NULL, NULL);
412 412
413upload:413upload:
414 if (!bitmap_equal(acpi_id_present, acpi_ids_done, nr_acpi_bits)) {414 if (!bitmap_equal(acpi_id_present, acpi_ids_done, nr_acpi_bits)) {
@@ -466,15 +466,33 @@ static int xen_upload_processor_pm_data(void) · 51 unmodified lines
466 return rc;466 return rc;
467}467}
468 468
469static int xen_acpi_processor_resume(struct notifier_block *nb,469static void xen_acpi_processor_resume_worker(struct work_struct *dummy)
470 unsigned long action, void *data)
471{470{
471 int rc;
472
472 bitmap_zero(acpi_ids_done, nr_acpi_bits);473 bitmap_zero(acpi_ids_done, nr_acpi_bits);
473 return xen_upload_processor_pm_data();474
475 rc = xen_upload_processor_pm_data();
476 if (rc != 0)
477 pr_info("ACPI data upload failed, error = %d\n", rc);
478}
479
480static void xen_acpi_processor_resume(void)
481{
482 static DECLARE_WORK(wq, xen_acpi_processor_resume_worker);
483
484 /*
485 * xen_upload_processor_pm_data() calls non-atomic code.
486 * However, the context for xen_acpi_processor_resume is syscore
487 * with only the boot CPU online and in an atomic context.
488 *
489 * So defer the upload for some point safer.
490 */
491 schedule_work(&wq);
474}492}
475 493
476struct notifier_block xen_acpi_processor_resume_nb = {494static struct syscore_ops xap_syscore_ops = {
477 .notifier_call = xen_acpi_processor_resume,495 .resume = xen_acpi_processor_resume,
478};496};
479 497
480static int __init xen_acpi_processor_init(void)498static int __init xen_acpi_processor_init(void)
@@ -527,7 +545,7 @@ static int __init xen_acpi_processor_init(void) · 46 unmodified lines
527 if (rc)545 if (rc)
528 goto err_unregister;546 goto err_unregister;
529 547
530 xen_resume_notifier_register(&xen_acpi_processor_resume_nb);548 register_syscore_ops(&xap_syscore_ops);
531 549
532 return 0;550 return 0;
533err_unregister:551err_unregister:
@@ -544,7 +562,7 @@ static void __exit xen_acpi_processor_exit(void) · 10 unmodified lines
544{562{
545 int i;563 int i;
546 564
547 xen_resume_notifier_unregister(&xen_acpi_processor_resume_nb);565 unregister_syscore_ops(&xap_syscore_ops);
548 kfree(acpi_ids_done);566 kfree(acpi_ids_done);
549 kfree(acpi_id_present);567 kfree(acpi_id_present);
550 kfree(acpi_id_cst_present);568 kfree(acpi_id_cst_present);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t