aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2011-03-25 09:58:15 -0700
committerDan Williams <dan.j.williams@intel.com>2011-07-03 03:58:14 -0700
commit4eefd2518aa04e1c69118252dc23e3444e694bc1 (patch)
tree5e901c31eb9d789586a3db32944a77f70e29e5c5
parentb5f18a201ed82ed3776c9950646689b93713ae57 (diff)
downloadlinux-4eefd2518aa04e1c69118252dc23e3444e694bc1.tar.gz
isci: fix apc mode definition
The original apc mode definition is the correct one, the fix from commit 4711ba10 "isci: fix oem parameter initialization and mode detection" was based on a typo from a specification update. Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--drivers/scsi/isci/probe_roms.h8
-rw-r--r--firmware/isci/isci_firmware.bin.ihex4
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/scsi/isci/probe_roms.h b/drivers/scsi/isci/probe_roms.h
index 1b444838779..c2162cf1205 100644
--- a/drivers/scsi/isci/probe_roms.h
+++ b/drivers/scsi/isci/probe_roms.h
@@ -96,10 +96,6 @@ struct isci_oem_hdr {
#define ISCI_ROM_SIG "ISCUOEMB"
#define ISCI_ROM_SIG_SIZE 8
-#define ISCI_PREBOOT_SOURCE_INIT (0x00)
-#define ISCI_PREBOOT_SOURCE_OROM (0x80)
-#define ISCI_PREBOOT_SOURCE_EFI (0x81)
-
#define ISCI_EFI_VENDOR_GUID \
EFI_GUID(0x193dfefa, 0xa445, 0x4302, 0x99, 0xd8, 0xef, 0x3a, 0xad, \
0x1a, 0x04, 0xc6)
@@ -116,8 +112,8 @@ struct isci_oem_hdr {
* being assigned is sufficient to declare manual PORT configuration.
*/
enum SCIC_PORT_CONFIGURATION_MODE {
- SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 0,
- SCIC_PORT_MANUAL_CONFIGURATION_MODE = 1
+ SCIC_PORT_MANUAL_CONFIGURATION_MODE = 0,
+ SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 1
};
struct sci_bios_oem_param_block_hdr {
diff --git a/firmware/isci/isci_firmware.bin.ihex b/firmware/isci/isci_firmware.bin.ihex
index 4f8767cc60f..31b5ecf1bdd 100644
--- a/firmware/isci/isci_firmware.bin.ihex
+++ b/firmware/isci/isci_firmware.bin.ihex
@@ -1,11 +1,11 @@
:10000000495343554F454D42E70017100002000089
-:10001000000000000000000001000000000000FFE0
+:10001000000000000000000101000000000000FFDF
:10002000FFCF5F01000000037C0E00037C0E000385
:100030007C0E00037C0E00FFFFCF5F010000000379
:100040007C0E00037C0E00037C0E00037C0E00FF80
:10005000FFCF5F01000000037C0E00037C0E000355
:100060007C0E00037C0E00FFFFCF5F010000000349
-:100070007C0E00037C0E00037C0E00037C0E00004F
+:100070007C0E00037C0E00037C0E00037C0E00014E
:1000800001000000000000FFFFCF5F02000000033E
:100090007C0E00037C0E00037C0E00037C0E00FF30
:1000A000FFCF5F02000000037C0E00037C0E000304