efi: add efivars kobject to efi sysfs folder

UEFI variable filesystem need a new mount point, so this patch add
efivars kobject to efi_kobj for create a /sys/firmware/efi/efivars
folder.

Cc: Matthew Garrett <mjg@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index d7658b4a5010a56b68bc711c163000c00db76fb9..6793965b7c8b109cf6443829a6e5625116cd854f 100644 (file)
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -1527,6 +1527,7 @@ void unregister_efivars(struct efivars *efivars)
                sysfs_remove_bin_file(&efivars->kset->kobj, efivars->del_var);
        kfree(efivars->new_var);
        kfree(efivars->del_var);
+       kobject_put(efivars->kobject);
        kset_unregister(efivars->kset);
 }
 EXPORT_SYMBOL_GPL(unregister_efivars);
@@ -1558,6 +1559,14 @@ int register_efivars(struct efivars *efivars,
                goto out;
        }
 
+       efivars->kobject = kobject_create_and_add("efivars", parent_kobj);
+       if (!efivars->kobject) {
+               pr_err("efivars: Subsystem registration failed.\n");
+               error = -ENOMEM;
+               kset_unregister(efivars->kset);
+               goto out;
+       }
+
        /*
         * Per EFI spec, the maximum storage allocated for both
         * the variable name and variable data is 1024 bytes.

diff --git a/include/linux/efi.h b/include/linux/efi.h
index b2af1571592be81452e1785add6f696b43ef00bf..337aefbfb0032fdf995ce3e227565785552ce0bd 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -662,6 +662,7 @@ struct efivars {
        spinlock_t lock;
        struct list_head list;
        struct kset *kset;
+       struct kobject *kobject;
        struct bin_attribute *new_var, *del_var;
        const struct efivar_operations *ops;
        struct efivar_entry *walk_entry;