From: Hawrylewicz Czarnowski, Przemyslaw <przemyslaw.hawrylewicz.czarnowski@intel.com>
Date: Sun, 27 Mar 2011 23:41:35 +0000 (+1100)
Subject: imsm: remove OEM table from detection of OROM and EFI.
X-Git-Tag: mdadm-3.2.1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96687b797fe65dbac75a1c5b3a00ae9a4e921efb;p=thirdparty%2Fmdadm.git

imsm: remove OEM table from detection of OROM and EFI.

OEM table does not suit our needs so it cannot be used.
This patch removes feature added in commit 8a0bf4f378c8b.

Signed-off-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/platform-intel.c b/platform-intel.c
index 64542b9b..fe6785c4 100644
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -236,8 +236,7 @@ static int scan(const void *start, const void *end, const void *data)
 
 	for (offset = 0; offset < len; offset += 4) {
 		imsm_mem = start + offset;
-		if ((memcmp(imsm_mem->signature, "$VER", 4) == 0) ||
-		    (memcmp(imsm_mem->signature, "$OEM", 4) == 0)) {
+		if ((memcmp(imsm_mem->signature, "$VER", 4) == 0)) {
 			imsm_orom[dev] = *imsm_mem;
 			populated_orom[dev] = 1;
 			return populated_orom[SYS_DEV_SATA] && populated_orom[SYS_DEV_SAS];
@@ -349,7 +348,6 @@ 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 \
@@ -395,12 +393,6 @@ const struct imsm_orom *find_imsm_efi(enum sys_dev_type hba_id)
 
 	dprintf("EFI VAR: path=%s\n", path);
 	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;