|
@@ -3324,6 +3324,13 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev,
|
|
|
|
|
|
host->sdma_boundary = SDHCI_DEFAULT_BOUNDARY_ARG;
|
|
|
|
|
|
+ /*
|
|
|
+ * The DMA table descriptor count is calculated as the maximum
|
|
|
+ * number of segments times 2, to allow for an alignment
|
|
|
+ * descriptor for each segment, plus 1 for a nop end descriptor.
|
|
|
+ */
|
|
|
+ host->adma_table_cnt = SDHCI_MAX_SEGS * 2 + 1;
|
|
|
+
|
|
|
return host;
|
|
|
}
|
|
|
|
|
@@ -3569,18 +3576,12 @@ int sdhci_setup_host(struct sdhci_host *host)
|
|
|
dma_addr_t dma;
|
|
|
void *buf;
|
|
|
|
|
|
- /*
|
|
|
- * The DMA descriptor table size is calculated as the maximum
|
|
|
- * number of segments times 2, to allow for an alignment
|
|
|
- * descriptor for each segment, plus 1 for a nop end descriptor,
|
|
|
- * all multipled by the descriptor size.
|
|
|
- */
|
|
|
if (host->flags & SDHCI_USE_64_BIT_DMA) {
|
|
|
- host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) *
|
|
|
+ host->adma_table_sz = host->adma_table_cnt *
|
|
|
SDHCI_ADMA2_64_DESC_SZ;
|
|
|
host->desc_sz = SDHCI_ADMA2_64_DESC_SZ;
|
|
|
} else {
|
|
|
- host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) *
|
|
|
+ host->adma_table_sz = host->adma_table_cnt *
|
|
|
SDHCI_ADMA2_32_DESC_SZ;
|
|
|
host->desc_sz = SDHCI_ADMA2_32_DESC_SZ;
|
|
|
}
|