* [PATCH] platform_intel: support EFI SCU OEM variable
@ 2011-03-18 14:34 Labun, Marcin
2011-03-20 4:49 ` NeilBrown
0 siblings, 1 reply; 2+ messages in thread
From: Labun, Marcin @ 2011-03-18 14:34 UTC (permalink / raw)
To: NeilBrown
Cc: linux-raid@vger.kernel.org, Hawrylewicz Czarnowski, Przemyslaw,
Neubauer, Wojciech, Williams, Dan J, Ciechanowski, Ed
From 0d5cf1adbe2fb966db199aef5f135d9cf8cc72b9 Mon Sep 17 00:00:00 2001
From: Marcin Labun <marcin.labun@intel.com>
Date: Fri, 18 Mar 2011 13:58:24 +0100
Subject: [PATCH] platform_intel: support EFI SCU OEM variable
RstScuV and RstScuO variable names are supported.
First try reading from RstScuV, when it fails try RstScuO.
Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Tested-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
---
platform-intel.c | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/platform-intel.c b/platform-intel.c
index 8003da6..64542b9 100644
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -349,6 +349,7 @@ static const struct imsm_orom *find_imsm_hba_orom(enum sys_dev_type hba_id)
#define SYS_EFI_VAR_PATH "/sys/firmware/efi/vars"
#define SCU_PROP "RstScuV"
+#define SCU_PROP_OEM "RstScuO"
#define AHCI_PROP "RstSataV"
#define VENDOR_GUID \
@@ -393,8 +394,14 @@ const struct imsm_orom *find_imsm_efi(enum sys_dev_type hba_id)
snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFI_VAR_PATH, AHCI_PROP, guid_str(buf, VENDOR_GUID));
dprintf("EFI VAR: path=%s\n", path);
-
- if ((dfd = open(path, O_RDONLY)) < 0) {
+ dfd = open(path, O_RDONLY);
+ if ((dfd < 0) && (hba_id == SYS_DEV_SAS)) {
+ /* check OEM parameters */
+ snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFI_VAR_PATH, SCU_PROP_OEM, guid_str(buf, VENDOR_GUID));
+ dfd = open(path, O_RDONLY);
+ dprintf("EFI VAR: path=%s\n", path);
+ }
+ if (dfd < 0) {
populated_efi[hba_id] = 0;
return NULL;
}
--
1.6.4.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] platform_intel: support EFI SCU OEM variable
2011-03-18 14:34 [PATCH] platform_intel: support EFI SCU OEM variable Labun, Marcin
@ 2011-03-20 4:49 ` NeilBrown
0 siblings, 0 replies; 2+ messages in thread
From: NeilBrown @ 2011-03-20 4:49 UTC (permalink / raw)
To: Labun, Marcin
Cc: linux-raid@vger.kernel.org, Hawrylewicz Czarnowski, Przemyslaw,
Neubauer, Wojciech, Williams, Dan J, Ciechanowski, Ed
On Fri, 18 Mar 2011 14:34:22 +0000 "Labun, Marcin" <Marcin.Labun@intel.com>
wrote:
> >From 0d5cf1adbe2fb966db199aef5f135d9cf8cc72b9 Mon Sep 17 00:00:00 2001
> From: Marcin Labun <marcin.labun@intel.com>
> Date: Fri, 18 Mar 2011 13:58:24 +0100
> Subject: [PATCH] platform_intel: support EFI SCU OEM variable
>
> RstScuV and RstScuO variable names are supported.
> First try reading from RstScuV, when it fails try RstScuO.
>
> Signed-off-by: Marcin Labun <marcin.labun@intel.com>
> Tested-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
> ---
> platform-intel.c | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/platform-intel.c b/platform-intel.c
> index 8003da6..64542b9 100644
> --- a/platform-intel.c
> +++ b/platform-intel.c
> @@ -349,6 +349,7 @@ static const struct imsm_orom *find_imsm_hba_orom(enum sys_dev_type hba_id)
>
> #define SYS_EFI_VAR_PATH "/sys/firmware/efi/vars"
> #define SCU_PROP "RstScuV"
> +#define SCU_PROP_OEM "RstScuO"
> #define AHCI_PROP "RstSataV"
>
> #define VENDOR_GUID \
> @@ -393,8 +394,14 @@ const struct imsm_orom *find_imsm_efi(enum sys_dev_type hba_id)
> snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFI_VAR_PATH, AHCI_PROP, guid_str(buf, VENDOR_GUID));
>
> dprintf("EFI VAR: path=%s\n", path);
> -
> - if ((dfd = open(path, O_RDONLY)) < 0) {
> + dfd = open(path, O_RDONLY);
> + if ((dfd < 0) && (hba_id == SYS_DEV_SAS)) {
> + /* check OEM parameters */
> + snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFI_VAR_PATH, SCU_PROP_OEM, guid_str(buf, VENDOR_GUID));
> + dfd = open(path, O_RDONLY);
> + dprintf("EFI VAR: path=%s\n", path);
> + }
> + if (dfd < 0) {
> populated_efi[hba_id] = 0;
> return NULL;
> }
Applied, thanks.
NeilBrown
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-20 4:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-18 14:34 [PATCH] platform_intel: support EFI SCU OEM variable Labun, Marcin
2011-03-20 4:49 ` NeilBrown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).