[PATCH 1/2] imsm: remove OEM table from detection of OROM and EFI.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
---
 platform-intel.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/platform-intel.c b/platform-intel.c
index 64542b9..fe6785c 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;
-- 
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux RAID Wiki]     [ATA RAID]     [Linux SCSI Target Infrastructure]     [Linux Block]     [Linux IDE]     [Linux SCSI]     [Linux Hams]     [Device Mapper]     [Device Mapper Cryptographics]     [Kernel]     [Linux Admin]     [Linux Net]     [GFS]     [RPM]     [git]     [Yosemite Forum]


  Powered by Linux