|
|
@@ -162,6 +162,64 @@ static void rt_fota_bkp_dr2_write(rt_uint16_t value)
|
|
|
*(__IO uint16_t *)(BKP_BASE + 4 * 2) = value;
|
|
|
}
|
|
|
|
|
|
+/* ===================== 长耗时 Flash 操作的看门狗喂狗 =====================
|
|
|
+ * 背景:IWDG 由 syswatch 在启动阶段开启(SYSWATCH_WDT_TIMEOUT=10s、LSI/256 分频),
|
|
|
+ * 一旦启动就无法停止,只能靠喂狗续命。而备份/恢复/擦除原来都是"整块"交给 FAL:
|
|
|
+ * fal_partition_erase(df_area, 4KB, 312KB) 在 NOR 上要逐 4KB 扇区擦 78 次,
|
|
|
+ * W25Q 单扇区擦除典型 45ms、最坏 400ms —— 一次调用可能 3.5s(典型)/ 31s(最坏),
|
|
|
+ * 中途没有任何喂狗机会,10s 超时必然复位(现象:备份/擦除做到一半板子重启,
|
|
|
+ * 重启后 DR2 残留 0xDEAD 还会触发回滚,进一步放大问题)。
|
|
|
+ * 对策:① rt_fota_wdt_feed() 供所有长耗时循环调用;
|
|
|
+ * ② 大块擦除拆成 RT_FOTA_BACKUP_BLK_SIZE(4KB) 分块,每块后喂一次;
|
|
|
+ * ③ 读/写循环每块喂一次。
|
|
|
+ *
|
|
|
+ * 安全:只有确认 IWDG 已启动(PR/RLR 非复位值 0)时才喂。IWDG 只要写入一次 KR
|
|
|
+ * (0xAAAA)就会启动且无法停止,若在 bootloader 里误喂一个"未启动"的 IWDG,
|
|
|
+ * 会把一个 10s 看门狗凭空带进 APP 运行期,造成随机复位。
|
|
|
+ */
|
|
|
+#define RT_FOTA_WDT_DEV_NAME "wdt"
|
|
|
+
|
|
|
+void rt_fota_wdt_feed(void)
|
|
|
+{
|
|
|
+ static rt_device_t wdt_dev = RT_NULL;
|
|
|
+
|
|
|
+ /* IWDG 未启动时 PR/RLR 保持复位值 0,直接返回:只要写一次 KR(0xAAAA)
|
|
|
+ * 就会启动看门狗且无法停止,绝不能对"未启动"的 IWDG 喂狗。
|
|
|
+ * 每次读两个寄存器(单周期访问)比缓存判断更稳,不受调用时机影响。 */
|
|
|
+ if ((IWDG->PR == 0) && (IWDG->RLR == 0))
|
|
|
+ return;
|
|
|
+
|
|
|
+ if (wdt_dev == RT_NULL)
|
|
|
+ wdt_dev = rt_device_find(RT_FOTA_WDT_DEV_NAME);
|
|
|
+
|
|
|
+ if (wdt_dev != RT_NULL)
|
|
|
+ rt_device_control(wdt_dev, RT_DEVICE_CTRL_WDT_KEEPALIVE, RT_NULL);
|
|
|
+}
|
|
|
+
|
|
|
+/* 分块擦除:把一次大块擦除拆成 chunk 大小的多次调用,块间喂狗。
|
|
|
+ * chunk 取 RT_FOTA_BACKUP_BLK_SIZE(4KB) = NOR 扇区粒度,对 onchip flash 亦按页对齐,
|
|
|
+ * 两种介质都安全。返回 0 成功,-1 失败(与 fal_partition_erase 语义一致)。 */
|
|
|
+static int rt_fota_erase_chunked(const struct fal_partition *part, rt_uint32_t addr, rt_size_t size)
|
|
|
+{
|
|
|
+ rt_uint32_t done = 0;
|
|
|
+ rt_size_t len;
|
|
|
+
|
|
|
+ while (done < size)
|
|
|
+ {
|
|
|
+ len = size - done;
|
|
|
+ if (len > RT_FOTA_BACKUP_BLK_SIZE)
|
|
|
+ len = RT_FOTA_BACKUP_BLK_SIZE;
|
|
|
+
|
|
|
+ if (fal_partition_erase(part, addr + done, len) < 0)
|
|
|
+ return -1;
|
|
|
+
|
|
|
+ done += len;
|
|
|
+ rt_fota_wdt_feed();
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
/* For shell */
|
|
|
static rt_sem_t shell_sem = RT_NULL;
|
|
|
static rt_device_t shell_dev = RT_NULL;
|
|
|
@@ -382,14 +440,126 @@ int rt_fota_check_upgrade(void)
|
|
|
if (rt_strcmp(fota_part_head.download_version, fota_part_head.current_version) != 0)
|
|
|
{
|
|
|
is_upgrade = 1;
|
|
|
- LOG_D("Application need upgrade.");
|
|
|
+ /* v1.3.4:原为 LOG_D(DBG_LEVEL=DBG_INFO 时不输出),导致现场完全看不到
|
|
|
+ * "为什么会跑升级/备份"。改为 LOG_I 并把两侧版本都打出来,一眼可判 */
|
|
|
+ LOG_I("Application need upgrade: fm_area[%s] != app[%s].",
|
|
|
+ fota_part_head.download_version, fota_part_head.current_version);
|
|
|
goto __exit_check_upgrade;
|
|
|
}
|
|
|
|
|
|
+ LOG_I("No upgrade: fm_area[%s] == app[%s].",
|
|
|
+ fota_part_head.download_version, fota_part_head.current_version);
|
|
|
+
|
|
|
__exit_check_upgrade:
|
|
|
return is_upgrade;
|
|
|
}
|
|
|
|
|
|
+/* ===================== v1.3.4:升级重试熔断 =====================
|
|
|
+ * 为什么需要(现场问题:没有下发升级包,断电重启却反复执行 backup):
|
|
|
+ * rt_fota_check_upgrade() 只比较 fm_area 里 RBL 头的 download_version 与
|
|
|
+ * current_version;而把 current_version 对齐成 download_version 的
|
|
|
+ * rt_fota_copy_version() 位于 rt_fota_upgrade() **之后**。所以只要 upgrade
|
|
|
+ * 失败(擦写途中被 IWDG 复位、NOR 读写异常等),copy_version 就不会执行,
|
|
|
+ * fm_area 里那个包始终"待升级"——
|
|
|
+ * 于是每次上电都重跑完整升级流程:先 rt_fota_backup_app_to_df() 备份 312KB
|
|
|
+ * (读一遍 + 擦 78 扇区 + 写一遍),再擦写 312KB。表现为:
|
|
|
+ * "没触发升级却每次启动都打印 rt_fota_backup_app_to_df!
|
|
|
+ * 并伴随长时间 # 输出、断电重启反复发生"。
|
|
|
+ * 对策:按"版本"记录连续失败次数。同一版本连续失败达到
|
|
|
+ * RT_FOTA_UPGRADE_MAX_RETRY 次后不再自动升级,直接跳转 APP 并打印原因;
|
|
|
+ * 用户重新下发新包(版本变化)时计数自动归零,无需人工清标志。
|
|
|
+ * 记录存 EasyFlash(NOR,掉电保持);EF 不可用时退化为本次上电内计数。
|
|
|
+ */
|
|
|
+#define RT_FOTA_RETRY_EF_KEY "fota_retry"
|
|
|
+#define RT_FOTA_UPGRADE_MAX_RETRY 3
|
|
|
+
|
|
|
+typedef struct
|
|
|
+{
|
|
|
+ rt_uint32_t cnt; /* 同一版本连续失败次数 */
|
|
|
+ char ver[24]; /* 上次尝试的 download_version */
|
|
|
+} rt_fota_retry_t;
|
|
|
+
|
|
|
+static rt_fota_retry_t fota_retry;
|
|
|
+static rt_bool_t fota_retry_loaded = RT_FALSE;
|
|
|
+
|
|
|
+static void rt_fota_retry_load(void)
|
|
|
+{
|
|
|
+ size_t saved_len = 0;
|
|
|
+
|
|
|
+ if (fota_retry_loaded)
|
|
|
+ return;
|
|
|
+
|
|
|
+ rt_memset(&fota_retry, 0, sizeof(fota_retry));
|
|
|
+ if (ef_get_env_blob(RT_FOTA_RETRY_EF_KEY, &fota_retry, sizeof(fota_retry), &saved_len) == 0)
|
|
|
+ {
|
|
|
+ /* 没有记录 or 读取失败:从头计数 */
|
|
|
+ rt_memset(&fota_retry, 0, sizeof(fota_retry));
|
|
|
+ }
|
|
|
+
|
|
|
+ /* EF 记录被擦成 0xFF 等异常时 cnt 可能是垃圾值(0xFFFFFFFF),
|
|
|
+ * 直接判"已达上限"会把升级永久禁用,这里按无效记录重置。
|
|
|
+ * 注意 ver 是空/0xFF 时必然与 download_version 不等,会走"新版本"分支归零,
|
|
|
+ * 所以只需兜住 cnt 本身。 */
|
|
|
+ if (fota_retry.cnt > 100)
|
|
|
+ {
|
|
|
+ LOG_I("Retry: invalid record(cnt=0x%08X), reset.", fota_retry.cnt);
|
|
|
+ rt_memset(&fota_retry, 0, sizeof(fota_retry));
|
|
|
+ }
|
|
|
+
|
|
|
+ fota_retry_loaded = RT_TRUE;
|
|
|
+}
|
|
|
+
|
|
|
+static void rt_fota_retry_save(void)
|
|
|
+{
|
|
|
+ if (ef_set_env_blob(RT_FOTA_RETRY_EF_KEY, &fota_retry, sizeof(fota_retry)) != EF_NO_ERR)
|
|
|
+ {
|
|
|
+ LOG_I("Retry: save retry record failed (fallback to RAM only).");
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+/* 升级前的熔断检查:新版本自动清零;返回 RT_TRUE 表示"可以升级" */
|
|
|
+static rt_bool_t rt_fota_retry_allow(void)
|
|
|
+{
|
|
|
+ rt_fota_retry_load();
|
|
|
+
|
|
|
+ /* 版本不同 = 用户下发了新包,重新给满次数 */
|
|
|
+ if (rt_strcmp(fota_retry.ver, fota_part_head.download_version) != 0)
|
|
|
+ {
|
|
|
+ rt_strncpy(fota_retry.ver, fota_part_head.download_version, sizeof(fota_retry.ver) - 1);
|
|
|
+ fota_retry.ver[sizeof(fota_retry.ver) - 1] = '\0';
|
|
|
+ fota_retry.cnt = 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (fota_retry.cnt >= RT_FOTA_UPGRADE_MAX_RETRY)
|
|
|
+ {
|
|
|
+ /* 达到上限:不再动 flash,保留现场供人工处理(msh: fota probe / dr2 0) */
|
|
|
+ rt_kprintf("Upgrade of version [%s] failed %d times, auto upgrade disabled.\n",
|
|
|
+ fota_retry.ver, (int)fota_retry.cnt);
|
|
|
+ rt_kprintf("Fix the image or erase fm_area; a new version will re-enable it.\n");
|
|
|
+ rt_fota_signal_led_mode(led_shell_mode);
|
|
|
+ return RT_FALSE;
|
|
|
+ }
|
|
|
+
|
|
|
+ fota_retry.cnt++;
|
|
|
+ rt_fota_wdt_feed();
|
|
|
+ rt_fota_retry_save();
|
|
|
+
|
|
|
+ return RT_TRUE;
|
|
|
+}
|
|
|
+
|
|
|
+/* 升级完全成功(含版本对齐)后清零 */
|
|
|
+static void rt_fota_retry_clear(void)
|
|
|
+{
|
|
|
+ rt_fota_retry_load();
|
|
|
+ if (fota_retry.cnt == 0)
|
|
|
+ return;
|
|
|
+
|
|
|
+ fota_retry.cnt = 0;
|
|
|
+ rt_memset(fota_retry.ver, 0, sizeof(fota_retry.ver));
|
|
|
+ rt_fota_wdt_feed();
|
|
|
+ rt_fota_retry_save();
|
|
|
+}
|
|
|
+
|
|
|
int rt_fota_copy_version(const char *part_name)
|
|
|
{
|
|
|
#define THE_NOR_FLASH_GRANULARITY 4096
|
|
|
@@ -468,7 +638,9 @@ int rt_fota_erase_app_part(void)
|
|
|
}
|
|
|
|
|
|
LOG_I("Partition[%s] erase start:", part->name);
|
|
|
- if (fal_partition_erase(part, 0, fota_part_head.raw_size) < 0)
|
|
|
+ /* 分块擦除 + 逐块喂狗:312KB 的 onchip 擦除按页进行(16 页一批关中断),
|
|
|
+ * 单次调用可达数秒,与前面的 df_area 备份累加后容易撞 IWDG 10s 超时 */
|
|
|
+ if (rt_fota_erase_chunked(part, 0, fota_part_head.raw_size) < 0)
|
|
|
{
|
|
|
LOG_D("Partition[%s] erase failed!", part->name);
|
|
|
fota_res = RT_FOTA_PART_ERASE_ERR;
|
|
|
@@ -502,6 +674,8 @@ int rt_fota_write_app_part(int fw_pos, rt_uint8_t *fw_buf, int fw_len)
|
|
|
rt_fota_res = RT_FOTA_PART_WRITE_ERR;
|
|
|
goto __partition_write_exit;
|
|
|
}
|
|
|
+ /* 搬运循环里每块都写一次 app 分区,逐块喂狗(onchip 写 2KB/页,整包累计数秒) */
|
|
|
+ rt_fota_wdt_feed();
|
|
|
__partition_write_exit:
|
|
|
if (rt_fota_res == RT_FOTA_NO_ERR)
|
|
|
{
|
|
|
@@ -560,6 +734,7 @@ __exit_read_decrypt:
|
|
|
|
|
|
int rt_fota_upgrade(const char *part_name)
|
|
|
{
|
|
|
+ rt_kprintf("rt_fota_upgrade:%s",part_name);
|
|
|
int fota_err = RT_FOTA_NO_ERR;
|
|
|
|
|
|
const struct fal_partition *part;
|
|
|
@@ -945,6 +1120,156 @@ __exit_upgrade:
|
|
|
return fota_err;
|
|
|
}
|
|
|
|
|
|
+/* ================== v1.3.2:跳转 APP 前的 SPI Flash 交接处理 ==================
|
|
|
+ * 现象:bootloader 内 SFUD 正常(打印 "Find a Winbond flash chip"),跳转后 APP 的
|
|
|
+ * SFUD 探测失败("Read SFDP parameter header information failed" /
|
|
|
+ * "This flash device is not found or not support"),FAL 里 w25q16m 设备为空,
|
|
|
+ * EasyFlash 于是逐个 4KB 扇区做"检查-格式化",启动被拖死(表现为"读参数很慢")。
|
|
|
+ *
|
|
|
+ * 原因:原跳转序列里的 HAL_DeInit()/HAL_RCC_DeInit() 会复位 APB2(含 GPIOA、SPI1、
|
|
|
+ * AFIO),/CS(PA4)、SCK(PA5)、MOSI(PA7) 变成浮空输入;从这一刻到 APP 里
|
|
|
+ * HAL_SPI_MspInit 重新配置引脚,中间有几十毫秒"悬空窗口"。悬空的 /CS 一旦被
|
|
|
+ * 噪声拉低,悬空时钟线上的毛刺就会被 Flash 当成指令时打入(0xB9 = 深度掉电、
|
|
|
+ * 0x38 = QPI 等),此后标准 SPI 读只能得到 0xFF/0x00 —— 与 APP 侧现象完全一致。
|
|
|
+ *
|
|
|
+ * 对策(两步,缺一不可):
|
|
|
+ * 1) 跳转前让芯片回到"标准 SPI + 空闲"态:等 BUSY 清零 → 0xAB 释放深度掉电 →
|
|
|
+ * 0xFF 逃逸 QPI/连续读 → 0x66/0x99 复位器件;
|
|
|
+ * 2) 外设复位之后再固定引脚电平:/CS 推挽输出高(不选中),SCK/MOSI/MISO 上拉输入。
|
|
|
+ * 注意必须在 HAL_DeInit() 之后做,否则会被 APB2 复位冲掉。
|
|
|
+ * 另外顺手读一次 JEDEC ID 打印出来,交接是否健康一眼可见(读不到 = 总线/芯片已异常)。
|
|
|
+ */
|
|
|
+#define RT_FOTA_SPI_FLASH_DEV_NAME "spi10"
|
|
|
+
|
|
|
+#define RT_FOTA_FLASH_CMD_READ_SR 0x05 /* 读状态寄存器 */
|
|
|
+#define RT_FOTA_FLASH_CMD_RELEASE_PD 0xAB /* 释放深度掉电 / 读器件 ID */
|
|
|
+#define RT_FOTA_FLASH_CMD_READ_ID 0x9F /* JEDEC ID */
|
|
|
+#define RT_FOTA_FLASH_CMD_RESET_EN 0x66 /* 复位使能 */
|
|
|
+#define RT_FOTA_FLASH_CMD_RESET 0x99 /* 复位器件 */
|
|
|
+
|
|
|
+static struct rt_spi_device *rt_fota_spi_flash_dev(void)
|
|
|
+{
|
|
|
+ return (struct rt_spi_device *)rt_device_find(RT_FOTA_SPI_FLASH_DEV_NAME);
|
|
|
+}
|
|
|
+
|
|
|
+/* 发 1 字节命令 + 读回数据(CS 由 SPI 框架自动拉低/释放) */
|
|
|
+static void rt_fota_spi_flash_cmd_recv(rt_uint8_t cmd, rt_uint8_t *rx, rt_size_t rx_len)
|
|
|
+{
|
|
|
+ struct rt_spi_device *dev = rt_fota_spi_flash_dev();
|
|
|
+
|
|
|
+ if ((dev == RT_NULL) || (rx == RT_NULL) || (rx_len == 0))
|
|
|
+ return;
|
|
|
+
|
|
|
+ rt_spi_send_then_recv(dev, &cmd, 1, rx, rx_len);
|
|
|
+}
|
|
|
+
|
|
|
+/* 只发 1 字节命令 */
|
|
|
+static void rt_fota_spi_flash_cmd(rt_uint8_t cmd)
|
|
|
+{
|
|
|
+ struct rt_spi_device *dev = rt_fota_spi_flash_dev();
|
|
|
+
|
|
|
+ if (dev == RT_NULL)
|
|
|
+ return;
|
|
|
+
|
|
|
+ rt_spi_send(dev, &cmd, 1);
|
|
|
+}
|
|
|
+
|
|
|
+/* 跳转前:把 SPI Flash 恢复到"标准 SPI + 空闲"状态 */
|
|
|
+static void rt_fota_spi_flash_quiesce(void)
|
|
|
+{
|
|
|
+ struct rt_spi_device *dev = rt_fota_spi_flash_dev();
|
|
|
+ rt_uint8_t status = 0xFF;
|
|
|
+ rt_uint8_t id[3] = {0, 0, 0};
|
|
|
+ rt_uint32_t start;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ if (dev == RT_NULL)
|
|
|
+ {
|
|
|
+ rt_kprintf("SPI flash handover: %s not found, skip quiesce.\n", RT_FOTA_SPI_FLASH_DEV_NAME);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 1) 等上一次写/擦除结束(BUSY=0),最长等 1s,避免复位指令打断写入 */
|
|
|
+ start = rt_tick_get();
|
|
|
+ do
|
|
|
+ {
|
|
|
+ status = 0xFF;
|
|
|
+ rt_fota_spi_flash_cmd_recv(RT_FOTA_FLASH_CMD_READ_SR, &status, 1);
|
|
|
+ if ((status & 0x01) == 0)
|
|
|
+ break;
|
|
|
+ } while ((rt_tick_get() - start) < rt_tick_from_millisecond(1000));
|
|
|
+
|
|
|
+ /* 2) 0xFF 逃逸(尽力而为):若芯片被噪声带入 QPI/连续读模式,需 0xFF 才能退出;
|
|
|
+ * 标准 SPI 模式下 0xFF 是空操作,无副作用。真正的兜底是后面的 0x66/0x99 复位
|
|
|
+ * 与"跳转后 /CS 保持高电平"(见 rt_fota_spi_pins_safe_state) */
|
|
|
+ for (i = 0; i < 8; i++)
|
|
|
+ rt_fota_spi_flash_cmd(0xFF);
|
|
|
+
|
|
|
+ /* 3) 释放深度掉电(0xB9 之后只有 0xAB 能被响应) */
|
|
|
+ rt_fota_spi_flash_cmd(RT_FOTA_FLASH_CMD_RELEASE_PD);
|
|
|
+ rt_thread_mdelay(1); /* tRES1,留足余量 */
|
|
|
+
|
|
|
+ /* 4) 器件复位(不支持的型号会忽略,无副作用) */
|
|
|
+ rt_fota_spi_flash_cmd(RT_FOTA_FLASH_CMD_RESET_EN);
|
|
|
+ rt_fota_spi_flash_cmd(RT_FOTA_FLASH_CMD_RESET);
|
|
|
+ rt_thread_mdelay(1); /* tRST */
|
|
|
+
|
|
|
+ /* 5) 交接自检:读 JEDEC ID,异常时提前暴露(正常应为 0xEF4015/0xEF4016 之类) */
|
|
|
+ rt_fota_spi_flash_cmd_recv(RT_FOTA_FLASH_CMD_READ_ID, id, 3);
|
|
|
+ rt_kprintf("SPI flash handover: SR=0x%02X JEDEC ID=0x%02X%02X%02X\n",
|
|
|
+ status, id[0], id[1], id[2]);
|
|
|
+}
|
|
|
+
|
|
|
+/* 外设复位后:把 SPI 引脚固定为安全电平,杜绝 APP 启动前的悬空窗口 */
|
|
|
+static void rt_fota_spi_pins_safe_state(void)
|
|
|
+{
|
|
|
+ rt_uint32_t crl;
|
|
|
+
|
|
|
+ __HAL_RCC_GPIOA_CLK_ENABLE();
|
|
|
+
|
|
|
+ /* 先置 ODR 再改模式:切换成输出的瞬间即为高电平,不会把 Flash 选中一下 */
|
|
|
+ GPIOA->BSRR = GPIO_PIN_4 | GPIO_PIN_5 | GPIO_PIN_6 | GPIO_PIN_7;
|
|
|
+
|
|
|
+ crl = GPIOA->CRL;
|
|
|
+ crl &= ~(0xFUL << 16); /* PA4:/CS */
|
|
|
+ crl |= (0x3UL << 16); /* 推挽输出 50MHz,ODR=1 → 不选中 */
|
|
|
+ crl &= ~(0xFFFUL << 20); /* PA5/PA6/PA7:SCK/MISO/MOSI */
|
|
|
+ crl |= (0x888UL << 20); /* 上拉输入,杜绝悬空引入毛刺 */
|
|
|
+ GPIOA->CRL = crl;
|
|
|
+}
|
|
|
+
|
|
|
+/* ============== v1.3.5:NOR 可用性快速检查(EasyFlash 初始化前置门禁) ==============
|
|
|
+ * 现场问题:SPI Flash 不可用时(SFUD 探测失败),EasyFlash 仍会对 3MB 环境区
|
|
|
+ * (768 个 4KB 扇区)逐个扇区执行"读头 → 判定无效 → 擦除 → 写头"的格式化尝试:
|
|
|
+ * - 每次读/擦/写都撞上 FAL 的 assert,各打一条日志;
|
|
|
+ * - 加上 EasyFlash 自己的 "Sector header check failed" 提示,
|
|
|
+ * 单个扇区产生约 4~5 条串口输出,768 个扇区合计近 4000 条;
|
|
|
+ * - @115200 下纯阻塞输出即达 20~30 秒,表现为"加载参数极慢、启动像卡死"。
|
|
|
+ * 更危险的是:一旦总线只是间歇异常,format_sector 有可能真的擦掉用户环境变量。
|
|
|
+ *
|
|
|
+ * 对策:在 easyflash_init() 之前先确认 NOR 真的能应答——读 JEDEC ID,
|
|
|
+ * 全 0x00 / 全 0xFF 视为不可用,直接跳过 EasyFlash 初始化并给出单条明确提示。
|
|
|
+ * 效果:故障时启动从数十秒降到毫秒级,且不会产生任何破坏性写入。
|
|
|
+ * 安全性:EasyFlash 未初始化时 ef_get_env_blob / ef_set_env_blob 内部有 init_ok
|
|
|
+ * 判据,会安全返回失败而不是崩溃(已核对 ef_env.c)。
|
|
|
+ */
|
|
|
+int rt_fota_nor_ready(void)
|
|
|
+{
|
|
|
+ rt_uint8_t id[3] = {0, 0, 0};
|
|
|
+
|
|
|
+ rt_fota_spi_flash_cmd_recv(RT_FOTA_FLASH_CMD_READ_ID, id, 3);
|
|
|
+
|
|
|
+ /* 全 0x00(MISO 被拉低/设备未接)或全 0xFF(MISO 悬空/设备无响应)均判不可用 */
|
|
|
+ if (((id[0] == 0x00) && (id[1] == 0x00) && (id[2] == 0x00)) ||
|
|
|
+ ((id[0] == 0xFF) && (id[1] == 0xFF) && (id[2] == 0xFF)))
|
|
|
+ {
|
|
|
+ rt_kprintf("NOR flash not responding (JEDEC ID=0x%02X%02X%02X).\n", id[0], id[1], id[2]);
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ return 1;
|
|
|
+}
|
|
|
+
|
|
|
int rt_fota_start_application(void)
|
|
|
{
|
|
|
int fota_res = RT_FOTA_NO_ERR;
|
|
|
@@ -981,6 +1306,10 @@ int rt_fota_start_application(void)
|
|
|
|
|
|
LOG_I("Implement application now.");
|
|
|
|
|
|
+ /* v1.3.2:把 SPI Flash 恢复到标准 SPI 空闲态(必须放在关中断之前,
|
|
|
+ * 因为 rt_spi_* 走总线互斥量/延时,关中断后会失去调度) */
|
|
|
+ rt_fota_spi_flash_quiesce();
|
|
|
+
|
|
|
__disable_irq();
|
|
|
/* 禁用并清除全部 NVIC 中断(原循环因 F1 无 FPU_IRQn 被注释,改用寄存器遍历),
|
|
|
* 防止 APP 启动初期残留/挂起中断使用旧向量表或未初始化外设 */
|
|
|
@@ -1001,7 +1330,10 @@ int rt_fota_start_application(void)
|
|
|
/* 外设与时钟恢复到默认状态 */
|
|
|
HAL_DeInit();
|
|
|
HAL_RCC_DeInit();
|
|
|
- HAL_DeInit();
|
|
|
+
|
|
|
+ /* v1.3.2:上面的 APB2 复位会把 GPIOA 打回浮空输入,这里重新固定 SPI 引脚电平,
|
|
|
+ * 保证从此刻到 APP 配好引脚之间 /CS 始终为高、时钟/数据线不被噪声干扰 */
|
|
|
+ rt_fota_spi_pins_safe_state();
|
|
|
|
|
|
/* 向量表预先指向 APP(其 SystemInit 会先写回 0x08000000,此步保证交接窗口安全) */
|
|
|
SCB->VTOR = app_addr;
|
|
|
@@ -1178,6 +1510,7 @@ static rt_err_t rt_fota_check_ymodem_request(void)
|
|
|
* 返回 RT_FOTA_NO_ERR 表示备份有效。 */
|
|
|
int rt_fota_backup_app_to_df(void)
|
|
|
{
|
|
|
+ rt_kprintf("rt_fota_backup_app_to_df!");
|
|
|
rt_fota_backup_head_t head;
|
|
|
const struct fal_partition *app_part;
|
|
|
const struct fal_partition *df_part;
|
|
|
@@ -1219,6 +1552,7 @@ int rt_fota_backup_app_to_df(void)
|
|
|
fota_res = RT_FOTA_PART_ERASE_ERR;
|
|
|
goto __exit_backup;
|
|
|
}
|
|
|
+ rt_fota_wdt_feed();
|
|
|
|
|
|
/* 2. 读取 APP 分区并计算数据 CRC32 */
|
|
|
extern rt_uint32_t rt_fota_step_crc(rt_uint32_t crc, rt_uint8_t *buf, rt_uint32_t len);
|
|
|
@@ -1239,12 +1573,14 @@ int rt_fota_backup_app_to_df(void)
|
|
|
|
|
|
crc = rt_fota_step_crc(crc, buf, read_len);
|
|
|
pos += read_len;
|
|
|
+ rt_fota_wdt_feed();
|
|
|
rt_kprintf("#");
|
|
|
}
|
|
|
crc ^= 0xffffffff;
|
|
|
|
|
|
- /* 3. 擦除数据区 */
|
|
|
- if (fal_partition_erase(df_part, RT_FOTA_BACKUP_HEAD_RSV, erase_len) < 0)
|
|
|
+ /* 3. 擦除数据区:分块擦除并逐块喂狗(整块 312KB 在 NOR 上最坏要擦 30s 以上,
|
|
|
+ * 一次性调用必然触发 IWDG 10s 超时复位) */
|
|
|
+ if (rt_fota_erase_chunked(df_part, RT_FOTA_BACKUP_HEAD_RSV, erase_len) < 0)
|
|
|
{
|
|
|
LOG_I("Backup: erase data area failed.");
|
|
|
fota_res = RT_FOTA_PART_ERASE_ERR;
|
|
|
@@ -1274,6 +1610,9 @@ int rt_fota_backup_app_to_df(void)
|
|
|
}
|
|
|
|
|
|
pos += read_len;
|
|
|
+ /* 喂狗放在 HMI_WRITE 之前:串口屏是阻塞发送(每次十几 ms),
|
|
|
+ * 78 块累计也有秒级,先确保看门狗被喂过 */
|
|
|
+ rt_fota_wdt_feed();
|
|
|
HMI_WRITE("debug.update.val=%d", (int)(pos * 100 / data_len));
|
|
|
rt_kprintf("#");
|
|
|
}
|
|
|
@@ -1309,6 +1648,7 @@ __exit_backup:
|
|
|
* 返回 RT_FOTA_NO_ERR 表示恢复完成。 */
|
|
|
int rt_fota_restore_app_from_df(int consume_backup)
|
|
|
{
|
|
|
+ LOG_I("rt_fota_restore_app_from_df:%d", consume_backup);
|
|
|
rt_fota_backup_head_t head;
|
|
|
const struct fal_partition *app_part;
|
|
|
const struct fal_partition *df_part;
|
|
|
@@ -1380,6 +1720,7 @@ int rt_fota_restore_app_from_df(int consume_backup)
|
|
|
|
|
|
crc = rt_fota_step_crc(crc, buf, read_len);
|
|
|
pos += read_len;
|
|
|
+ rt_fota_wdt_feed();
|
|
|
rt_kprintf("#");
|
|
|
}
|
|
|
crc ^= 0xffffffff;
|
|
|
@@ -1391,8 +1732,9 @@ int rt_fota_restore_app_from_df(int consume_backup)
|
|
|
goto __exit_restore;
|
|
|
}
|
|
|
|
|
|
- /* 3. 擦除 APP 分区并回写备份数据 */
|
|
|
- if (fal_partition_erase(app_part, 0, app_part->len) < 0)
|
|
|
+ /* 3. 擦除 APP 分区并回写备份数据:分块擦除 + 逐块喂狗
|
|
|
+ * (自动回滚路径尤其关键:擦到一半被看门狗复位,会变成"回滚-复位"死循环) */
|
|
|
+ if (rt_fota_erase_chunked(app_part, 0, app_part->len) < 0)
|
|
|
{
|
|
|
LOG_I("Restore: erase [%s] failed.", app_part->name);
|
|
|
fota_res = RT_FOTA_PART_ERASE_ERR;
|
|
|
@@ -1421,6 +1763,7 @@ int rt_fota_restore_app_from_df(int consume_backup)
|
|
|
}
|
|
|
|
|
|
pos += read_len;
|
|
|
+ rt_fota_wdt_feed();
|
|
|
HMI_WRITE("debug.update.val=%d", (int)(pos * 100 / head.data_len));
|
|
|
rt_kprintf("#");
|
|
|
}
|
|
|
@@ -1521,7 +1864,10 @@ void rt_fota_thread_entry(void *arg)
|
|
|
if (rt_fota_set_device(RT_CONSOLE_DEVICE_NAME) == RT_EOK)
|
|
|
{
|
|
|
|
|
|
- if(easyflash_init()==EF_NO_ERR) //初始化成功
|
|
|
+ /* v1.3.5:EasyFlash 前置门禁——NOR 不响应时不要进去,
|
|
|
+ * 否则会对 768 个扇区逐一做无效的格式化尝试(近 4000 条日志、
|
|
|
+ * 阻塞启动 20~30 秒),且存在误擦用户环境变量的风险 */
|
|
|
+ if ((rt_fota_nor_ready() != 0) && (easyflash_init() == EF_NO_ERR)) //初始化成功
|
|
|
{
|
|
|
rt_uint8_t boot_flag_buf[4] = {0, 0, 0, 0};
|
|
|
ef_get_env_blob("stop_in_bootloader", boot_flag_buf, sizeof(boot_flag_buf), NULL);
|
|
|
@@ -1560,6 +1906,12 @@ void rt_fota_thread_entry(void *arg)
|
|
|
if (rt_fota_check_upgrade() <= 0)
|
|
|
goto __exit_boot_entry;
|
|
|
|
|
|
+ /* v1.3.4:重试熔断——同一版本连续失败到上限后不再动 flash,直接跳 APP。
|
|
|
+ * 否则 upgrade 失败会让 fm_area 永远处于"待升级"状态,每次上电都重跑
|
|
|
+ * backup(312KB 读+擦+写) + 升级,形成"重启-升级-失败"循环 */
|
|
|
+ if (rt_fota_retry_allow() != RT_TRUE)
|
|
|
+ goto __exit_boot_entry;
|
|
|
+
|
|
|
/* enter to upgrade mode */
|
|
|
rt_fota_signal_led_mode(led_upgrade_mode);
|
|
|
|
|
|
@@ -1573,12 +1925,22 @@ void rt_fota_thread_entry(void *arg)
|
|
|
/* Implement upgrade, copy firmware partition to app partition */
|
|
|
fota_err = rt_fota_upgrade(RT_FOTA_FM_PART_NAME);
|
|
|
if (fota_err != RT_FOTA_NO_ERR)
|
|
|
+ {
|
|
|
+ LOG_I("Upgrade failed(%d), fm_area image kept for retry.", fota_err);
|
|
|
goto __exit_boot_entry;
|
|
|
+ }
|
|
|
|
|
|
/* Update new application verison in RBL file of firmware partition */
|
|
|
fota_err = rt_fota_copy_version(RT_FOTA_FM_PART_NAME);
|
|
|
if (fota_err != RT_FOTA_NO_ERR)
|
|
|
+ {
|
|
|
+ LOG_I("Copy version failed(%d), fm_area stays pending upgrade.", fota_err);
|
|
|
goto __exit_boot_entry;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* 升级 + 版本对齐都成功:清零熔断计数,下次上电不会再走升级分支 */
|
|
|
+ rt_fota_retry_clear();
|
|
|
+ rt_kprintf("Upgrade done, version[%s] applied.\n", fota_part_head.download_version);
|
|
|
|
|
|
__exit_boot_entry:
|
|
|
/* Implement application */
|
|
|
@@ -1633,8 +1995,9 @@ void rt_fota_info(rt_uint8_t argc, char **argv)
|
|
|
{
|
|
|
[0] = "fota probe - probe RBL file of partiton",
|
|
|
[1] = "fota show partition addr size - show 'size' bytes starting at 'addr'",
|
|
|
- [2] = "fota clone des_part src_part - clone src partition to des partiton",
|
|
|
- [3] = "fota exec - execute application program",
|
|
|
+ [2] = "fota retry [0] - show or clear upgrade retry counter",
|
|
|
+ [3] = "fota clone des_part src_part - clone src partition to des partiton",
|
|
|
+ [4] = "fota exec - execute application program",
|
|
|
};
|
|
|
|
|
|
if (argc < 2)
|
|
|
@@ -1691,6 +2054,12 @@ void rt_fota_info(rt_uint8_t argc, char **argv)
|
|
|
}
|
|
|
LOG_I("| Algorithm mode | %*.s |", 11, put_buf);
|
|
|
LOG_I("| Firmware version | %*.s |", 11, fota_part_head.download_version);
|
|
|
+ /* v1.3.4:把 current_version 和"是否需升级"一并打出来。
|
|
|
+ * 这两个字段不等就会在每次上电触发升级+备份,原来完全看不到 */
|
|
|
+ LOG_I("| Applied version | %*.s |", 11, fota_part_head.current_version);
|
|
|
+ LOG_I("| Upgrade pending | %11s |",
|
|
|
+ (rt_strcmp(fota_part_head.download_version, fota_part_head.current_version) != 0)
|
|
|
+ ? "YES" : "NO");
|
|
|
LOG_I("| Code raw size | %11d |", fota_part_head.raw_size);
|
|
|
LOG_I("| Code package size | %11d |", fota_part_head.com_size);
|
|
|
LOG_I("| Build Timestamp | %11d |", *((rt_uint32_t *)(&fota_part_head.fm_time[2])));
|
|
|
@@ -1738,6 +2107,28 @@ void rt_fota_info(rt_uint8_t argc, char **argv)
|
|
|
rt_kprintf("%s partition is not exist!\n", part_name);
|
|
|
}
|
|
|
}
|
|
|
+ else if (!rt_strcmp(operator, "retry"))
|
|
|
+ {
|
|
|
+ /* v1.3.4:查看/清除升级重试熔断记录。
|
|
|
+ * fota retry - 查看连续失败次数与上次尝试的版本
|
|
|
+ * fota retry 0 - 清零(熔断后想再试一次、或定位问题后强制重试) */
|
|
|
+ rt_fota_retry_load();
|
|
|
+ if (argc < 3)
|
|
|
+ {
|
|
|
+ rt_kprintf("Upgrade retry: cnt=%d/%d, last version=[%s]\n",
|
|
|
+ (int)fota_retry.cnt, RT_FOTA_UPGRADE_MAX_RETRY, fota_retry.ver);
|
|
|
+ rt_kprintf("Auto upgrade is %s.\n",
|
|
|
+ (fota_retry.cnt >= RT_FOTA_UPGRADE_MAX_RETRY) ? "DISABLED" : "enabled");
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ fota_retry.cnt = 0;
|
|
|
+ rt_memset(fota_retry.ver, 0, sizeof(fota_retry.ver));
|
|
|
+ rt_fota_wdt_feed();
|
|
|
+ rt_fota_retry_save();
|
|
|
+ rt_kprintf("Upgrade retry record cleared.\n");
|
|
|
+ }
|
|
|
+ }
|
|
|
else if (!rt_strcmp(operator, "clone"))
|
|
|
{
|
|
|
const char *dst_part_name = argv[2];
|
|
|
@@ -1758,7 +2149,8 @@ void rt_fota_info(rt_uint8_t argc, char **argv)
|
|
|
else
|
|
|
{
|
|
|
rt_kprintf("Clone %s partition to %s partition:\n", src_part_name, dst_part_name);
|
|
|
- if (fal_partition_erase(dst_part, 0, dst_part->len) >= 0)
|
|
|
+ /* 分块擦除 + 逐块喂狗(dst 可能是 512KB NOR,整块擦会撞 IWDG 超时) */
|
|
|
+ if (rt_fota_erase_chunked(dst_part, 0, dst_part->len) >= 0)
|
|
|
{
|
|
|
int clone_pos = 0;
|
|
|
int clone_len = 0, clone_tol_len;
|
|
|
@@ -1784,6 +2176,7 @@ void rt_fota_info(rt_uint8_t argc, char **argv)
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
+ rt_fota_wdt_feed();
|
|
|
rt_kprintf("#");
|
|
|
clone_pos += clone_len;
|
|
|
}
|