build(deps): bump docker/build-push-action from 4 to 5

.github/workflows/build.yml

@@ -67,13 +67,13 @@ jobs:
             # Determine the repo and leave that unset to use the normal checkout behavior
             # of using the merge commit instead of HEAD
             case $GITHUB_REPOSITORY in
-              "apache/nuttx")
+              "tiiuae/nuttx")
                 # OS
                 echo "Triggered by change in OS"
                 APPS_REF=$REF_NAME
                 ;;
 
-              "apache/nuttx-apps" )
+              "tiiuae/incubator-nuttx-apps" )
                 # APPS
                 OS_REF=$REF_NAME
                 echo "Triggered by change in APPS"
@@ -91,7 +91,7 @@ jobs:
       - name: Checkout nuttx repo
         uses: actions/checkout@v3
         with:
-          repository: apache/nuttx
+          repository: tiiuae/nuttx
           ref: ${{ steps.gittargets.outputs.os_ref }}
           path: sources/nuttx
           fetch-depth: 1
@@ -101,7 +101,7 @@ jobs:
       - name: Checkout apps repo
         uses: actions/checkout@v3
         with:
-          repository: apache/nuttx-apps
+          repository: tiiuae/incubator-nuttx-apps
           ref: ${{ steps.gittargets.outputs.apps_ref }}
           path: sources/apps
           fetch-depth: 1
@@ -123,7 +123,7 @@ jobs:
 
     strategy:
       matrix:
-        boards: [arm-01, arm-02, arm-03, arm-04, arm-05, arm-06, arm-07, arm-08, arm-09, arm-10, arm-11, arm-12, arm-13, other, risc-v, sim-01, sim-02, xtensa, codechecker]
+        boards: [arm-12, risc-v]
 
     steps:
       - name: Download Source Artifact
@@ -173,6 +173,7 @@ jobs:
         continue-on-error: true
 
   macOS:
+    if: ${{ false }}  # disable for now
     permissions:
       contents: none
     runs-on: macos-13

.github/workflows/check.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Checkout nuttx repo
         uses: actions/checkout@v3
         with:
-          repository: apache/nuttx
+          repository: tiiuae/nuttx
           path: nuttx
           fetch-depth: 0
 

.github/workflows/docker_linux.yml

@@ -66,7 +66,7 @@ jobs:
         run: |
           df -h
       - name: Push Linux image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: tools/ci/docker/linux
           platforms: linux/amd64

arch/arm/src/stm32f7/stm32_ethernet.c

@@ -3136,7 +3136,9 @@ static inline int stm32_dm9161(struct stm32_ethmac_s *priv)
 
 static int stm32_phyinit(struct stm32_ethmac_s *priv)
 {
+#ifdef CONFIG_STM32F7_AUTONEG
   volatile uint32_t timeout;
+#endif
   uint32_t regval;
   uint16_t phyval;
   int ret;

arch/risc-v/src/common/riscv_pmp.c

@@ -100,6 +100,32 @@ typedef struct pmp_entry_s pmp_entry_t;
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: log2ceil
+ *
+ * Description:
+ *   Calculate the up-rounded power-of-two for input.
+ *
+ * Input Parameters:
+ *   size - The size of the PMP region.
+ *
+ * Returned Value:
+ *   Power-of-two for argument, rounded up.
+ *
+ ****************************************************************************/
+
+static uintptr_t log2ceil(uintptr_t size)
+{
+  uintptr_t pot = 0;
+
+  for (size = size - 1; size > 1; size >>= 1)
+    {
+      pot++;
+    }
+
+  return pot;
+}
+
 /****************************************************************************
  * Name: pmp_check_addrmatch_type
  *
@@ -160,7 +186,8 @@ static bool pmp_check_addrmatch_type(uintptr_t type)
  *
  ****************************************************************************/
 
-static bool pmp_check_region_attrs(uintptr_t base, uintptr_t size)
+static bool pmp_check_region_attrs(uintptr_t base, uintptr_t size,
+                                   uintptr_t type)
 {
   /* Check that the size is not too small */
 
@@ -183,7 +210,23 @@ static bool pmp_check_region_attrs(uintptr_t base, uintptr_t size)
       return false;
     }
 
-  return OK;
+  /* Perform additional checks on base and size for NAPOT area */
+
+  if (type == PMPCFG_A_NAPOT)
+    {
+      /* Get the power-of-two for size, rounded up */
+
+      uintptr_t pot = log2ceil(size);
+
+      if ((base & ((UINT64_C(1) << pot) - 1)) != 0)
+        {
+          /* The start address is not properly aligned with size */
+
+          return false;
+        }
+    }
+
+  return true;
 }
 
 /****************************************************************************
@@ -455,15 +498,15 @@ int riscv_config_pmp_region(uintptr_t region, uintptr_t attr,
 
   /* Check the region attributes */
 
-  if (pmp_check_region_attrs(base, size))
+  if (pmp_check_region_attrs(base, size, type) == false)
     {
       return -EINVAL;
     }
 
   /* Calculate new base address from type */
 
   addr = base >> 2;
-  if (PMPCFG_A_NAPOT == (attr & PMPCFG_A_MASK))
+  if (type == PMPCFG_A_NAPOT)
     {
       addr |= (size - 1) >> 3;
     }

arch/risc-v/src/litex/litex_sdio.c

@@ -860,12 +860,10 @@ static int litex_recvsetup(struct sdio_dev_s *dev, uint8_t *buffer,
 
   /* flush CPU d-cache */
 
-#ifndef CONFIG_LITEX_COHERENT_DMA
   up_invalidate_dcache_all();
-#endif
 
   putreg32(0, LITEX_SDBLOCK2MEM_DMA_ENABLE);
-  putreg32((uintptr_t)(&buffer[4]), LITEX_SDBLOCK2MEM_DMA_BASE);
+  putreg32((uintptr_t)buffer >> 32, LITEX_SDBLOCK2MEM_DMA_BASE);
   putreg32((uintptr_t)buffer, LITEX_SDBLOCK2MEM_DMA_BASE + 0x04);
   putreg32(nbytes, LITEX_SDBLOCK2MEM_DMA_LENGTH);
   putreg32(1, LITEX_SDBLOCK2MEM_DMA_ENABLE);
@@ -905,12 +903,10 @@ static int litex_sendsetup(struct sdio_dev_s *dev,
 
   /* flush CPU d-cache */
 
-#ifndef CONFIG_LITEX_COHERENT_DMA
   up_invalidate_dcache_all();
-#endif
 
   putreg32(0, LITEX_SDMEM2BLOCK_DMA_ENABLE);
-  putreg32((uintptr_t)(&buffer[4]), LITEX_SDMEM2BLOCK_DMA_BASE);
+  putreg32((uintptr_t)buffer >> 32, LITEX_SDMEM2BLOCK_DMA_BASE);
   putreg32((uintptr_t)buffer, LITEX_SDMEM2BLOCK_DMA_BASE + 0x04);
   putreg32(nbytes, LITEX_SDMEM2BLOCK_DMA_LENGTH);
   putreg32(1, LITEX_SDMEM2BLOCK_DMA_ENABLE);

arch/risc-v/src/mpfs/.gitignore

@@ -0,0 +1 @@
+/crypto