|
 |
2ddfcf |
From 88605db99c00f48bd56ad86718657d54e254be57 Mon Sep 17 00:00:00 2001
|
|
|
2ddfcf |
From: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
|
2ddfcf |
Date: Thu, 20 Nov 2014 18:56:13 +0100
|
|
|
2ddfcf |
Subject: [PATCH] imsm: use efivarfs interface for reading UEFI variables
|
|
|
2ddfcf |
|
|
|
2ddfcf |
Read UEFI variables using the new efivarfs interface, fallback to
|
|
|
2ddfcf |
sysfs-efivars if that fails.
|
|
|
2ddfcf |
|
|
|
2ddfcf |
Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
|
|
|
2ddfcf |
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
|
2ddfcf |
---
|
|
|
2ddfcf |
platform-intel.c | 37 ++++++++++++++++++++++++++++++++++++-
|
|
|
2ddfcf |
1 file changed, 36 insertions(+), 1 deletion(-)
|
|
|
2ddfcf |
|
|
|
2ddfcf |
diff --git a/platform-intel.c b/platform-intel.c
|
|
|
2ddfcf |
index 54ef37f..37274da 100644
|
|
|
2ddfcf |
--- a/platform-intel.c
|
|
|
2ddfcf |
+++ b/platform-intel.c
|
|
|
2ddfcf |
@@ -416,6 +416,7 @@ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
|
|
|
2ddfcf |
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }})
|
|
|
2ddfcf |
|
|
|
2ddfcf |
#define SYS_EFI_VAR_PATH "/sys/firmware/efi/vars"
|
|
|
2ddfcf |
+#define SYS_EFIVARS_PATH "/sys/firmware/efi/efivars"
|
|
|
2ddfcf |
#define SCU_PROP "RstScuV"
|
|
|
2ddfcf |
#define AHCI_PROP "RstSataV"
|
|
|
2ddfcf |
#define AHCI_SSATA_PROP "RstsSatV"
|
|
|
2ddfcf |
@@ -426,13 +427,47 @@ static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba)
|
|
|
2ddfcf |
|
|
|
2ddfcf |
#define PCI_CLASS_RAID_CNTRL 0x010400
|
|
|
2ddfcf |
|
|
|
2ddfcf |
-int read_efi_variable(void *buffer, ssize_t buf_size, char *variable_name, struct efi_guid guid)
|
|
|
2ddfcf |
+static int read_efi_var(void *buffer, ssize_t buf_size, char *variable_name, struct efi_guid guid)
|
|
|
2ddfcf |
+{
|
|
|
2ddfcf |
+ char path[PATH_MAX];
|
|
|
2ddfcf |
+ char buf[GUID_STR_MAX];
|
|
|
2ddfcf |
+ int fd;
|
|
|
2ddfcf |
+ ssize_t n;
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+ snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFIVARS_PATH, variable_name, guid_str(buf, guid));
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+ fd = open(path, O_RDONLY);
|
|
|
2ddfcf |
+ if (fd < 0)
|
|
|
2ddfcf |
+ return 1;
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+ /* read the variable attributes and ignore it */
|
|
|
2ddfcf |
+ n = read(fd, buf, sizeof(__u32));
|
|
|
2ddfcf |
+ if (n < 0) {
|
|
|
2ddfcf |
+ close(fd);
|
|
|
2ddfcf |
+ return 1;
|
|
|
2ddfcf |
+ }
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+ /* read the variable data */
|
|
|
2ddfcf |
+ n = read(fd, buffer, buf_size);
|
|
|
2ddfcf |
+ close(fd);
|
|
|
2ddfcf |
+ if (n < buf_size)
|
|
|
2ddfcf |
+ return 1;
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+ return 0;
|
|
|
2ddfcf |
+}
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
+static int read_efi_variable(void *buffer, ssize_t buf_size, char *variable_name, struct efi_guid guid)
|
|
|
2ddfcf |
{
|
|
|
2ddfcf |
char path[PATH_MAX];
|
|
|
2ddfcf |
char buf[GUID_STR_MAX];
|
|
|
2ddfcf |
int dfd;
|
|
|
2ddfcf |
ssize_t n, var_data_len;
|
|
|
2ddfcf |
|
|
|
2ddfcf |
+ /* Try to read the variable using the new efivarfs interface first.
|
|
|
2ddfcf |
+ * If that fails, fall back to the old sysfs-efivars interface. */
|
|
|
2ddfcf |
+ if (!read_efi_var(buffer, buf_size, variable_name, guid))
|
|
|
2ddfcf |
+ return 0;
|
|
|
2ddfcf |
+
|
|
|
2ddfcf |
snprintf(path, PATH_MAX, "%s/%s-%s/size", SYS_EFI_VAR_PATH, variable_name, guid_str(buf, guid));
|
|
|
2ddfcf |
|
|
|
2ddfcf |
dprintf("EFI VAR: path=%s\n", path);
|
|
|
2ddfcf |
--
|
|
|
2ddfcf |
2.4.3
|
|
|
2ddfcf |
|