diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-08-13 14:20:43 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-08-13 14:20:43 +0000 |
| commit | 69fba4a51edb69fb983ca887d985c1d9a1c62e5e (patch) | |
| tree | 3301408cf6afa629fcff0e89853b1cab37f08e15 | |
| parent | 4d611c9a2f4c5d9080d8b6a6f0d7431233cd56f9 (diff) | |
Remove OpenBIOS ESP patch. Merged upstream.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2108 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | pc-bios/openbios-esp.diff | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/pc-bios/openbios-esp.diff b/pc-bios/openbios-esp.diff deleted file mode 100644 index 5d4f836f12..0000000000 --- a/pc-bios/openbios-esp.diff +++ /dev/null @@ -1,30 +0,0 @@ -The ESP SCSI driver currently doesn't check whether a DMA requests has -completed before checking its status. On older qemu versions this works ok -because DMA happens instantly. On never qemu DMA can take an indeterminate -amount of time ooto complete, just like on real hardware. - -The patch below waits for the controller to raise the DMA interrupt after -initiating a DMA request. - -Index: drivers/esp.c -=================================================================== ---- drivers/esp.c (revision 61) -+++ drivers/esp.c (working copy) -@@ -113,6 +113,8 @@ do_command(esp_private_t *esp, sd_privat - esp->espdma.regs->cond_reg = 0; - // Set ATN, issue command - esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; -+ // Wait for DMA to complete -+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; - // Check status - status = esp->ll->regs[ESP_STATUS]; - -@@ -129,6 +131,8 @@ do_command(esp_private_t *esp, sd_privat - esp->espdma.regs->cond_reg = DMA_ST_WRITE; - // Transfer - esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; -+ // Wait for DMA to complete -+ while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0) /* no-op */; - // Check status - status = esp->ll->regs[ESP_STATUS]; - |