From bba361016d07f06ce17b2aecd632c05d056f96cc Mon Sep 17 00:00:00 2001 From: "Sergio R. Caprile" Date: Mon, 27 Feb 2023 17:21:33 -0300 Subject: [PATCH] Update RMII ex, enhance MIP --- .../rp2040/pico-rmii/driver_rp2040_rmii.c | 59 +++++-------------- examples/rp2040/pico-rmii/main.c | 2 + mongoose.c | 34 ++++++----- mongoose.h | 15 +++-- src/tcpip/tcpip.c | 22 +++---- src/tcpip/tcpip.h | 19 +++--- src/util.c | 12 ++-- 7 files changed, 73 insertions(+), 90 deletions(-) diff --git a/examples/rp2040/pico-rmii/driver_rp2040_rmii.c b/examples/rp2040/pico-rmii/driver_rp2040_rmii.c index b61bd450..e77b81d1 100644 --- a/examples/rp2040/pico-rmii/driver_rp2040_rmii.c +++ b/examples/rp2040/pico-rmii/driver_rp2040_rmii.c @@ -29,21 +29,21 @@ static dma_channel_config dmacfg_tx; static uint8_t s_rxbuf[2][ETH_PKT_SIZE]; // ping-pong buffer static uint8_t s_txbuf[ETH_PKT_SIZE]; -static struct mg_tcpip_if *s_ifp; // MIP interface +static struct mg_tcpip_if *s_ifp; // MIP interface #define rmii_tx_wrap_target 0 #define rmii_tx_wrap 8 static const uint16_t rmii_tx_program_instructions[] = { // .wrap_target - 0xe000, // 0: set pins, 0 side 0 - 0x80a0, // 1: pull block side 0 - 0xe03d, // 2: set x, 29 side 0 - 0xf101, // 3: set pins, 1 side 1 [1] - 0x1144, // 4: jmp x--, 4 side 1 [1] - 0xf103, // 5: set pins, 3 side 1 [1] - 0x7002, // 6: out pins, 2 side 1 - 0x10e6, // 7: jmp !osre, 6 side 1 + 0xe000, // 0: set pins, 0 side 0 + 0x80a0, // 1: pull block side 0 + 0xe03d, // 2: set x, 29 side 0 + 0xf101, // 3: set pins, 1 side 1 [1] + 0x1144, // 4: jmp x--, 4 side 1 [1] + 0xf103, // 5: set pins, 3 side 1 [1] + 0x7002, // 6: out pins, 2 side 1 + 0x10e6, // 7: jmp !osre, 6 side 1 // .wrap }; @@ -216,21 +216,6 @@ static inline void smi_rd_init(PIO pio, uint sm, uint addr, uint gpio) { pio_sm_init(pio, sm, addr, &c); } -static inline uint32_t crc_calc(const uint8_t *data, int length) { - static const uint32_t crclut[16] = { - // table for polynomial 0xEDB88320 (reflected) - 0x00000000, 0x1DB71064, 0x3B6E20C8, 0x26D930AC, 0x76DC4190, 0x6B6B51F4, - 0x4DB26158, 0x5005713C, 0xEDB88320, 0xF00F9344, 0xD6D6A3E8, 0xCB61B38C, - 0x9B64C2B0, 0x86D3D2D4, 0xA00AE278, 0xBDBDF21C}; - uint32_t crc = 0xFFFFFFFF; - while (--length >= 0) { - uint8_t byte = *data++; - crc = crclut[(crc ^ byte) & 0x0F] ^ (crc >> 4); - crc = crclut[(crc ^ (byte >> 4)) & 0x0F] ^ (crc >> 4); - } - return ~crc; -} - static void eth_write_phy(int addr, int reg, int val, uint8_t gpio) { uint16_t op = 0x5002 | (addr << 7) | (reg << 2); // b0101aaaaarrrrr10 smi_wr_init(pio0, SMITXSM, smi_wr_addr, gpio); @@ -299,12 +284,12 @@ static bool mg_tcpip_driver_rp2040_rmii_init(struct mg_tcpip_if *ifp) { } static size_t mg_tcpip_driver_rp2040_rmii_tx(const void *buf, size_t len, - struct mg_tcpip_if *ifp) { + struct mg_tcpip_if *ifp) { dma_channel_wait_for_finish_blocking(dma_tx); memset(s_txbuf, 0, 60); // pre-pad memcpy(s_txbuf, buf, len); if (len < 60) len = 60; // pad - uint32_t crc = crc_calc(s_txbuf, len); // host is little-endian + uint32_t crc = mg_crc32(0, s_txbuf, len); // host is little-endian memcpy(s_txbuf + len, (uint8_t *) &crc, 4); len += 4; sleep_us(10); // enforce IFG in case software has been lightning fast... @@ -324,31 +309,17 @@ static void rx_irq(void) { 1; // 2 buffers, switch to the available one as fast as possible size_t len = ETH_PKT_SIZE - hw->transfer_count; dma_channel_abort(dma_rx); - dma_channel_set_write_addr(dma_rx, s_rxbuf[rxno], true); // restart DMA + dma_channel_set_write_addr(dma_rx, s_rxbuf[rxno], true); // restart DMA pio_interrupt_clear(pio0, 0); // ACK PIO IRQ so the state machine resumes receiving // NOTE(scaprile) Here we could check addressing to avoid queuing frames not - // for us, or we can defer that for later as we do with CRC The max amount of - // time we can linger here is what it takes for the other buffer to fill - // (<8us) and that includes irq chaining + // for us. The max amount of time we can linger here is what it takes for the + // other buffer to fill (<8us) and that includes irq chaining if (len >= 64 && len <= ETH_PKT_SIZE) mg_tcpip_qwrite(s_rxbuf[s_rxno], len, s_ifp); s_rxno = rxno; } -static size_t mg_tcpip_driver_rp2040_rmii_rx(void *buf, size_t buflen, struct mg_tcpip_if *ifp) { - size_t len = 0; // mg_tcpip_qread(buf, ifp); - if (len == 0) return 0; - len -= 4; // exclude CRC from frame length - uint32_t crc = crc_calc(buf, len); // calculate CRC and compare - // NOTE(scaprile) Here we could check addressing to avoid delivering frames - // not for us, though MIP already does that (now ?) - if (memcmp(&((uint8_t *) buf)[len], &crc, - sizeof(crc))) // host is little-endian - return 0; - return len; -} - static bool mg_tcpip_driver_rp2040_rmii_up(struct mg_tcpip_if *ifp) { struct mg_tcpip_driver_rp2040_rmii_data *d = (struct mg_tcpip_driver_rp2040_rmii_data *) ifp->driver_data; @@ -360,6 +331,6 @@ static bool mg_tcpip_driver_rp2040_rmii_up(struct mg_tcpip_if *ifp) { struct mg_tcpip_driver mg_tcpip_driver_rp2040_rmii = { mg_tcpip_driver_rp2040_rmii_init, mg_tcpip_driver_rp2040_rmii_tx, - mg_tcpip_driver_rp2040_rmii_rx, + NULL, mg_tcpip_driver_rp2040_rmii_up, }; diff --git a/examples/rp2040/pico-rmii/main.c b/examples/rp2040/pico-rmii/main.c index d7e69cbc..6ea96ea1 100644 --- a/examples/rp2040/pico-rmii/main.c +++ b/examples/rp2040/pico-rmii/main.c @@ -42,6 +42,8 @@ int main(void) { struct mg_tcpip_if mif = { .mac = {2, 0, 1, 2, 3, 5}, .ip = 0, + .enable_mac_check = true, + .enable_crc32_check = true, .driver = &mg_tcpip_driver_rp2040_rmii, .driver_data = &driver_data, }; diff --git a/mongoose.c b/mongoose.c index 7a0971c9..6b258f5b 100644 --- a/mongoose.c +++ b/mongoose.c @@ -5672,11 +5672,16 @@ uint16_t mg_ntohs(uint16_t net) { } uint32_t mg_crc32(uint32_t crc, const char *buf, size_t len) { - int i; + static const uint32_t crclut[16] = { + // table for polynomial 0xEDB88320 (reflected) + 0x00000000, 0x1DB71064, 0x3B6E20C8, 0x26D930AC, 0x76DC4190, 0x6B6B51F4, + 0x4DB26158, 0x5005713C, 0xEDB88320, 0xF00F9344, 0xD6D6A3E8, 0xCB61B38C, + 0x9B64C2B0, 0x86D3D2D4, 0xA00AE278, 0xBDBDF21C}; crc = ~crc; while (len--) { - crc ^= *(unsigned char *) buf++; - for (i = 0; i < 8; i++) crc = crc & 1 ? (crc >> 1) ^ 0xedb88320 : crc >> 1; + uint8_t byte = *(uint8_t *)buf++; + crc = crclut[(crc ^ byte) & 0x0F] ^ (crc >> 4); + crc = crclut[(crc ^ (byte >> 4)) & 0x0F] ^ (crc >> 4); } return ~crc; } @@ -5755,7 +5760,6 @@ uint64_t mg_millis(void) { } #endif - #ifdef MG_ENABLE_LINES #line 1 "src/ws.c" #endif @@ -7867,10 +7871,16 @@ static void mg_tcpip_rx(struct mg_tcpip_if *ifp, void *buf, size_t len) { pkt.raw.len = len; pkt.eth = (struct eth *) buf; if (pkt.raw.len < sizeof(*pkt.eth)) return; // Truncated - runt? - if (memcmp(pkt.eth->dst, ifp->mac, sizeof(pkt.eth->dst)) != 0 && - memcmp(pkt.eth->dst, broadcast, sizeof(pkt.eth->dst)) != 0) { - // Not for us. Drop silently - } else if (pkt.eth->type == mg_htons(0x806)) { + if (ifp->enable_mac_check && + memcmp(pkt.eth->dst, ifp->mac, sizeof(pkt.eth->dst)) != 0 && + memcmp(pkt.eth->dst, broadcast, sizeof(pkt.eth->dst)) != 0) + return; + if (ifp->enable_crc32_check && len > 4) { + len -= 4; // TODO(scaprile): check on bigendian + uint32_t crc = mg_crc32(0, (const char *) buf, len); + if (memcmp((void *) ((size_t) buf + len), &crc, sizeof(crc))) return; + } + if (pkt.eth->type == mg_htons(0x806)) { pkt.arp = (struct arp *) (pkt.eth + 1); if (sizeof(*pkt.eth) + sizeof(*pkt.arp) > pkt.raw.len) return; // Truncated rx_arp(ifp, &pkt); @@ -7971,11 +7981,6 @@ void mg_tcpip_qwrite(void *buf, size_t len, struct mg_tcpip_if *ifp) { } } -size_t mg_tcpip_driver_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) { - (void) buf, (void) len, (void) ifp; - return 0; -} - void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) { // If MAC address is not set, make a random one if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 && @@ -7990,7 +7995,8 @@ void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) { } else { size_t framesize = 1540; ifp->tx.ptr = (char *) calloc(1, framesize), ifp->tx.len = framesize; - ifp->recv_queue.size = ifp->driver->rx ? framesize : 8192; + if (ifp->recv_queue.size == 0) + ifp->recv_queue.size = ifp->driver->rx ? framesize : 8192; ifp->recv_queue.buf = (char *) calloc(1, ifp->recv_queue.size); ifp->timer_1000ms = mg_millis(); mgr->priv = ifp; diff --git a/mongoose.h b/mongoose.h index 6bc4bce9..69496b80 100644 --- a/mongoose.h +++ b/mongoose.h @@ -1514,11 +1514,13 @@ struct mg_tcpip_driver { // Network interface struct mg_tcpip_if { - uint8_t mac[6]; // MAC address. Must be set to a valid MAC - uint32_t ip, mask, gw; // IP address, mask, default gateway - struct mg_str tx; // Output (TX) buffer - bool enable_dhcp_client; // Enable DCHP client - bool enable_dhcp_server; // Enable DCHP server + uint8_t mac[6]; // MAC address. Must be set to a valid MAC + uint32_t ip, mask, gw; // IP address, mask, default gateway + struct mg_str tx; // Output (TX) buffer + bool enable_dhcp_client; // Enable DCHP client + bool enable_dhcp_server; // Enable DCHP server + bool enable_crc32_check; // Do a CRC check on rx frames and strip it + bool enable_mac_check; // Do a MAC check on rx frames struct mg_tcpip_driver *driver; // Low level driver void *driver_data; // Driver-specific data struct mg_mgr *mgr; // Mongoose event manager @@ -1543,9 +1545,6 @@ struct mg_tcpip_if { void mg_tcpip_init(struct mg_mgr *, struct mg_tcpip_if *); void mg_tcpip_free(struct mg_tcpip_if *); void mg_tcpip_qwrite(void *buf, size_t len, struct mg_tcpip_if *ifp); -size_t mg_tcpip_qread(void *buf, struct mg_tcpip_if *ifp); -// conveniency rx function for IRQ-driven drivers -size_t mg_tcpip_driver_rx(void *buf, size_t len, struct mg_tcpip_if *ifp); extern struct mg_tcpip_driver mg_tcpip_driver_stm32; extern struct mg_tcpip_driver mg_tcpip_driver_w5500; diff --git a/src/tcpip/tcpip.c b/src/tcpip/tcpip.c index 5273f608..02330b2c 100644 --- a/src/tcpip/tcpip.c +++ b/src/tcpip/tcpip.c @@ -693,10 +693,16 @@ static void mg_tcpip_rx(struct mg_tcpip_if *ifp, void *buf, size_t len) { pkt.raw.len = len; pkt.eth = (struct eth *) buf; if (pkt.raw.len < sizeof(*pkt.eth)) return; // Truncated - runt? - if (memcmp(pkt.eth->dst, ifp->mac, sizeof(pkt.eth->dst)) != 0 && - memcmp(pkt.eth->dst, broadcast, sizeof(pkt.eth->dst)) != 0) { - // Not for us. Drop silently - } else if (pkt.eth->type == mg_htons(0x806)) { + if (ifp->enable_mac_check && + memcmp(pkt.eth->dst, ifp->mac, sizeof(pkt.eth->dst)) != 0 && + memcmp(pkt.eth->dst, broadcast, sizeof(pkt.eth->dst)) != 0) + return; + if (ifp->enable_crc32_check && len > 4) { + len -= 4; // TODO(scaprile): check on bigendian + uint32_t crc = mg_crc32(0, (const char *) buf, len); + if (memcmp((void *) ((size_t) buf + len), &crc, sizeof(crc))) return; + } + if (pkt.eth->type == mg_htons(0x806)) { pkt.arp = (struct arp *) (pkt.eth + 1); if (sizeof(*pkt.eth) + sizeof(*pkt.arp) > pkt.raw.len) return; // Truncated rx_arp(ifp, &pkt); @@ -797,11 +803,6 @@ void mg_tcpip_qwrite(void *buf, size_t len, struct mg_tcpip_if *ifp) { } } -size_t mg_tcpip_driver_rx(void *buf, size_t len, struct mg_tcpip_if *ifp) { - (void) buf, (void) len, (void) ifp; - return 0; -} - void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) { // If MAC address is not set, make a random one if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 && @@ -816,7 +817,8 @@ void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) { } else { size_t framesize = 1540; ifp->tx.ptr = (char *) calloc(1, framesize), ifp->tx.len = framesize; - ifp->recv_queue.size = ifp->driver->rx ? framesize : 8192; + if (ifp->recv_queue.size == 0) + ifp->recv_queue.size = ifp->driver->rx ? framesize : 8192; ifp->recv_queue.buf = (char *) calloc(1, ifp->recv_queue.size); ifp->timer_1000ms = mg_millis(); mgr->priv = ifp; diff --git a/src/tcpip/tcpip.h b/src/tcpip/tcpip.h index 371faed4..677dba60 100644 --- a/src/tcpip/tcpip.h +++ b/src/tcpip/tcpip.h @@ -15,11 +15,13 @@ struct mg_tcpip_driver { // Network interface struct mg_tcpip_if { - uint8_t mac[6]; // MAC address. Must be set to a valid MAC - uint32_t ip, mask, gw; // IP address, mask, default gateway - struct mg_str tx; // Output (TX) buffer - bool enable_dhcp_client; // Enable DCHP client - bool enable_dhcp_server; // Enable DCHP server + uint8_t mac[6]; // MAC address. Must be set to a valid MAC + uint32_t ip, mask, gw; // IP address, mask, default gateway + struct mg_str tx; // Output (TX) buffer + bool enable_dhcp_client; // Enable DCHP client + bool enable_dhcp_server; // Enable DCHP server + bool enable_crc32_check; // Do a CRC check on rx frames and strip it + bool enable_mac_check; // Do a MAC check on rx frames struct mg_tcpip_driver *driver; // Low level driver void *driver_data; // Driver-specific data struct mg_mgr *mgr; // Mongoose event manager @@ -44,9 +46,6 @@ struct mg_tcpip_if { void mg_tcpip_init(struct mg_mgr *, struct mg_tcpip_if *); void mg_tcpip_free(struct mg_tcpip_if *); void mg_tcpip_qwrite(void *buf, size_t len, struct mg_tcpip_if *ifp); -size_t mg_tcpip_qread(void *buf, struct mg_tcpip_if *ifp); -// conveniency rx function for IRQ-driven drivers -size_t mg_tcpip_driver_rx(void *buf, size_t len, struct mg_tcpip_if *ifp); extern struct mg_tcpip_driver mg_tcpip_driver_stm32; extern struct mg_tcpip_driver mg_tcpip_driver_w5500; @@ -64,8 +63,8 @@ struct mg_tcpip_spi { #if MG_ENABLE_TCPIP #if !defined(MG_ENABLE_DRIVER_STM32H) && !defined(MG_ENABLE_DRIVER_TM4C) - #define MG_ENABLE_DRIVER_STM32 1 +#define MG_ENABLE_DRIVER_STM32 1 #else - #define MG_ENABLE_DRIVER_STM32 0 +#define MG_ENABLE_DRIVER_STM32 0 #endif #endif diff --git a/src/util.c b/src/util.c index 6f7f5c0c..e2d44730 100644 --- a/src/util.c +++ b/src/util.c @@ -48,11 +48,16 @@ uint16_t mg_ntohs(uint16_t net) { } uint32_t mg_crc32(uint32_t crc, const char *buf, size_t len) { - int i; + static const uint32_t crclut[16] = { + // table for polynomial 0xEDB88320 (reflected) + 0x00000000, 0x1DB71064, 0x3B6E20C8, 0x26D930AC, 0x76DC4190, 0x6B6B51F4, + 0x4DB26158, 0x5005713C, 0xEDB88320, 0xF00F9344, 0xD6D6A3E8, 0xCB61B38C, + 0x9B64C2B0, 0x86D3D2D4, 0xA00AE278, 0xBDBDF21C}; crc = ~crc; while (len--) { - crc ^= *(unsigned char *) buf++; - for (i = 0; i < 8; i++) crc = crc & 1 ? (crc >> 1) ^ 0xedb88320 : crc >> 1; + uint8_t byte = *(uint8_t *)buf++; + crc = crclut[(crc ^ byte) & 0x0F] ^ (crc >> 4); + crc = crclut[(crc ^ (byte >> 4)) & 0x0F] ^ (crc >> 4); } return ~crc; } @@ -130,4 +135,3 @@ uint64_t mg_millis(void) { #endif } #endif -