| Message ID | 20210326055822.1437471-4-hch@lst.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/8] aha1542: use a local bounce buffer | expand |
On 3/26/21 6:58 AM, Christoph Hellwig wrote: > 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> > --- > drivers/scsi/BusLogic.c | 21 ++++++--------------- > drivers/scsi/BusLogic.h | 1 - > 2 files changed, 6 insertions(+), 16 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), GF: Felix Imendörffer
On 3/25/21 11:58 PM, Christoph Hellwig wrote: > 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> > --- > drivers/scsi/BusLogic.c | 21 ++++++--------------- > drivers/scsi/BusLogic.h | 1 - > 2 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c > index c3ed03c4b3f5cb..c8977e4bdba8c2 100644 > --- 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 @@ static bool __init blogic_rdconfig(struct blogic_adapter *adapter) > 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; > } > > @@ -3705,7 +3697,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 6eaddc009b5c55..858187af8fd1e8 100644 > --- a/drivers/scsi/BusLogic.h > +++ b/drivers/scsi/BusLogic.h > @@ -1010,7 +1010,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; > Acked-by: Khalid Aziz <khalid@gonehiking.org>
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index c3ed03c4b3f5cb..c8977e4bdba8c2 100644 --- 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 @@ static bool __init blogic_rdconfig(struct blogic_adapter *adapter) 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; } @@ -3705,7 +3697,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 6eaddc009b5c55..858187af8fd1e8 100644 --- a/drivers/scsi/BusLogic.h +++ b/drivers/scsi/BusLogic.h @@ -1010,7 +1010,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;
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> --- drivers/scsi/BusLogic.c | 21 ++++++--------------- drivers/scsi/BusLogic.h | 1 - 2 files changed, 6 insertions(+), 16 deletions(-)