2020-01-17 11:57:46

by Thomas Bogendoerfer

Subject: [PATCH] scsi: qla1280: Make checking for 64bit support consistent

Use #ifdef QLA_64BIT_PTR to check if 64bit support is enabled.
This fixes ("scsi: qla1280: Fix dma firmware download, if dma
address is 64bit").

Signed-off-by: Thomas Bogendoerfer <[email protected]>
---
drivers/scsi/qla1280.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 607cbddcdd14..3337cd341d21 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1699,7 +1699,7 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha)
return err;
}

-#if QLA_64BIT_PTR
+#ifdef QLA_64BIT_PTR
#define LOAD_CMD MBC_LOAD_RAM_A64_ROM
#define DUMP_CMD MBC_DUMP_RAM_A64_ROM
#define CMD_ARGS (BIT_7 | BIT_6 | BIT_4 | BIT_3 | BIT_2 | BIT_1 | BIT_0)
--
2.24.1

2020-01-20 23:39:56

by Martin K. Petersen

Subject: Re: [PATCH] scsi: qla1280: Make checking for 64bit support consistent

Thomas,

> Use #ifdef QLA_64BIT_PTR to check if 64bit support is enabled. This
> fixes ("scsi: qla1280: Fix dma firmware download, if dma address is
> 64bit").

Applied to 5.6/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering