sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMV7 HSCMI: Don't assert of the data buffer is unaligned. Instead, return -EFAULT. This will allow the FAT file system to utilize the CONFIG_FAT_DMAMEMORY option and fix the problem from the file system

Browse Source
This commit is contained in:
Gregory Nutt 2016-02-22 16:44:33 -06:00
parent 1446784fbd
commit 08f0086771
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/src/samv7/sam_hsmci.c
View File

@ -2931,18 +2931,20 @@ static int sam_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SAMV7_HSMCI_UNALIGNED
/* 32-bit buffer alignment is required for DMA transfers */ /* 32-bit buffer alignment is required for DMA transfers */
if (((uintptr_t)buffer & 3) != 0 || (buflen & 3) != 0) if (((uintptr_t)buffer & 3) != 0 || (buflen & 3) != 0)
{ {
/* Fall back and do a non-DMA transfer */ #ifdef CONFIG_SAMV7_HSMCI_UNALIGNED
/* Fall back and do an unaligned, non-DMA transfer */
return sam_recvsetup(dev, buffer, buflen); return sam_recvsetup(dev, buffer, buflen);
}
#else #else
DEBUGASSERT(((uint32_t)buffer & 3) == 0 && (buflen & 3) == 0); /* Return the -EFAULT error. */
return -EFAULT;
#endif #endif
}
/* How many blocks? That should have been saved by the sam_blocksetup() /* How many blocks? That should have been saved by the sam_blocksetup()
* method earlier. * method earlier.
@ -3039,18 +3041,21 @@ static int sam_dmasendsetup(FAR struct sdio_dev_s *dev,
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#ifdef CONFIG_SAMV7_HSMCI_UNALIGNED
/* 32-bit buffer alignment is required for DMA transfers */ /* 32-bit buffer alignment is required for DMA transfers */
if (((uintptr_t)buffer & 3) != 0 || (buflen & 3) != 0) if (((uintptr_t)buffer & 3) != 0 || (buflen & 3) != 0)
{ {
/* Fall back and do a non-DMA transfer */ #ifdef CONFIG_SAMV7_HSMCI_UNALIGNED
/* Fall back and do an unaligned, non-DMA transfer */
return sam_sendsetup(dev, buffer, buflen); return sam_sendsetup(dev, buffer, buflen);
}
#else #else
DEBUGASSERT(((uint32_t)buffer & 3) == 0 && (buflen & 3) == 0); /* Return the -EFAULT error. */
return -EFAULT;
#endif #endif
/* Fall back and do a non-DMA transfer */
}
/* How many blocks? That should have been saved by the sam_blocksetup() /* How many blocks? That should have been saved by the sam_blocksetup()
* method earlier. * method earlier.