Merge branch 'main' into stm32-networkinterface-bugfixes

tony-josi-aws · web-flow · commit e0882da5f029 · 2025-09-17T17:44:49.000+05:30
diff --git a/.github/.cSpellWords.txt b/.github/.cSpellWords.txt
@@ -7,6 +7,7 @@ ACTLR
 ADDAR
 ADDRH
 ADDRL
+ADIN
 AFECR
 AFSR
 AFVALID
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -10,6 +10,10 @@ on:
         description: 'Release Version Number (Eg, v1.0.0-rc1)'
         required: true
 
+# Workflow permissions block
+permissions:
+  contents: write # This grants write access to repository content, including pushing commits/tags and creating releases.
+
 jobs:
   tag-commit:
     name: Tag commit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,6 +10,10 @@ on:
         description: 'Release Version Number (Eg, v1.0.0)'
         required: true
 
+# Workflow permissions block
+permissions:
+  contents: write # This grants write access to repository content, including pushing commits/tags and creating releases.
+
 jobs:
   tag-commit:
     name: Tag commit
@@ -140,6 +144,8 @@ jobs:
           ref: ${{ github.event.inputs.version_number }}
           add_release: "true"
   create-release:
+    permissions:
+      id-token: write
     needs:
       - create-zip
       - deploy-doxygen
@@ -171,6 +177,11 @@ jobs:
           asset_path: ./FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip
           asset_name: FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip
           asset_content_type: application/zip
+      - name: Backup Release Asset
+        uses: FreeRTOS/CI-CD-Github-Actions/artifact-backup@main
+        with:
+          artifact_path: ./FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip
+          release_tag: ${{ github.event.inputs.version_number }}
   cleanup:
     needs:
       - create-release
diff --git a/source/FreeRTOS_DNS_Parser.c b/source/FreeRTOS_DNS_Parser.c
@@ -262,7 +262,7 @@
         uint16_t x;
         BaseType_t xReturn = pdTRUE;
         uint32_t ulIPAddress = 0U;
-        BaseType_t xDNSHookReturn;
+        BaseType_t xDNSHookReturn = 0U;
 
         ( void ) memset( &( xSet ), 0, sizeof( xSet ) );
         xSet.usPortNumber = usPort;
diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c
@@ -1016,13 +1016,28 @@ BaseType_t FreeRTOS_IPInit_Multi( void )
             {
                 static StaticTask_t xIPTaskBuffer;
                 static StackType_t xIPTaskStack[ ipconfigIP_TASK_STACK_SIZE_WORDS ];
-                xIPTaskHandle = xTaskCreateStatic( &prvIPTask,
-                                                   "IP-Task",
-                                                   ipconfigIP_TASK_STACK_SIZE_WORDS,
-                                                   NULL,
-                                                   ipconfigIP_TASK_PRIORITY,
-                                                   xIPTaskStack,
-                                                   &xIPTaskBuffer );
+                #if ( ipconfigIP_TASK_AFFINITY > 0 )
+                {
+                    xIPTaskHandle = xTaskCreateStaticAffinitySet( &prvIPTask,
+                                                                  "IP-Task",
+                                                                  ipconfigIP_TASK_STACK_SIZE_WORDS,
+                                                                  NULL,
+                                                                  ipconfigIP_TASK_PRIORITY,
+                                                                  xIPTaskStack,
+                                                                  &xIPTaskBuffer,
+                                                                  ipconfigIP_TASK_AFFINITY );
+                }
+                #else /* if ( ipconfigIP_TASK_AFFINITY ) */
+                {
+                    xIPTaskHandle = xTaskCreateStatic( &prvIPTask,
+                                                       "IP-Task",
+                                                       ipconfigIP_TASK_STACK_SIZE_WORDS,
+                                                       NULL,
+                                                       ipconfigIP_TASK_PRIORITY,
+                                                       xIPTaskStack,
+                                                       &xIPTaskBuffer );
+                }
+                #endif /* ipconfigIP_TASK_AFFINITY */
 
                 if( xIPTaskHandle != NULL )
                 {
@@ -1031,12 +1046,26 @@ BaseType_t FreeRTOS_IPInit_Multi( void )
             }
             #else /* if ( configSUPPORT_STATIC_ALLOCATION == 1 ) */
             {
-                xReturn = xTaskCreate( &prvIPTask,
-                                       "IP-task",
-                                       ipconfigIP_TASK_STACK_SIZE_WORDS,
-                                       NULL,
-                                       ipconfigIP_TASK_PRIORITY,
-                                       &( xIPTaskHandle ) );
+                #if ( ipconfigIP_TASK_AFFINITY > 0 )
+                {
+                    xReturn = xTaskCreateAffinitySet( &prvIPTask,
+                                                      "IP-task",
+                                                      ipconfigIP_TASK_STACK_SIZE_WORDS,
+                                                      NULL,
+                                                      ipconfigIP_TASK_PRIORITY,
+                                                      ipconfigIP_TASK_AFFINITY,
+                                                      &( xIPTaskHandle ) );
+                }
+                #else /* if ( ipconfigIP_TASK_AFFINITY ) */
+                {
+                    xReturn = xTaskCreate( &prvIPTask,
+                                           "IP-task",
+                                           ipconfigIP_TASK_STACK_SIZE_WORDS,
+                                           NULL,
+                                           ipconfigIP_TASK_PRIORITY,
+                                           &( xIPTaskHandle ) );
+                }
+                #endif /* ipconfigIP_TASK_AFFINITY */
             }
             #endif /* configSUPPORT_STATIC_ALLOCATION */
         }
diff --git a/source/FreeRTOS_IPv4.c b/source/FreeRTOS_IPv4.c
@@ -82,7 +82,7 @@
 
         /* Map the buffer onto a IP-Packet struct to easily access the
          * fields of the IP packet. */
-        const IPPacket_t * const pxIPPacket = ( ( const IPPacket_t * const ) pvEthernetBuffer );
+        const IPPacket_t * const pxIPPacket = ( ( const IPPacket_t * ) pvEthernetBuffer );
 
         DEBUG_DECLARE_TRACE_VARIABLE( BaseType_t, xLocation, 0 );
 
diff --git a/source/FreeRTOS_IPv6.c b/source/FreeRTOS_IPv6.c
@@ -99,11 +99,11 @@ const struct xIPv6_Address FreeRTOS_in6addr_loopback = { { 0U, 0U, 0U, 0U, 0U, 0
         size_t uxMinimumLength;
         size_t uxExtHeaderLength = 0;
         const IPExtHeader_IPv6_t * pxExtHeader = NULL;
-        const uint8_t * const pucEthernetBuffer = ( const uint8_t * const ) pvEthernetBuffer;
+        const uint8_t * const pucEthernetBuffer = ( const uint8_t * ) pvEthernetBuffer;
 
         /* Map the buffer onto a IPv6-Packet struct to easily access the
          * fields of the IPv6 packet. */
-        const IPPacket_IPv6_t * const pxIPv6Packet = ( const IPPacket_IPv6_t * const ) pucEthernetBuffer;
+        const IPPacket_IPv6_t * const pxIPv6Packet = ( const IPPacket_IPv6_t * ) pucEthernetBuffer;
 
         DEBUG_DECLARE_TRACE_VARIABLE( BaseType_t, xLocation, 0 );
 
diff --git a/source/FreeRTOS_ND.c b/source/FreeRTOS_ND.c
@@ -97,12 +97,6 @@
 /** @brief The ND cache. */
     static NDCacheRow_t xNDCache[ ipconfigND_CACHE_ENTRIES ];
 
-/** @brief  The time at which the last unsolicited ND was sent. Unsolicited NDs are used
- * to ensure ND tables are up to date and to detect IP address conflicts. */
-/* MISRA Ref 8.9.1 [File scoped variables] */
-/* More details at: https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/blob/main/MISRA.md#rule-89 */
-/* coverity[misra_c_2012_rule_8_9_violation] */
-    static TickType_t xLastUnsolicitedNDTime = 0U;
 
 /*-----------------------------------------------------------*/
 
@@ -1405,19 +1399,4 @@
     }
 
 /*-----------------------------------------------------------*/
-
-/**
- * @brief Send an unsolicited ND packet to allow this node to announce the IP-MAC
- *        mapping to the entire network.
- */
-    void vNDSendUnsolicited( void )
-    {
-        /* Setting xLastUnsolicitedNDTime to 0 will force an unsolicited ND the next
-         * time vNDAgeCache() is called. */
-        xLastUnsolicitedNDTime = ( TickType_t ) 0;
-
-        /* Let the IP-task call vARPAgeCache(). */
-        ( void ) xSendEventToIPTask( eNDTimerEvent );
-    }
-/*-----------------------------------------------------------*/
 #endif /* ipconfigUSE_IPv6 */
diff --git a/source/FreeRTOS_RA.c b/source/FreeRTOS_RA.c
@@ -329,12 +329,14 @@
 
                 case ndICMP_MTU_OPTION: /* 5 */
                    {
-                       uint32_t ulMTU;
-                       ( void ) ulMTU;
-
-                       /* ulChar2u32 returns host-endian numbers. */
-                       ulMTU = ulChar2u32( &( pucBytes[ uxIndex + 4U ] ) );
-                       FreeRTOS_printf( ( "RA: MTU = %u\n", ( unsigned int ) ulMTU ) );
+                       #if ipconfigHAS_PRINTF == 1
+                           uint32_t ulMTU;
+                           ( void ) ulMTU;
+
+                           /* ulChar2u32 returns host-endian numbers. */
+                           ulMTU = ulChar2u32( &( pucBytes[ uxIndex + 4U ] ) );
+                           FreeRTOS_printf( ( "RA: MTU = %u\n", ( unsigned int ) ulMTU ) );
+                       #endif /* ipconfigHAS_PRINTF == 1 */
                    }
                    break;
 
diff --git a/source/include/FreeRTOSIPConfigDefaults.h b/source/include/FreeRTOSIPConfigDefaults.h
@@ -1139,6 +1139,46 @@ STATIC_ASSERT( pdMS_TO_TICKS( ipconfigPHY_LS_LOW_CHECK_TIME_MS ) <= portMAX_DELA
 
 /*---------------------------------------------------------------------------*/
 
+/*
+ * ipconfigIP_TASK_AFFINITY
+ *
+ * https://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_IP_Configuration.html#ipconfigIP_TASK_AFFINITY
+ *
+ * Type: UBaseType_t
+ * Unit: task affinity
+ * Minimum: 0
+ * Maximum: (2 ^ configNUMBER_OF_CORES) - 1
+ *
+ * When running using a SMP kernel, task affinity can be used to prevent
+ * concurrent execution of code that does not fully support SMP.  Until
+ * the TCP library and ports fully supports SMP, it is necessary to set
+ * the affinity of all tasks which use TCP functions to the same core in
+ * order to prevent concurrent execution.
+ *
+ * An alternative to setting task affinity is to set configRUN_MULTIPLE_PRIORITIES
+ * to 0.
+ *
+ * Task affinity is defined as shifting a bit by the core number.
+ *
+ * Example:
+ * (1U << 0U) //run only on core 0
+ * (1U << 1U) //run only on core 1
+ */
+
+#ifndef ipconfigIP_TASK_AFFINITY
+    #define ipconfigIP_TASK_AFFINITY    ( 0 )
+#endif
+
+#if ( ipconfigIP_TASK_AFFINITY < 0 )
+    #error ipconfigIP_TASK_AFFINITY must be at least 0
+#endif
+
+#if ( ipconfigIP_TASK_AFFINITY > 0 && configUSE_CORE_AFFINITY == 0 )
+    #error configUSE_CORE_AFFINITY must be 1 in order to use ipconfigIP_TASK_AFFINITY
+#endif
+
+/*---------------------------------------------------------------------------*/
+
 /*
  * ipconfigIP_TASK_STACK_SIZE_WORDS
  *
diff --git a/source/include/FreeRTOS_ND.h b/source/include/FreeRTOS_ND.h
@@ -209,8 +209,6 @@
 /* Clear all entries in the ND cache. */
     void FreeRTOS_ClearND( const struct xNetworkEndPoint * pxEndPoint );
 
-    void vNDSendUnsolicited( void );
-
     extern const uint8_t pcLOCAL_ALL_NODES_MULTICAST_IP[ ipSIZE_OF_IPv6_ADDRESS ];
     extern const uint8_t pcLOCAL_ALL_NODES_MULTICAST_MAC[ ipMAC_ADDRESS_LENGTH_BYTES ];
 
diff --git a/source/portable/BufferManagement/BufferAllocation_1.c b/source/portable/BufferManagement/BufferAllocation_1.c
@@ -313,6 +313,7 @@ NetworkBufferDescriptor_t * pxGetNetworkBufferWithDescriptor( size_t xRequestedS
         }
         else
         {
+            FreeRTOS_printf( ( "pxGetNetworkBufferWithDescriptor: module not initialised or `xRequestedSizeBytes` too small" ) );
             /* lint wants to see at least a comment. */
             iptraceFAILED_TO_OBTAIN_NETWORK_BUFFER();
         }
diff --git a/source/portable/NetworkInterface/Common/phyHandling.c b/source/portable/NetworkInterface/Common/phyHandling.c
@@ -681,6 +681,31 @@ BaseType_t xPhyStartAutoNegotiation( EthernetPhy_t * pxPhyObject,
                     ulRegValue |= phyPHYSTS_DUPLEX_STATUS;
                 }
             }
+            else if( ulPhyID == PHY_ID_ADIN1200 )
+            {
+                /* ADIN1200 get the resolved speed information from register 0x1A (PHY_STATUS_1)
+                 */
+                uint32_t ulControlStatus = 0u;
+                uint32_t ulPortOperationMode = 0u;
+                pxPhyObject->fnPhyRead( xPhyAddress, 0x1A, &ulControlStatus );
+                /* Bits 7-9 indicate the speed and duplex. */
+                ulPortOperationMode = ( ulControlStatus >> 7u ) & 0x07u;
+
+                ulRegValue = 0;
+
+                /* Detect 10Mb operation */
+                if( ( ulPortOperationMode & 0x2 ) == 0 )
+                {
+                    /* phyPHYSTS_SPEED_STATUS: 1=10Mb, 0=100Mb */
+                    ulRegValue |= phyPHYSTS_SPEED_STATUS;
+                }
+
+                /* Detect full duplex operation */
+                if( ulPortOperationMode & 0x1 )
+                {
+                    ulRegValue |= phyPHYSTS_DUPLEX_STATUS;
+                }
+            }
             else if( xHas_1F_PHYSPCS( ulPhyID ) )
             {
                 /* 31 RW PHY Special Control Status */
diff --git a/source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.c b/source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.c
@@ -293,7 +293,7 @@
         static void ETH_DMATxDescListInit( ETH_HandleTypeDef * heth );
         static void ETH_DMARxDescListInit( ETH_HandleTypeDef * heth );
         static uint32_t ETH_Prepare_Tx_Descriptors( ETH_HandleTypeDef * heth,
-                                                    ETH_TxPacketConfig * pTxConfig,
+                                                    ETH_TxPacketConfigTypeDef * pTxConfig,
                                                     uint32_t ItMode );
         static void ETH_UpdateDescriptor( ETH_HandleTypeDef * heth );
         static void ETH_FlushTransmitFIFO( ETH_HandleTypeDef * heth );
@@ -970,7 +970,7 @@
  * @retval HAL status
  */
         HAL_StatusTypeDef HAL_ETH_Transmit( ETH_HandleTypeDef * heth,
-                                            ETH_TxPacketConfig * pTxConfig,
+                                            ETH_TxPacketConfigTypeDef * pTxConfig,
                                             uint32_t Timeout )
         {
             uint32_t tickstart;
@@ -1047,7 +1047,7 @@
  * @retval HAL status
  */
         HAL_StatusTypeDef HAL_ETH_Transmit_IT( ETH_HandleTypeDef * heth,
-                                               ETH_TxPacketConfig * pTxConfig )
+                                               ETH_TxPacketConfigTypeDef * pTxConfig )
         {
             if( pTxConfig == NULL )
             {
@@ -3117,7 +3117,7 @@
  * @retval Status
  */
         static uint32_t ETH_Prepare_Tx_Descriptors( ETH_HandleTypeDef * heth,
-                                                    ETH_TxPacketConfig * pTxConfig,
+                                                    ETH_TxPacketConfigTypeDef * pTxConfig,
                                                     uint32_t ItMode )
         {
             ETH_TxDescListTypeDef * dmatxdesclist = &heth->TxDescList;
diff --git a/source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.h b/source/portable/NetworkInterface/STM32/Drivers/F4/stm32f4xx_hal_eth.h
@@ -156,7 +156,7 @@
                                            *   This parameter can be a value of @ref ETH_Tx_Packet_Inner_VLAN_Control   */
 
             void * pData;                 /*!< Specifies Application packet pointer to save   */
-        } ETH_TxPacketConfig;
+        } ETH_TxPacketConfigTypeDef;
 
 /**
  *
@@ -2049,10 +2049,10 @@
         #endif /* HAL_ETH_USE_PTP */
 
         HAL_StatusTypeDef HAL_ETH_Transmit( ETH_HandleTypeDef * heth,
-                                            ETH_TxPacketConfig * pTxConfig,
+                                            ETH_TxPacketConfigTypeDef * pTxConfig,
                                             uint32_t Timeout );
         HAL_StatusTypeDef HAL_ETH_Transmit_IT( ETH_HandleTypeDef * heth,
-                                               ETH_TxPacketConfig * pTxConfig );
+                                               ETH_TxPacketConfigTypeDef * pTxConfig );
 
         HAL_StatusTypeDef HAL_ETH_WritePHYRegister( const ETH_HandleTypeDef * heth,
                                                     uint32_t PHYAddr,
diff --git a/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32/Legacy/STM32Hxx/NetworkInterface.c
@@ -392,7 +392,8 @@ static BaseType_t xSTM32H_NetworkInterfaceInitialise( NetworkInterface_t * pxInt
 
                 #if ( ipconfigZERO_COPY_RX_DRIVER != 0 )
                 {
-                    pucBuffer = pucGetRXBuffer( ETH_RX_BUF_SIZE );
+                    /* Subtracted 'ipBUFFER_PADDING', which is the size of the meta data. */
+                    pucBuffer = pucGetRXBuffer( ETH_RX_BUF_SIZE - ipBUFFER_PADDING );
                     configASSERT( pucBuffer != NULL );
                 }
                 #else
@@ -1046,7 +1047,7 @@ size_t uxNetworkInterfaceAllocateRAMToBuffers( NetworkBufferDescriptor_t pxNetwo
         ucRAMBuffer += ETH_RX_BUF_SIZE;
     }
 
-    return (ETH_RX_BUF_SIZE - ipBUFFER_PADDING);
+    return( ETH_RX_BUF_SIZE - ipBUFFER_PADDING );
 }
 /*-----------------------------------------------------------*/
 
diff --git a/source/portable/NetworkInterface/STM32/NetworkInterface.c b/source/portable/NetworkInterface/STM32/NetworkInterface.c
@@ -602,8 +602,7 @@ static BaseType_t prvNetworkInterfaceOutput( NetworkInterface_t * pxInterface,
             break;
         }
 
-        /* ETH_TxPacketConfigTypeDef */
-        ETH_TxPacketConfig xTxConfig =
+        ETH_TxPacketConfigTypeDef xTxConfig =
         {
             .CRCPadCtrl = ETH_CRC_PAD_INSERT,
             .Attributes = ETH_TX_PACKETS_FEATURES_CRCPAD,
@@ -2027,7 +2026,7 @@ NetworkInterface_t * pxSTM32_FillInterfaceDescriptor( BaseType_t xEMACIndex,
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxSTM32_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxSTM32_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/Zynq/NetworkInterface.c b/source/portable/NetworkInterface/Zynq/NetworkInterface.c
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif.h b/source/portable/NetworkInterface/Zynq/x_emacpsif.h
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_dma.c
diff --git a/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.c b/source/portable/NetworkInterface/Zynq/x_emacpsif_hw.c
diff --git a/source/portable/NetworkInterface/include/phyHandling.h b/source/portable/NetworkInterface/include/phyHandling.h
diff --git a/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c b/test/unit-test/FreeRTOS_ND/FreeRTOS_ND_utest.c

-Original file line number
+Diff line change
 ADDAR
 ADDRH
 ADDRL
 +ADIN
 AFECR
 AFSR
 AFVALID