aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams2011-03-11 12:43:57 -0600
committerDan Williams2011-07-03 05:55:31 -0500
commit4711ba10b13891edf228944a9d0a21dfe7fe90f0 (patch)
treec846eb029eb2bc827a614df963b00aa412b95956 /firmware
parent2e8320f751030a12efc3e64ee857bfa4647f81fe (diff)
downloadkernel-video-4711ba10b13891edf228944a9d0a21dfe7fe90f0.tar.gz
kernel-video-4711ba10b13891edf228944a9d0a21dfe7fe90f0.tar.xz
kernel-video-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 'firmware')
-rw-r--r--firmware/isci/isci_firmware.bin.ihex28
1 files changed, 14 insertions, 14 deletions
diff --git a/firmware/isci/isci_firmware.bin.ihex b/firmware/isci/isci_firmware.bin.ihex
index b1bb5cf4499..4f8767cc60f 100644
--- a/firmware/isci/isci_firmware.bin.ihex
+++ b/firmware/isci/isci_firmware.bin.ihex
@@ -1,16 +1,16 @@
1:10000000495343554F454D42E70017100002000089 1:10000000495343554F454D42E70017100002000089
2:10001000000000000000000101000000000000FFDF 2:10001000000000000000000001000000000000FFE0
3:10002000FFCF5F000000F0000000000000000000B3 3:10002000FFCF5F01000000037C0E00037C0E000385
4:1000300000000000000000FFFFCF5F000000F100A3 4:100030007C0E00037C0E00FFFFCF5F010000000379
5:10004000000000000000000000000000000000FFB1 5:100040007C0E00037C0E00037C0E00037C0E00FF80
6:10005000FFCF5F000000F200000000000000000081 6:10005000FFCF5F01000000037C0E00037C0E000355
7:1000600000000000000000FFFFCF5F000000F30071 7:100060007C0E00037C0E00FFFFCF5F010000000349
8:10007000000000000000000000000000000000017F 8:100070007C0E00037C0E00037C0E00037C0E00004F
9:1000800001000000000000FFFFCF5F000000F4004F 9:1000800001000000000000FFFFCF5F02000000033E
10:10009000000000000000000000000000000000FF61 10:100090007C0E00037C0E00037C0E00037C0E00FF30
11:1000A000FFCF5F000000F50000000000000000002E 11:1000A000FFCF5F02000000037C0E00037C0E000304
12:1000B00000000000000000FFFFCF5F000000F6001E 12:1000B0007C0E00037C0E00FFFFCF5F0200000003F8
13:1000C000000000000000000000000000000000FF31 13:1000C0007C0E00037C0E00037C0E00037C0E00FF00
14:1000D000FFCF5F000000F7000000000000000000FC 14:1000D000FFCF5F02000000037C0E00037C0E0003D4
15:0700E0000000000000000019 15:0700E0007C0E00037C0E0002
16:00000001FF 16:00000001FF