isci: Add support for probing OROM for OEM params

We need to scan the OROM for signature and grab the OEM parameters. We
also need to do the same for EFI. If all fails then we resort to user
binary blob, and if that fails then we go to the defaults.

Share the format with the create_fw utility so that all possible sources
of the parameters are in-sync.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

12 files changed, 453 insertions, 427 deletions

diff --git a/drivers/scsi/isci/Makefile b/drivers/scsi/isci/Makefile
index d402d679a31..1252d768c42 100644
--- a/drivers/scsi/isci/Makefile
+++ b/drivers/scsi/isci/Makefile
@@ -9,7 +9,7 @@ EXTRA_CFLAGS += -Idrivers/scsi/isci/core/ -Idrivers/scsi/isci/
 obj-$(CONFIG_SCSI_ISCI) += isci.o
 isci-objs := init.o phy.o request.o sata.o \
              remote_device.o port.o timers.o \
-             host.o task.o events.o \
+             host.o task.o events.o probe_roms.o \
              core/scic_sds_controller.o  \
              core/scic_sds_remote_device.o    \
              core/scic_sds_request.o \
diff --git a/drivers/scsi/isci/core/scic_config_parameters.h b/drivers/scsi/isci/core/scic_config_parameters.h
index 485fefc0888..5e1345daf01 100644
--- a/drivers/scsi/isci/core/scic_config_parameters.h
+++ b/drivers/scsi/isci/core/scic_config_parameters.h
@@ -68,6 +68,7 @@
 #include "sci_status.h"
 #include "intel_sas.h"
 #include "sci_controller_constants.h"
+#include "probe_roms.h"
 
 struct scic_sds_controller;
 
@@ -224,44 +225,6 @@ union scic_user_parameters {
 #define SCIC_SDS_PARM_PHY_MASK_MAX 0xF
 
 /**
- * struct scic_sds_oem_parameters - This structure delineates the various OEM
- *    parameters that must be set the core user.
- *
- *
- */
-struct scic_sds_oem_parameters {
-        struct {
-                /**
-                 * This field indicates whether Spread Spectrum Clocking (SSC)
-                 * should be enabled or disabled.
-                 */
-                bool do_enable_ssc;
-
-        } controller;
-
-        struct {
-                /**
-                 * This field specifies the phys to be contained inside a port.
-                 * The bit position in the mask specifies the index of the phy
-                 * to be contained in the port.  Multiple bits (i.e. phys)
-                 * can be contained in a single port.
-                 */
-                u8 phy_mask;
-
-        } ports[SCI_MAX_PORTS];
-
-        struct sci_phy_oem_params {
-                /**
-                 * This field specifies the SAS address to be transmitted on
-                 * for this phy index.
-                 */
-                struct sci_sas_address sas_address;
-
-        } phys[SCI_MAX_PHYS];
-
-};
-
-/**
  * This structure/union specifies the various different OEM parameter sets
  *    available.  Each type is specific to a hardware controller version.
  *
@@ -273,7 +236,7 @@ union scic_oem_parameters {
          * Storage Controller Unit (SCU) Driver Standard (SDS) version
          * 1.
          */
-        struct scic_sds_oem_parameters sds1;
+        struct scic_sds_oem_params sds1;
 
 };
 
diff --git a/drivers/scsi/isci/core/scic_sds_controller.c b/drivers/scsi/isci/core/scic_sds_controller.c
index 799a04bc093..e7f3711b4af 100644
--- a/drivers/scsi/isci/core/scic_sds_controller.c
+++ b/drivers/scsi/isci/core/scic_sds_controller.c
@@ -2039,10 +2039,8 @@ static void scic_sds_controller_set_default_config_parameters(struct scic_sds_co
 
         /* Initialize all of the phy parameter information. */
         for (index = 0; index < SCI_MAX_PHYS; index++) {
-                /*
-                 * Default to 3G (i.e. Gen 2) for now.  User can override if
-                 * they choose. */
-                scic->user_parameters.sds1.phys[index].max_speed_generation = 2;
+                /* Default to 6G (i.e. Gen 3) for now. */
+                scic->user_parameters.sds1.phys[index].max_speed_generation = 3;
 
                 /* the frequencies cannot be 0 */
                 scic->user_parameters.sds1.phys[index].align_insertion_frequency = 0x7f;
diff --git a/drivers/scsi/isci/firmware/create_fw.c b/drivers/scsi/isci/firmware/create_fw.c
index 442caac9675..f8f96d6eb7d 100644
--- a/drivers/scsi/isci/firmware/create_fw.c
+++ b/drivers/scsi/isci/firmware/create_fw.c
@@ -6,157 +6,30 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <asm/types.h>
+#include <strings.h>
+#include <stdint.h>
 
-char blob_name[] = "isci_firmware.bin";
-char id[] = "#SCU MAGIC#";
-unsigned char version = 1;
-unsigned char sub_version = 0;
-
-
-/*
- * For all defined arrays:
- * elements 0-3 are for SCU0, ports 0-3
- * elements 4-7 are for SCU1, ports 0-3
- *
- * valid configurations for one SCU are:
- *  P0  P1  P2  P3
- * ----------------
- * 0xF,0x0,0x0,0x0 # 1 x4 port
- * 0x3,0x0,0x4,0x8 # Phys 0 and 1 are a x2 port, phy 2 and phy 3 are each x1
- *                 # ports
- * 0x1,0x2,0xC,0x0 # Phys 0 and 1 are each x1 ports, phy 2 and phy 3 are a x2
- *                 # port
- * 0x3,0x0,0xC,0x0 # Phys 0 and 1 are a x2 port, phy 2 and phy 3 are a x2 port
- * 0x1,0x2,0x4,0x8 # Each phy is a x1 port (this is the default configuration)
- *
- * if there is a port/phy on which you do not wish to override the default
- * values, use the value assigned to UNINIT_PARAM (255).
- */
-unsigned int phy_mask[] = { 1, 2, 4, 8, 1, 2, 4, 8 };
-
-
-/* denotes SAS generation. i.e. 3: SAS Gen 3 6G */
-unsigned int phy_gen[] = { 3, 3, 3, 3, 3, 3, 3, 3 };
-
-/*
- * if there is a port/phy on which you do not wish to override the default
- * values, use the value "0000000000000000". SAS address of zero's is
- * considered invalid and will not be used.
- */
-unsigned long long sas_addr[] = { 0x5FCFFFFFF0000000ULL,
-                                  0x5FCFFFFFF1000000ULL,
-                                  0x5FCFFFFFF2000000ULL,
-                                  0x5FCFFFFFF3000000ULL,
-                                  0x5FCFFFFFF4000000ULL,
-                                  0x5FCFFFFFF5000000ULL,
-                                  0x5FCFFFFFF6000000ULL,
-                                  0x5FCFFFFFF7000000ULL };
-
-int write_blob(void)
+#include "create_fw.h"
+#include "../probe_roms.h"
+
+int write_blob(struct isci_orom *isci_orom)
 {
         FILE *fd;
         int err;
+        size_t count;
 
         fd = fopen(blob_name, "w+");
         if (!fd) {
                 perror("Open file for write failed");
+                fclose(fd);
                 return -EIO;
         }
 
-        /* write id */
-        err = fwrite((void *)id, sizeof(char), strlen(id)+1, fd);
+        count = fwrite(isci_orom, sizeof(struct isci_orom), 1, fd);
+        if (count != 1) {