D20199.id57175.diff
No OneTemporary
Actions

Size

934 B

Referenced Files

None

Subscribers

None

D20199.id57175.diff
View Options

	Index: sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
	===================================================================
	--- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
	+++ sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
	@@ -539,6 +539,22 @@
	left = min(BCM_SDHCI_BUFFER_SIZE,
	slot->curcmd->data->len - slot->offset);

	+ /*
	+ * If there is less than buffer size outstanding, we would not handle
	+ * it anymore using DMA if bcm_sdhci_will_handle_transfer() were asked.
	+ * Re-enable interrupts and return and let the SDHCI state machine
	+ * finish the job.
	+ */
	+ if (left < BCM_SDHCI_BUFFER_SIZE) {
	+ /* Re-enable data interrupts. */
	+ slot->intmask \|= SDHCI_INT_DATA_AVAIL \| SDHCI_INT_SPACE_AVAIL \|
	+ SDHCI_INT_DATA_END;
	+ bcm_sdhci_write_4(slot->bus, slot, SDHCI_SIGNAL_ENABLE,
	+ slot->intmask);
	+ mtx_unlock(&slot->mtx);
	+ return;
	+ }
	+
	/* DATA END? */
	reg = bcm_sdhci_read_4(slot->bus, slot, SDHCI_INT_STATUS);