isci: allow fallback to option-rom if efi variable retrieval fails
If the scu efi driver is disabled but the option-rom is enabled (during an efi
boot) allow the code to fallback to scanning legacy option-rom space for the
parameters.
Reported-by: Yinghai Lu <yinghai.lu@oracle.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index f7ca9e8..10b60ab 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -475,7 +475,7 @@
int err, i;
struct isci_host *isci_host;
const struct firmware *fw = NULL;
- struct isci_orom *orom;
+ struct isci_orom *orom = NULL;
char *source = "(platform)";
check_si_rev(pdev);
@@ -487,7 +487,8 @@
if (efi_enabled)
orom = isci_get_efi_var(pdev);
- else
+
+ if (!orom)
orom = isci_request_oprom(pdev);
for (i = 0; orom && i < ARRAY_SIZE(orom->ctrl); i++) {