ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refine M487 EMAC bus reset

pull/12991/head
cyliangtw 2020-05-15 19:37:46 +08:00
parent c937fdaacb
commit 16dacb73c0
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
features/netsocket/emac-drivers/TARGET_NUVOTON_EMAC/TARGET_M480/m480_eth.c
View File

@ -16,9 +16,10 @@
* *
* Description: M480 MAC driver source file * Description: M480 MAC driver source file
*/ */
#include <stdbool.h>
#include "m480_eth.h" #include "m480_eth.h"
#include "mbed_toolchain.h" #include "mbed_toolchain.h"
#define NU_TRACE //#define NU_TRACE
#include "numaker_eth_hal.h" #include "numaker_eth_hal.h"
#define ETH_TRIGGER_RX() do{EMAC->RXST = 0;}while(0) #define ETH_TRIGGER_RX() do{EMAC->RXST = 0;}while(0)
@ -46,6 +47,9 @@ void *nu_userData = NULL;
extern void ack_emac_rx_isr(void); extern void ack_emac_rx_isr(void);
static bool isPhyReset = false;
static uint16_t phyLPAval = 0;
// PTP source clock is 84MHz (Real chip using PLL). Each tick is 11.90ns // PTP source clock is 84MHz (Real chip using PLL). Each tick is 11.90ns
// Assume we want to set each tick to 100ns. // Assume we want to set each tick to 100ns.
// Increase register = (100 * 2^31) / (10^9) = 214.71 =~ 215 = 0xD7 // Increase register = (100 * 2^31) / (10^9) = 214.71 =~ 215 = 0xD7
@ -118,6 +122,7 @@ static int reset_phy(void)
return(-1); return(-1);
} else { } else {
reg = mdio_read(CONFIG_PHY_ADDR, MII_LPA); reg = mdio_read(CONFIG_PHY_ADDR, MII_LPA);
phyLPAval = reg;
if(reg & ADVERTISE_100FULL) { if(reg & ADVERTISE_100FULL) {
NU_DEBUGF(("100 full\n")); NU_DEBUGF(("100 full\n"));
@ -269,14 +274,32 @@ void numaker_eth_init(uint8_t *mac_addr)
EMAC_CAMCTL_ABP_Msk; EMAC_CAMCTL_ABP_Msk;
EMAC->CAMEN = 1; // Enable CAM entry 0 EMAC->CAMEN = 1; // Enable CAM entry 0
/* Limit the max receive frame length to 1514 + 4 */ /* Limit the max receive frame length to 1514 + 4 */
EMAC->MRFL = 1518; EMAC->MRFL = NU_ETH_MAX_FLEN;
/* Set RX FIFO threshold as 8 words */ /* Set RX FIFO threshold as 8 words */
EMAC->FIFOCTL = 0x00200100; EMAC->FIFOCTL = 0x00200100;
/* Limit the max receive frame length to 1514 + 4 */ if (isPhyReset != true)
EMAC->MRFL = NU_ETH_MAX_FLEN; {
reset_phy(); if (!reset_phy())
{
isPhyReset = true;
}
} else {
if (phyLPAval & ADVERTISE_100FULL) {
NU_DEBUGF(("100 full\n"));
EMAC->CTL |= (EMAC_CTL_OPMODE_Msk | EMAC_CTL_FUDUP_Msk);
} else if (phyLPAval & ADVERTISE_100HALF) {
NU_DEBUGF(("100 half\n"));
EMAC->CTL = (EMAC->CTL & ~EMAC_CTL_FUDUP_Msk) | EMAC_CTL_OPMODE_Msk;
} else if (phyLPAval & ADVERTISE_10FULL) {
NU_DEBUGF(("10 full\n"));
EMAC->CTL = (EMAC->CTL & ~EMAC_CTL_OPMODE_Msk) | EMAC_CTL_FUDUP_Msk;
} else {
NU_DEBUGF(("10 half\n"));
EMAC->CTL &= ~(EMAC_CTL_OPMODE_Msk | EMAC_CTL_FUDUP_Msk);
}
}
EMAC_ENABLE_RX(); EMAC_ENABLE_RX();
EMAC_ENABLE_TX(); EMAC_ENABLE_TX();
@ -329,12 +352,12 @@ int numaker_eth_get_rx_buf(uint16_t *len, uint8_t **buf)
if (status & RXFD_RXGD) { if (status & RXFD_RXGD) {
*buf = cur_rx_desc_ptr->buf; *buf = cur_rx_desc_ptr->buf;
*len = status & 0xFFFF; *len = status & 0xFFFF;
if( *len > 1514 ) { // length of payload should be <= 1514
if ( *len > (NU_ETH_MAX_FLEN - 4) ) {
NU_DEBUGF(("%s... unexpected long packet length=%d, buf=0x%x\r\n", __FUNCTION__, *len, *buf)); NU_DEBUGF(("%s... unexpected long packet length=%d, buf=0x%x\r\n", __FUNCTION__, *len, *buf));
*len = 0; // Skip this unexpected long packet *len = 0; // Skip this unexpected long packet
} }
if( *len == 1514 ) NU_DEBUGF(("%s... length=%d, buf=0x%x\r\n", __FUNCTION__, *len, *buf)); if (*len == (NU_ETH_MAX_FLEN - 4)) NU_DEBUGF(("%s... length=%d, buf=0x%x\r\n", __FUNCTION__, *len, *buf));
} }
return 0; return 0;
} }

5
features/netsocket/emac-drivers/TARGET_NUVOTON_EMAC/numaker_emac.cpp
View File

@ -186,8 +186,9 @@ void NUMAKER_EMAC::thread_function(void* pvParameters)
if (flags & FLAG_RX) { if (flags & FLAG_RX) {
nu_enet->packet_rx(); nu_enet->packet_rx();
} else if (flags & FLAG_BUS_RESET) { }
NU_DEBUGF(("RX BUS error and reset bus\r\n")); if (flags & FLAG_BUS_RESET) {
NU_DEBUGF(("BUS error and reset bus\r\n"));
nu_enet->bus_reset(); nu_enet->bus_reset();
} }
} }