Skip to content

Commit

Permalink
Merge pull request #14 from Infineon/topic/ferreije-fix_timeout_issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayushev
ayushev authored Dec 15, 2020
2 parents 3354c8d + 22383ec commit 6d1cc7f
Show file tree
Hide file tree
Showing 225 changed files with 27,920 additions and 151,064 deletions.
161 changes: 92 additions & 69 deletions ..._plus/standard/freertos_plus_tcp/source/portable/NetworkInterface/XMC4/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ static __ALIGNED(4) uint8_t eth_tx_buf[configNUM_TX_DESCRIPTORS][XMC_ETH_MAC_BUF
#endif
#endif

#define TX_BUFFER_FREE_WAIT ( pdMS_TO_TICKS( 5UL ) )
#define MAX_TX_ATTEMPTS ( 10 )

/* If ipconfigETHERNET_DRIVER_FILTERS_FRAME_TYPES is set to 1, then the Ethernet
driver will filter incoming packets and only pass the stack those packets it
Expand Down Expand Up @@ -148,30 +150,27 @@ void ETH0_0_IRQHandler(void)
ulStatusRegister = XMC_ETH_MAC_GetEventStatus(&eth_mac);
XMC_ETH_MAC_ClearEventStatus(&eth_mac, ulStatusRegister);

if (netif_task_handler != 0)
{
/* xHigherPriorityTaskWoken must be initialised to pdFALSE. If calling
xTaskNotifyFromISR() unblocks the handling task, and the priority of
the handling task is higher than the priority of the currently running task,
then xHigherPriorityTaskWoken will automatically get set to pdTRUE. */
xHigherPriorityTaskWoken = pdFALSE;

/* Unblock the handling task so the task can perform any processing necessitated
by the interrupt. xHandlingTask is the task's handle, which was obtained
when the task was created. The handling task's notification value
is bitwise ORed with the interrupt status - ensuring bits that are already
set are not overwritten. */
xTaskNotifyFromISR(netif_task_handler, ulStatusRegister, eSetBits, &xHigherPriorityTaskWoken );

/* Force a context switch if xHigherPriorityTaskWoken is now set to pdTRUE.
The macro used to do this is dependent on the port and may be called
portEND_SWITCHING_ISR. */
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}
/* xHigherPriorityTaskWoken must be initialised to pdFALSE. If calling
xTaskNotifyFromISR() unblocks the handling task, and the priority of
the handling task is higher than the priority of the currently running task,
then xHigherPriorityTaskWoken will automatically get set to pdTRUE. */
xHigherPriorityTaskWoken = pdFALSE;

/* Unblock the handling task so the task can perform any processing necessitated
by the interrupt. xHandlingTask is the task's handle, which was obtained
when the task was created. The handling task's notification value
is bitwise ORed with the interrupt status - ensuring bits that are already
set are not overwritten. */
xTaskNotifyFromISR(netif_task_handler, ulStatusRegister, eSetBits, &xHigherPriorityTaskWoken );

/* Force a context switch if xHigherPriorityTaskWoken is now set to pdTRUE.
The macro used to do this is dependent on the port and may be called
portEND_SWITCHING_ISR. */
portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
}

#if (ipconfigZERO_COPY_RX_DRIVER == 0)
static void prvNetworkInterfaceInput(void)
static BaseType_t prvNetworkInterfaceInput(void)
{
uint32_t xReceivedLength;
uint8_t *pucBuffer;
Expand Down Expand Up @@ -213,63 +212,79 @@ static void prvNetworkInterfaceInput(void)
XMC_ETH_MAC_ReturnRxDescriptor(&eth_mac);
XMC_ETH_MAC_ResumeRx(&eth_mac);

return ( xReceivedLength > 0 );

}
#else
static void prvNetworkInterfaceInput(void)
static BaseType_t prvNetworkInterfaceInput(void)
{
uint32_t xReceivedLength;
uint8_t *pucBuffer;
NetworkBufferDescriptor_t *pxDescriptor;
const TickType_t xDescriptorWaitTime = pdMS_TO_TICKS( 250 );
NetworkBufferDescriptor_t *pxCurDescriptor;
NetworkBufferDescriptor_t *pxNewDescriptor = NULL;

xIPStackEvent_t xRxEvent = { eNetworkRxEvent, NULL };

xReceivedLength = XMC_ETH_MAC_GetRxFrameSize(&eth_mac);
if ((xReceivedLength > 0) && (xReceivedLength <= ipTOTAL_ETHERNET_FRAME_SIZE))
if (xReceivedLength > 0)
{
pucBuffer = XMC_ETH_MAC_GetRxBuffer(&eth_mac);

if (ipCONSIDER_FRAME_FOR_PROCESSING(pucBuffer))
/* Check if it is a valid frame */
if (xReceivedLength <= ipTOTAL_ETHERNET_FRAME_SIZE)
{
/* Allocate a new network buffer descriptor that references an Ethernet
frame large enough to hold the maximum network packet size (as defined
in the FreeRTOSIPConfig.h header file). */
pxDescriptor = pxGetNetworkBufferWithDescriptor(ipTOTAL_ETHERNET_FRAME_SIZE, xDescriptorWaitTime);
if (pxDescriptor != NULL)
{
XMC_ETH_MAC_SetRxBuffer(&eth_mac, pxDescriptor->pucEthernetBuffer);

pxDescriptor->pucEthernetBuffer = pucBuffer;
pxDescriptor->xDataLength = xReceivedLength;

*( ( NetworkBufferDescriptor_t ** )
( pxDescriptor->pucEthernetBuffer - ipBUFFER_PADDING ) ) = pxDescriptor;

/*
* The network buffer descriptor now points to the Ethernet buffer that
* contains the received data, and the Ethernet DMA descriptor now points
* to a newly allocated (and empty) Ethernet buffer ready to receive more
* data. No data was copied. Only pointers to data were swapped.
*/
pucBuffer = XMC_ETH_MAC_GetRxBuffer(&eth_mac);

xRxEvent.pvData = ( void * )pxDescriptor;

/* Pass the data to the TCP/IP task for processing. */
if (xSendEventStructToIPTask( &xRxEvent, xDescriptorWaitTime ) == pdFALSE)
if (ipCONSIDER_FRAME_FOR_PROCESSING(pucBuffer))
{
/* Allocate a new network buffer descriptor that references an Ethernet
frame large enough to hold the maximum network packet size (as defined
in the FreeRTOSIPConfig.h header file). */
pxNewDescriptor = pxGetNetworkBufferWithDescriptor(ipTOTAL_ETHERNET_FRAME_SIZE, 0);
if (pxNewDescriptor != NULL)
{
/* Could not send the descriptor into the TCP/IP stack, it must be released. */
vReleaseNetworkBufferAndDescriptor(pxDescriptor);
iptraceETHERNET_RX_EVENT_LOST();
XMC_ETH_MAC_SetRxBuffer(&eth_mac, pxNewDescriptor->pucEthernetBuffer);

pxCurDescriptor = pxPacketBuffer_to_NetworkBuffer( pucBuffer );
configASSERT( pxCurDescriptor != NULL );

pxCurDescriptor->xDataLength = xReceivedLength;

/*
* The network buffer descriptor now points to the Ethernet buffer that
* contains the received data, and the Ethernet DMA descriptor now points
* to a newly allocated (and empty) Ethernet buffer ready to receive more
* data. No data was copied. Only pointers to data were swapped.
*/

xRxEvent.pvData = ( void * )pxCurDescriptor;

/* Pass the data to the TCP/IP task for processing. */
if (xSendEventStructToIPTask( &xRxEvent, 0 ) == pdFALSE)
{
/* Could not send the descriptor into the TCP/IP stack, it must be released. */
vReleaseNetworkBufferAndDescriptor(pxCurDescriptor);
iptraceETHERNET_RX_EVENT_LOST();
}
else
{
iptraceNETWORK_INTERFACE_RECEIVE();
}
}
else
{
iptraceNETWORK_INTERFACE_RECEIVE();
/* The event was lost because a network buffer was not available.
Call the standard trace macro to log the occurrence. */
iptraceETHERNET_RX_EVENT_LOST();
}
}
}

XMC_ETH_MAC_ReturnRxDescriptor(&eth_mac);
}

XMC_ETH_MAC_ReturnRxDescriptor(&eth_mac);
XMC_ETH_MAC_ResumeRx(&eth_mac);

return ( xReceivedLength > 0 );

}
#endif

Expand All @@ -290,7 +305,7 @@ static void vClearTXBuffers()
NetworkBufferDescriptor_t *pxDescriptor = pxPacketBuffer_to_NetworkBuffer(ucPayLoad);
if (pxDescriptor != NULL)
{
vReleaseNetworkBufferAndDescriptor(pxDescriptor);
vReleaseNetworkBufferAndDescriptor(pxDescriptor);
}
XMC_ETH_MAC_SetTxBufferEx(&eth_mac, ulTxDescriptorToClear, 0);
}
Expand Down Expand Up @@ -320,7 +335,7 @@ static void set_link_up(void)
XMC_ETH_MAC_SetLink(&eth_mac, speed, duplex);

/* Enable ethernet interrupts */
XMC_ETH_MAC_EnableEvent(&eth_mac, (uint32_t)(XMC_ETH_MAC_EVENT_RECEIVE | XMC_ETH_MAC_EVENT_TRANSMIT));
XMC_ETH_MAC_EnableEvent(&eth_mac, (uint32_t)(XMC_ETH_MAC_EVENT_RECEIVE | XMC_ETH_MAC_EVENT_RECEIVE_BUFFER_UNAVAILABLE | XMC_ETH_MAC_EVENT_TRANSMIT));

NVIC_SetPriority(ETH0_0_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(), 62U, 0U));
NVIC_ClearPendingIRQ(ETH0_0_IRQn);
Expand All @@ -334,7 +349,7 @@ static void set_link_up(void)

static void set_link_down(void)
{
XMC_ETH_MAC_DisableEvent(&eth_mac, (uint32_t)(XMC_ETH_MAC_EVENT_RECEIVE | XMC_ETH_MAC_EVENT_TRANSMIT));
XMC_ETH_MAC_DisableEvent(&eth_mac, (uint32_t)(XMC_ETH_MAC_EVENT_RECEIVE | XMC_ETH_MAC_EVENT_RECEIVE_BUFFER_UNAVAILABLE | XMC_ETH_MAC_EVENT_TRANSMIT));
NVIC_DisableIRQ(ETH0_0_IRQn);

XMC_ETH_MAC_DisableTx(&eth_mac);
Expand All @@ -360,13 +375,9 @@ static void netif_task(void *arg)
&ulInterruptStatus, /* Receives the notification value. */
portMAX_DELAY); /* Block indefinitely. */

if ((ulInterruptStatus & XMC_ETH_MAC_EVENT_RECEIVE) != 0)
if ((ulInterruptStatus & (XMC_ETH_MAC_EVENT_RECEIVE | XMC_ETH_MAC_EVENT_RECEIVE_BUFFER_UNAVAILABLE)) != 0)
{
/* Go through the application owned descriptors */
while (XMC_ETH_MAC_IsRxDescriptorOwnedByDma(&eth_mac) == pdFALSE)
{
prvNetworkInterfaceInput();
}
while (prvNetworkInterfaceInput());
}

if ((ulInterruptStatus & XMC_ETH_MAC_EVENT_TRANSMIT) != 0 )
Expand Down Expand Up @@ -516,8 +527,8 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxNetworkB
BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxDescriptor, BaseType_t xReleaseAfterSend )
{
(void)xReleaseAfterSend;
const TickType_t xBlockTimeTicks = pdMS_TO_TICKS(50u);
BaseType_t xReturn = pdFAIL;
int32_t x;

do
{
Expand All @@ -526,9 +537,18 @@ BaseType_t xNetworkInterfaceOutput( NetworkBufferDescriptor_t * const pxDescript
break;
}

if (xSemaphoreTake(xTXDescriptorSemaphore, xBlockTimeTicks) != pdPASS)
for (x = 0; x < MAX_TX_ATTEMPTS; ++x)
{
if (xSemaphoreTake(xTXDescriptorSemaphore, 0) == pdPASS)
{
break;
}
iptraceWAITING_FOR_TX_DMA_DESCRIPTOR();
vTaskDelay(TX_BUFFER_FREE_WAIT);
}

if (x == MAX_TX_ATTEMPTS)
{
/* Time-out waiting for a free TX descriptor. */
break;
}

Expand Down Expand Up @@ -586,6 +606,9 @@ void vNetworkInterfaceAllocateRAMToBuffers(
/* pucEthernetBuffer is set to point ipBUFFER_PADDING bytes in from the
beginning of the allocated buffer. */
pxDescriptor[ x ].pucEthernetBuffer = &( ucBuffers[ x ][ ipBUFFER_PADDING ] );
pxDescriptor[ x ].xDataLength = 0;
pxDescriptor[ x ].usPort = 0;
pxDescriptor[ x ].usBoundPort = 0;

/* The following line is also required, but will not be required in
future versions. */
Expand Down
15 changes: 13 additions & 2 deletions vendors/infineon/XMCLib/2.2.0/CMSIS/CHANGELOG.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,40 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.7.0-p1] - 2020-04-20
## [5.7.0-p1] - 2020-11
Based on CMSIS 5.7.0 with Infineon specific files
See https://github.com/ARM-software/CMSIS_5/releases for changes on CMSIS 5.7.0

### Added
- Option to generate own ISR handlers for interrupts instead of a single common default ISR
- Scatter files for ARM compiler v5 and v6
### Changed
- Infineon specific files uses now the Boost Software License, https://www.boost.org/users/license.html
- Device header files to avoid compilation warnings in Keil MDK
### Fixed
- system_XMC1400.c
Fix seeting of ANAOSCHPCTRL accoring to OSC_CM.D001 in errata
- system_XMC4100.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4200.c
Fix EXTCLKDIV macro definition
Fix code for condition EXTCLK_PIN == EXTCLK_PIN_P1_15
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4300.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4400.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4500.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4700.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- system_XMC4800.c
Fix clock setup when using internal oscillator as clock source for the system PLL
- Newlib/syscalls.c
Fix C++ compilation

### Added
- CMSIS Driver implementation
- Device variants header files to avoid compilation warnings in Keil MDK

## [5.6.0-p1] - 2019-08-01
Based on CMSIS 5.6.0 with Infineon specific files
Expand Down
Loading

0 comments on commit 6d1cc7f

Please sign in to comment.