[bouffalo lab] fix wifi scan issues and update some platform changes

Author: wy-hh

examples/lighting-app/bouffalolab/bl602/BUILD.gn

@@ -97,7 +97,7 @@ bouffalolab_executable("lighting_app") {
   output_name = "chip-bl602-lighting-example.out"
 
   defines = [
-    "APP_TASK_STACK_SIZE=2044",
+    "APP_TASK_STACK_SIZE=4096",
     "CHIP_UART_BAUDRATE=${baudrate}",
     "START_ENTRY=bfl_main",
     "SYS_AOS_LOOP_ENABLE",
@@ -110,6 +110,10 @@ bouffalolab_executable("lighting_app") {
   defines +=
       [ "CONFIG_BOUFFALOLAB_FACTORY_DATA_ENABLE=${chip_enable_factory_data}" ]
 
+  if (enable_lwip_pbuf_ram) {
+    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
+  }
+
   bl_plat_name = "bl602"
   sources = [
     "${examples_plat_dir}/common/route_hook/bl_route_hook.c",
@@ -228,6 +232,11 @@ bouffalolab_executable("lighting_app") {
   inputs = [ ldscript ]
 
   if (chip_print_memory_usage) {
+
+    if (enable_lwip_pbuf_ram) {
+      ldflags += [ "-Wl,--defsym=__RAM_PBUF_POOL=0" ]
+    }
+
     ldflags += [
       "-Wl,--print-memory-usage",
       "-fstack-usage",

examples/lighting-app/bouffalolab/bl616/BUILD.gn

@@ -72,6 +72,7 @@ bouffalo_sdk("sdk") {
     "OTA_PERIODIC_TIMEOUT=${ota_periodic_query_timeout_seconds}",
     "OTA_AUTO_REBOOT_DELAY=${ota_auto_reboot_delay_seconds}",
     "CHIP_UART_BAUDRATE=${baudrate}",
+    "CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE=388",
   ]
 
   defines += [ "PW_RPC_ENABLED=${chip_enable_pw_rpc}" ]
@@ -108,6 +109,7 @@ bouffalolab_executable("lighting_app") {
     "CHIP_UART_BAUDRATE=${baudrate}",
     "BL616_ENABLE",
     "START_ENTRY=main",
+    "CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE=388",
   ]
 
   defines +=
@@ -121,6 +123,10 @@ bouffalolab_executable("lighting_app") {
     defines += [ "BOOT_PIN_RESET=2" ]
   }
 
+  if (enable_lwip_pbuf_ram) {
+    defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
+  }
+  
   defines += [ "BL616DK" ]
 
   sources = [

examples/lighting-app/bouffalolab/bl616/args.gni

@@ -19,16 +19,7 @@ import("${chip_root}/src/platform/bouffalolab/BL616/args.gni")
 
 bouffalo_sdk_target = get_label_info(":sdk", "label_no_toolchain")
 
-pw_log_BACKEND = "${chip_root}/src/pw_backends/log"
-pw_assert_BACKEND = "${chip_root}/src/pw_backends/assert"
-pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex"
-
-chip_detail_logging = true
+chip_detail_logging = false
 
 # use -Os instead of -Og
 is_debug = false
-
-pw_build_LINK_DEPS = [
-  "$dir_pw_assert:impl",
-  "$dir_pw_log:impl",
-]

examples/lighting-app/bouffalolab/bl702/BUILD.gn

@@ -129,7 +129,7 @@ bouffalolab_executable("lighting_app") {
   bl_plat_name = "bl702"
 
   defines = [
-    "APP_TASK_STACK_SIZE=2048",
+    "APP_TASK_STACK_SIZE=4096",
     "CHIP_UART_BAUDRATE=${baudrate}",
     "START_ENTRY=bl702_main",
   ]

examples/lighting-app/bouffalolab/bl702l/BUILD.gn

@@ -106,7 +106,7 @@ bouffalolab_executable("lighting_app") {
   bl_plat_name = "bl702l"
 
   defines = [
-    "APP_TASK_STACK_SIZE=2048",
+    "APP_TASK_STACK_SIZE=4096",
     "CHIP_UART_BAUDRATE=${baudrate}",
     "START_ENTRY=bl702_main",
   ]

examples/platform/bouffalolab/bl602/ldscripts/flash_rom.ld

@@ -11,7 +11,9 @@ __RFTLV_HEAD1_L = (0x41524150); /* PAPA */
 __RAM_START = 0x4200C000;
 __RAM_END = 0x4200C000 + 256K - __EM_SIZE; /* leave 8K left for BLE */
 
-__RAM_TCM_LEN = (16K + 16K + 48K + 64K + 64K - 16K - 16K);
+__RAM_PBUF_POOL = DEFINED(__RAM_PBUF_POOL) ? __RAM_PBUF_POOL : 30K;
+
+__RAM_TCM_LEN = (16K + 16K + 48K + 64K + 64K - 16K - 16K + 30K - 12K - __RAM_PBUF_POOL);
 __RAM_WIFI_LEN = (__RAM_END - __RAM_START - __RAM_TCM_LEN);
 
 MEMORY
@@ -173,6 +175,9 @@ SECTIONS
     *libwifi_drv.a:bl_utils.o(.bss*)
     *(.wifi_ram*)
     . = ALIGN(16);
+
+    KEEP(*libCHIP.a:*(.bss.*PlatformManagerImp*))
+    . = ALIGN(16);
   } > ram_wifi
 
   PROVIDE( _heap_wifi_start = . );

examples/platform/bouffalolab/bl602/lwipopts/lwipopts.h

@@ -78,10 +78,6 @@ a lot of data that needs to be copied, this should be set high. */
 
 #define MEMP_NUM_NETCONN (MEMP_NUM_TCP_PCB + MEMP_NUM_UDP_PCB + MEMP_NUM_TCP_PCB_LISTEN)
 
-/* ---------- Pbuf options ---------- */
-/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
-#define PBUF_POOL_SIZE 20
-
 /* ---------- TCP options ---------- */
 #define LWIP_TCP 1
 #define IP_DEFAULT_TTL 64
@@ -269,17 +265,37 @@ a lot of data that needs to be copied, this should be set high. */
 
 #define LWIP_NETIF_EXT_STATUS_CALLBACK 1
 
-/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
 #define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
 
-#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
-
 /*
    ---------------------------------
    ---------- MISC. options ----------
    ---------------------------------
 */
 
+#if defined(CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM) && CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM
+#define PBUF_POOL_SIZE                    0
+#define MEM_LIBC_MALLOC                   0
+#define MEM_USE_POOLS                     0
+#define MEMP_USE_CUSTOM_POOLS             0
+
+#include <lwip/arch.h>
+#include <lwip/mem.h>
+#define LWIP_PBUF_CUSTOM_DATA           mem_size_t pool;
+
+#if defined(__cplusplus)
+extern "C" const mem_size_t * memp_sizes;
+extern "C" struct pbuf *pbuf_rightsize(struct pbuf *p, s16_t offset);
+#else
+extern const mem_size_t * memp_sizes;
+extern struct pbuf *pbuf_rightsize(struct pbuf *p, s16_t offset);
+#endif
+#else
+
+#define PBUF_POOL_SIZE 20
+#define LWIP_PBUF_FROM_CUSTOM_POOLS (0)
+#endif
+
 #if defined(__cplusplus)
 extern "C" int bl_rand(void);
 extern "C" int * __errno(void);

examples/platform/bouffalolab/bl616/lwipopts.h

@@ -120,10 +120,9 @@ extern const int fhost_tcpip_priority;
 #define MEMP_NUM_UDP_PCB 16
 #define MEMP_NUM_REASSDATA LWIP_MIN((IP_REASS_MAX_PBUFS), 5)
 
-#define PBUF_POOL_SIZE 0
 #define MEM_ALIGNMENT 4
 #define MEM_SIZE 30720
-#define PBUF_POOL_BUFSIZE (PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + 1280)
+#define PBUF_POOL_BUFSIZE (1280 + 462 + 26)
 #define MEMP_MEM_MALLOC 1
 
 // #define LWIP_HOOK_FILENAME        "lwiphooks.h"
@@ -177,4 +176,22 @@ extern const int fhost_tcpip_priority;
 #define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size)                                                                           \
     u8_t variable_name[size] __attribute__((aligned(4))) __attribute__((section("SHAREDRAM")))
 
+#if defined(CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM) && CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM
+#define PBUF_POOL_SIZE                    0
+
+#include <lwip/arch.h>
+#include <lwip/mem.h>
+#define LWIP_PBUF_CUSTOM_DATA           mem_size_t pool;
+
+#if defined(__cplusplus)
+extern "C" const mem_size_t * memp_sizes;
+extern "C" struct pbuf *pbuf_rightsize(struct pbuf *p, s16_t offset);
+#else
+extern const mem_size_t * memp_sizes;
+extern struct pbuf *pbuf_rightsize(struct pbuf *p, s16_t offset);
+#endif
+#else
+#define PBUF_POOL_SIZE 20
+#endif
+
 #endif /* LWIP_HDR_LWIPOPTS_H__ */

examples/platform/bouffalolab/bl702/ldscripts/psram_flash.ld

@@ -208,6 +208,9 @@ SECTIONS
     _bt_l2cap_fixed_chan_list_start = .;
     KEEP(*(SORT_BY_NAME("._bt_l2cap_fixed_chan.static.*")))
     _bt_l2cap_fixed_chan_list_end = .;
+
+    . = ALIGN(8);
+    KEEP(*libCHIP.a:*(.bss.*PlatformManagerImp*))
   } >tcm_ocram AT >flash
 
   .boot2 (NOLOAD) :

examples/platform/bouffalolab/bl702l/ldscripts/psram_flash.ld

@@ -170,6 +170,9 @@ SECTIONS
     _bt_l2cap_fixed_chan_list_start = .;
     KEEP(*(SORT_BY_NAME("._bt_l2cap_fixed_chan.static.*")))
     _bt_l2cap_fixed_chan_list_end = .;
+
+    . = ALIGN(8);
+    KEEP(*libCHIP.a:*(.bss.*PlatformManagerImp*))
   } >tcm_ocram AT >flash
 
   .boot2 (NOLOAD) :

examples/platform/bouffalolab/common/bouffalo_sdk/platform_port.cpp

@@ -56,8 +56,9 @@ extern "C" void vAssertCalled(void)
         printf("vAssertCalled, ra = %p in task %s\r\n", (void *) ra, pcTaskGetName(NULL));
     }
 
-    while (true)
-        ;
+    abort();
+
+    while (true) ;
 }
 
 extern "C" void bflb_assert(void) __attribute__((weak, alias("vAssertCalled")));

examples/platform/bouffalolab/common/iot_sdk/platform_port.cpp

@@ -178,8 +178,7 @@ extern "C" void vAssertCalled(void)
 
     portABORT();
 
-    while (true)
-        ;
+    while (true) ;
 }
 
 extern "C" void user_vAssertCalled(void) __attribute__((weak, alias("vAssertCalled")));

examples/platform/bouffalolab/common/plat/platform.cpp

@@ -235,7 +235,8 @@ CHIP_ERROR PlatformManagerImpl::PlatformInit(void)
     }
     else
     {
-        ChipLogError(NotSpecified, "sFactoryDataProvider.Init() failed");
+        ChipLogError(NotSpecified, "factory data provider is failed to initialize, use example DAC provider.");
+        SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());
     }
 #else
     SetDeviceAttestationCredentialsProvider(Examples::GetExampleDACProvider());

scripts/build/builders/bouffalolab.py

@@ -285,16 +285,14 @@ def PreBuildCommand(self):
 
     def PostBuildCommand(self):
 
-        bouffalo_sdk_chips = ["bl616"]
-        abs_path_fw = os.path.join(self.output_dir, self.app.AppNamePrefix(self.chip_name) + ".bin")
-
-        if self.chip_name not in bouffalo_sdk_chips:
-            abs_path_fw_raw = os.path.join(self.output_dir, self.app.AppNamePrefix(self.chip_name) + ".raw")
+        if self.chip_name in ["bl616"]:
+            abs_path_fw = os.path.join(self.output_dir, self.app.AppNamePrefix(self.chip_name) + ".raw")
+        else:
+            abs_path_fw = os.path.join(self.output_dir, self.app.AppNamePrefix(self.chip_name) + ".bin")
 
         if os.path.isfile(abs_path_fw):
             target_dir = self.output_dir.replace(self.chip_dir, "").strip("/")
 
-            abs_path_fw_bin = os.path.join(self.output_dir, self.app.AppNamePrefix(self.chip_name) + ".bin")
             path_fw = os.path.join(target_dir, self.app.AppNamePrefix(self.chip_name) + ".bin")
             path_flash_script = os.path.join(target_dir, self.app.AppNamePrefix(self.chip_name) + ".flash.py")
 

src/platform/bouffalolab/BL602/NetworkCommissioningDriver.cpp

@@ -268,7 +268,7 @@ void BLWiFiDriver::OnScanWiFiNetworkDone()
     }
 
     wifi_mgmr_ap_item_t * ScanResult = (wifi_mgmr_ap_item_t *) pvPortMalloc(ap_num * sizeof(wifi_mgmr_ap_item_t));
-    wifi_mgmr_get_scan_result(ScanResult, &ap_num, 0, mScanSSID);
+    wifi_mgmr_get_scan_result(ScanResult, &ap_num, mScanType, mScanSSID);
 
     if (ScanResult)
     {

src/platform/bouffalolab/common/CHIPDevicePlatformConfig.h

@@ -58,4 +58,6 @@
 #define CHIP_CONFIG_FREERTOS_USE_STATIC_QUEUE 1
 #elif CHIP_DEVICE_LAYER_TARGET_BL702
 #define CHIP_CONFIG_FREERTOS_USE_STATIC_TASK 1
+#elif CHIP_DEVICE_LAYER_TARGET_BL702L
+#define CHIP_CONFIG_FREERTOS_USE_STATIC_TASK 1
 #endif

src/platform/bouffalolab/common/DiagnosticDataProviderImpl.cpp

@@ -78,16 +78,20 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapUsed(uint64_t & currentHeap
 CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark)
 {
 #if CHIP_DEVICE_LAYER_TARGET_BL616
-    return CHIP_ERROR_NOT_IMPLEMENTED;
+    struct meminfo info;
+    bflb_mem_usage(KMEM_HEAP, &info);
+    currentHeapHighWatermark = info.total_size - info.max_free_size;
+
 #else
 #ifdef CFG_USE_PSRAM
     currentHeapHighWatermark =
         get_heap_size() + get_heap3_size() - xPortGetMinimumEverFreeHeapSize() - xPortGetMinimumEverFreeHeapSizePsram();
 #else
     currentHeapHighWatermark = get_heap_size() - xPortGetMinimumEverFreeHeapSize();
 #endif
-    return CHIP_NO_ERROR;
 #endif
+
+    return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadMetricsOut)

src/platform/bouffalolab/common/DiagnosticDataProviderImpl.h

@@ -32,6 +32,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     static DiagnosticDataProviderImpl & GetDefaultInstance();
 
     // ===== Methods that implement the PlatformManager abstract interface.
+    bool SupportsWatermarks() override { return true; }
 
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;

src/platform/bouffalolab/common/SystemPlatformConfig.h

@@ -38,7 +38,6 @@ struct ChipDeviceEvent;
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(mbedtls_sha256_context) in hw_acc/sha256_alt.h
 #define CHIP_CONFIG_SHA256_CONTEXT_SIZE (32 + 64 + 64 + 19 * 32)
 #define CHIP_CONFIG_SHA256_CONTEXT_ALIGN 32
-#define CHIP_SYSTEM_CRYPTO_HEADER_RESERVE_SIZE (388)
 #else
 
 // #define CHIP_CONFIG_SHA256_CONTEXT_SIZE sizeof(bl_sha_ctx_t)

third_party/bouffalolab/bl602/bl_iot_sdk.gni

@@ -20,6 +20,7 @@ import("${chip_root}/src/lib/lib.gni")
 declare_args() {
   bl_iot_sdk_root = "${chip_root}/third_party/bouffalolab/repo"
 
+  enable_lwip_pbuf_ram = false
   enable_debug_coredump = false
   coredump_binary_id = 0
 }
@@ -63,6 +64,11 @@ template("bl_iot_sdk") {
       "-include",
       rebase_path("${invoker.freertos_config}", root_build_dir),
     ]
+
+    if (defined(invoker.enable_lwip_pbuf_ram) &&
+        invoker.enable_lwip_pbuf_ram) {
+      defines += [ "CHIP_SYSTEM_CONFIG_PACKETBUFFER_LWIP_PBUF_RAM=1" ]
+    }
   }
 
   source_set("${sdk_target_name}_soc") {
@@ -906,6 +912,11 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip_dhcpd",
     ]
 
+    if (defined(invoker.enable_lwip_pbuf_ram) &&
+        invoker.enable_lwip_pbuf_ram) {
+      include_dirs += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip" ]
+    }
+
     defines = [ "LWIP_IPV6=1" ]
   }
 
@@ -927,7 +938,6 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/core/inet_chksum.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/init.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ip.c",
-      "${bl_iot_sdk_root}/components/network/lwip/src/core/mem.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/memp.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/netif.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/pbuf.c",
@@ -941,6 +951,14 @@ template("bl_iot_sdk") {
       "${bl_iot_sdk_root}/components/network/lwip/src/core/udp.c",
     ]
 
+    if (defined(invoker.enable_lwip_pbuf_ram) &&
+        invoker.enable_lwip_pbuf_ram) {
+      sources += [ "${bouffalolab_iot_sdk_build_root}/patches/lwip/mem.c" ]
+    }
+    else {
+      sources += [ "${bl_iot_sdk_root}/components/network/lwip/src/core/mem.c" ]
+    }
+
     sources += [
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ipv4/autoip.c",
       "${bl_iot_sdk_root}/components/network/lwip/src/core/ipv4/dhcp.c",