diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2011-02-24 21:09:39 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 12:55:30 +0200 |
| commit | ca507b98e65f539e0b3866b6aa8efd76c13be285 (patch) | |
| tree | e8c20ae094480fcb83916dcf46e13715602fd63f /drivers/scsi/isci/probe_roms.h | |
| parent | isci: add support for 2 more oem parmeters (diff) | |
| download | linux-ca507b98e65f539e0b3866b6aa8efd76c13be285.tar.xz linux-ca507b98e65f539e0b3866b6aa8efd76c13be285.zip | |
isci: update efi variable name and guid
These are the finalized values that the driver can expect to see in
production.
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.h')
| -rw-r--r-- | drivers/scsi/isci/probe_roms.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/isci/probe_roms.h b/drivers/scsi/isci/probe_roms.h index 69526ffa8474..02940e709f97 100644 --- a/drivers/scsi/isci/probe_roms.h +++ b/drivers/scsi/isci/probe_roms.h @@ -73,6 +73,7 @@ struct isci_orom *isci_get_efi_var(struct pci_dev *pdev); #else #define SCI_MAX_PORTS 4 #define SCI_MAX_PHYS 4 +#define SCI_MAX_CONTROLLERS 2 #endif #define ISCI_FW_NAME "isci/isci_firmware.bin" @@ -82,9 +83,11 @@ struct isci_orom *isci_get_efi_var(struct pci_dev *pdev); #define ISCI_ROM_SIG "ISCUOEMB" #define ISCI_ROM_SIG_SIZE 8 -#define ISCI_EFI_VENDOR_GUID NULL_GUID +#define ISCI_EFI_VENDOR_GUID \ + EFI_GUID(0x193dfefa, 0xa445, 0x4302, 0x99, 0xd8, 0xef, 0x3a, 0xad, \ + 0x1a, 0x04, 0xc6) #define ISCI_EFI_ATTRIBUTES 0 -#define ISCI_EFI_VAR_NAME "isci_oemb" +#define ISCI_EFI_VAR_NAME "RST_SCU_OEM" /* Allowed PORT configuration modes APC Automatic PORT configuration mode is * defined by the OEM configuration parameters providing no PHY_MASK parameters @@ -138,7 +141,7 @@ struct scic_sds_oem_params { struct isci_orom { struct sci_bios_oem_param_block_hdr hdr; - struct scic_sds_oem_params ctrl[2]; + struct scic_sds_oem_params ctrl[SCI_MAX_CONTROLLERS]; } __attribute__ ((packed)); #endif |