June 2019 - U-Boot

[U-Boot] [PATCH] cmd/led.c: fix typos in online help
by Anatolij Gustschin 22 Jun '19

22 Jun '19

Remove square brackets around label in state command description. Fixes: ea41b15617fa ("cmd/led: check subcommand "list" instead "l"") Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- cmd/led.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/led.c b/cmd/led.c index 403abbc6bc..50ffa509ab 100644 --- a/cmd/led.c +++ b/cmd/led.c @@ -137,6 +137,6 @@ U_BOOT_CMD( led, 4, 1, do_led, "manage LEDs", "<led_label> on|off|toggle" BLINK "\tChange LED state\n" - "led [<led_label>]\tGet LED state\n" + "led <led_label>\tGet LED state\n" "led list\t\tshow a list of LEDs" ); -- 2.17.1

3 2

[U-Boot] [PATCH] rsa: reject images with unknown padding
by Patrick Doyle 22 Jun '19

22 Jun '19

Previously we would store NULL in info->padding and jump to an illegal instruction if an unknown value for "padding" was specified in the device tree. Signed-off-by: Patrick Doyle <pdoyle(a)irobot.com> --- common/image-sig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/image-sig.c b/common/image-sig.c index 4f6b4ec..004fbc5 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -211,7 +211,7 @@ static int fit_image_setup_verify(struct image_sign_info *info, info->required_keynode = required_keynode; printf("%s:%s", algo_name, info->keyname); - if (!info->checksum || !info->crypto) { + if (!info->checksum || !info->crypto || !info->padding) { *err_msgp = "Unknown signature algorithm"; return -1; } -- 2.7.4

2 1

[U-Boot] [PATCH] arm: am335x-pdu001: Remove watchdog support
by Felix Brack 22 Jun '19

22 Jun '19

This board does not require watchdog support. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- configs/am335x_pdu001_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index 05077c5b73..4308b192f1 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -17,7 +17,7 @@ CONFIG_BOOTDELAY=1 CONFIG_SPL_I2C_SUPPORT=y # CONFIG_SPL_NAND_SUPPORT is not set CONFIG_SPL_POWER_SUPPORT=y -CONFIG_SPL_WATCHDOG_SUPPORT=y +# CONFIG_OMAP_WATCHDOG is not set CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -- 2.17.1

2 1

[U-Boot] [PATCH v2] lib: Makefile: build fdtdec_common.c when OF_LIBFDT selected
by Peng Fan 22 Jun '19

22 Jun '19

When build SPL_OF_PLATDATA on i.MX6, meet issue the fdtdec_get_int not defined, however fdtdec.c will use fdtdec_get_int, so let's compile fdtdec_common.c when OF_LIBFDT selected. Since there is also SPL_OF_LIBFDT, so need to use CONFIG_$(SPL_TPL_)OF_LIBFDT. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 09c45b8122..2fffd68f94 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -88,7 +88,7 @@ obj-y += crc32.o obj-$(CONFIG_CRC32C) += crc32c.o obj-y += ctype.o obj-y += div64.o -obj-$(CONFIG_OF_LIBFDT) += fdtdec.o +obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdtdec.o fdtdec_common.o obj-y += hang.o obj-y += linux_compat.o obj-y += linux_string.o -- 2.16.4

2 1

[U-Boot] [PATCH v2] pci: Avoid assigning PCI resources that are below 0x1000
by Bin Meng 22 Jun '19

22 Jun '19

commit b7598a43f2b4 ("[PATCH] Avoid assigning PCI resources from zero address") only moved the bus lower address to 0x1000 if the given bus start address is zero. The comment said 0x1000 is a reasonable starting value, hence we'd better apply the same adjustment when the given bus start address is below 0x1000. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes in v2: - avoid changing res->bus_start drivers/pci/pci_auto_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index 1837873..84908e6 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -21,9 +21,10 @@ void pciauto_region_init(struct pci_region *res) /* * Avoid allocating PCI resources from address 0 -- this is illegal * according to PCI 2.1 and moreover, this is known to cause Linux IDE - * drivers to fail. Use a reasonable starting value of 0x1000 instead. + * drivers to fail. Use a reasonable starting value of 0x1000 instead + * if the bus start address is below 0x1000. */ - res->bus_lower = res->bus_start ? res->bus_start : 0x1000; + res->bus_lower = res->bus_start < 0x1000 ? 0x1000 : res->bus_start; } void pciauto_region_align(struct pci_region *res, pci_size_t size) -- 2.7.4

3 3

[U-Boot] [PATCH v3 1/2] watchdog: tangier: Replace unused constant with a comment
by Andy Shevchenko 22 Jun '19

22 Jun '19

The default timeout value had been left in order to leave some traces about default setup of watchdog done by firmware. For better understanding and compiler burden, replace it with a comment. Suggested-by: Stefan Roese <sr(a)denx.de> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/watchdog/tangier_wdt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c index be4a8f467a..b2f40ef057 100644 --- a/drivers/watchdog/tangier_wdt.c +++ b/drivers/watchdog/tangier_wdt.c @@ -10,7 +10,12 @@ #define WDT_PRETIMEOUT 15 #define WDT_TIMEOUT_MIN (1 + WDT_PRETIMEOUT) #define WDT_TIMEOUT_MAX 170 -#define WDT_DEFAULT_TIMEOUT 90 + +/* + * Note, firmware chooses 90 seconds as a default timeout for watchdog on + * Intel Tangier SoC. It means that without handling it in the running code + * the reboot will happen. + */ #ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS #define WATCHDOG_HEARTBEAT 60000 -- 2.20.1

2 4

[U-Boot] [PATCH v1] x86: Revert "Don't set up MTRRs in SPL"
by Andy Shevchenko 22 Jun '19

22 Jun '19

This breaks Intel Edison to work. It gets laggish and unable to boot kernel. Reverts commit 665cb18ea64aabbeb03d27a4c92ddec1baccb87a for now till better solution will be proposed. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/lib/init_helpers.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/lib/init_helpers.c b/arch/x86/lib/init_helpers.c index ac85278cdf..0481f453ca 100644 --- a/arch/x86/lib/init_helpers.c +++ b/arch/x86/lib/init_helpers.c @@ -18,10 +18,7 @@ __weak ulong board_get_usable_ram_top(ulong total_size) int init_cache_f_r(void) { -#if (CONFIG_IS_ENABLED(X86_32BIT_INIT) || \ - (!defined(CONFIG_SPL_BUILD) && \ - !CONFIG_IS_ENABLED(CONFIG_X86_RUN_64BIT))) && \ - !defined(CONFIG_HAVE_FSP) +#if CONFIG_IS_ENABLED(X86_32BIT_INIT) && !defined(CONFIG_HAVE_FSP) int ret; ret = mtrr_commit(false); -- 2.20.1

2 2

[U-Boot] [PATCH v5 0/8] Update SiFive Unleashed Drivers
by Anup Patel 21 Jun '19

21 Jun '19

This series update SiFive Unleashed clock driver and Cadence MACB driver so that: 1. It is in sync with upstream Linux driver 2. It uses latest DT bindings as-per upstream Linux driver With this series, we can now use latest DT bindings with U-Boot. I have tested SiFive Serial driver and Cadence MACB ethernet driver with this changes and both work fine. The legacy FSBL will still pass DTB with older DT bindings which will break the updated SiFive Unleashed clock driver. To tackle this, we have embedded DTB in OpenSBI FW_PAYLOAD firmware for SiFive Unleashed so that OpenSBI will override and pass updated DTB to U-Boot. The updated DTB passed by OpenSBI is in fact the DTB build by upstream Linux so we can straight away pass this DTB to Linux as well. This series can be found in riscv_unleashed_clk_sync_v5 branch at: https://github.com/avpatel/u-boot.git To try this series use latest OpenSBI at: https://github.com/riscv/opensbi.git And Linux-5.2-rc1 from v5.2-rc1_unleashed branch at: https://github.com/avpatel/linux.git Changes since v4: - Rebased patches upon Ramon's MACB changes (Refer, https://patchwork.ozlabs.org/patch/1114025/) - Added PATCH7 to setup ethaddr based on board serial number read from OTP - Added PATCH8 to update documentation Changes since v3: - Extend MACB ethernet driver for SiFive Unleashed board (just like Linux) Changes since v2: - Dropped PATCH6 which adds new compatible string to MACB driver because more changes are required in MACB driver for different ethernet speeds Changes since v1: - Dropped GEMGXL clock driver - Added new compatible string for SiFive MACB ethernet Anup Patel (8): clk: sifive: Factor-out PLL library as separate module clk: sifive: Sync-up WRPLL library with upstream Linux clk: sifive: Sync-up DT bindings header with upstream Linux clk: sifive: Sync-up main driver with upstream Linux clk: sifive: Drop GEMGXL clock driver net: macb: Extend MACB driver for SiFive Unleashed board riscv: sifive: fu540: Setup ethaddr env variable using OTP doc: sifive-fu540: Update README for steps to create FW_PAYLOAD board/sifive/fu540/Kconfig | 1 - board/sifive/fu540/fu540.c | 118 ++++++ configs/sifive_fu540_defconfig | 1 + doc/README.sifive-fu540 | 356 ++++++++---------- drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/analogbits/Kconfig | 4 + drivers/clk/analogbits/Makefile | 3 + .../{sifive => analogbits}/wrpll-cln28hpc.c | 168 ++++----- drivers/clk/sifive/Kconfig | 10 - drivers/clk/sifive/Makefile | 4 - drivers/clk/sifive/fu540-prci.c | 123 +++--- drivers/clk/sifive/gemgxl-mgmt.c | 60 --- drivers/net/macb.c | 53 ++- include/dt-bindings/clk/sifive-fu540-prci.h | 29 -- include/dt-bindings/clock/sifive-fu540-prci.h | 18 + .../linux/clk}/analogbits-wrpll-cln28hpc.h | 70 ++-- 17 files changed, 523 insertions(+), 497 deletions(-) create mode 100644 drivers/clk/analogbits/Kconfig create mode 100644 drivers/clk/analogbits/Makefile rename drivers/clk/{sifive => analogbits}/wrpll-cln28hpc.c (69%) delete mode 100644 drivers/clk/sifive/gemgxl-mgmt.c delete mode 100644 include/dt-bindings/clk/sifive-fu540-prci.h create mode 100644 include/dt-bindings/clock/sifive-fu540-prci.h rename {drivers/clk/sifive => include/linux/clk}/analogbits-wrpll-cln28hpc.h (52%) -- 2.17.1

4 19

[U-Boot] [PATCH v2] net: introduce packet capture support
by Ramon Fried 21 Jun '19

21 Jun '19

Add support for capturing ethernet packets and storing them in memory in PCAP(2.4) format, later to be analyzed by any PCAP viewer software (IE. Wireshark) This feature greatly assist debugging network issues such as detecting dropped packets, packet corruption etc. Signed-off-by: Ramon Fried <rfried.dev(a)gmail.com> Reviewed-by: Alex Marginean <alexm.osslist(a)gmail.com> Tested-by: Alex Marginean <alexm.osslist(a)gmail.com> --- v2: Fix type assignmnet to header.ts_sec include/net.h | 29 ++++++++++++++++++ net/Kconfig | 22 ++++++++++++++ net/Makefile | 1 + net/net.c | 11 +++++++ net/pcap.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+) create mode 100644 net/pcap.c diff --git a/include/net.h b/include/net.h index 44b32385c4..d1dc864896 100644 --- a/include/net.h +++ b/include/net.h @@ -630,6 +630,31 @@ bool arp_is_waiting(void); /* Waiting for ARP reply? */ void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */ void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */ +/* PCAP extension */ + +/** + * pcap_init() - Initialize PCAP memory buffer + * + * @return 0 on success, -ERROR on error + */ +int pcap_init(void); + +/** + * pcap_post() - Post a packet to PCAP file + * + * @packet: packet to post + * @len: packet length in bytes + * @return 0 on success, -ERROR on error + */ +int pcap_post(const void *packet, size_t len); + +/** + * pcap_size() - get size of PCAP file + * + * @return size of PCAP file in bytes + */ +unsigned int pcap_size(void); + /* Network loop state */ enum net_loop_state { NETLOOP_CONTINUE, @@ -658,6 +683,10 @@ static inline void net_send_packet(uchar *pkt, int len) { /* Currently no way to return errors from eth_send() */ (void) eth_send(pkt, len); + +#if defined(CONFIG_NET_PCAP) + pcap_post(pkt, len); +#endif } /* diff --git a/net/Kconfig b/net/Kconfig index 68cecf75a2..f1d3719b04 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -8,6 +8,28 @@ menuconfig NET if NET +config NET_PCAP + bool "PCAP network capture" + help + Selecting this will capture all Ethernet packets and store + them in a PCAP formated file later to be analyzed by PCAP + reader application (IE. WireShark). + +config NET_PCAP_ADDR + hex "Address of PCAP file in memory" + depends on NET_PCAP + help + Sets the address of the PCAP file in physical memory. + +config NET_PCAP_SIZE + hex "Size of PCAP file" + depends on NET_PCAP + default 0x100000 + help + Sets the maximum size of PCAP file in bytes. + When it fills up completely, it will stop capturing + packets silently. + config NET_RANDOM_ETHADDR bool "Random ethaddr if unset" help diff --git a/net/Makefile b/net/Makefile index ce36362168..85103fee93 100644 --- a/net/Makefile +++ b/net/Makefile @@ -18,6 +18,7 @@ endif obj-$(CONFIG_NET) += eth_common.o obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o obj-$(CONFIG_NET) += net.o +obj-$(CONFIG_NET_PCAP) += pcap.o obj-$(CONFIG_CMD_NFS) += nfs.o obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_CMD_RARP) += rarp.o diff --git a/net/net.c b/net/net.c index 58b0417cbe..d0bdf8fe20 100644 --- a/net/net.c +++ b/net/net.c @@ -387,6 +387,10 @@ void net_init(void) /* Only need to setup buffer pointers once. */ first_call = 0; + +#if defined(CONFIG_NET_PCAP) + pcap_init(); +#endif } net_init_loop(); @@ -671,6 +675,10 @@ done: net_set_icmp_handler(NULL); #endif net_set_state(prev_net_state); + +#if defined(CONFIG_NET_PCAP) + printf("PCAP len: 0x%x\n", pcap_size()); +#endif return ret; } @@ -1083,6 +1091,9 @@ void net_process_received_packet(uchar *in_packet, int len) debug_cond(DEBUG_NET_PKT, "packet received\n"); +#if defined(CONFIG_NET_PCAP) + pcap_post(in_packet, len); +#endif net_rx_packet = in_packet; net_rx_packet_len = len; et = (struct ethernet_hdr *)in_packet; diff --git a/net/pcap.c b/net/pcap.c new file mode 100644 index 0000000000..d33d57698c --- /dev/null +++ b/net/pcap.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Ramon Fried <rfried.dev(a)gmail.com> + */ + +#include <common.h> +#include <net.h> +#include <time.h> +#include <asm/io.h> + +#define LINKTYPE_ETHERNET 1 + +static void *buf; +static unsigned int pos; + +struct pcap_header { + u32 magic; + u16 version_major; + u16 version_minor; + s32 thiszone; + u32 sigfigs; + u32 snaplen; + u32 network; +}; + +struct pcap_packet_header { + u32 ts_sec; + u32 ts_usec; + u32 incl_len; + u32 orig_len; +}; + +static struct pcap_header file_header = { + .magic = 0xa1b2c3d4, + .version_major = 2, + .version_minor = 4, + .snaplen = 65535, + .network = LINKTYPE_ETHERNET, +}; + +int pcap_init(void) +{ + buf = map_physmem(CONFIG_NET_PCAP_ADDR, CONFIG_NET_PCAP_SIZE, 0); + if (!buf) { + printf("Failed mapping PCAP memory\n"); + return -ENOMEM; + } + + printf("PCAP capture initialized: addr: 0x%lx max length: 0x%x\n", + (unsigned long)buf, CONFIG_NET_PCAP_SIZE); + + memcpy(buf, &file_header, sizeof(file_header)); + pos += sizeof(file_header); + return 0; +} + +int pcap_post(const void *packet, size_t len) +{ + struct pcap_packet_header header; + u64 cur_time = timer_get_us(); + + if (!buf) + return -ENODEV; + if ((pos + len + sizeof(header)) >= CONFIG_NET_PCAP_SIZE) + return -ENOMEM; + + header.ts_sec = cur_time / 1000000; + header.ts_usec = cur_time % 1000000; + header.incl_len = len; + header.orig_len = len; + + memcpy(buf + pos, &header, sizeof(header)); + pos += sizeof(header); + memcpy(buf + pos, packet, len); + pos += len; + + return 0; +} + +unsigned int pcap_size(void) +{ + return pos; +} -- 2.22.0

2 3

[U-Boot] [PATCH] net: introduce packet capture support
by Ramon Fried 21 Jun '19

21 Jun '19

Add support for capturing ethernet packets and storing them in memory in PCAP(2.4) format, later to be analyzed by any PCAP viewer software (IE. Wireshark) This feature greatly assist debugging network issues such as detecting dropped packets, packet corruption etc. Signed-off-by: Ramon Fried <rfried.dev(a)gmail.com> --- include/net.h | 29 ++++++++++++++++++ net/Kconfig | 22 ++++++++++++++ net/Makefile | 1 + net/net.c | 11 +++++++ net/pcap.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 146 insertions(+) create mode 100644 net/pcap.c diff --git a/include/net.h b/include/net.h index 44b32385c4..d1dc864896 100644 --- a/include/net.h +++ b/include/net.h @@ -630,6 +630,31 @@ bool arp_is_waiting(void); /* Waiting for ARP reply? */ void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */ void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */ +/* PCAP extension */ + +/** + * pcap_init() - Initialize PCAP memory buffer + * + * @return 0 on success, -ERROR on error + */ +int pcap_init(void); + +/** + * pcap_post() - Post a packet to PCAP file + * + * @packet: packet to post + * @len: packet length in bytes + * @return 0 on success, -ERROR on error + */ +int pcap_post(const void *packet, size_t len); + +/** + * pcap_size() - get size of PCAP file + * + * @return size of PCAP file in bytes + */ +unsigned int pcap_size(void); + /* Network loop state */ enum net_loop_state { NETLOOP_CONTINUE, @@ -658,6 +683,10 @@ static inline void net_send_packet(uchar *pkt, int len) { /* Currently no way to return errors from eth_send() */ (void) eth_send(pkt, len); + +#if defined(CONFIG_NET_PCAP) + pcap_post(pkt, len); +#endif } /* diff --git a/net/Kconfig b/net/Kconfig index f2363e5256..8b8ab88e57 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -8,6 +8,28 @@ menuconfig NET if NET +config NET_PCAP + bool "PCAP network capture" + help + Selecting this will capture all Ethernet packets and store + them in a PCAP formated file later to be analyzed by PCAP + reader application (IE. WireShark). + +config NET_PCAP_ADDR + hex "Address of PCAP file in memory" + depends on NET_PCAP + help + Sets the address of the PCAP file in physical memory. + +config NET_PCAP_SIZE + hex "Size of PCAP file" + depends on NET_PCAP + default 0x100000 + help + Sets the maximum size of PCAP file in bytes. + When it fills up completely, it will stop capturing + packets silently. + config NET_RANDOM_ETHADDR bool "Random ethaddr if unset" help diff --git a/net/Makefile b/net/Makefile index ce36362168..85103fee93 100644 --- a/net/Makefile +++ b/net/Makefile @@ -18,6 +18,7 @@ endif obj-$(CONFIG_NET) += eth_common.o obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o obj-$(CONFIG_NET) += net.o +obj-$(CONFIG_NET_PCAP) += pcap.o obj-$(CONFIG_CMD_NFS) += nfs.o obj-$(CONFIG_CMD_PING) += ping.o obj-$(CONFIG_CMD_RARP) += rarp.o diff --git a/net/net.c b/net/net.c index 58b0417cbe..d0bdf8fe20 100644 --- a/net/net.c +++ b/net/net.c @@ -387,6 +387,10 @@ void net_init(void) /* Only need to setup buffer pointers once. */ first_call = 0; + +#if defined(CONFIG_NET_PCAP) + pcap_init(); +#endif } net_init_loop(); @@ -671,6 +675,10 @@ done: net_set_icmp_handler(NULL); #endif net_set_state(prev_net_state); + +#if defined(CONFIG_NET_PCAP) + printf("PCAP len: 0x%x\n", pcap_size()); +#endif return ret; } @@ -1083,6 +1091,9 @@ void net_process_received_packet(uchar *in_packet, int len) debug_cond(DEBUG_NET_PKT, "packet received\n"); +#if defined(CONFIG_NET_PCAP) + pcap_post(in_packet, len); +#endif net_rx_packet = in_packet; net_rx_packet_len = len; et = (struct ethernet_hdr *)in_packet; diff --git a/net/pcap.c b/net/pcap.c new file mode 100644 index 0000000000..dadfa7563b --- /dev/null +++ b/net/pcap.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2019 Ramon Fried <rfried.dev(a)gmail.com> + */ + +#include <common.h> +#include <net.h> +#include <time.h> +#include <asm/io.h> + +#define LINKTYPE_ETHERNET 1 + +static void *buf; +static unsigned int pos; + +struct pcap_header { + u32 magic; + u16 version_major; + u16 version_minor; + s32 thiszone; + u32 sigfigs; + u32 snaplen; + u32 network; +}; + +struct pcap_packet_header { + u32 ts_sec; + u32 ts_usec; + u32 incl_len; + u32 orig_len; +}; + +static struct pcap_header file_header = { + .magic = 0xa1b2c3d4, + .version_major = 2, + .version_minor = 4, + .snaplen = 65535, + .network = LINKTYPE_ETHERNET, +}; + +int pcap_init(void) +{ + buf = map_physmem(CONFIG_NET_PCAP_ADDR, CONFIG_NET_PCAP_SIZE, 0); + if (!buf) { + printf("Failed mapping PCAP memory\n"); + return -ENOMEM; + } + + printf("PCAP capture initialized: addr: 0x%lx max length: 0x%x\n", + (unsigned long)buf, CONFIG_NET_PCAP_SIZE); + + memcpy(buf, &file_header, sizeof(file_header)); + pos += sizeof(file_header); + return 0; +} + +int pcap_post(const void *packet, size_t len) +{ + struct pcap_packet_header header; + u64 cur_time = timer_get_us(); + + if (!buf) + return -ENODEV; + if ((pos + len + sizeof(header)) >= CONFIG_NET_PCAP_SIZE) + return -ENOMEM; + + header.ts_sec = cur_time / 1000000; + header.ts_sec = cur_time % 1000000; + header.incl_len = len; + header.orig_len = len; + + memcpy(buf + pos, &header, sizeof(header)); + pos += sizeof(header); + memcpy(buf + pos, packet, len); + pos += len; + + return 0; +} + +unsigned int pcap_size(void) +{ + return pos; +} -- 2.21.0

3 4