#include <limits.h>
+static int devpath_to_ll(const char *dev_path, const char *entry,
+ unsigned long long *val);
+
static __u16 devpath_to_vendor(const char *dev_path);
void free_sys_dev(struct sys_dev **list)
struct sys_dev *head = NULL;
struct sys_dev *list = NULL;
enum sys_dev_type type;
+ unsigned long long dev_id;
if (strcmp(driver, "isci") == 0)
type = SYS_DEV_SAS;
if (devpath_to_vendor(path) != 0x8086)
continue;
+ if (devpath_to_ll(path, "device", &dev_id) != 0)
+ continue;
+
/* start / add list entry */
if (!head) {
head = malloc(sizeof(*head));
break;
}
+ list->dev_id = (__u16) dev_id;
list->type = type;
list->path = canonicalize_file_name(path);
list->next = NULL;
}
+static struct sys_dev *intel_devices=NULL;
+
+static enum sys_dev_type device_type_by_id(__u16 device_id)
+{
+ struct sys_dev *iter;
+
+ for(iter = intel_devices; iter != NULL; iter = iter->next)
+ if (iter->dev_id == device_id)
+ return iter->type;
+ return SYS_DEV_UNKNOWN;
+}
+
+static int devpath_to_ll(const char *dev_path, const char *entry, unsigned long long *val)
+{
+ char path[strlen(dev_path) + strlen(entry) + 2];
+ int fd;
+ int n;
+
+ sprintf(path, "%s/%s", dev_path, entry);
+
+ fd = open(path, O_RDONLY);
+ if (fd < 0)
+ return -1;
+ n = sysfs_fd_get_ll(fd, val);
+ close(fd);
+ return n;
+}
+
+
static __u16 devpath_to_vendor(const char *dev_path)
{
char path[strlen(dev_path) + strlen("/vendor") + 1];
return ahci;
}
-static int platform_has_intel_devices(void)
-{
- struct sys_dev *devices;
- devices = find_intel_devices();
- if (devices) {
- free_sys_dev(&devices);
- return 1;
- }
- return 0;
-}
-
/*
* PCI Expansion ROM Data Structure Format */
struct pciExpDataStructFormat {
int len = (end - start);
struct pciExpDataStructFormat *ptr= (struct pciExpDataStructFormat *)data;
+ if (data + 0x18 > end) {
+ dprintf("cannot find pciExpDataStruct \n");
+ return 0;
+ }
+
dprintf("ptr->vendorID: %lx __le16_to_cpu(ptr->deviceID): %lx \n",
(ulong) __le16_to_cpu(ptr->vendorID),
(ulong) __le16_to_cpu(ptr->deviceID));
- if ((__le16_to_cpu(ptr->vendorID) == 0x8086) &&
- (__le16_to_cpu(ptr->deviceID) == 0x2822))
- dev = SYS_DEV_SATA;
- else if ((__le16_to_cpu(ptr->vendorID) == 0x8086) &&
- (__le16_to_cpu(ptr->deviceID) == 0x1D60))
- dev = SYS_DEV_SAS;
+ if (__le16_to_cpu(ptr->vendorID) == 0x8086) {
+ /* serach attached intel devices by device id from OROM */
+ dev = device_type_by_id(__le16_to_cpu(ptr->deviceID));
+ if (dev == SYS_DEV_UNKNOWN)
+ return 0;
+ }
else
return 0;
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];
check_env("IMSM_TEST_SCU_EFI"))
return NULL;
- if (!platform_has_intel_devices())
+
+ if (intel_devices != NULL)
+ free_sys_dev(&intel_devices);
+
+ intel_devices = find_intel_devices();
+
+ if (intel_devices == NULL)
return NULL;
/* scan option-rom memory looking for an imsm signature */
if (probe_roms_init(align) != 0)
return NULL;
probe_roms();
- /* ignore result - True is returned if both are found */
+ /* ignore return value - True is returned if both adapater roms are found */
scan_adapter_roms(scan);
probe_roms_exit();
+ if (intel_devices != NULL)
+ free_sys_dev(&intel_devices);
+ intel_devices = NULL;
+
if (populated_orom[hba_id])
return &imsm_orom[hba_id];
return NULL;
static struct imsm_orom imsm_efi[SYS_DEV_MAX];
-const struct imsm_orom *find_imsm_efi(enum sys_dev_type hba_id)
+int read_efi_variable(void *buffer, ssize_t buf_size, char *variable_name, struct efi_guid guid)
{
- int dfd=-1;
char path[PATH_MAX];
char buf[GUID_STR_MAX];
- int n;
+ int dfd;
+ ssize_t n, var_data_len;
+
+ snprintf(path, PATH_MAX, "%s/%s-%s/size", SYS_EFI_VAR_PATH, variable_name, guid_str(buf, guid));
+
+ dprintf("EFI VAR: path=%s\n", path);
+ /* get size of variable data */
+ dfd = open(path, O_RDONLY);
+ if (dfd < 0)
+ return 1;
+
+ n = read(dfd, &buf, sizeof(buf));
+ close(dfd);
+ if (n < 0)
+ return 1;
+ buf[n] = '\0';
+ errno = 0;
+ var_data_len = strtoul(buf, NULL, 16);
+ if ((errno == ERANGE && (var_data_len == LONG_MAX))
+ || (errno != 0 && var_data_len == 0))
+ return 1;
+
+ /* get data */
+ snprintf(path, PATH_MAX, "%s/%s-%s/data", SYS_EFI_VAR_PATH, variable_name, guid_str(buf, guid));
+
+ dprintf("EFI VAR: path=%s\n", path);
+ dfd = open(path, O_RDONLY);
+ if (dfd < 0)
+ return 1;
+
+ n = read(dfd, buffer, buf_size);
+ close(dfd);
+ if (n != var_data_len || n < buf_size) {
+ return 1;
+ }
+
+ return 0;
+}
+
+const struct imsm_orom *find_imsm_efi(enum sys_dev_type hba_id)
+{
if (hba_id >= SYS_DEV_MAX)
return NULL;
return imsm_platform_test(hba_id, &populated_efi[hba_id], &imsm_efi[hba_id]);
}
/* OROM test is set, return that there is no EFI capabilities */
- if (check_env("IMSM_TEST_OROM")) {
+ if (check_env("IMSM_TEST_OROM"))
return NULL;
- }
- if (hba_id == SYS_DEV_SAS)
- snprintf(path, PATH_MAX, "%s/%s-%s", SYS_EFI_VAR_PATH, SCU_PROP, guid_str(buf, VENDOR_GUID));
- else
- 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) {
+ if (read_efi_variable(&imsm_efi[hba_id], sizeof(imsm_efi[0]), hba_id == SYS_DEV_SAS ? SCU_PROP : AHCI_PROP, VENDOR_GUID)) {
populated_efi[hba_id] = 0;
return NULL;
}
- n = read(dfd, &imsm_efi[hba_id], sizeof(imsm_efi[0]));
- close(dfd);
- if (n < (int) (sizeof(imsm_efi[0]))) {
- return NULL;
- }
+
populated_efi[hba_id] = 1;
return &imsm_efi[hba_id];
}