---

yaml --- r: 254381 b: refs/heads/master c: ca507b9 h: refs/heads/master i: 254379: 2f85bff v: v3
git-mirror · Jul 3, 2011 · 81e4f1a · 81e4f1a
1 parent b4094c9
commit 81e4f1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07373a5caa29e4159ef1ea5e72985ddaf013519a
+refs/heads/master: ca507b98e65f539e0b3866b6aa8efd76c13be285
diff --git a/trunk/drivers/scsi/isci/probe_roms.h b/trunk/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