add: 跑通底层固件FOTA, 还需要继续调底层+脚本的FOTA和纯脚本FOTA

app/port/luat_fota_air101.c

@@ -10,6 +10,7 @@
 #include "wm_internal_flash.h"
 #include "wm_pmu.h"
 #include "wm_fwup.h"
+#include "wm_flash_map.h"
 
 #include "luat_base.h"
 #include "luat_crypto.h"
@@ -34,30 +35,55 @@ static int fota_state;
 static uint32_t fota_write_offset;
 static uint32_t ota_zone_size;
 static uint32_t upgrade_img_addr;
+static uint32_t fota_head_check;
+// static IMAGE_HEADER_PARAM_ST fota_head;
 
 static int check_image_head(IMAGE_HEADER_PARAM_ST* imghead, const char* tag);
+static uint32_t img_checksum(const char* ptr, size_t len);
 
 int luat_fota_init(uint32_t start_address, uint32_t len, luat_spi_device_t* spi_device, const char *path, uint32_t pathlen) {
     fota_state = FOTA_ONGO;
     fota_write_offset = 0;
+    fota_head_check = 0;
     // 读取update区域位置及大小, 按4k对齐的方式, 清除对应的区域
     for (size_t i = 0; i < ota_zone_size / 4096; i++)
     {
-        LLOGD("清除ota区域: %08X", upgrade_img_addr + i * 4096);
+        // LLOGD("清除ota区域: %08X", upgrade_img_addr + i * 4096);
         tls_fls_erase((upgrade_img_addr + i * 4096) / INSIDE_FLS_SECTOR_SIZE);
     }
-    LLOGI("OTA区域初始化完成");
+    LLOGI("OTA区域初始化完成, 大小 %d kbyte", ota_zone_size / 1024);
     return 0;
 }
 
 int luat_fota_write(uint8_t *data, uint32_t len) {
     if (len + fota_write_offset > ota_zone_size) {
+        LLOGD("write %p %d -> %08X %08X", data, len, fota_write_offset, upgrade_img_addr + fota_write_offset);
         LLOGE("OTA区域写满, 无法继续写入");
         return -1;
     }
     int ret = tls_fls_write_without_erase(upgrade_img_addr + fota_write_offset, data, len);
     fota_write_offset += len;
-    return ret;
+    if (ret) {
+        LLOGD("tls_fls_write_without_erase ret %d", ret);
+        return ret;
+    }
+    if (fota_head_check == 0 && fota_write_offset >= sizeof(IMAGE_HEADER_PARAM_ST)) {
+        // 检查头部magic_no
+        IMAGE_HEADER_PARAM_ST* imghead = (IMAGE_HEADER_PARAM_ST*)upgrade_img_addr;
+        if (imghead->magic_no != MAGIC_NO) {
+            LLOGD("fota包的magic_no错误, 0x%08X", imghead->magic_no);
+            return -2;
+        }
+        // 检查头部校验和
+        // 计算一下header的checksum
+        uint32_t cm = img_checksum((const char*)imghead, sizeof(IMAGE_HEADER_PARAM_ST) - 4);
+        if (cm != imghead->hd_checksum) {
+            LLOGD("foto包的头部校验和不正确 expect %08X but %08X", imghead->hd_checksum, cm);
+            return -3;
+        }
+        fota_head_check = 1;
+    }
+    return 0;
 }
 
 int luat_fota_done(void) {
@@ -67,31 +93,39 @@ int luat_fota_done(void) {
     }
     if (fota_write_offset < sizeof(IMAGE_HEADER_PARAM_ST)) {
         LLOGI("写入数据小于最小长度, 还不能判断");
-        return 0;
+        return -2;
     }
     // 写入长度已经超过最小长度, 判断是否是合法的镜像
-    IMAGE_HEADER_PARAM_ST* imghead = (IMAGE_HEADER_PARAM_ST*)upgrade_img_addr;
-    if (imghead->magic_no != MAGIC_NO) {
-        LLOGE("image magic: %08x", imghead->magic_no);
-        return -2;
+    if (fota_write_offset < sizeof(IMAGE_HEADER_PARAM_ST)) {
+        LLOGI("fota头部尚未接收完成");
+        return -3;
     }
-    if (imghead->img_len + sizeof(IMAGE_HEADER_PARAM_ST) < fota_write_offset) {
+    IMAGE_HEADER_PARAM_ST* imghead = (IMAGE_HEADER_PARAM_ST*)upgrade_img_addr;
+    if (imghead->img_len > fota_write_offset + sizeof(IMAGE_HEADER_PARAM_ST)) {
         LLOGI("fota数据还不够, 继续等数据");
-        return 0;
+        return -4;
     }
+
     // 写入长度足够, 判断是否是合法的镜像, 开始计算check sum
-    if (check_image_head(imghead, "fota") == 0) {
-        LLOGI("image check sum: %08x", imghead->hd_checksum);
-        fota_state = FOTA_DONE;
-        return 0;
+    uint32_t cm = img_checksum((const char*)upgrade_img_addr + sizeof(IMAGE_HEADER_PARAM_ST), imghead->img_len);
+    if (cm != imghead->org_checksum) {
+        LLOGD("foto包的头部校验和不正确 expect %08X but %08X", imghead->org_checksum, cm);
+        return -3;
     }
-
+    LLOGD("FOTA数据校验通过, ");
+    fota_state = FOTA_DONE;
     return 0;
 }
 
 int luat_fota_end(uint8_t is_ok) {
-    if (fota_state == FOTA_DONE) {
-        return 0;
+    if (fota_state == FOTA_DONE && is_ok) {
+        IMAGE_HEADER_PARAM_ST* imghead = (IMAGE_HEADER_PARAM_ST*)upgrade_img_addr;
+        LLOGI("准备写入升级标志 addr %08X checksum %08X", TLS_FLASH_OTA_FLAG_ADDR, imghead->org_checksum);
+        int ret = tls_fls_write(TLS_FLASH_OTA_FLAG_ADDR, (u8 *)&imghead->org_checksum, sizeof(imghead->org_checksum));
+        if (ret) {
+            LLOGE("写入升级标志位失败, ret %d", ret);
+        }
+        return ret;
     }
     LLOGD("状态不正确, 要么数据没写完,要么校验没通过");
     return -1;
@@ -134,17 +168,17 @@ static int check_image_head(IMAGE_HEADER_PARAM_ST* imghead, const char* tag) {
     LLOGD("%s image img_header_addr: %08X", tag, imghead->img_header_addr);
     LLOGD("%s image upgrade_img_addr: %08X", tag, imghead->upgrade_img_addr);
     LLOGD("%s image org_checksum: %08X", tag, imghead->org_checksum);
-    LLOGD("%s image upd_no: %08X", tag, imghead->upd_no);
-    LLOGD("%s image ver: %.16s", tag, imghead->ver);
+    // LLOGD("%s image upd_no: %08X", tag, imghead->upd_no);
+    // LLOGD("%s image ver: %.16s", tag, imghead->ver);
     LLOGD("%s image hd_checksum: %08X", tag, imghead->hd_checksum);
-    LLOGD("%s image next: %08X", tag, imghead->next);
+    // LLOGD("%s image next: %08X", tag, imghead->next);
     
     // image attr
-    LLOGD("%s image attr img_type: %d", tag, imghead->img_attr.b.img_type);
-    LLOGD("%s image attr zip_type: %d", tag, imghead->img_attr.b.zip_type);
-    LLOGD("%s image attr psram_io: %d", tag, imghead->img_attr.b.psram_io);
-    LLOGD("%s image attr erase_block_en: %d", tag, imghead->img_attr.b.erase_block_en);
-    LLOGD("%s image attr erase_always: %d", tag, imghead->img_attr.b.erase_always);
+    // LLOGD("%s image attr img_type: %d", tag, imghead->img_attr.b.img_type);
+    // LLOGD("%s image attr zip_type: %d", tag, imghead->img_attr.b.zip_type);
+    // LLOGD("%s image attr psram_io: %d", tag, imghead->img_attr.b.psram_io);
+    // LLOGD("%s image attr erase_block_en: %d", tag, imghead->img_attr.b.erase_block_en);
+    // LLOGD("%s image attr erase_always: %d", tag, imghead->img_attr.b.erase_always);
     
     // 先判断一下magicno
     if (imghead->magic_no != MAGIC_NO) {
@@ -152,41 +186,40 @@ static int check_image_head(IMAGE_HEADER_PARAM_ST* imghead, const char* tag) {
     }
     // 计算一下header的checksum
     uint32_t cm = img_checksum((const char*)imghead, sizeof(IMAGE_HEADER_PARAM_ST) - 4);
-    LLOGD("%s head checksum: %08X %08X", tag, cm, imghead->hd_checksum);
     if (cm != imghead->hd_checksum) {
+        LLOGD("%s head expect %08X but %08X", tag, imghead->hd_checksum, cm);
         return -3;
     }
-    cm = img_checksum((const char*)imghead->img_addr, imghead->img_len);
-    LLOGD("%s data checksum: %08X %08X", tag, cm, imghead->org_checksum);
+    const char* dataptr = (const char*)imghead->img_addr;
+    cm = img_checksum(dataptr, imghead->img_len);
     if (cm != imghead->org_checksum) {
+        LLOGD("%s data expect %08X but %08X addr %08X", tag, imghead->org_checksum, cm, imghead->img_addr);
         return -4;
     }
-
     return 0;
 }
 
 void luat_fota_boot_check(void) {
-    LLOGD("启动fota开机检查");
-    LLOGD("sizeof(IMAGE_HEADER_PARAM_ST) %d %d %d", sizeof(IMAGE_HEADER_PARAM_ST), sizeof(Img_Attr_Type), sizeof(unsigned int));
+    // LLOGD("启动fota开机检查");
+    // LLOGD("sizeof(IMAGE_HEADER_PARAM_ST) %d %d %d", sizeof(IMAGE_HEADER_PARAM_ST), sizeof(Img_Attr_Type), sizeof(unsigned int));
     // 读取secboot区域的信息, 大小1kb
     IMAGE_HEADER_PARAM_ST* secimg = (IMAGE_HEADER_PARAM_ST*)0x8002000;
-    // check_image_head(secimg, "secboot");
-    IMAGE_HEADER_PARAM_ST* upimg = (IMAGE_HEADER_PARAM_ST*)secimg->upgrade_img_addr;
+    // IMAGE_HEADER_PARAM_ST* upimg = (IMAGE_HEADER_PARAM_ST*)secimg->upgrade_img_addr;
     IMAGE_HEADER_PARAM_ST* runimg = (secimg->next);
 
+    // check_image_head(secimg, "secboot");
     // check_image_head(upimg, "update");
     // check_image_head(runimg, "user");
 
     // 计算出OTA区域大小, 运行区镜像的大小
-    uint32_t ota_size = ((uint32_t)runimg) - ((uint32_t)upimg);
-    LLOGD("ota zone size: 0x%08X %dkb", ota_size, ota_size/1024);
-
-    // 当前运行区镜像的大小
-    LLOGD("run image size: 0x%08X %dkb", runimg->img_len, runimg->img_len/1024);
 
     // 把相关参数存起来
     upgrade_img_addr = secimg->upgrade_img_addr;
     
-    ota_zone_size = ((uint32_t)runimg) - ((uint32_t)upimg);
+    ota_zone_size = ((uint32_t)runimg) - upgrade_img_addr;
     ota_zone_size = (ota_zone_size + 0x3FF) & (~0x3FF);
+
+    LLOGD("ota zone : 0x%08X %dkb", upgrade_img_addr, ota_zone_size/1024);
+    // 当前运行区镜像的大小
+    LLOGD("run image size: 0x%08X %dkb", runimg->img_len, runimg->img_len/1024);
 }