mmc: sdhci: Define maximum segments

Define the maximum number of segments instead of
having the constant 128 appearing in the code in
various places.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 053b55df9df18c8c8ca976f6d9743f2889586494..586c7391a066554b023e0e6db8e6f12b615164ea 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2877,8 +2877,8 @@ int sdhci_add_host(struct sdhci_host *host)
                 * descriptor for each segment, plus 1 for a nop end descriptor,
                 * all multipled by the descriptor size.
                 */
-               host->adma_table_sz = (128 * 2 + 1) * 8;
-               host->align_buffer_sz = 128 * 4;
+               host->adma_table_sz = (SDHCI_MAX_SEGS * 2 + 1) * 8;
+               host->align_buffer_sz = SDHCI_MAX_SEGS * 4;
                host->desc_sz = 8;
                host->align_sz = 4;
                host->align_mask = 3;
@@ -3192,11 +3192,11 @@ int sdhci_add_host(struct sdhci_host *host)
         * can do scatter/gather or not.
         */
        if (host->flags & SDHCI_USE_ADMA)
-               mmc->max_segs = 128;
+               mmc->max_segs = SDHCI_MAX_SEGS;
        else if (host->flags & SDHCI_USE_SDMA)
                mmc->max_segs = 1;
        else /* PIO */
-               mmc->max_segs = 128;
+               mmc->max_segs = SDHCI_MAX_SEGS;
 
        /*
         * Maximum number of sectors in one transfer. Limited by DMA boundary

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 31896a779d4ed07834026743ac9d87ad917bebb8..6ae75cdd5f4182c6f573509c21938e1ec2ad7f3c 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -266,6 +266,12 @@
 #define SDHCI_DEFAULT_BOUNDARY_SIZE  (512 * 1024)
 #define SDHCI_DEFAULT_BOUNDARY_ARG   (ilog2(SDHCI_DEFAULT_BOUNDARY_SIZE) - 12)
 
+/*
+ * Maximum segments assuming a 512KiB maximum requisition size and a minimum
+ * 4KiB page size.
+ */
+#define SDHCI_MAX_SEGS         128
+
 struct sdhci_ops {
 #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
        u32             (*read_l)(struct sdhci_host *host, int reg);