Commit 4eefd2518aa04e1c69118252dc23e3444e694bc1

Authored by Dan Williams
1 parent b5f18a201e

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>

Showing 2 changed files with 4 additions and 8 deletions Side-by-side Diff

drivers/scsi/isci/probe_roms.h
... ... @@ -96,10 +96,6 @@
96 96 #define ISCI_ROM_SIG "ISCUOEMB"
97 97 #define ISCI_ROM_SIG_SIZE 8
98 98  
99   -#define ISCI_PREBOOT_SOURCE_INIT (0x00)
100   -#define ISCI_PREBOOT_SOURCE_OROM (0x80)
101   -#define ISCI_PREBOOT_SOURCE_EFI (0x81)
102   -
103 99 #define ISCI_EFI_VENDOR_GUID \
104 100 EFI_GUID(0x193dfefa, 0xa445, 0x4302, 0x99, 0xd8, 0xef, 0x3a, 0xad, \
105 101 0x1a, 0x04, 0xc6)
... ... @@ -116,8 +112,8 @@
116 112 * being assigned is sufficient to declare manual PORT configuration.
117 113 */
118 114 enum SCIC_PORT_CONFIGURATION_MODE {
119   - SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 0,
120   - SCIC_PORT_MANUAL_CONFIGURATION_MODE = 1
  115 + SCIC_PORT_MANUAL_CONFIGURATION_MODE = 0,
  116 + SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE = 1
121 117 };
122 118  
123 119 struct sci_bios_oem_param_block_hdr {
firmware/isci/isci_firmware.bin.ihex
1 1 :10000000495343554F454D42E70017100002000089
2   -:10001000000000000000000001000000000000FFE0
  2 +:10001000000000000000000101000000000000FFDF
3 3 :10002000FFCF5F01000000037C0E00037C0E000385
4 4 :100030007C0E00037C0E00FFFFCF5F010000000379
5 5 :100040007C0E00037C0E00037C0E00037C0E00FF80
6 6 :10005000FFCF5F01000000037C0E00037C0E000355
7 7 :100060007C0E00037C0E00FFFFCF5F010000000349
8   -:100070007C0E00037C0E00037C0E00037C0E00004F
  8 +:100070007C0E00037C0E00037C0E00037C0E00014E
9 9 :1000800001000000000000FFFFCF5F02000000033E
10 10 :100090007C0E00037C0E00037C0E00037C0E00FF30
11 11 :1000A000FFCF5F02000000037C0E00037C0E000304