D4240.diff
No OneTemporary
Actions

Size

724 B

Referenced Files

None

Subscribers

None

D4240.diff
View Options

	Index: head/sys/dev/ahci/ahci.c
	===================================================================
	--- head/sys/dev/ahci/ahci.c
	+++ head/sys/dev/ahci/ahci.c
	@@ -1606,10 +1606,15 @@
	if ((ch->quirks & AHCI_Q_NOBSYRES) == 0 &&
	(ch->quirks & AHCI_Q_ATI_PMP_BUG) == 0 &&
	softreset == 2 && et == AHCI_ERR_NONE) {
	- while ((val = fis[2]) & ATA_S_BUSY) {
	- DELAY(10);
	- if (count++ >= timeout)
	+ for ( ; count < timeout; count++) {
	+ bus_dmamap_sync(ch->dma.rfis_tag,
	+ ch->dma.rfis_map, BUS_DMASYNC_POSTREAD);
	+ val = fis[2];
	+ bus_dmamap_sync(ch->dma.rfis_tag,
	+ ch->dma.rfis_map, BUS_DMASYNC_PREREAD);
	+ if ((val & ATA_S_BUSY) == 0)
	break;
	+ DELAY(10);
	}
	}