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
2727 #include <linux/init.h>
2828 #include <linux/module.h>
2929 #include <linux/types.h>
30+#include <linux/syscore_ops.h>
3031 #include <linux/acpi.h>
3132 #include <acpi/processor.h>
3233 #include <xen/xen.h>
33−#include <xen/xen-ops.h>
3434 #include <xen/interface/platform.h>
3535 #include <asm/xen/hypercall.h>
3636
@@ -408,7 +408,7 @@ static int check_acpi_ids(struct acpi_processor *pr_backup) · 371 unmodified lines
408408 acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
409409 ACPI_UINT32_MAX,
410410 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);
412412
413413 upload:
414414 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
466466 return rc;
467467 }
468468
469−static int xen_acpi_processor_resume(struct notifier_block *nb,
470− unsigned long action, void *data)
469+static void xen_acpi_processor_resume_worker(struct work_struct *dummy)
471470 {
471+ int rc;
472+
472473 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+
480+static 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);
474492 }
475493
476−struct notifier_block xen_acpi_processor_resume_nb = {
477− .notifier_call = xen_acpi_processor_resume,
494+static struct syscore_ops xap_syscore_ops = {
495+ .resume = xen_acpi_processor_resume,
478496 };
479497
480498 static int __init xen_acpi_processor_init(void)
@@ -527,7 +545,7 @@ static int __init xen_acpi_processor_init(void) · 46 unmodified lines
527545 if (rc)
528546 goto err_unregister;
529547
530− xen_resume_notifier_register(&xen_acpi_processor_resume_nb);
548+ register_syscore_ops(&xap_syscore_ops);
531549
532550 return 0;
533551 err_unregister:
@@ -544,7 +562,7 @@ static void __exit xen_acpi_processor_exit(void) · 10 unmodified lines
544562 {
545563 int i;
546564
547− xen_resume_notifier_unregister(&xen_acpi_processor_resume_nb);
565+ unregister_syscore_ops(&xap_syscore_ops);
548566 kfree(acpi_ids_done);
549567 kfree(acpi_id_present);
550568 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