Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-28 11:56:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

imx9_usdhc.c: Fix build error when CONFIG_ARM64_DCACHE_DISABLE=y

Browse Source 
priv->rxbuffer does not exist when CONFIG_ARM64_DCACHE_DISABLE=y so
references to it will create a build error -> flag / remove accesses
to it.
This commit is contained in:
Ville Juven
2024-08-29 11:59:25 +03:00
committed by Xiang Xiao
parent 52baca0a89
commit 23e0bf5953
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/src/imx9/imx9_usdhc.c
+6 -5
View File
@@ -2985,7 +2985,7 @@ static int imx9_dmapreflight(struct sdio_dev_s *dev,
/* DMA must be possible to the buffer and it must be word (4 bytes) aligned /* DMA must be possible to the buffer and it must be word (4 bytes) aligned
*/ */
if (buffer != priv->rxbuffer && ((uintptr_t)buffer & 3) != 0) if (((uintptr_t)buffer & 3) != 0)
{ {
mcerr("non word aligned buffer:%p\n", buffer); mcerr("non word aligned buffer:%p\n", buffer);
return -EFAULT; return -EFAULT;
@@ -3039,11 +3039,12 @@ static int imx9_dmarecvsetup(struct sdio_dev_s *dev,
struct imx9_dev_s *priv = (struct imx9_dev_s *)dev; struct imx9_dev_s *priv = (struct imx9_dev_s *)dev;
DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0); DEBUGASSERT(priv != NULL && buffer != NULL && buflen > 0);
#if defined(CONFIG_ARCH_HAVE_SDIO_PREFLIGHT) #if defined(CONFIG_ARCH_HAVE_SDIO_PREFLIGHT) && \
/* Normaly imx9_dmapreflight is called prior to imx9_dmarecvsetup !defined(CONFIG_ARM64_DCACHE_DISABLE)
* except for the case where the CSR read is done at initalization /* Normally imx9_dmapreflight is called prior to imx9_dmarecvsetup
* except for the case where the CSR read is done at initialization.
* *
* With a total read size of less then priv->rxbuffer we can * With a total read size of less then priv->rxbuffer we can
* handle the unaligned case herein, using the rxbuffer. * handle the unaligned case herein, using the rxbuffer.
* *
* Any other case is a fault. * Any other case is a fault.