diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-03-11 19:43:57 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 12:55:31 +0200 |
| commit | 4711ba10b13891edf228944a9d0a21dfe7fe90f0 (patch) | |
| tree | c846eb029eb2bc827a614df963b00aa412b95956 /drivers/scsi/isci/probe_roms.c | |
| parent | isci: Fixup for OEM parameter EFI variable retrieval (diff) | |
| download | linux-4711ba10b13891edf228944a9d0a21dfe7fe90f0.tar.xz linux-4711ba10b13891edf228944a9d0a21dfe7fe90f0.zip | |
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>
Diffstat (limited to 'drivers/scsi/isci/probe_roms.c')
| -rw-r--r-- | drivers/scsi/isci/probe_roms.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c index 0d968d3b334b..1697487f908c 100644 --- a/drivers/scsi/isci/probe_roms.c +++ b/drivers/scsi/isci/probe_roms.c @@ -138,10 +138,7 @@ enum sci_status isci_parse_oem_parameters(union scic_oem_parameters *oem_params, scu_index > orom->hdr.num_elements || !oem_params) return -EINVAL; - memcpy(oem_params, - &orom->ctrl[scu_index], - sizeof(struct scic_sds_oem_params)); - + oem_params->sds1 = orom->ctrl[scu_index]; return 0; } |