Merge branch 'rt-smart' of https://gitee.com/rtthread/rt-thread into rt-smart

bsp/qemu-vexpress-a9/drivers/automac.h

@@ -1,15 +0,0 @@
-
-#ifndef __MAC_AUTO_GENERATE_H__
-#define __MAC_AUTO_GENERATE_H__
-
-/* Automatically generated file; DO NOT EDIT. */
-/* mac configure file for RT-Thread qemu */
-
-#define AUTOMAC0  0x52
-#define AUTOMAC1  0x54
-#define AUTOMAC2  0x00
-#define AUTOMAC3  0x28
-#define AUTOMAC4  0xae
-#define AUTOMAC5  0xeb
-
-#endif

bsp/qemu-vexpress-a9/gdb.init

@@ -0,0 +1,3 @@
+target remote localhost:1234
+b *0x100010
+add-symbol-file ../../../userapps/gnu-apps/wget/wget-1.20/src/wget 0x100000

bsp/qemu-vexpress-a9/qemu-dbg.sh

@@ -2,5 +2,6 @@ if [ ! -f "sd.bin" ]; then
 dd if=/dev/zero of=sd.bin bs=1024 count=65536
 fi
 
+#qemu-system-arm -M vexpress-a9 -kernel rtthread.elf -serial vc -serial vc -sd sd.bin -S -s
+qemu-system-arm -M vexpress-a9 -kernel rtthread.bin -nographic -sd sd.bin -S -s
 
-qemu-system-arm -M vexpress-a9 -kernel rtthread.elf -serial vc -serial vc -sd sd.bin -S -s

bsp/raspberry-pi/raspi4-32/.config

@@ -15,7 +15,7 @@ CONFIG_RT_ALIGN_SIZE=4
 CONFIG_RT_THREAD_PRIORITY_32=y
 # CONFIG_RT_THREAD_PRIORITY_256 is not set
 CONFIG_RT_THREAD_PRIORITY_MAX=32
-CONFIG_RT_TICK_PER_SECOND=100
+CONFIG_RT_TICK_PER_SECOND=1000
 CONFIG_RT_USING_OVERFLOW_CHECK=y
 CONFIG_RT_USING_HOOK=y
 CONFIG_RT_USING_IDLE_HOOK=y
@@ -69,8 +69,10 @@ CONFIG_RT_USING_CONSOLE=y
 CONFIG_RT_CONSOLEBUF_SIZE=512
 CONFIG_RT_CONSOLE_DEVICE_NAME="uart0"
 CONFIG_RT_VER_NUM=0x40003
-CONFIG_ARCH_ARM=y
+CONFIG_RT_USING_CACHE=y
 # CONFIG_RT_USING_CPU_FFS is not set
+# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
+CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM_MMU=y
 CONFIG_RT_USING_USERSPACE=y
 CONFIG_KERNEL_VADDR_START=0xc0000000
@@ -79,8 +81,6 @@ CONFIG_RT_IOREMAP_LATE=y
 CONFIG_ARCH_ARM_CORTEX_A=y
 # CONFIG_RT_BACKTRACE_FUNCTION_NAME is not set
 CONFIG_ARCH_ARMV8=y
-# CONFIG_ARCH_CPU_STACK_GROWS_UPWARD is not set
-CONFIG_RT_USING_CACHE=y
 
 #
 # RT-Thread Components
@@ -166,6 +166,7 @@ CONFIG_RT_USING_I2C=y
 # CONFIG_RT_I2C_DEBUG is not set
 CONFIG_RT_USING_I2C_BITOPS=y
 # CONFIG_RT_I2C_BITOPS_DEBUG is not set
+# CONFIG_RT_USING_PHY is not set
 CONFIG_RT_USING_PIN=y
 # CONFIG_RT_USING_ADC is not set
 # CONFIG_RT_USING_DAC is not set
@@ -210,7 +211,6 @@ CONFIG_RT_USING_WDT=y
 CONFIG_RT_USING_LIBC=y
 # CONFIG_RT_USING_NEWLIB is not set
 CONFIG_RT_USING_MUSL=y
-# CONFIG_RT_USING_MUSL_LIBC is not set
 # CONFIG_RT_USING_PTHREADS is not set
 CONFIG_RT_USING_POSIX=y
 CONFIG_RT_USING_POSIX_MMAP=y
@@ -328,7 +328,6 @@ CONFIG_RT_LWP_MAX_NR=30
 CONFIG_RT_CH_MSG_MAX_NR=1024
 CONFIG_RT_LWP_SHM_MAX_NR=64
 CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
-# CONFIG_LWP_USING_CORE_DUMP is not set
 
 #
 # RT-Thread online packages
@@ -438,6 +437,7 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
 # CONFIG_PKG_USING_WAVPLAYER is not set
 # CONFIG_PKG_USING_TJPGD is not set
 # CONFIG_PKG_USING_HELIX is not set
+# CONFIG_PKG_USING_AZUREGUIX is not set
 
 #
 # tools packages
@@ -486,7 +486,15 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
 # CONFIG_PKG_USING_RAMDISK is not set
 # CONFIG_PKG_USING_MININI is not set
 # CONFIG_PKG_USING_QBOOT is not set
+
+#
+# Micrium: Micrium software products porting for RT-Thread
+#
 # CONFIG_PKG_USING_UCOSIII_WRAPPER is not set
+# CONFIG_PKG_USING_UC_CRC is not set
+# CONFIG_PKG_USING_UC_CLK is not set
+# CONFIG_PKG_USING_UC_COMMON is not set
+# CONFIG_PKG_USING_UC_MODBUS is not set
 # CONFIG_PKG_USING_PPOOL is not set
 
 #
@@ -542,6 +550,7 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
 # CONFIG_PKG_USING_WK2124 is not set
 # CONFIG_PKG_USING_LY68L6400 is not set
 # CONFIG_PKG_USING_DM9051 is not set
+# CONFIG_PKG_USING_SSD1306 is not set
 
 #
 # miscellaneous packages
@@ -571,6 +580,7 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
 # CONFIG_PKG_USING_PERIPHERAL_SAMPLES is not set
 # CONFIG_PKG_USING_HELLO is not set
 # CONFIG_PKG_USING_VI is not set
+# CONFIG_PKG_USING_KI is not set
 # CONFIG_PKG_USING_NNOM is not set
 # CONFIG_PKG_USING_LIBANN is not set
 # CONFIG_PKG_USING_ELAPACK is not set
@@ -622,6 +632,8 @@ CONFIG_LWP_CONSOLE_INPUT_BUFFER_SIZE=1024
 # CONFIG_PKG_USING_DCM is not set
 # CONFIG_PKG_USING_EMQ is not set
 # CONFIG_PKG_USING_CFGM is not set
+# CONFIG_PKG_USING_RT_CMSIS_DAP is not set
+# CONFIG_PKG_USING_VIRTUAL_DEVICE is not set
 CONFIG_BCM2711_SOC=y
 # CONFIG_BSP_SUPPORT_FPU is not set
 

bsp/raspberry-pi/raspi4-32/applications/main.c

@@ -7,7 +7,7 @@
  * Date           Author       Notes
  * 2017-5-30     bernard       the first version
  */
-
+#include <rtthread.h>
 #include <stdio.h>
 
 int main(int argc, char** argv)

bsp/raspberry-pi/raspi4-32/driver/board.c

@@ -73,21 +73,26 @@ void rt_hw_timer_isr(int vector, void *parameter)
 
 void rt_hw_timer_init(void)
 {
-    rt_hw_interrupt_install(ARM_TIMER_IRQ, rt_hw_timer_isr, RT_NULL, "tick");
-    rt_hw_interrupt_umask(ARM_TIMER_IRQ);
+    rt_uint32_t apb_clock = 0;
+    rt_uint32_t timer_clock = 1000000;
     /* timer_clock = apb_clock/(pre_divider + 1) */
-    ARM_TIMER_PREDIV = (250 - 1);
+    apb_clock = bcm271x_mbox_clock_get_rate(CORE_CLK_ID);
+    ARM_TIMER_PREDIV = (apb_clock/timer_clock - 1);
 
     ARM_TIMER_RELOAD = 0;
     ARM_TIMER_LOAD   = 0;
     ARM_TIMER_IRQCLR = 0;
     ARM_TIMER_CTRL   = 0;
 
-    ARM_TIMER_RELOAD = 10000;
-    ARM_TIMER_LOAD   = 10000;
+    ARM_TIMER_RELOAD = 1000000/RT_TICK_PER_SECOND;
+    ARM_TIMER_LOAD   = 1000000/RT_TICK_PER_SECOND;
 
     /* 23-bit counter, enable interrupt, enable timer */
     ARM_TIMER_CTRL   = (1 << 1) | (1 << 5) | (1 << 7);
+
+    rt_hw_interrupt_install(ARM_TIMER_IRQ, rt_hw_timer_isr, RT_NULL, "tick");
+    rt_hw_interrupt_umask(ARM_TIMER_IRQ);
+
 }
 
 void idle_wfi(void)

bsp/raspberry-pi/raspi4-32/driver/drv_eth.c

@@ -19,6 +19,8 @@
 #include "raspi4.h"
 #include "drv_eth.h"
 
+//#define ETH_RX_POLL
+
 #define DBG_LEVEL   DBG_LOG
 #include <rtdbg.h>
 #define LOG_TAG                "drv.eth"
@@ -76,19 +78,36 @@ static inline void write32(void *addr, rt_uint32_t value)
     (*((volatile unsigned int*)(addr))) = value;
 }
 
-void eth_rx_irq(void *param)
+static void eth_rx_irq(int irq, void *param)
 {
+#ifndef ETH_RX_POLL
+    rt_uint32_t val = 0;
+    val = read32(mac_reg_base_addr + GENET_INTRL2_CPU_STAT);
+    val &= ~read32(mac_reg_base_addr + GENET_INTRL2_CPU_STAT_MASK);
+    write32(mac_reg_base_addr + GENET_INTRL2_CPU_CLEAR, val);
+    if (val & GENET_IRQ_RXDMA_DONE)
+    {
+        eth_device_ready(&eth_dev.parent);
+    }
+
+    if (val & GENET_IRQ_TXDMA_DONE)
+    {
+        //todo
+    }
+#else
     eth_device_ready(&eth_dev.parent);
+#endif
 }
 
 /* We only support RGMII (as used on the RPi4). */
 static int bcmgenet_interface_set(void)
 {
     int phy_mode = PHY_INTERFACE_MODE_RGMII;
-    switch (phy_mode) {
+    switch (phy_mode)
+    {
     case PHY_INTERFACE_MODE_RGMII:
     case PHY_INTERFACE_MODE_RGMII_RXID:
-        write32(mac_reg_base_addr + SYS_PORT_CTRL,PORT_MODE_EXT_GPHY);
+        write32(mac_reg_base_addr + SYS_PORT_CTRL, PORT_MODE_EXT_GPHY);
         break;
     default:
         rt_kprintf("unknown phy mode: %d\n", mac_reg_base_addr);
@@ -105,10 +124,10 @@ static void bcmgenet_umac_reset(void)
     write32((mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL), reg);
 
     reg &= ~BIT(1);
-    write32((mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL),reg);
+    write32((mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL), reg);
 
     DELAY_MICROS(10);
-    write32((mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL),0);
+    write32((mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL), 0);
     DELAY_MICROS(10);
     write32(mac_reg_base_addr + UMAC_CMD, 0);
     write32(mac_reg_base_addr + UMAC_CMD, (CMD_SW_RESET | CMD_LCL_LOOP_EN));
@@ -156,7 +175,7 @@ static int bcmgenet_mdio_write(rt_uint32_t addr, rt_uint32_t reg, rt_uint32_t va
 {
     int count = 10000;
     rt_uint32_t val;
-    val = MDIO_WR | (addr << MDIO_PMD_SHIFT) |(reg << MDIO_REG_SHIFT) | (0xffff & value);
+    val = MDIO_WR | (addr << MDIO_PMD_SHIFT) | (reg << MDIO_REG_SHIFT) | (0xffff & value);
     write32(mac_reg_base_addr + MDIO_CMD, val);
 
     rt_uint32_t reg_val = read32(mac_reg_base_addr + MDIO_CMD);
@@ -169,7 +188,6 @@ static int bcmgenet_mdio_write(rt_uint32_t addr, rt_uint32_t reg, rt_uint32_t va
     reg_val = read32(mac_reg_base_addr + MDIO_CMD);
 
     return reg_val & 0xffff;
-    
 }
 
 static int bcmgenet_mdio_read(rt_uint32_t addr, rt_uint32_t reg)
@@ -190,7 +208,7 @@ static int bcmgenet_mdio_read(rt_uint32_t addr, rt_uint32_t reg)
 
     reg_val = read32(mac_reg_base_addr + MDIO_CMD);
 
-    return reg_val & 0xffff;    
+    return reg_val & 0xffff;
 }
 
 static int bcmgenet_gmac_write_hwaddr(void)
@@ -218,7 +236,7 @@ static int get_ethernet_uid(void)
     uid_low = bcmgenet_mdio_read(1, BCM54213PE_PHY_IDENTIFIER_LOW);
     uid = (uid_high << 16 | uid_low);
 
-    if(BCM54213PE_VERSION_B1 == uid)
+    if (BCM54213PE_VERSION_B1 == uid)
     {
         LOG_I("version is B1\n");
     }
@@ -230,7 +248,7 @@ static void bcmgenet_mdio_init(void)
     rt_uint32_t ret = 0;
     /*get ethernet uid*/
     ret = get_ethernet_uid();
-    if(ret == 0)
+    if (ret == 0)
     {
         return;
     }
@@ -255,13 +273,13 @@ static void bcmgenet_mdio_init(void)
     bcmgenet_mdio_read(1, BCM54213PE_MII_CONTROL);
 
     /* set mii control */
-    bcmgenet_mdio_write(1,BCM54213PE_MII_CONTROL,(MII_CONTROL_AUTO_NEGOTIATION_ENABLED | MII_CONTROL_AUTO_NEGOTIATION_RESTART| MII_CONTROL_PHY_FULL_DUPLEX| MII_CONTROL_SPEED_SELECTION));
+    bcmgenet_mdio_write(1, BCM54213PE_MII_CONTROL, (MII_CONTROL_AUTO_NEGOTIATION_ENABLED | MII_CONTROL_AUTO_NEGOTIATION_RESTART | MII_CONTROL_PHY_FULL_DUPLEX | MII_CONTROL_SPEED_SELECTION));
 }
 
 static void rx_ring_init(void)
 {
     write32(mac_reg_base_addr + RDMA_REG_BASE + DMA_SCB_BURST_SIZE, DMA_MAX_BURST_LENGTH);
-    write32(mac_reg_base_addr + RDMA_RING_REG_BASE + DMA_START_ADDR,0x0 );
+    write32(mac_reg_base_addr + RDMA_RING_REG_BASE + DMA_START_ADDR, 0x0);
     write32(mac_reg_base_addr + RDMA_READ_PTR, 0x0);
     write32(mac_reg_base_addr + RDMA_WRITE_PTR, 0x0);
     write32(mac_reg_base_addr + RDMA_RING_REG_BASE + DMA_END_ADDR, RX_DESCS * DMA_DESC_SIZE / 4 - 1);
@@ -270,7 +288,7 @@ static void rx_ring_init(void)
     write32(mac_reg_base_addr + RDMA_CONS_INDEX, 0x0);
     write32(mac_reg_base_addr + RDMA_RING_REG_BASE + DMA_RING_BUF_SIZE, (RX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH);
     write32(mac_reg_base_addr + RDMA_XON_XOFF_THRESH, DMA_FC_THRESH_VALUE);
-    write32(mac_reg_base_addr + RDMA_REG_BASE + DMA_RING_CFG,1 << DEFAULT_Q);
+    write32(mac_reg_base_addr + RDMA_REG_BASE + DMA_RING_CFG, 1 << DEFAULT_Q);
 }
 
 static void tx_ring_init(void)
@@ -281,13 +299,13 @@ static void tx_ring_init(void)
     write32(mac_reg_base_addr + TDMA_READ_PTR, 0x0);
     write32(mac_reg_base_addr + TDMA_READ_PTR, 0x0);
     write32(mac_reg_base_addr + TDMA_WRITE_PTR, 0x0);
-    write32(mac_reg_base_addr + TDMA_RING_REG_BASE + DMA_END_ADDR,TX_DESCS * DMA_DESC_SIZE / 4 - 1);
+    write32(mac_reg_base_addr + TDMA_RING_REG_BASE + DMA_END_ADDR, TX_DESCS * DMA_DESC_SIZE / 4 - 1);
     write32(mac_reg_base_addr + TDMA_PROD_INDEX, 0x0);
     write32(mac_reg_base_addr + TDMA_CONS_INDEX, 0x0);
-    write32(mac_reg_base_addr + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH,0x1);
-    write32(mac_reg_base_addr + TDMA_FLOW_PERIOD,0x0);
+    write32(mac_reg_base_addr + TDMA_RING_REG_BASE + DMA_MBUF_DONE_THRESH, 0x1);
+    write32(mac_reg_base_addr + TDMA_FLOW_PERIOD, 0x0);
     write32(mac_reg_base_addr + TDMA_RING_REG_BASE + DMA_RING_BUF_SIZE, (TX_DESCS << DMA_RING_SIZE_SHIFT) | RX_BUF_LENGTH);
-    write32(mac_reg_base_addr + TDMA_REG_BASE + DMA_RING_CFG,1 << DEFAULT_Q);
+    write32(mac_reg_base_addr + TDMA_REG_BASE + DMA_RING_CFG, 1 << DEFAULT_Q);
 }
 
 static void rx_descs_init(void)
@@ -297,10 +315,11 @@ static void rx_descs_init(void)
     void *desc_base = (void *)RX_DESC_BASE;
 
     len_stat = (RX_BUF_LENGTH << DMA_BUFLENGTH_SHIFT) | DMA_OWN;
-    for (i = 0; i < RX_DESCS; i++) {
+    for (i = 0; i < RX_DESCS; i++)
+    {
         write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_LO), lower_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
-        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI),upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
-        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS),len_stat);
+        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_ADDRESS_HI), upper_32_bits((uintptr_t)&rxbuffs[i * RX_BUF_LENGTH]));
+        write32((desc_base + i * DMA_DESC_SIZE + DMA_DESC_LENGTH_STATUS), len_stat);
     }
 }
 
@@ -308,8 +327,9 @@ static int bcmgenet_adjust_link(void)
 {
     rt_uint32_t speed;
     rt_uint32_t phy_dev_speed = link_speed;
-    
-    switch (phy_dev_speed) {
+
+    switch (phy_dev_speed)
+    {
     case SPEED_1000:
         speed = UMAC_SPEED_1000;
         break;
@@ -337,7 +357,7 @@ static int bcmgenet_adjust_link(void)
 
 void link_irq(void *param)
 {
-    if((bcmgenet_mdio_read(1, BCM54213PE_MII_STATUS) & MII_STATUS_LINK_UP) != 0)
+    if ((bcmgenet_mdio_read(1, BCM54213PE_MII_STATUS) & MII_STATUS_LINK_UP) != 0)
     {
         rt_sem_release(&link_ack);
     }
@@ -362,14 +382,15 @@ static int bcmgenet_gmac_eth_start(void)
 
     /* Update MAC registers based on PHY property */
     ret = bcmgenet_adjust_link();
-    if (ret) {
+    if(ret)
+    {
         rt_kprintf("bcmgenet: adjust PHY link failed: %d\n", ret);
         return ret;
     }
 
     /* wait tx index clear */
     while ((read32(mac_reg_base_addr + TDMA_CONS_INDEX) != 0) && (--count))
-    DELAY_MICROS(1);
+        DELAY_MICROS(1);
 
     tx_index = read32(mac_reg_base_addr + TDMA_CONS_INDEX);
     write32(mac_reg_base_addr + TDMA_PROD_INDEX, tx_index);
@@ -388,6 +409,8 @@ static int bcmgenet_gmac_eth_start(void)
     rx_tx_en |= (CMD_TX_EN | CMD_RX_EN);
 
     write32(mac_reg_base_addr + UMAC_CMD, rx_tx_en);
+    //IRQ
+    write32(mac_reg_base_addr + GENET_INTRL2_CPU_CLEAR_MASK, GENET_IRQ_TXDMA_DONE | GENET_IRQ_RXDMA_DONE);
     return 0;
 }
 
@@ -402,6 +425,7 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
     if(prod_index == index_flag)
     {
         cur_recv_cnt = index_flag;
+        index_flag = 0x7fffffff;
         //no buff
         return 0;
     }
@@ -411,7 +435,7 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
         {
             return 0;
         }
-        
+
         desc_base = RX_DESC_BASE + rx_index * DMA_DESC_SIZE;
         length = read32(desc_base + DMA_DESC_LENGTH_STATUS);
         length = (length >> DMA_BUFLENGTH_SHIFT) & DMA_BUFLENGTH_MASK;
@@ -430,6 +454,11 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
         write32(mac_reg_base_addr + RDMA_CONS_INDEX, cur_recv_cnt);
 
         cur_recv_cnt = cur_recv_cnt + 1;
+
+        if(cur_recv_cnt > 0xffff)
+        {
+            cur_recv_cnt = 0;
+        }
         prev_recv_cnt = cur_recv_cnt;
 
         return length;
@@ -438,41 +467,53 @@ static rt_uint32_t bcmgenet_gmac_eth_recv(rt_uint8_t **packetp)
 
 static int bcmgenet_gmac_eth_send(void *packet, int length)
 {
-    void* desc_base = (TX_DESC_BASE + tx_index * DMA_DESC_SIZE);
+    void *desc_base = (TX_DESC_BASE + tx_index * DMA_DESC_SIZE);
     rt_uint32_t len_stat = length << DMA_BUFLENGTH_SHIFT;
 
     rt_uint32_t prod_index, cons;
     rt_uint32_t tries = 100;
-    
+
     prod_index = read32(mac_reg_base_addr + TDMA_PROD_INDEX);
 
     len_stat |= 0x3F << DMA_TX_QTAG_SHIFT;
     len_stat |= DMA_TX_APPEND_CRC | DMA_SOP | DMA_EOP;
 
-    write32((desc_base + DMA_DESC_ADDRESS_LO),SEND_DATA_NO_CACHE);
-    write32((desc_base + DMA_DESC_ADDRESS_HI),0);
-    write32((desc_base + DMA_DESC_LENGTH_STATUS),len_stat);
+    write32((desc_base + DMA_DESC_ADDRESS_LO), SEND_DATA_NO_CACHE);
+    write32((desc_base + DMA_DESC_ADDRESS_HI), 0);
+    write32((desc_base + DMA_DESC_LENGTH_STATUS), len_stat);
+
+    tx_index = tx_index + 1;
+    prod_index = prod_index + 1;
 
-    if(++tx_index>= TX_DESCS)
+    if (prod_index == 0xe000)
+    {
+        write32(mac_reg_base_addr + TDMA_PROD_INDEX, 0);
+        prod_index = 0;
+    }
+
+    if (tx_index == 256)
     {
         tx_index = 0;
     }
-    prod_index++;
+
     /* Start Transmisson */
-    write32(mac_reg_base_addr + TDMA_PROD_INDEX,prod_index);
+    write32(mac_reg_base_addr + TDMA_PROD_INDEX, prod_index);
 
-    do {
+    do
+    {
         cons = read32(mac_reg_base_addr + TDMA_CONS_INDEX);
     } while ((cons & 0xffff) < prod_index && --tries);
+
     if (!tries)
     {
+        rt_kprintf("send err! tries is %d\n", tries);
         return -1;
     }
     return 0;
 }
 
 static void link_task_entry(void *param)
-{   
+{
     struct eth_device *eth_device = (struct eth_device *)param;
     RT_ASSERT(eth_device != RT_NULL);
     struct rt_eth_dev *dev = &eth_dev;
@@ -488,7 +529,7 @@ static void link_task_entry(void *param)
 
     //link wait forever
     rt_sem_take(&link_ack, RT_WAITING_FOREVER);
-    eth_device_linkchange(&eth_dev.parent, RT_TRUE);//link up
+    eth_device_linkchange(&eth_dev.parent, RT_TRUE); //link up
     rt_timer_stop(&dev->link_timer);
 
     //set mac
@@ -496,12 +537,12 @@ static void link_task_entry(void *param)
     bcmgenet_gmac_write_hwaddr();
 
     //check link speed
-    if((bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 10)) || (bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 11)))
+    if ((bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 10)) || (bcmgenet_mdio_read(1, BCM54213PE_STATUS) & (1 << 11)))
     {
         link_speed = 1000;
         rt_kprintf("Support link mode Speed 1000M\n");
     }
-    else if((bcmgenet_mdio_read(1, 0x05) & (1 << 7)) || (bcmgenet_mdio_read(1, 0x05) & (1 << 8))  || (bcmgenet_mdio_read(1, 0x05) & (1 << 9)))
+    else if ((bcmgenet_mdio_read(1, 0x05) & (1 << 7)) || (bcmgenet_mdio_read(1, 0x05) & (1 << 8)) || (bcmgenet_mdio_read(1, 0x05) & (1 << 9)))
     {
         link_speed = 100;
         rt_kprintf("Support link mode Speed 100M\n");
@@ -514,6 +555,7 @@ static void link_task_entry(void *param)
 
     bcmgenet_gmac_eth_start();
     //irq or poll
+#ifdef ETH_RX_POLL
     rt_timer_init(&dev->rx_poll_timer, "rx_poll_timer",
                   eth_rx_irq,
                   NULL,
@@ -521,6 +563,10 @@ static void link_task_entry(void *param)
                   RT_TIMER_FLAG_PERIODIC);
 
     rt_timer_start(&dev->rx_poll_timer);
+#else
+    rt_hw_interrupt_install(ETH_IRQ, eth_rx_irq, NULL, "eth_irq");
+    rt_hw_interrupt_umask(ETH_IRQ);
+#endif
     link_flag = 1;
 }
 
@@ -533,7 +579,8 @@ static rt_err_t bcmgenet_eth_init(rt_device_t device)
     rt_uint8_t major = 0;
     hw_reg = read32(mac_reg_base_addr + SYS_REV_CTRL);
     major = (hw_reg >> 24) & 0x0f;
-    if (major != 6) {
+    if (major != 6)
+    {
         if (major == 5)
             major = 4;
         else if (major == 0)
@@ -547,7 +594,7 @@ static rt_err_t bcmgenet_eth_init(rt_device_t device)
     if (ret)
     {
         return ret;
-    }    
+    }
 
     /* rbuf clear */
     write32(mac_reg_base_addr + SYS_RBUF_FLUSH_CTRL, 0);
@@ -557,9 +604,9 @@ static rt_err_t bcmgenet_eth_init(rt_device_t device)
     /* issue soft reset with (rg)mii loopback to ensure a stable rxclk */
     write32(mac_reg_base_addr + UMAC_CMD, CMD_SW_RESET | CMD_LCL_LOOP_EN);
 
-    link_thread_tid = rt_thread_create("link",link_task_entry, (void *)device,
-                            LINK_THREAD_STACK_SIZE,
-                            LINK_THREAD_PRIORITY, LINK_THREAD_TIMESLICE);
+    link_thread_tid = rt_thread_create("link", link_task_entry, (void *)device,
+                                       LINK_THREAD_STACK_SIZE,
+                                       LINK_THREAD_PRIORITY, LINK_THREAD_TIMESLICE);
     if (link_thread_tid != RT_NULL)
         rt_thread_startup(link_thread_tid);
 
@@ -571,10 +618,12 @@ static rt_err_t bcmgenet_eth_control(rt_device_t dev, int cmd, void *args)
     switch (cmd)
     {
     case NIOCTL_GADDR:
-        if (args) rt_memcpy(args, eth_dev.dev_addr, 6);
-        else return -RT_ERROR;
+        if (args)
+            rt_memcpy(args, eth_dev.dev_addr, 6);
+        else
+            return -RT_ERROR;
         break;
-    default :
+    default:
         break;
     }
     return RT_EOK;
@@ -584,7 +633,7 @@ rt_err_t rt_eth_tx(rt_device_t device, struct pbuf *p)
 {
     rt_uint32_t sendbuf = (rt_uint32_t)eth_send_no_cache;
     /* lock eth device */
-    if(link_flag == 1)
+    if (link_flag == 1)
     {
         rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
         pbuf_copy_partial(p, (void *)&send_cache_pbuf[0], p->tot_len, 0);
@@ -602,11 +651,11 @@ struct pbuf *rt_eth_rx(rt_device_t device)
     int recv_len = 0;
     rt_uint32_t addr_point[8];
     struct pbuf *pbuf = RT_NULL;
-    if(link_flag == 1)
+    if (link_flag == 1)
     {
         rt_sem_take(&sem_lock, RT_WAITING_FOREVER);
         recv_len = bcmgenet_gmac_eth_recv((rt_uint8_t **)&addr_point[0]);
-        if(recv_len > 0)
+        if (recv_len > 0)
         {
             pbuf = pbuf_alloc(PBUF_LINK, recv_len, PBUF_RAM);
             //calc offset

bsp/raspberry-pi/raspi4-32/driver/drv_eth.h

@@ -52,6 +52,17 @@
 #define MDIO_REG_SHIFT              (16)
 #define MDIO_REG_MASK               (0x1f)
 
+#define  GENET_INTRL2_OFF               (0x0200)
+#define  GENET_INTRL2_CPU_STAT          (GENET_INTRL2_OFF + 0x00)
+#define  GENET_INTRL2_CPU_CLEAR         (GENET_INTRL2_OFF + 0x08)
+#define  GENET_INTRL2_CPU_STAT_MASK     (GENET_INTRL2_OFF + 0x0c)
+#define  GENET_INTRL2_CPU_SET_MASK      (GENET_INTRL2_OFF + 0x10)
+#define  GENET_INTRL2_CPU_CLEAR_MASK    (GENET_INTRL2_OFF + 0x14)
+#define  GENET_IRQ_MDIO_ERROR           BIT(24)
+#define  GENET_IRQ_MDIO_DONE            BIT(23)
+#define  GENET_IRQ_TXDMA_DONE           BIT(16)
+#define  GENET_IRQ_RXDMA_DONE           BIT(13)
+
 #define CMD_TX_EN                   BIT(0)
 #define CMD_RX_EN                   BIT(1)
 #define UMAC_SPEED_10               (0)

bsp/raspberry-pi/raspi4-32/driver/drv_sdio.c

@@ -552,8 +552,8 @@ static rt_err_t reset_emmc(struct sdhci_pdata_t * pdat)
 
     // Clear control2
     write32(pdat->virt + EMMC_CONTROL2, 0);
-    // Get the base clock rate
-    mmc_base_clock = bcm271x_mbox_clock_get_rate(12);
+    // Get the base clock rate //12
+    mmc_base_clock = bcm271x_mbox_clock_get_rate(EMMC_CLK_ID);
     if(mmc_base_clock == 0)
     {
         rt_kprintf("EMMC: assuming clock rate to be 100MHz\n");

bsp/raspberry-pi/raspi4-32/driver/mbox.h

@@ -136,6 +136,17 @@ enum {
 #define MBOX_ADDR 0x08000000
 extern uint32_t mbox_addr;
 
+#define    RES_CLK_ID           (0x000000000)
+#define    EMMC_CLK_ID          (0x000000001)
+#define    UART_CLK_ID          (0x000000002)
+#define    ARM_CLK_ID           (0x000000003)
+#define    CORE_CLK_ID          (0x000000004)
+#define    V3D_CLK_ID           (0x000000005)
+#define    H264_CLK_ID          (0x000000006)
+#define    ISP_CLK_ID           (0x000000007)
+#define    SDRAM_CLK_ID         (0x000000008)
+#define    PIXEL_CLK_ID         (0x000000009)
+#define    PWM_CLK_ID           (0x00000000a)
 
 int mbox_call(unsigned char ch, int mmu_enable);
 int bcm271x_notify_reboot(void);

bsp/raspberry-pi/raspi4-32/driver/raspi4.h

@@ -165,6 +165,8 @@ extern uint32_t mmc2_base_addr;
 #define MAC_REG                 (void *)(0xfd580000)
 extern void *                   mac_reg_base_addr;
 
+#define ETH_IRQ                 (160+29)
+
 #define SEND_DATA_NO_CACHE      (0x08200000)
 extern void *                   eth_send_no_cache;
 

bsp/raspberry-pi/raspi4-32/rtconfig.h

@@ -11,7 +11,7 @@
 #define RT_ALIGN_SIZE 4
 #define RT_THREAD_PRIORITY_32
 #define RT_THREAD_PRIORITY_MAX 32
-#define RT_TICK_PER_SECOND 100
+#define RT_TICK_PER_SECOND 1000
 #define RT_USING_OVERFLOW_CHECK
 #define RT_USING_HOOK
 #define RT_USING_IDLE_HOOK
@@ -46,6 +46,7 @@
 #define RT_CONSOLEBUF_SIZE 512
 #define RT_CONSOLE_DEVICE_NAME "uart0"
 #define RT_VER_NUM 0x40003
+#define RT_USING_CACHE
 #define ARCH_ARM
 #define ARCH_ARM_MMU
 #define RT_USING_USERSPACE
@@ -54,7 +55,6 @@
 #define RT_IOREMAP_LATE
 #define ARCH_ARM_CORTEX_A
 #define ARCH_ARMV8
-#define RT_USING_CACHE
 
 /* RT-Thread Components */
 
@@ -251,6 +251,9 @@
 /* system packages */
 
 
+/* Micrium: Micrium software products porting for RT-Thread */
+
+
 /* peripheral libraries and drivers */
 
 

components/drivers/Kconfig

@@ -8,7 +8,7 @@ if RT_USING_DEVICE_IPC
     config RT_PIPE_BUFSZ
         int "Set pipe buffer size"
         default 512
-    
+
     config RT_USING_SYSTEM_WORKQUEUE
         bool "Using system default workqueue"
         default n
@@ -118,7 +118,11 @@ config RT_USING_ADC
 config RT_USING_DAC
     bool "Using DAC device drivers"
     default n
-    
+
+config RT_USING_NULL
+    bool "Using NULL device drivers"
+    default n
+
 config RT_USING_PWM
     bool "Using PWM device drivers"
     default n
@@ -202,7 +206,7 @@ config RT_USING_SPI
     bool "Using SPI Bus/Device device drivers"
     default n
 
-    if RT_USING_SPI  
+    if RT_USING_SPI
         config RT_USING_QSPI
             bool "Enable QSPI mode"
             default n
@@ -226,7 +230,7 @@ config RT_USING_SPI
                 config RT_SFUD_USING_FLASH_INFO_TABLE
                 bool "Using defined supported flash chip information table"
                 default y
-                
+
                 config RT_SFUD_USING_QSPI
                 bool "Using QSPI mode support"
                 select RT_USING_QSPI

components/drivers/misc/SConscript

@@ -1,28 +1,31 @@
 from building import *
 
 cwd = GetCurrentDir()
-src = [] 
+src = []
 CPPPATH = [cwd + '/../include']
 group = []
 
 if GetDepend(['RT_USING_PIN']):
     src = src + ['pin.c']
-    
+
 if GetDepend(['RT_USING_ADC']):
     src = src + ['adc.c']
-    
+
 if GetDepend(['RT_USING_DAC']):
     src = src + ['dac.c']
 
 if GetDepend(['RT_USING_PWM']):
     src = src + ['rt_drv_pwm.c']
-    
+
 if GetDepend(['RT_USING_PULSE_ENCODER']):
     src = src + ['pulse_encoder.c']
 
 if GetDepend(['RT_USING_INPUT_CAPTURE']):
     src = src + ['rt_inputcapture.c']
 
+if GetDepend(['RT_USING_NULL']):
+    src = src + ['rt_null.c']
+
 if len(src):
     group = DefineGroup('DeviceDrivers', src, depend = [''], CPPPATH = CPPPATH)
 

components/drivers/misc/rt_null.c

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2011-2020, Shanghai Real-Thread Electronic Technology Co.,Ltd
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-12-03     quanzhao     the first version
+ */
+
+#include <time.h>
+#include <string.h>
+#include <rtthread.h>
+
+static struct rt_device null_dev;
+
+static rt_size_t null_read    (rt_device_t dev, rt_off_t pos, void *buffer, rt_size_t size)
+{
+    rt_memset(buffer, 0, size);
+    return size;
+}
+
+static rt_size_t null_write   (rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size)
+{
+    return size;
+}
+
+static rt_err_t  null_control (rt_device_t dev, int cmd, void *args)
+{
+    return RT_EOK;
+}
+
+#ifdef RT_USING_DEVICE_OPS
+const static struct rt_device_ops null_ops =
+{
+    RT_NULL,
+    RT_NULL,
+    RT_NULL,
+    null_read,
+    null_write,
+    null_control
+};
+#endif
+
+int null_device_init(void)
+{
+    static rt_bool_t init_ok = RT_FALSE;
+
+    if (init_ok)
+    {
+        return 0;
+    }
+    RT_ASSERT(!rt_device_find("null"));
+    null_dev.type    = RT_Device_Class_Miscellaneous;
+
+#ifdef RT_USING_DEVICE_OPS
+    null_dev.ops     = &null_ops;
+#else
+    null_dev.init    = RT_NULL;
+    null_dev.open    = RT_NULL;
+    null_dev.close   = RT_NULL;
+    null_dev.read    = null_read;
+    null_dev.write   = null_write;
+    null_dev.control = null_control;
+#endif
+
+    /* no private */
+    null_dev.user_data = RT_NULL;
+
+    rt_device_register(&null_dev, "null", RT_DEVICE_FLAG_RDWR);
+
+    init_ok = RT_TRUE;
+
+    return 0;
+}
+INIT_DEVICE_EXPORT(null_device_init);
+

components/libc/compilers/musl/SConscript

@@ -8,7 +8,7 @@ group = []
 CFLAGS     = ' -nostdinc'
 CPPPATH    = [cwd, cwd + '/libc/include']
 CPPDEFINES = ['__STDC_ISO_10646__=201206L', '_STDC_PREDEF_H']
-LIBS       = ['c', 'm', 'gcc']
+LIBS       = ['c', 'gcc']
 LIBPATH    = [cwd + '/libc/lib']
 
 if rtconfig.PLATFORM == 'gcc':

components/lwp/lwp_pid.c

@@ -119,6 +119,63 @@ out:
     return lwp;
 }
 
+static void lwp_user_obj_free(struct rt_lwp *lwp)
+{
+    rt_base_t level = 0;
+    struct rt_list_node *list = RT_NULL, *node = RT_NULL;
+    struct rt_object *object = RT_NULL;
+
+    list = &(lwp->object_list), node = list->next;
+
+    level = rt_hw_interrupt_disable();
+    while (list != node)
+    {
+        object = rt_list_entry(node, struct rt_object, lwp_obj_list);
+        node = node->next;
+
+        /* remove from kernel object list */
+        switch (object->type)
+        {
+        case RT_Object_Class_Thread:
+        {
+            rt_thread_t tid = (rt_thread_t)object;
+            if (tid->stat != RT_THREAD_CLOSE)
+            {
+                rt_thread_delete(tid);
+            }
+            break;
+        }
+        case RT_Object_Class_Semaphore:
+            rt_sem_delete((rt_sem_t)object);
+            break;
+        case RT_Object_Class_Mutex:
+            rt_mutex_delete((rt_mutex_t)object);
+            break;
+        case RT_Object_Class_Event:
+            rt_event_delete((rt_event_t)object);
+            break;
+        case RT_Object_Class_MailBox:
+            rt_mb_delete((rt_mailbox_t)object);
+            break;
+        case RT_Object_Class_MessageQueue:
+            rt_mq_delete((rt_mq_t)object);
+            break;
+        case RT_Object_Class_Device:
+            rt_device_close((rt_device_t)object);
+            break;
+        case RT_Object_Class_Timer:
+            rt_timer_delete((rt_timer_t)object);
+            break;
+        case RT_Object_Class_Channel:
+            break;
+        default:
+            LOG_E("input object type(%d) error", object->type);
+            break;
+        }
+    }
+    rt_hw_interrupt_enable(level);
+}
+
 void lwp_free(struct rt_lwp* lwp)
 {
     rt_base_t level;
@@ -142,6 +199,7 @@ void lwp_free(struct rt_lwp* lwp)
     {
         /* auto clean fds */
         __exit_files(lwp);
+        lwp_user_obj_free(lwp);
         rt_free(lwp->fdt.fds);
         lwp->fdt.fds = RT_NULL;
     }
@@ -224,63 +282,6 @@ void lwp_free(struct rt_lwp* lwp)
     rt_hw_interrupt_enable(level);
 }
 
-void lwp_user_obj_free(struct rt_lwp *lwp)
-{
-    rt_base_t level;
-    struct rt_list_node *list = RT_NULL, *node = RT_NULL;
-    struct rt_object *object = RT_NULL;
-
-    list = &(lwp->object_list), node = list->next;
-
-    level = rt_hw_interrupt_disable();
-    for ( ;list != node; )
-    {
-        object = rt_list_entry(node, struct rt_object, lwp_obj_list);
-        node = node->next;
-
-        /* remove from kernel object list */
-        switch (object->type)
-        {
-        case RT_Object_Class_Thread:
-        {
-            rt_thread_t tid = (rt_thread_t)object;
-            if (tid->stat != RT_THREAD_CLOSE)
-            {
-                rt_thread_delete(tid);
-            }
-            break;
-        }
-        case RT_Object_Class_Semaphore:
-            rt_sem_delete((rt_sem_t)object);
-            break;
-        case RT_Object_Class_Mutex:
-            rt_mutex_delete((rt_mutex_t)object);
-            break;
-        case RT_Object_Class_Event:
-            rt_event_delete((rt_event_t)object);
-            break;
-        case RT_Object_Class_MailBox:
-            rt_mb_delete((rt_mailbox_t)object);
-            break;
-        case RT_Object_Class_MessageQueue:
-            rt_mq_delete((rt_mq_t)object);
-            break;
-        case RT_Object_Class_Device:
-            rt_device_close((rt_device_t)object);
-            break;
-        case RT_Object_Class_Timer:
-            rt_timer_delete((rt_timer_t)object);
-            break;
-        case RT_Object_Class_Channel:
-            break;
-        default:
-            LOG_E("input object type(%d) error", object->type);
-            break;
-        }
-    }
-    rt_hw_interrupt_enable(level);
-}
-
 void lwp_ref_inc(struct rt_lwp *lwp)
 {
     rt_base_t level;
@@ -311,7 +312,6 @@ void lwp_ref_dec(struct rt_lwp *lwp)
                 rt_raw_channel_send(gdb_get_server_channel(), &msg);
             }
 #endif
-            lwp_user_obj_free(lwp);
             lwp_free(lwp);
         }
     }

components/lwp/lwp_syscall.c

@@ -76,6 +76,126 @@ static void kmem_put(void *kptr)
 }
 #endif
 
+/* The same socket option is defined differently in the user interfaces and the
+ * implementation. The options should be converted in the kernel. */
+
+/* socket levels */
+#define INTF_SOL_SOCKET     1
+#define IMPL_SOL_SOCKET     0xFFF
+
+/* socket option name */
+#define INTF_SO_REUSEADDR   2
+#define INTF_SO_KEEPALIVE   9
+#define INTF_SO_BROADCAST   6
+#define INTF_SO_ACCEPTCONN  30
+#define INTF_SO_DONTROUTE   5
+#define INTF_SO_LINGER      13
+#define INTF_SO_OOBINLINE   10
+#define INTF_SO_REUSEPORT   15
+#define INTF_SO_SNDBUF      7
+#define INTF_SO_RCVBUF      8
+#define INTF_SO_SNDLOWAT    19
+#define INTF_SO_RCVLOWAT    18
+#define INTF_SO_SNDTIMEO    21
+#define INTF_SO_RCVTIMEO    20
+#define INTF_SO_ERROR       4
+#define INTF_SO_TYPE        3
+#define INTF_SO_NO_CHECK    11
+
+#define IMPL_SO_REUSEADDR   0x0004
+#define IMPL_SO_KEEPALIVE   0x0008
+#define IMPL_SO_BROADCAST   0x0020
+#define IMPL_SO_ACCEPTCONN  0x0002
+#define IMPL_SO_DONTROUTE   0x0010
+#define IMPL_SO_LINGER      0x0080
+#define IMPL_SO_OOBINLINE   0x0100
+#define IMPL_SO_REUSEPORT   0x0200
+#define IMPL_SO_SNDBUF      0x1001
+#define IMPL_SO_RCVBUF      0x1002
+#define IMPL_SO_SNDLOWAT    0x1003
+#define IMPL_SO_RCVLOWAT    0x1004
+#define IMPL_SO_SNDTIMEO    0x1005
+#define IMPL_SO_RCVTIMEO    0x1006
+#define IMPL_SO_ERROR       0x1007
+#define IMPL_SO_TYPE        0x1008
+#define IMPL_SO_NO_CHECK    0x100a
+
+static void convert_sockopt(int *level, int *optname)
+{
+    switch (*level)
+    {
+        case INTF_SOL_SOCKET:
+            *level = IMPL_SOL_SOCKET;
+            break;
+        default:
+            break;
+    }
+
+    switch (*optname)
+    {
+        case INTF_SO_REUSEADDR:
+            *optname = IMPL_SO_REUSEADDR;
+            break;
+        case INTF_SO_KEEPALIVE:
+            *optname = IMPL_SO_KEEPALIVE;
+            break;
+        case INTF_SO_BROADCAST:
+            *optname = IMPL_SO_BROADCAST;
+            break;
+        case INTF_SO_ACCEPTCONN:
+            *optname = IMPL_SO_ACCEPTCONN;
+            break;
+        case INTF_SO_DONTROUTE:
+            *optname = IMPL_SO_DONTROUTE;
+            break;
+        case INTF_SO_LINGER:
+            *optname = IMPL_SO_LINGER;
+            break;
+        case INTF_SO_OOBINLINE:
+            *optname = IMPL_SO_OOBINLINE;
+            break;
+        case INTF_SO_REUSEPORT:
+            *optname = IMPL_SO_REUSEPORT;
+            break;
+        case INTF_SO_SNDBUF:
+            *optname = IMPL_SO_SNDBUF;
+            break;
+        case INTF_SO_RCVBUF:
+            *optname = IMPL_SO_RCVBUF;
+            break;
+        case INTF_SO_SNDLOWAT:
+            *optname = IMPL_SO_SNDLOWAT;
+            break;
+        case INTF_SO_RCVLOWAT:
+            *optname = IMPL_SO_RCVLOWAT;
+            break;
+        case INTF_SO_SNDTIMEO:
+            *optname = IMPL_SO_SNDTIMEO;
+            break;
+        case INTF_SO_RCVTIMEO:
+            *optname = IMPL_SO_RCVTIMEO;
+            break;
+        case INTF_SO_ERROR:
+            *optname = IMPL_SO_ERROR;
+            break;
+        case INTF_SO_TYPE:
+            *optname = IMPL_SO_TYPE;
+            break;
+        case INTF_SO_NO_CHECK:
+            *optname = IMPL_SO_NO_CHECK;
+            break;
+
+        /*
+         * SO_DONTLINGER (*level = ((int)(~SO_LINGER))),
+         * SO_USELOOPBACK (*level = 0x0040) and
+         * SO_CONTIMEO (*level = 0x1009) are not supported for now.
+         */
+        default:
+            *optname = 0;
+            break;
+    }
+}
+
 static void sockaddr_tolwip(const struct musl_sockaddr *std, struct sockaddr *lwip)
 {
     if (std && lwip)
@@ -297,46 +417,70 @@ int sys_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, s
 
     if (readfds)
     {
-        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)readfds, nfds * sizeof *readfds))
+        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)readfds, sizeof *readfds))
+        {
             return -1;
-        kreadfds = (fd_set *)kmem_get(nfds * sizeof *kreadfds);
+        }
+        kreadfds = (fd_set *)kmem_get(sizeof *kreadfds);
         if (!kreadfds)
+        {
             goto quit;
-        lwp_data_get(&lwp_self()->mmu_info, kreadfds, readfds, nfds * sizeof *kreadfds);
+        }
+        lwp_data_get(&lwp_self()->mmu_info, kreadfds, readfds, sizeof *kreadfds);
     }
     if (writefds)
     {
-        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)writefds, nfds * sizeof *writefds))
+        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)writefds, sizeof *writefds))
+        {
             return -1;
-        kwritefds = (fd_set *)kmem_get(nfds * sizeof *kwritefds);
+        }
+        kwritefds = (fd_set *)kmem_get(sizeof *kwritefds);
         if (!kwritefds)
+        {
             goto quit;
-        lwp_data_get(&lwp_self()->mmu_info, kwritefds, writefds, nfds * sizeof *kwritefds);
+        }
+        lwp_data_get(&lwp_self()->mmu_info, kwritefds, writefds, sizeof *kwritefds);
     }
     if (exceptfds)
     {
-        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)exceptfds, nfds * sizeof *exceptfds))
+        if (!lwp_data_access_ok(&lwp_self()->mmu_info, (void*)exceptfds, sizeof *exceptfds))
+        {
             return -1;
-        kexceptfds = (fd_set *)kmem_get(nfds * sizeof *kexceptfds);
+        }
+        kexceptfds = (fd_set *)kmem_get(sizeof *kexceptfds);
         if (!kexceptfds)
+        {
             goto quit;
-        lwp_data_get(&lwp_self()->mmu_info, kexceptfds, exceptfds, nfds * sizeof *kexceptfds);
+        }
+        lwp_data_get(&lwp_self()->mmu_info, kexceptfds, exceptfds, sizeof *kexceptfds);
     }
 
     ret = select(nfds, kreadfds, kwritefds, kexceptfds, timeout);
     if (kreadfds)
-        lwp_data_put(&lwp_self()->mmu_info, readfds, kreadfds, nfds * sizeof *kreadfds);
+    {
+        lwp_data_put(&lwp_self()->mmu_info, readfds, kreadfds, sizeof *kreadfds);
+    }
     if (kwritefds)
-        lwp_data_put(&lwp_self()->mmu_info, writefds, kwritefds, nfds * sizeof *kwritefds);
+    {
+        lwp_data_put(&lwp_self()->mmu_info, writefds, kwritefds, sizeof *kwritefds);
+    }
     if (kexceptfds)
-        lwp_data_put(&lwp_self()->mmu_info, exceptfds, kexceptfds, nfds * sizeof *kexceptfds);
+    {
+        lwp_data_put(&lwp_self()->mmu_info, exceptfds, kexceptfds, sizeof *kexceptfds);
+    }
 quit:
     if (kreadfds)
+    {
         kmem_put(kreadfds);
+    }
     if (kwritefds)
+    {
         kmem_put(kwritefds);
+    }
     if (kexceptfds)
+    {
         kmem_put(kexceptfds);
+    }
     return ret;
 #else
     return select(nfds, readfds, writefds, exceptfds, timeout);
@@ -813,11 +957,28 @@ void sys_exit_critical(void)
 }
 
 /* syscall: "sys_log" ret: "int" args: "const char*" "size" */
+static int __sys_log_enable = 0;
+static int sys_log_enable(int argc, char** argv)
+{
+    if (argc == 1)
+    {
+        rt_kprintf("sys_log = %d\n", __sys_log_enable);
+        return 0;
+    }
+    else
+    {
+        __sys_log_enable = atoi(argv[1]);
+    }
+
+    return 0;
+}
+MSH_CMD_EXPORT_ALIAS(sys_log_enable, sys_log, sys_log 1(enable)/0(disable));
+
 int sys_log(const char* log, int size)
 {
     rt_device_t console = rt_console_get_device();
 
-    if (console) rt_device_write(console, -1, log, size);
+    if (console && __sys_log_enable) rt_device_write(console, -1, log, size);
 
     return 0;
 }
@@ -955,6 +1116,7 @@ int sys_getsockopt (int socket, int level, int optname, void *optval, socklen_t
 {
     LOG_I("syscall: getsockopt");
 
+    convert_sockopt(&level, &optname);
     return getsockopt (socket, level, optname, optval, optlen);
 }
 
@@ -962,6 +1124,7 @@ int sys_setsockopt (int socket, int level, int optname, const void *optval, sock
 {
     LOG_I("syscall: setsockopt");
 
+    convert_sockopt(&level, &optname);
     return setsockopt (socket, level, optname, optval, optlen);
 }
 
@@ -1029,9 +1192,9 @@ int sys_recvfrom(int socket, void *mem, size_t len, int flags,
     if (from)
     {
         struct sockaddr sa;
-        sockaddr_tolwip(from, &sa);
 
         ret = recvfrom(socket, kmem, len, flgs, &sa, fromlen);
+        sockaddr_tomusl(&sa, from);
     } else
         ret = recvfrom(socket, kmem, len, flgs, NULL, NULL);
 
@@ -1043,10 +1206,12 @@ int sys_recvfrom(int socket, void *mem, size_t len, int flags,
 #else
     if (from)
     {
-        struct sockaddr sa;
-        sockaddr_tolwip(from, &sa);
+        int ret = -1;
+        struct sockaddr sa = {0};
 
-        return recvfrom(socket, mem, len, flgs, &sa, fromlen);
+        ret = recvfrom(socket, mem, len, flgs, &sa, fromlen);
+        sockaddr_tomusl(&sa, from);
+        return ret;
     }
 
     return recvfrom(socket, mem, len, flags, NULL, NULL);
@@ -1118,10 +1283,28 @@ int sys_send(int socket, const void *dataptr, size_t size, int flags)
 
 int sys_socket(int domain, int type, int protocol)
 {
+    int fd = -1;
+    int nonblock = 0;
     /* not support SOCK_CLOEXEC type */
     if (type & SOCK_CLOEXEC) type &= ~SOCK_CLOEXEC;
+    if (type & SOCK_NONBLOCK)
+    {
+        nonblock = 1;
+        type &= ~SOCK_NONBLOCK;
+    }
+
+    fd = socket(domain, type, protocol);
+    if (fd < 0)
+    {
+        goto out;
+    }
+    if (nonblock)
+    {
+        fcntl(fd, F_SETFL, O_NONBLOCK);
+    }
 
-    return socket(domain, type, protocol);
+out:
+    return fd;
 }
 
 int sys_closesocket(int socket)
@@ -1239,6 +1422,7 @@ int sys_getaddrinfo(const char *nodename, const char *servname, const struct mus
         /* set up addrinfo */
         res->ai_family = k_res->ai_family;
         res->ai_flags  = k_res->ai_flags;
+        res->ai_next = NULL;
 
         if (hints != NULL)
         {