From: Mike Waychison <mikew@google.com>
To: Greg KH <greg@kroah.com>, Matt Domsch <Matt_Domsch@dell.com>,
Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Duncan Laurie <dlaurie@google.com>,
Aaron Durbin <adurbin@google.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Tim Hockin <thockin@google.com>, San Mehat <san@google.com>
Subject: [PATCH v2 02/12] efivars: Make efivars bin_attributes dynamic
Date: Fri, 11 Mar 2011 17:43:06 -0800 [thread overview]
Message-ID: <20110312014305.6133.7681.stgit@mike.mtv.corp.google.com> (raw)
In-Reply-To: <20110312014254.6133.43079.stgit@mike.mtv.corp.google.com>
In preparation for encapsulating efivars, we need to have the
bin_attributes be dynamically allocated so that we can use their
->private fields to get back to the struct efivars structure.
Signed-off-by: Mike Waychison <mikew@google.com>
---
drivers/firmware/efivars.c | 93 ++++++++++++++++++++++++++++++++------------
1 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index f10ecb6..528ce47 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -101,6 +101,7 @@ struct efivars {
spinlock_t lock;
struct list_head list;
struct kset *kset;
+ struct bin_attribute *new_var, *del_var;
};
static struct efivars __efivars;
static struct efivars *efivars = &__efivars;
@@ -525,16 +526,6 @@ static ssize_t efivar_delete(struct file *filp, struct kobject *kobj,
return count;
}
-static struct bin_attribute var_subsys_attr_new_var = {
- .attr = {.name = "new_var", .mode = 0200},
- .write = efivar_create,
-};
-
-static struct bin_attribute var_subsys_attr_del_var = {
- .attr = {.name = "del_var", .mode = 0200},
- .write = efivar_delete,
-};
-
/*
* Let's not leave out systab information that snuck into
* the efivars driver
@@ -640,6 +631,66 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
return 0;
}
+
+static int
+create_efivars_bin_attributes(struct efivars *efivars)
+{
+ struct bin_attribute *attr;
+ int error;
+
+ /* new_var */
+ attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+ if (!attr)
+ return -ENOMEM;
+
+ attr->attr.name = "new_var";
+ attr->attr.mode = 0200;
+ attr->write = efivar_create;
+ attr->private = efivars;
+ efivars->new_var = attr;
+
+ /* del_var */
+ attr = kzalloc(sizeof(*attr), GFP_KERNEL);
+ if (!attr) {
+ error = -ENOMEM;
+ goto out_free;
+ }
+ attr->attr.name = "del_var";
+ attr->attr.mode = 0200;
+ attr->write = efivar_delete;
+ attr->private = efivars;
+ efivars->del_var = attr;
+
+ sysfs_bin_attr_init(efivars->new_var);
+ sysfs_bin_attr_init(efivars->del_var);
+
+ /* Register */
+ error = sysfs_create_bin_file(&efivars->kset->kobj,
+ efivars->new_var);
+ if (error) {
+ printk(KERN_ERR "efivars: unable to create new_var sysfs file"
+ " due to error %d\n", error);
+ goto out_free;
+ }
+ error = sysfs_create_bin_file(&efivars->kset->kobj,
+ efivars->del_var);
+ if (error) {
+ printk(KERN_ERR "efivars: unable to create del_var sysfs file"
+ " due to error %d\n", error);
+ sysfs_remove_bin_file(&efivars->kset->kobj,
+ efivars->new_var);
+ goto out_free;
+ }
+
+ return 0;
+out_free:
+ kfree(efivars->new_var);
+ efivars->new_var = NULL;
+ kfree(efivars->new_var);
+ efivars->new_var = NULL;
+ return error;
+}
+
/*
* For now we register the efi subsystem with the firmware subsystem
* and the vars subsystem with the efi subsystem. In the future, it
@@ -714,20 +765,7 @@ efivars_init(void)
}
} while (status != EFI_NOT_FOUND);
- /*
- * Now add attributes to allow creation of new vars
- * and deletion of existing ones...
- */
- error = sysfs_create_bin_file(&efivars->kset->kobj,
- &var_subsys_attr_new_var);
- if (error)
- printk(KERN_ERR "efivars: unable to create new_var sysfs file"
- " due to error %d\n", error);
- error = sysfs_create_bin_file(&efivars->kset->kobj,
- &var_subsys_attr_del_var);
- if (error)
- printk(KERN_ERR "efivars: unable to create del_var sysfs file"
- " due to error %d\n", error);
+ error = create_efivars_bin_attributes(efivars);
/* Don't forget the systab entry */
error = sysfs_create_group(efi_kobj, &efi_subsys_attr_group);
@@ -758,7 +796,12 @@ efivars_exit(void)
spin_unlock(&efivars->lock);
efivar_unregister(entry);
}
-
+ if (efivars->new_var)
+ sysfs_remove_bin_file(&efivars->kset->kobj, efivars->new_var);
+ if (efivars->del_var)
+ sysfs_remove_bin_file(&efivars->kset->kobj, efivars->del_var);
+ kfree(efivars->new_var);
+ kfree(efivars->del_var);
kset_unregister(efivars->kset);
kobject_put(efi_kobj);
}
next prev parent reply other threads:[~2011-03-12 1:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-12 1:42 [PATCH v2 00/12] google firmware support Mike Waychison
2011-03-12 1:43 ` [PATCH v2 01/12] efivars: move efivars globals into struct efivars Mike Waychison
2011-03-12 1:43 ` Mike Waychison [this message]
2011-03-12 1:43 ` [PATCH v2 03/12] efivars: parameterize efivars Mike Waychison
2011-03-12 1:43 ` [PATCH v2 04/12] efivars: Split out variable registration Mike Waychison
2011-03-12 1:43 ` [PATCH v2 05/12] efivars: Parameterize operations Mike Waychison
2011-03-12 1:43 ` [PATCH v2 06/12] efivars: Expose efivars functionality to external drivers Mike Waychison
2011-03-12 1:43 ` [PATCH v2 07/12] efivars: Add Documentation Mike Waychison
2011-03-12 1:43 ` [PATCH v2 08/12] x86: get_bios_ebda_length() Mike Waychison
2011-03-14 15:43 ` Greg KH
2011-03-12 1:43 ` [PATCH v2 09/12] x86: Better comments for get_bios_ebda() Mike Waychison
2011-03-14 15:43 ` Greg KH
2011-03-12 1:43 ` [PATCH v2 10/12] Introduce CONFIG_GOOGLE_FIRMWARE Mike Waychison
2011-03-14 15:45 ` Greg KH
2011-03-14 19:49 ` Mike Waychison
2011-03-14 19:59 ` Greg KH
2011-03-14 20:06 ` Mike Waychison
2011-03-12 1:43 ` [PATCH v2 11/12] driver: Google EFI SMI Mike Waychison
2011-03-14 15:47 ` Greg KH
2011-03-14 20:01 ` Mike Waychison
2011-03-14 20:13 ` Greg KH
2011-03-14 21:09 ` Mike Waychison
2011-03-14 23:05 ` Alan Cox
2011-03-12 1:43 ` [PATCH v2 12/12] driver: Google Memory Console Mike Waychison
2011-03-14 4:54 ` H. Peter Anvin
2011-03-14 4:58 ` Tim Hockin
2011-03-14 5:02 ` H. Peter Anvin
2011-03-14 9:22 ` Ingo Molnar
2011-03-14 14:01 ` Tim Hockin
2011-03-14 14:23 ` Ingo Molnar
2011-03-14 15:47 ` Greg KH
2011-03-14 20:03 ` Mike Waychison
2011-03-14 22:46 ` H. Peter Anvin
2011-03-12 3:54 ` [PATCH v2 00/12] google firmware support Matt Domsch
2011-03-14 15:42 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110312014305.6133.7681.stgit@mike.mtv.corp.google.com \
--to=mikew@google.com \
--cc=Matt_Domsch@dell.com \
--cc=adurbin@google.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=dlaurie@google.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=san@google.com \
--cc=thockin@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®