SAMA5D3/4: All configurations. I suspect a MMC/SD multi-block DMA transfer issue. So for name, this feature is disabled in all configurations

6 files changed, 22 insertions, 4 deletions

diff --git a/nuttx/configs/sama5d3-xplained/README.txt b/nuttx/configs/sama5d3-xplained/README.txt
index 6bfec18f9..47d1f7961 100644
--- a/nuttx/configs/sama5d3-xplained/README.txt
+++ b/nuttx/configs/sama5d3-xplained/README.txt
@@ -1041,6 +1041,7 @@ HSMCI Card Slots
     Device Drivers -> MMC/SD Driver Support
       CONFIG_MMCSD=y                        : Enable MMC/SD support
       CONFIG_MMSCD_NSLOTS=1                 : One slot per driver instance
+      CONFIG_MMCSD_MULTIBLOCK_DISABLE=y     : (REVISIT)
       CONFIG_MMCSD_HAVECARDDETECT=y         : Supports card-detect PIOs
       CONFIG_MMCSD_MMCSUPPORT=n             : Interferes with some SD cards
       CONFIG_MMCSD_SPI=n                    : No SPI-based MMC/SD support
@@ -2793,6 +2794,12 @@ To-Do List
 
 2) HSCMI TX DMA support is currently commented out.
 
+   Also, CONFIG_MMCSD_MULTIBLOCK_DISABLE=y is set to disable multi-block
+   transfers.
+
+   Both of these issues need to be revisited to determine there is or
+   is not a real problem.
+
 3) GMAC has only been tested on a 10/100Base-T network.  I don't have a
    1000Base-T network to support additional testing.
 
diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index 9f26f5ec0..e25d29937 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -1200,6 +1200,7 @@ HSMCI Card Slots
     Device Drivers -> MMC/SD Driver Support
       CONFIG_MMCSD=y                        : Enable MMC/SD support
       CONFIG_MMSCD_NSLOTS=1                 : One slot per driver instance
+      CONFIG_MMCSD_MULTIBLOCK_DISABLE=y     : (REVISIT)
       CONFIG_MMCSD_HAVECARDDETECT=y         : Supports card-detect PIOs
       CONFIG_MMCSD_MMCSUPPORT=n             : Interferes with some SD cards
       CONFIG_MMCSD_SPI=n                    : No SPI-based MMC/SD support
@@ -3476,6 +3477,12 @@ To-Do List
 
 4) HSCMI TX DMA support is currently commented out.
 
+   Also, CONFIG_MMCSD_MULTIBLOCK_DISABLE=y is set to disable multi-block
+   transfers.
+
+   Both of these issues need to be revisited to determine there is or
+   is not a real problem.
+
 5) I believe that there is an issue when the internal AT25 FLASH is
    formatted by NuttX.  That format works fine with Linux, but does not
    appear to work with Windows.  Reformatting on Windows can resolve this.
diff --git a/nuttx/configs/sama5d3x-ek/demo/defconfig b/nuttx/configs/sama5d3x-ek/demo/defconfig
index d35164409..7c8e36561 100644
--- a/nuttx/configs/sama5d3x-ek/demo/defconfig
+++ b/nuttx/configs/sama5d3x-ek/demo/defconfig
@@ -486,7 +486,7 @@ CONFIG_RTC_DATETIME=y
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
-# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_MMCSUPPORT is not set
 CONFIG_MMCSD_HAVECARDDETECT=y
 # CONFIG_MMCSD_SPI is not set
diff --git a/nuttx/configs/sama5d4-ek/README.txt b/nuttx/configs/sama5d4-ek/README.txt
index cb2447763..6baa525da 100644
--- a/nuttx/configs/sama5d4-ek/README.txt
+++ b/nuttx/configs/sama5d4-ek/README.txt
@@ -1528,6 +1528,7 @@ HSMCI Card Slots
     Device Drivers -> MMC/SD Driver Support
       CONFIG_MMCSD=y                        : Enable MMC/SD support
       CONFIG_MMSCD_NSLOTS=1                 : One slot per driver instance
+      CONFIG_MMCSD_MULTIBLOCK_DISABLE=y     : (REVISIT)
       CONFIG_MMCSD_HAVECARDDETECT=y         : Supports card-detect PIOs
       CONFIG_MMCSD_MMCSUPPORT=n             : Interferes with some SD cards
       CONFIG_MMCSD_SPI=n                    : No SPI-based MMC/SD support
@@ -4042,11 +4043,14 @@ To-Do List
    EHCI drivers).
 
 2) HSCMI TX DMA support is currently commented out.  There were problems at
-   one time (on the SAMA5D3) and the temporary workaround was simpley to
+   one time (on the SAMA5D3) and the temporary workaround was simply to
    disable TX DMA.  There have been several fixes to both HSMCI and DMA
    support since then and TX DMA is very likely okay now.  But this needs
    to be verified by re-enabled HSMCI TX DMA.
 
+   Also, CONFIG_MMCSD_MULTIBLOCK_DISABLE=y is set to disable multi-block
+   transfers.
+
 3) There is a kludge in place in the Ethernet code to work around a problem
    that I see.  The problem that I see is as follows:
 
diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig
index 5dd8cab1c..dcdd5b471 100644
--- a/nuttx/configs/sama5d4-ek/nsh/defconfig
+++ b/nuttx/configs/sama5d4-ek/nsh/defconfig
@@ -553,7 +553,7 @@ CONFIG_MXT_NPOLLWAITERS=4
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
-# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_MMCSUPPORT is not set
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_ARCH_HAVE_SDIO=y
diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig
index efd10a8f1..b64b393a2 100644
--- a/nuttx/configs/sama5d4-ek/nxwm/defconfig
+++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig
@@ -556,7 +556,7 @@ CONFIG_MXT_NPOLLWAITERS=4
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
-# CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
+CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_MMCSUPPORT is not set
 CONFIG_MMCSD_HAVECARDDETECT=y
 CONFIG_ARCH_HAVE_SDIO=y