isci: fix oem parameter initialization and mode detection

1/ Since commit 858d4aa7 "isci: Move firmware loading to per PCI device" we have
   been silently falling back to built-in defaults for the parameter settings by
   skipping the call to scic_oem_parameters_set().

2/ The afe parameters from the firmware were not being honored

3/ The latest oem parameter definition flips the mode_type values which are
   now 0: for APC 1: for MPC.  For APC we need to make sure all the phys
   default to the same address otherwise strict_wide_ports will cause duplicate
   domains.

4/ Fix up the driver announcement to indicate the source of the
   parameters.

5/ Fix up the sas addresses to be unique per controller (in the fallback case)

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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index ef0c49a0c0a0..51a7bce20dae 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -466,6 +466,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
         struct isci_host *isci_host;
         const struct firmware *fw = NULL;
         struct isci_orom *orom;
+        char *source = "(platform)";
 
         check_si_rev(pdev);
 
@@ -480,6 +481,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
                 orom = isci_request_oprom(pdev);
 
         if (!orom) {
+                source = "(firmware)";
                 orom = isci_request_firmware(pdev, fw);
                 if (!orom) {
                         /* TODO convert this to WARN_TAINT_ONCE once the
@@ -496,9 +498,9 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
 
         if (orom)
                 dev_info(&pdev->dev,
-                         "OEM SAS parameters (version: %u.%u) loaded\n",
+                         "OEM SAS parameters (version: %u.%u) loaded %s\n",
                          (orom->hdr.version & 0xf0) >> 4,
-                         (orom->hdr.version & 0xf));
+                         (orom->hdr.version & 0xf), source);
 
         pci_info->orom = orom;