You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2026/10/01 14:14:51 UTC

(nuttx) branch master updated (91008cf1b1a -> d0b5d0b7b38)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


    from 91008cf1b1a sched/clock: keep the seqlock sequence in uint32_t
     new 414d300e1aa drivers/mmcsd/mmcsd_sdio.c: check RECVSETUP/SENDSETUP return on non-DMA paths
     new d0b5d0b7b38 drivers/mmcsd/mmcsd_sdio.c: fix legacy nxstyle alignment in ioctl switches

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 drivers/mmcsd/mmcsd_sdio.c | 382 +++++++++++++++++++++++++--------------------
 1 file changed, 215 insertions(+), 167 deletions(-)


(nuttx) 02/02: drivers/mmcsd/mmcsd_sdio.c: fix legacy nxstyle alignment in ioctl switches

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit d0b5d0b7b38ba5465f6ef2e6619494cae1a0c0c4
Author: rikaken2004 <24...@users.noreply.github.com>
AuthorDate: Thu Oct 1 16:11:41 2026 +0800

    drivers/mmcsd/mmcsd_sdio.c: fix legacy nxstyle alignment in ioctl switches
    
    The check CI job runs nxstyle over the whole file once it is touched,
    and mmcsd_ioctl()/mmcsd_iocmd() carried pre-existing violations: case
    labels and their blocks were indented one level too shallow, and four
    argument continuation lines exceeded 78 columns. Reindent the two
    switch bodies and rewrap the long call sites (local buffer variables
    for the CMD8/18/25 data pointers, operand-per-line for the CMD23
    ternary). No functional change.
    
    Signed-off-by: rikaken2004 <24...@users.noreply.github.com>
---
 drivers/mmcsd/mmcsd_sdio.c | 326 +++++++++++++++++++++++----------------------
 1 file changed, 166 insertions(+), 160 deletions(-)

diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index eb99a246110..3ea6b85a6a5 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -2686,65 +2686,65 @@ static int mmcsd_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
 
   switch (cmd)
     {
-    case BIOC_PROBE: /* Check for media in the slot */
-      {
-        finfo("BIOC_PROBE\n");
+      case BIOC_PROBE: /* Check for media in the slot */
+        {
+          finfo("BIOC_PROBE\n");
 
-        /* Probe the MMC/SD slot for media */
+          /* Probe the MMC/SD slot for media */
 
-        ret = mmcsd_probe(priv);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_probe failed: %d\n", ret);
-          }
-      }
-      break;
+          ret = mmcsd_probe(priv);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_probe failed: %d\n", ret);
+            }
+        }
+        break;
 
-    case BIOC_EJECT: /* Media has been removed from the slot */
-      {
-        finfo("BIOC_EJECT\n");
+      case BIOC_EJECT: /* Media has been removed from the slot */
+        {
+          finfo("BIOC_EJECT\n");
 
-        /* Process the removal of the card */
+          /* Process the removal of the card */
 
-        ret = mmcsd_removed(priv);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_removed failed: %d\n", ret);
-          }
+          ret = mmcsd_removed(priv);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_removed failed: %d\n", ret);
+            }
 
-        /* Enable logic to detect if a card is re-inserted */
+          /* Enable logic to detect if a card is re-inserted */
 
-        SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
-      }
-      break;
+          SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
+        }
+        break;
 
 #ifdef CONFIG_MMCSD_IOCSUPPORT
-    case MMC_IOC_CMD: /* MMCSD device ioctl commands */
-      {
-        finfo("MMC_IOC_CMD\n");
-        ret = mmcsd_iocmd(part, (FAR struct mmc_ioc_cmd *)arg);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_iocmd failed: %d\n", ret);
-          }
-      }
-      break;
-
-    case MMC_IOC_MULTI_CMD: /* MMCSD device ioctl multi commands */
-      {
-        finfo("MMC_IOC_MULTI_CMD\n");
-        ret = mmcsd_multi_iocmd(part, (FAR struct mmc_ioc_multi_cmd *)arg);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_iocmd failed: %d\n", ret);
-          }
-      }
-      break;
+      case MMC_IOC_CMD: /* MMCSD device ioctl commands */
+        {
+          finfo("MMC_IOC_CMD\n");
+          ret = mmcsd_iocmd(part, (FAR struct mmc_ioc_cmd *)arg);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_iocmd failed: %d\n", ret);
+            }
+        }
+        break;
+
+      case MMC_IOC_MULTI_CMD: /* MMCSD device ioctl multi commands */
+        {
+          finfo("MMC_IOC_MULTI_CMD\n");
+          ret = mmcsd_multi_iocmd(part, (FAR struct mmc_ioc_multi_cmd *)arg);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_iocmd failed: %d\n", ret);
+            }
+        }
+        break;
 #endif
 
-    default:
-      ret = -ENOTTY;
-      break;
+      default:
+        ret = -ENOTTY;
+        break;
     }
 
   mmcsd_unlock(priv);
@@ -3785,122 +3785,128 @@ static int mmcsd_iocmd(FAR struct mmcsd_part_s *part,
   opcode = ic_ptr->opcode & MMCSD_CMDIDX_MASK;
   switch (opcode)
     {
-    case MMCSD_CMDIDX0: /* Reset card to idle state */
-      {
-        mmcsd_sendcmdpoll(priv, MMCSD_CMD0, ic_ptr->arg);
-        MMCSD_USLEEP(MMCSD_IDLE_DELAY);
-      }
-      break;
-    case MMCSD_CMDIDX2: /* Get cid reg data */
-      {
-        memcpy((FAR void *)(uintptr_t)ic_ptr->data_ptr,
-               priv->cid, sizeof(priv->cid));
-      }
-      break;
+      case MMCSD_CMDIDX0: /* Reset card to idle state */
+        {
+          mmcsd_sendcmdpoll(priv, MMCSD_CMD0, ic_ptr->arg);
+          MMCSD_USLEEP(MMCSD_IDLE_DELAY);
+        }
+        break;
+      case MMCSD_CMDIDX2: /* Get cid reg data */
+        {
+          memcpy((FAR void *)(uintptr_t)ic_ptr->data_ptr,
+                 priv->cid, sizeof(priv->cid));
+        }
+        break;
 #ifdef CONFIG_MMCSD_MMCSUPPORT
-    case MMCSD_CMDIDX6: /* Switch commands */
-      {
-        ret = mmcsd_switch(priv, ic_ptr->arg);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_switch failed: %d\n", ret);
-          }
-      }
-      break;
-    case MMC_CMDIDX8: /* Get extended csd reg data */
-      {
-        ret = mmcsd_read_extcsd(priv,
-                                (FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr);
-      }
-      break;
+      case MMCSD_CMDIDX6: /* Switch commands */
+        {
+          ret = mmcsd_switch(priv, ic_ptr->arg);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_switch failed: %d\n", ret);
+            }
+        }
+        break;
+      case MMC_CMDIDX8: /* Get extended csd reg data */
+        {
+          FAR uint8_t *buf = (FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr;
+
+          ret = mmcsd_read_extcsd(priv, buf);
+        }
+        break;
 #endif
-    case MMCSD_CMDIDX13: /* Send status commands */
-      {
-        ret = mmcsd_get_r1(priv, ic_ptr->response);
-        if (ret != OK)
-          {
-            ferr("ERROR: mmcsd_get_r1 failed: %d\n", ret);
-          }
-      }
-      break;
+      case MMCSD_CMDIDX13: /* Send status commands */
+        {
+          ret = mmcsd_get_r1(priv, ic_ptr->response);
+          if (ret != OK)
+            {
+              ferr("ERROR: mmcsd_get_r1 failed: %d\n", ret);
+            }
+        }
+        break;
 #if MMCSD_MULTIBLOCK_LIMIT != 1
-    case MMCSD_CMDIDX18: /* Read multi blocks commands */
-      {
-        if (ic_ptr->blocks > 0)
-          {
-            /* Address argument in CMD18, 25 will be ignored in rpmb case */
-
-            ret = mmcsd_readmultiple(part,
-                                  (FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr,
-                                   ic_ptr->arg, ic_ptr->blocks);
-            if (ret != ic_ptr->blocks)
-              {
-                ferr("ERROR: mmcsd_readmultiple failed: %d\n", ret);
-              }
-            else
-              {
-                ret = OK;
-              }
-          }
-      }
-      break;
-    case MMCSD_CMDIDX23: /* Set transfer block counts */
-      {
-        ret = mmcsd_setblockcount(priv,
-                              ic_ptr->blocks ? ic_ptr->blocks : ic_ptr->arg);
-      }
-      break;
-    case MMCSD_CMDIDX25: /* Write multi blocks commands */
-      {
-        if (ic_ptr->blocks > 0)
-          {
-            /* Address argument in CMD18, 25 will be ignored in rpmb case */
-
-            ret = mmcsd_writemultiple(part,
-                            (const FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr,
-                             ic_ptr->arg, ic_ptr->blocks);
-            if (ret != ic_ptr->blocks)
-              {
-                ferr("ERROR: mmcsd_writemultiple failed: %d\n", ret);
-              }
-            else
-              {
-                ret = OK;
-              }
-          }
-      }
-      break;
+      case MMCSD_CMDIDX18: /* Read multi blocks commands */
+        {
+          if (ic_ptr->blocks > 0)
+            {
+              FAR uint8_t *buf =
+                (FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr;
+
+              /* Address argument in CMD18, 25 will be ignored in rpmb case */
+
+              ret = mmcsd_readmultiple(part, buf, ic_ptr->arg,
+                                       ic_ptr->blocks);
+              if (ret != ic_ptr->blocks)
+                {
+                  ferr("ERROR: mmcsd_readmultiple failed: %d\n", ret);
+                }
+              else
+                {
+                  ret = OK;
+                }
+            }
+        }
+        break;
+      case MMCSD_CMDIDX23: /* Set transfer block counts */
+        {
+          ret = mmcsd_setblockcount(priv,
+                                    ic_ptr->blocks ? ic_ptr->blocks :
+                                    ic_ptr->arg);
+        }
+        break;
+      case MMCSD_CMDIDX25: /* Write multi blocks commands */
+        {
+          if (ic_ptr->blocks > 0)
+            {
+              const FAR uint8_t *buf =
+                (const FAR uint8_t *)(uintptr_t)ic_ptr->data_ptr;
+
+              /* Address argument in CMD18, 25 will be ignored in rpmb case */
+
+              ret = mmcsd_writemultiple(part, buf, ic_ptr->arg,
+                                        ic_ptr->blocks);
+              if (ret != ic_ptr->blocks)
+                {
+                  ferr("ERROR: mmcsd_writemultiple failed: %d\n", ret);
+                }
+              else
+                {
+                  ret = OK;
+                }
+            }
+        }
+        break;
 #endif
-    case MMCSD_CMDIDX56: /* General commands */
-      {
-        if (ic_ptr->write_flag)
-          {
-            ret = mmcsd_general_cmd_write(priv,
-                    (FAR uint8_t *)(uintptr_t)(ic_ptr->data_ptr),
-                    ic_ptr->arg);
-            if (ret != OK)
-              {
-                ferr("mmcsd_iocmd MMCSD_CMDIDX56 write failed.\n");
-              }
-          }
-        else
-          {
-            ret = mmcsd_general_cmd_read(priv,
-                    (FAR uint8_t *)(uintptr_t)(ic_ptr->data_ptr),
-                    ic_ptr->arg);
-            if (ret != OK)
-              {
-                ferr("mmcsd_iocmd MMCSD_CMDIDX56 read failed.\n");
-              }
-          }
-      }
-      break;
-    default:
-      {
-        ferr("mmcsd_iocmd opcode unsupported.\n");
-        ret = -EINVAL;
-      }
-      break;
+      case MMCSD_CMDIDX56: /* General commands */
+        {
+          if (ic_ptr->write_flag)
+            {
+              ret = mmcsd_general_cmd_write(priv,
+                      (FAR uint8_t *)(uintptr_t)(ic_ptr->data_ptr),
+                      ic_ptr->arg);
+              if (ret != OK)
+                {
+                  ferr("mmcsd_iocmd MMCSD_CMDIDX56 write failed.\n");
+                }
+            }
+          else
+            {
+              ret = mmcsd_general_cmd_read(priv,
+                      (FAR uint8_t *)(uintptr_t)(ic_ptr->data_ptr),
+                      ic_ptr->arg);
+              if (ret != OK)
+                {
+                  ferr("mmcsd_iocmd MMCSD_CMDIDX56 read failed.\n");
+                }
+            }
+        }
+        break;
+      default:
+        {
+          ferr("mmcsd_iocmd opcode unsupported.\n");
+          ret = -EINVAL;
+        }
+        break;
     }
 
   return ret;


(nuttx) 01/02: drivers/mmcsd/mmcsd_sdio.c: check RECVSETUP/SENDSETUP return on non-DMA paths

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 414d300e1aa71e217bf7c8fdc6cc36ea35da4aec
Author: rikaken2004 <24...@users.noreply.github.com>
AuthorDate: Wed Sep 30 16:28:20 2026 +0800

    drivers/mmcsd/mmcsd_sdio.c: check RECVSETUP/SENDSETUP return on non-DMA paths
    
    The non-DMA data paths discard the return value of SDIO_RECVSETUP in
    mmcsd_readsingle() and mmcsd_readmultiple() and of SDIO_SENDSETUP in
    mmcsd_writesingle(), mmcsd_writemultiple() and the CMD56 read/write
    helpers, so when the lower half fails to set up the transfer the
    driver still issues CMD17/18/24/25/56 and the failure only surfaces
    later as an unrelated-looking transfer timeout. The DMA paths in the
    same functions all check SDIO_DMARECVSETUP/SDIO_DMASENDSETUP, cancel
    the transfer and propagate the error, so mirror that handling on the
    non-DMA paths.
    
    Signed-off-by: rikaken2004 <24...@users.noreply.github.com>
---
 drivers/mmcsd/mmcsd_sdio.c | 56 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 6f2402128b0..eb99a246110 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -1662,7 +1662,13 @@ static ssize_t mmcsd_readsingle(FAR struct mmcsd_part_s *part,
   else
 #endif
     {
-      SDIO_RECVSETUP(priv->dev, buffer, priv->blocksize);
+      ret = SDIO_RECVSETUP(priv->dev, buffer, priv->blocksize);
+      if (ret != OK)
+        {
+          finfo("SDIO_RECVSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* Send CMD17, READ_SINGLE_BLOCK: Read a block of the size selected
@@ -1818,7 +1824,13 @@ static ssize_t mmcsd_readmultiple(FAR struct mmcsd_part_s *part,
   else
 #endif
     {
-      SDIO_RECVSETUP(priv->dev, buffer, nbytes);
+      ret = SDIO_RECVSETUP(priv->dev, buffer, nbytes);
+      if (ret != OK)
+        {
+          finfo("SDIO_RECVSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
 #ifdef CONFIG_MMCSD_MMCSUPPORT
@@ -2013,7 +2025,13 @@ static ssize_t mmcsd_writesingle(FAR struct mmcsd_part_s *part,
   else
 #endif
     {
-      SDIO_SENDSETUP(priv->dev, buffer, priv->blocksize);
+      ret = SDIO_SENDSETUP(priv->dev, buffer, priv->blocksize);
+      if (ret != OK)
+        {
+          finfo("SDIO_SENDSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* If Controller needs DMA setup before write then only send CMD24 now. */
@@ -2265,7 +2283,13 @@ static ssize_t mmcsd_writemultiple(FAR struct mmcsd_part_s *part,
   else
 #endif
     {
-      SDIO_SENDSETUP(priv->dev, buffer, nbytes);
+      ret = SDIO_SENDSETUP(priv->dev, buffer, nbytes);
+      if (ret != OK)
+        {
+          ferr("SDIO_SENDSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* If Controller needs DMA setup before write then only send CMD25 now. */
@@ -3428,7 +3452,13 @@ static int mmcsd_read_extcsd(FAR struct mmcsd_state_s *priv,
   else
 #endif
     {
-      SDIO_RECVSETUP(priv->dev, extcsd, 512);
+      ret = SDIO_RECVSETUP(priv->dev, extcsd, 512);
+      if (ret != OK)
+        {
+          ferr("SDIO_RECVSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* Send CMD8 in data-transfer mode to obtain the
@@ -3565,7 +3595,13 @@ static int mmcsd_general_cmd_write(FAR struct mmcsd_state_s *priv,
   else
 #endif
     {
-      SDIO_SENDSETUP(priv->dev, buffer, priv->blocksize);
+      ret = SDIO_SENDSETUP(priv->dev, buffer, priv->blocksize);
+      if (ret != OK)
+        {
+          finfo("SDIO_SENDSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* If Controller needs DMA setup before write then only send CMD24 now. */
@@ -3693,7 +3729,13 @@ static int mmcsd_general_cmd_read(FAR struct mmcsd_state_s *priv,
   else
 #endif
     {
-      SDIO_RECVSETUP(priv->dev, buffer, priv->blocksize);
+      ret = SDIO_RECVSETUP(priv->dev, buffer, priv->blocksize);
+      if (ret != OK)
+        {
+          finfo("SDIO_RECVSETUP: error %d\n", ret);
+          SDIO_CANCEL(priv->dev);
+          return ret;
+        }
     }
 
   /* Send CMD56: Read a sector size data and verify that good R1