Skip to content

Commit

Permalink
esp.c: update end of transfer logic at the end of esp_transfer_data()
Browse files Browse the repository at this point in the history
Since esp_dma_done() is called in both cases, and ti_size cannot be zero
(otherwise esp_command_complete() would have been called instead), replace
the conditional logic with a single call to esp_dma_done().

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Tested-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20240112125420.514425-28-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  • Loading branch information
mcayland committed Feb 13, 2024
1 parent fe082b5 commit a79e767
Showing 1 changed file with 4 additions and 10 deletions.
14 changes: 4 additions & 10 deletions hw/scsi/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,16 +925,10 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len)
*/

if (s->ti_cmd == (CMD_TI | CMD_DMA)) {
if (dmalen) {
esp_do_dma(s);
} else if (s->ti_size <= 0) {
/*
* If this was the last part of a DMA transfer then the
* completion interrupt is deferred to here.
*/
esp_dma_done(s);
esp_lower_drq(s);
}
/* When the SCSI layer returns more data, raise deferred INTR_BS */
esp_dma_done(s);

esp_do_dma(s);
} else if (s->ti_cmd == CMD_TI) {
esp_do_nodma(s);
}
Expand Down

0 comments on commit a79e767

Please sign in to comment.