Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:Update
mdadm.5365
0050-imsm-simplified-multiple-OROMs-support.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0050-imsm-simplified-multiple-OROMs-support.patch of Package mdadm.5365
From 5e1d612824bdb8d8f5ce30c4cebf1a5165824f42 Mon Sep 17 00:00:00 2001 From: Artur Paszkiewicz <artur.paszkiewicz@intel.com> Date: Fri, 27 Feb 2015 14:39:42 +0100 Subject: [PATCH 062/359] imsm: simplified multiple OROMs support References: bsc#1081910 Replaced oroms array with list, add_orom() now only appends to this list and add_orom_device_id() only appends devid_list node to an orom_entry. Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com> Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: Coly Li <colyli@suse.de> --- platform-intel.c | 96 +++++++++++++++++++++++++++----------------------------- platform-intel.h | 4 ++- super-intel.c | 18 +++++------ 3 files changed, 57 insertions(+), 61 deletions(-) diff --git a/platform-intel.c b/platform-intel.c index 37274da..9c89c20 100644 --- a/platform-intel.c +++ b/platform-intel.c @@ -229,65 +229,61 @@ struct pciExpDataStructFormat { __u16 devListOffset; } __attribute__ ((packed)); -static struct orom_entry oroms[SYS_DEV_MAX]; - -const struct orom_entry *get_oroms(void) -{ - return (const struct orom_entry *)&oroms; -} +struct orom_entry *orom_entries; const struct imsm_orom *get_orom_by_device_id(__u16 dev_id) { - int i; - struct devid_list *list; + struct orom_entry *entry; + struct devid_list *devid; - for (i = 0; i < SYS_DEV_MAX; i++) { - for (list = oroms[i].devid_list; list; list = list->next) { - if (list->devid == dev_id) - return &oroms[i].orom; + for (entry = orom_entries; entry; entry = entry->next) { + for (devid = entry->devid_list; devid; devid = devid->next) { + if (devid->devid == dev_id) + return &entry->orom; } } + return NULL; } -static const struct imsm_orom *add_orom(const struct imsm_orom *orom) +static struct orom_entry *add_orom(const struct imsm_orom *orom) { - int i; - - for (i = 0; i < SYS_DEV_MAX; i++) { - if (&oroms[i].orom == orom) - return orom; - if (oroms[i].orom.signature[0] == 0) { - oroms[i].orom = *orom; - return &oroms[i].orom; - } - } - return NULL; + struct orom_entry *list; + struct orom_entry *prev = NULL; + + for (list = orom_entries; list; prev = list, list = list->next) + ; + + list = xmalloc(sizeof(struct orom_entry)); + list->orom = *orom; + list->devid_list = NULL; + list->next = NULL; + + if (prev == NULL) + orom_entries = list; + else + prev->next = list; + + return list; } -static void add_orom_device_id(const struct imsm_orom *orom, __u16 dev_id) +static void add_orom_device_id(struct orom_entry *entry, __u16 dev_id) { - int i; struct devid_list *list; struct devid_list *prev = NULL; - for (i = 0; i < SYS_DEV_MAX; i++) { - if (&oroms[i].orom == orom) { - for (list = oroms[i].devid_list; list; prev = list, list = list->next) { - if (list->devid == dev_id) - return; - } - list = xmalloc(sizeof(struct devid_list)); - list->devid = dev_id; - list->next = NULL; - - if (prev == NULL) - oroms[i].devid_list = list; - else - prev->next = list; + for (list = entry->devid_list; list; prev = list, list = list->next) { + if (list->devid == dev_id) return; - } } + list = xmalloc(sizeof(struct devid_list)); + list->devid = dev_id; + list->next = NULL; + + if (prev == NULL) + entry->devid_list = list; + else + prev->next = list; } static int scan(const void *start, const void *end, const void *data) @@ -321,7 +317,7 @@ static int scan(const void *start, const void *end, const void *data) if (!imsm_mem) return 0; - const struct imsm_orom *orom = add_orom(imsm_mem); + struct orom_entry *orom = add_orom(imsm_mem); if (ptr->devListOffset) { const __u16 *dev_list = (void *)ptr + ptr->devListOffset; @@ -367,11 +363,11 @@ const struct imsm_orom *imsm_platform_test(struct sys_dev *hba) IMSM_OROM_RLC_RAID10; } - const struct imsm_orom *ret = add_orom(&orom); + struct orom_entry *ret = add_orom(&orom); add_orom_device_id(ret, hba->dev_id); - return ret; + return &ret->orom; } static const struct imsm_orom *find_imsm_hba_orom(struct sys_dev *hba) @@ -508,7 +504,7 @@ static int read_efi_variable(void *buffer, ssize_t buf_size, char *variable_name const struct imsm_orom *find_imsm_efi(struct sys_dev *hba) { struct imsm_orom orom; - const struct imsm_orom *ret; + struct orom_entry *ret; int err; if (check_env("IMSM_TEST_AHCI_EFI") || check_env("IMSM_TEST_SCU_EFI")) @@ -529,14 +525,14 @@ const struct imsm_orom *find_imsm_efi(struct sys_dev *hba) /* try to read variable for combined AHCI controllers */ if (err && hba->type == SYS_DEV_SATA) { - static const struct imsm_orom *csata; + static struct orom_entry *csata; err = read_efi_variable(&orom, sizeof(orom), AHCI_CSATA_PROP, VENDOR_GUID); if (!err) { if (!csata) csata = add_orom(&orom); add_orom_device_id(csata, hba->dev_id); - return csata; + return &csata->orom; } } @@ -546,12 +542,12 @@ const struct imsm_orom *find_imsm_efi(struct sys_dev *hba) ret = add_orom(&orom); add_orom_device_id(ret, hba->dev_id); - return ret; + return &ret->orom; } const struct imsm_orom *find_imsm_nvme(struct sys_dev *hba) { - static const struct imsm_orom *nvme_orom; + static struct orom_entry *nvme_orom; if (hba->type != SYS_DEV_NVME) return NULL; @@ -574,7 +570,7 @@ const struct imsm_orom *find_imsm_nvme(struct sys_dev *hba) nvme_orom = add_orom(&nvme_orom_compat); } add_orom_device_id(nvme_orom, hba->dev_id); - return nvme_orom; + return &nvme_orom->orom; } const struct imsm_orom *find_imsm_capability(struct sys_dev *hba) diff --git a/platform-intel.h b/platform-intel.h index 2ead431..631fa76 100644 --- a/platform-intel.h +++ b/platform-intel.h @@ -213,8 +213,11 @@ struct devid_list { struct orom_entry { struct imsm_orom orom; struct devid_list *devid_list; + struct orom_entry *next; }; +extern struct orom_entry *orom_entries; + static inline char *guid_str(char *buf, struct efi_guid guid) { sprintf(buf, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", @@ -235,6 +238,5 @@ int devt_attached_to_hba(dev_t dev, const char *hba_path); char *devt_to_devpath(dev_t dev); int path_attached_to_hba(const char *disk_path, const char *hba_path); const char *get_sys_dev_type(enum sys_dev_type); -const struct orom_entry * get_oroms(void); const struct imsm_orom *get_orom_by_device_id(__u16 device_id); struct sys_dev *device_by_id(__u16 device_id); diff --git a/super-intel.c b/super-intel.c index 7f75b53..77df8db 100644 --- a/super-intel.c +++ b/super-intel.c @@ -1948,13 +1948,12 @@ static int detail_platform_imsm(int verbose, int enumerate_only, char *controlle return result; } - const struct orom_entry *oroms = get_oroms(); - int i; + const struct orom_entry *entry; - for (i = 0; i < SYS_DEV_MAX && oroms[i].devid_list; i++) { - print_imsm_capability(&oroms[i].orom); + for (entry = orom_entries; entry; entry = entry->next) { + print_imsm_capability(&entry->orom); - if (imsm_orom_is_nvme(&oroms[i].orom)) { + if (imsm_orom_is_nvme(&entry->orom)) { for (hba = list; hba; hba = hba->next) { if (hba->type == SYS_DEV_NVME) printf(" NVMe Device : %s\n", hba->path); @@ -1963,7 +1962,7 @@ static int detail_platform_imsm(int verbose, int enumerate_only, char *controlle } struct devid_list *devid; - for (devid = oroms[i].devid_list; devid; devid = devid->next) { + for (devid = entry->devid_list; devid; devid = devid->next) { hba = device_by_id(devid->devid); if (!hba) continue; @@ -2007,11 +2006,10 @@ static int export_detail_platform_imsm(int verbose, char *controller_path) result = 0; } - const struct orom_entry *oroms = get_oroms(); - int i; + const struct orom_entry *entry; - for (i = 0; i < SYS_DEV_MAX && oroms[i].devid_list; i++) - print_imsm_capability_export(&oroms[i].orom); + for (entry = orom_entries; entry; entry = entry->next) + print_imsm_capability_export(&entry->orom); return result; } -- 2.16.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
