Platform-intel: support for OROM SAS and AHCI controller

Signed-off-by: Marcin Labun <marcin.labun@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 100 insertions, 30 deletions

diff --git a/platform-intel.c b/platform-intel.c
index a4f0f491..08cf4edd 100644
--- a/platform-intel.c
+++ b/platform-intel.c
@@ -28,6 +28,10 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <limits.h>
+
+
+static __u16 devpath_to_vendor(const char *dev_path);
 
 void free_sys_dev(struct sys_dev **list)
 {
@@ -113,7 +117,8 @@ struct sys_dev *find_driver_devices(const char *bus, const char *driver)
 	return head;
 }
 
-__u16 devpath_to_vendor(const char *dev_path)
+
+static __u16 devpath_to_vendor(const char *dev_path)
 {
 	char path[strlen(dev_path) + strlen("/vendor") + 1];
 	char vendor[7];
@@ -167,19 +172,21 @@ static int platform_has_intel_devices(void)
 }
 
 /*
- * PCI Expansion ROM Data Structure Format
- */
+ * PCI Expansion ROM Data Structure Format */
 struct pciExpDataStructFormat {
 	__u8  ver[4];
 	__u16 vendorID;
 	__u16 deviceID;
 } __attribute__ ((packed));
 
-static struct imsm_orom imsm_orom;
+static struct imsm_orom imsm_orom[SYS_DEV_MAX];
+static int populated_orom[SYS_DEV_MAX];
+
 static int scan(const void *start, const void *end, const void *data)
 {
 	int offset;
 	const struct imsm_orom *imsm_mem;
+	int dev;
 	int len = (end - start);
 	struct pciExpDataStructFormat *ptr= (struct pciExpDataStructFormat *)data;
 
@@ -187,47 +194,86 @@ static int scan(const void *start, const void *end, const void *data)
 		(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)))
+	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;
+	else
 		return 0;
 
 	for (offset = 0; offset < len; offset += 4) {
 		imsm_mem = start + offset;
 		if (memcmp(imsm_mem->signature, "$VER", 4) == 0) {
-			imsm_orom = *imsm_mem;
-			return 1;
+			imsm_orom[dev] = *imsm_mem;
+			populated_orom[dev] = 1;
+			return populated_orom[SYS_DEV_SATA] && populated_orom[SYS_DEV_SAS];
 		}
 	}
 	return 0;
 }
 
-const struct imsm_orom *find_imsm_orom(void)
-{
-	static int populated = 0;
-	unsigned long align;
 
-	/* it's static data so we only need to read it once */
-	if (populated)
-		return &imsm_orom;
-
-	if (check_env("IMSM_TEST_OROM")) {
-		memset(&imsm_orom, 0, sizeof(imsm_orom));
-		imsm_orom.rlc = IMSM_OROM_RLC_RAID0 | IMSM_OROM_RLC_RAID1 |
+const struct imsm_orom *imsm_platform_test(enum sys_dev_type hba_id, int *populated,
+					   struct imsm_orom *imsm_orom)
+{
+	memset(imsm_orom, 0, sizeof(*imsm_orom));
+	imsm_orom->rlc = IMSM_OROM_RLC_RAID0 | IMSM_OROM_RLC_RAID1 |
 				IMSM_OROM_RLC_RAID10 | IMSM_OROM_RLC_RAID5;
-		imsm_orom.sss = IMSM_OROM_SSS_4kB | IMSM_OROM_SSS_8kB |
+	imsm_orom->sss = IMSM_OROM_SSS_4kB | IMSM_OROM_SSS_8kB |
 				IMSM_OROM_SSS_16kB | IMSM_OROM_SSS_32kB |
 				IMSM_OROM_SSS_64kB | IMSM_OROM_SSS_128kB |
 				IMSM_OROM_SSS_256kB | IMSM_OROM_SSS_512kB |
 				IMSM_OROM_SSS_1MB | IMSM_OROM_SSS_2MB;
-		imsm_orom.dpa = 6;
-		imsm_orom.tds = 6;
-		imsm_orom.vpa = 2;
-		imsm_orom.vphba = 4;
-		imsm_orom.attr = imsm_orom.rlc | IMSM_OROM_ATTR_ChecksumVerify;
-		populated = 1;
-		return &imsm_orom;
+	imsm_orom->dpa = IMSM_OROM_DISKS_PER_ARRAY;
+	imsm_orom->tds = IMSM_OROM_TOTAL_DISKS;
+	imsm_orom->vpa = IMSM_OROM_VOLUMES_PER_ARRAY;
+	imsm_orom->vphba = IMSM_OROM_VOLUMES_PER_HBA;
+	imsm_orom->attr = imsm_orom->rlc | IMSM_OROM_ATTR_ChecksumVerify;
+	*populated = 1;
+
+	if (check_env("IMSM_TEST_OROM_NORAID5")) {
+		imsm_orom->rlc = IMSM_OROM_RLC_RAID0 | IMSM_OROM_RLC_RAID1 |
+				IMSM_OROM_RLC_RAID10;
+	}
+	if (check_env("IMSM_TEST_AHCI_EFI_NORAID5") && (hba_id == SYS_DEV_SAS)) {
+		imsm_orom->rlc = IMSM_OROM_RLC_RAID0 | IMSM_OROM_RLC_RAID1 |
+				IMSM_OROM_RLC_RAID10;
+	}
+	if (check_env("IMSM_TEST_SCU_EFI_NORAID5") && (hba_id == SYS_DEV_SATA)) {
+		imsm_orom->rlc = IMSM_OROM_RLC_RAID0 | IMSM_OROM_RLC_RAID1 |
+				IMSM_OROM_RLC_RAID10;
 	}
 
+	return imsm_orom;
+}
+
+
+
+static const struct imsm_orom *find_imsm_hba_orom(enum sys_dev_type hba_id)
+{
+	unsigned long align;
+
+	if (hba_id >= SYS_DEV_MAX)
+		return NULL;
+
+	/* it's static data so we only need to read it once */
+	if (populated_orom[hba_id]) {
+		dprintf("OROM CAP: %p, pid: %d pop: %d\n",
+			&imsm_orom[hba_id], (int) getpid(), populated_orom[hba_id]);
+		return &imsm_orom[hba_id];
+	}
+	if (check_env("IMSM_TEST_OROM")) {
+		dprintf("OROM CAP: %p,  pid: %d pop: %d\n",
+                     &imsm_orom[hba_id], (int) getpid(), populated_orom[hba_id]);
+		return imsm_platform_test(hba_id, &populated_orom[hba_id], &imsm_orom[hba_id]);
+	}
+	/* return empty OROM capabilities in EFI test mode */
+	if (check_env("IMSM_TEST_AHCI_EFI") ||
+	    check_env("IMSM_TEST_SCU_EFI"))
+		return NULL;
+
 	if (!platform_has_intel_devices())
 		return NULL;
 
@@ -239,11 +285,30 @@ const struct imsm_orom *find_imsm_orom(void)
 	if (probe_roms_init(align) != 0)
 		return NULL;
 	probe_roms();
-	populated = scan_adapter_roms(scan);
+	/* ignore result - True is returned if both are found */
+	scan_adapter_roms(scan);
 	probe_roms_exit();
 
-	if (populated)
-		return &imsm_orom;
+	if (populated_orom[hba_id])
+		return &imsm_orom[hba_id];
+	return NULL;
+}
+
+
+/*
+ * backward interface compatibility
+ */
+const struct imsm_orom *find_imsm_orom(void)
+{
+	return find_imsm_hba_orom(SYS_DEV_SATA);
+}
+
+const struct imsm_orom *find_imsm_capability(enum sys_dev_type hba_id)
+{
+	const struct imsm_orom *cap=NULL;
+
+	if ((cap = find_imsm_hba_orom(hba_id)) != NULL)
+		return cap;
 	return NULL;
 }
 
@@ -274,6 +339,11 @@ int path_attached_to_hba(const char *disk_path, const char *hba_path)
 {
 	int rc;
 
+	if (check_env("IMSM_TEST_AHCI_DEV") ||
+	    check_env("IMSM_TEST_SCU_DEV")) {
+		return 1;
+	}
+
 	if (!disk_path || !hba_path)
 		return 0;
 	dprintf("hba: %s - disk: %s\n", hba_path, disk_path);