libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

fix eth error (#8929) 

* fix eth error

* fix eth error

* fix eth error

* fix eth error

* fix eth error
This commit is contained in:
xiao-mang 2024-05-11 11:10:53 +08:00 committed by GitHub
parent 989cc61f48
commit b3277fa704
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bsp/nxp/imx/imx6ull-smart/README.md
View File

@ -35,7 +35,6 @@ ART-pi smart采用了米尔科技的imx6ull核心板，硬件由韦东山团队
> >
> ### 待完善、修复 > ### 待完善、修复
> * [ ] 网络 以太网网络问题修复
> * [ ] 信号 信号处理问题修复 > * [ ] 信号 信号处理问题修复

13
bsp/nxp/imx/imx6ull-smart/drivers/drv_eth.c
View File

@ -171,13 +171,13 @@ rt_err_t enet_buffer_init(enet_buffer_config_t *buffConfig)
((SYS_PAGE_SIZE<<TX_BUFFER_INDEX_NUM)<buffConfig->txBufferTotalSize)) ((SYS_PAGE_SIZE<<TX_BUFFER_INDEX_NUM)<buffConfig->txBufferTotalSize))
{ {
LOG_E("ERROR: alloc mem not enough for enet driver"); LOG_E("ERROR: alloc mem not enough for enet driver");
return RT_ERROR; return -RT_ERROR;
} }
rx_buff_addr = rt_pages_alloc(RX_BUFFER_INDEX_NUM); rx_buff_addr = rt_pages_alloc(RX_BUFFER_INDEX_NUM);
if(!rx_buff_addr) if(!rx_buff_addr)
{ {
LOG_E("ERROR: rx buff page alloc failed"); LOG_E("ERROR: rx buff page alloc failed");
return RT_ERROR; return -RT_ERROR;
} }
buffConfig->rxBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_buff_addr), (SYS_PAGE_SIZE<<RX_BUFFER_INDEX_NUM)); buffConfig->rxBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_buff_addr), (SYS_PAGE_SIZE<<RX_BUFFER_INDEX_NUM));
buffConfig->rxPhyBufferAlign = (void *)virtual_to_physical(rx_buff_addr); buffConfig->rxPhyBufferAlign = (void *)virtual_to_physical(rx_buff_addr);
@ -186,7 +186,7 @@ rt_err_t enet_buffer_init(enet_buffer_config_t *buffConfig)
if(!tx_buff_addr) if(!tx_buff_addr)
{ {
LOG_E("ERROR: tx buff page alloc failed"); LOG_E("ERROR: tx buff page alloc failed");
return RT_ERROR; return -RT_ERROR;
} }
buffConfig->txBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_buff_addr), (SYS_PAGE_SIZE<<TX_BUFFER_INDEX_NUM)); buffConfig->txBufferAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_buff_addr), (SYS_PAGE_SIZE<<TX_BUFFER_INDEX_NUM));
buffConfig->txPhyBufferAlign = (void *)virtual_to_physical(tx_buff_addr); buffConfig->txPhyBufferAlign = (void *)virtual_to_physical(tx_buff_addr);
@ -195,7 +195,7 @@ rt_err_t enet_buffer_init(enet_buffer_config_t *buffConfig)
if(!rx_bd_addr) if(!rx_bd_addr)
{ {
LOG_E("ERROR: rx bd page alloc failed"); LOG_E("ERROR: rx bd page alloc failed");
return RT_ERROR; return -RT_ERROR;
} }
buffConfig->rxBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_bd_addr), (SYS_PAGE_SIZE<<RX_BD_INDEX_NUM)); buffConfig->rxBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(rx_bd_addr), (SYS_PAGE_SIZE<<RX_BD_INDEX_NUM));
buffConfig->rxPhyBdStartAddrAlign = virtual_to_physical(rx_bd_addr); buffConfig->rxPhyBdStartAddrAlign = virtual_to_physical(rx_bd_addr);
@ -204,7 +204,7 @@ rt_err_t enet_buffer_init(enet_buffer_config_t *buffConfig)
if(!tx_bd_addr) if(!tx_bd_addr)
{ {
LOG_E("ERROR: tx bd page alloc failed"); LOG_E("ERROR: tx bd page alloc failed");
return RT_ERROR; return -RT_ERROR;
} }
buffConfig->txBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_bd_addr), (SYS_PAGE_SIZE<<TX_BD_INDEX_NUM)); buffConfig->txBdStartAddrAlign = (void *)rt_ioremap_nocache(virtual_to_physical(tx_bd_addr), (SYS_PAGE_SIZE<<TX_BD_INDEX_NUM));
buffConfig->txPhyBdStartAddrAlign = virtual_to_physical(tx_bd_addr); buffConfig->txPhyBdStartAddrAlign = virtual_to_physical(tx_bd_addr);
@ -387,10 +387,11 @@ rt_err_t rt_imx6ul_eth_tx(rt_device_t dev, struct pbuf *p)
offset = offset + q->len; offset = offset + q->len;
if(status == kStatus_Success) if(status == kStatus_Success)
{ {
ret = RT_EOK;
} }
else else
{ {
return RT_ERROR; ret = -RT_ERROR;
} }
} }
if(offset > ENET_FRAME_MAX_FRAMELEN) if(offset > ENET_FRAME_MAX_FRAMELEN)