BusLogic: reject broken old firmware that requires ISA-style bounce buffering

Warn on and don't support adapters that have a DMA bug that forces ISA-style
bounce buffering.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Khalid Aziz <khalid@gonehiking.org>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20210331073001.46776-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 25ca2f9383462c3eb8803ea14279fd66432402d4..69068081f4396bc9eb23da9f29a69c1ab38f19a6 100644 (file)
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -1616,14 +1616,12 @@ static bool __init blogic_rdconfig(struct blogic_adapter *adapter)
           hardware bug whereby when the BIOS is enabled, transfers to/from
           the same address range the BIOS occupies modulo 16MB are handled
           incorrectly.  Only properly functioning BT-445S Host Adapters
-          have firmware version 3.37, so require that ISA Bounce Buffers
-          be used for the buggy BT-445S models if there is more than 16MB
-          memory.
+          have firmware version 3.37.
         */
-       if (adapter->bios_addr > 0 && strcmp(adapter->model, "BT-445S") == 0 &&
-                       strcmp(adapter->fw_ver, "3.37") < 0 &&
-                       (void *) high_memory > (void *) MAX_DMA_ADDRESS)
-               adapter->need_bouncebuf = true;
+       if (adapter->bios_addr > 0 &&
+           strcmp(adapter->model, "BT-445S") == 0 &&
+           strcmp(adapter->fw_ver, "3.37") < 0)
+               return blogic_failure(adapter, "Too old firmware");
        /*
           Initialize parameters common to MultiMaster and FlashPoint
           Host Adapters.
@@ -1646,14 +1644,9 @@ common:
                if (adapter->drvr_opts != NULL &&
                                adapter->drvr_opts->qdepth[tgt_id] > 0)
                        qdepth = adapter->drvr_opts->qdepth[tgt_id];
-               else if (adapter->need_bouncebuf)
-                       qdepth = BLOGIC_TAG_DEPTH_BB;
                adapter->qdepth[tgt_id] = qdepth;
        }
-       if (adapter->need_bouncebuf)
-               adapter->untag_qdepth = BLOGIC_UNTAG_DEPTH_BB;
-       else
-               adapter->untag_qdepth = BLOGIC_UNTAG_DEPTH;
+       adapter->untag_qdepth = BLOGIC_UNTAG_DEPTH;
        if (adapter->drvr_opts != NULL)
                adapter->common_qdepth = adapter->drvr_opts->common_qdepth;
        if (adapter->common_qdepth > 0 &&
@@ -2155,7 +2148,6 @@ static void __init blogic_inithoststruct(struct blogic_adapter *adapter,
        host->this_id = adapter->scsi_id;
        host->can_queue = adapter->drvr_qdepth;
        host->sg_tablesize = adapter->drvr_sglimit;
-       host->unchecked_isa_dma = adapter->need_bouncebuf;
        host->cmd_per_lun = adapter->untag_qdepth;
 }
 
@@ -3677,7 +3669,6 @@ static struct scsi_host_template blogic_template = {
 #if 0
        .eh_abort_handler = blogic_abort,
 #endif
-       .unchecked_isa_dma = 1,
        .max_sectors = 128,
 };
 

diff --git a/drivers/scsi/BusLogic.h b/drivers/scsi/BusLogic.h
index 2eedeaa47970f0e88797f1af9bde1fcfddb612bb..a8e4a19788a77641778e16e994aa6d234da86f8c 100644 (file)
--- a/drivers/scsi/BusLogic.h
+++ b/drivers/scsi/BusLogic.h
@@ -1003,7 +1003,6 @@ struct blogic_adapter {
        bool terminfo_valid:1;
        bool low_term:1;
        bool high_term:1;
-       bool need_bouncebuf:1;
        bool strict_rr:1;
        bool scam_enabled:1;
        bool scam_lev2:1;