x86/tboot: Convert to hotplug state machine

[cascardo/linux.git] / arch / x86 / kernel / tboot.c

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 9b0185f..654f6c6 100644 (file)
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -323,25 +323,16 @@ static int tboot_wait_for_aps(int num_aps)
        return !(atomic_read((atomic_t *)&tboot->num_in_wfs) == num_aps);
 }
 
-static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
-                             void *hcpu)
+static int tboot_dying_cpu(unsigned int cpu)
 {
-       switch (action) {
-       case CPU_DYING:
-               atomic_inc(&ap_wfs_count);
-               if (num_online_cpus() == 1)
-                       if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
-                               return NOTIFY_BAD;
-               break;
+       atomic_inc(&ap_wfs_count);
+       if (num_online_cpus() == 1) {
+               if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
+                       return -EBUSY;
        }
-       return NOTIFY_OK;
+       return 0;
 }
 
-static struct notifier_block tboot_cpu_notifier =
-{
-       .notifier_call = tboot_cpu_callback,
-};
-
 #ifdef CONFIG_DEBUG_FS
 
 #define TBOOT_LOG_UUID { 0x26, 0x25, 0x19, 0xc0, 0x30, 0x6b, 0xb4, 0x4d, \
@@ -417,8 +408,8 @@ static __init int tboot_late_init(void)
        tboot_create_trampoline();
 
        atomic_set(&ap_wfs_count, 0);
-       register_hotcpu_notifier(&tboot_cpu_notifier);
-
+       cpuhp_setup_state(CPUHP_AP_X86_TBOOT_DYING, "AP_X86_TBOOT_DYING", NULL,
+                         tboot_dying_cpu);
 #ifdef CONFIG_DEBUG_FS
        debugfs_create_file("tboot_log", S_IRUSR,
                        arch_debugfs_dir, NULL, &tboot_log_fops);