Consistently handle boot-count reset and upgrade across ipq40xx, ipq806x, kirkwood, mvebu Dual-firmware devices often utilize a specific MTD partition to record the number of times the boot loader has initiated boot. Most of these devices are NAND, typically with a 2k erase size. When this code was ported to the ipq40xx platform, the device in hand used NOR for this partition, with a 16-byte "record" size. As the implementation of `mtd resetbc` is by-platform, the hard-coded nature of this change prevented proper operation of a NAND-based device. * Unified the "NOR" variant with the rest of the Linksys variants * Added logging to indicate success and failure * Provided a meaningful return value for scripting * "Protected" the use of `mtd resetbc` in start-up scripts so that failure does not end the boot sequence * Moved Linksys-specific actions into common `/etc/init.d/bootcount` For upgrade, these devices need to determine which partition to flash, as well as set certain U-Boot envirnment variables to change the next boot to the newly flashed version. * Moved upgrade-related environment changes out of bootcount * Combined multiple flashes of environment into single one * Current-partition detection now handles absence of `boot_part` Runtime-tested: Linksys EA8300 Signed-off-by: Jeff Kletsky <git-commits@allycomm.com> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [checkpatch.pl fixes, traded split strings for 80+ chars per line]master
parent
4bdc873a5f
commit
b3770eaca3
@ -1,115 +0,0 @@ |
|||||||
/*
|
|
||||||
* Linksys boot counter reset code for mtd |
|
||||||
* |
|
||||||
* Copyright (C) 2013 Jonas Gorski <jogo@openwrt.org> |
|
||||||
* |
|
||||||
* This program is free software; you can redistribute it and/or |
|
||||||
* modify it under the terms of the GNU General Public License v2 |
|
||||||
* as published by the Free Software Foundation. |
|
||||||
* |
|
||||||
* This program is distributed in the hope that it will be useful, |
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||||
* GNU General Public License for more details. |
|
||||||
* |
|
||||||
* You should have received a copy of the GNU General Public License |
|
||||||
* along with this program; if not, write to the Free Software |
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
|
||||||
* |
|
||||||
*/ |
|
||||||
|
|
||||||
#include <stdio.h> |
|
||||||
#include <stdlib.h> |
|
||||||
#include <stddef.h> |
|
||||||
#include <unistd.h> |
|
||||||
#include <fcntl.h> |
|
||||||
#include <sys/mman.h> |
|
||||||
#include <sys/stat.h> |
|
||||||
#include <endian.h> |
|
||||||
#include <string.h> |
|
||||||
#include <errno.h> |
|
||||||
#include <stdint.h> |
|
||||||
|
|
||||||
#include <sys/ioctl.h> |
|
||||||
#include <mtd/mtd-user.h> |
|
||||||
|
|
||||||
#include "mtd.h" |
|
||||||
|
|
||||||
#define BOOTCOUNT_MAGIC 0x20110811 |
|
||||||
|
|
||||||
struct bootcounter { |
|
||||||
uint32_t magic; |
|
||||||
uint32_t count; |
|
||||||
uint32_t checksum; |
|
||||||
}; |
|
||||||
|
|
||||||
static char page[2048]; |
|
||||||
|
|
||||||
int mtd_resetbc(const char *mtd) |
|
||||||
{ |
|
||||||
struct mtd_info_user mtd_info; |
|
||||||
struct bootcounter *curr = (struct bootcounter *)page; |
|
||||||
unsigned int i; |
|
||||||
int last_count = 0; |
|
||||||
int num_bc; |
|
||||||
int fd; |
|
||||||
int ret; |
|
||||||
|
|
||||||
fd = mtd_check_open(mtd); |
|
||||||
|
|
||||||
if (ioctl(fd, MEMGETINFO, &mtd_info) < 0) { |
|
||||||
fprintf(stderr, "failed to get mtd info!\n"); |
|
||||||
return -1; |
|
||||||
} |
|
||||||
|
|
||||||
num_bc = mtd_info.size / 16; |
|
||||||
|
|
||||||
for (i = 0; i < num_bc; i++) { |
|
||||||
pread(fd, curr, sizeof(*curr), i * 16); |
|
||||||
|
|
||||||
if (curr->magic != (BOOTCOUNT_MAGIC) && curr->magic != 0xffffffff) { |
|
||||||
fprintf(stderr, "unexpected magic %08x, bailing out\n", curr->magic); |
|
||||||
goto out; |
|
||||||
} |
|
||||||
|
|
||||||
if (curr->magic == 0xffffffff) |
|
||||||
break; |
|
||||||
|
|
||||||
last_count = curr->count; |
|
||||||
} |
|
||||||
|
|
||||||
/* no need to do writes when last boot count is already 0 */ |
|
||||||
if (last_count == 0) |
|
||||||
goto out; |
|
||||||
|
|
||||||
|
|
||||||
if (i == num_bc) { |
|
||||||
struct erase_info_user erase_info; |
|
||||||
erase_info.start = 0; |
|
||||||
erase_info.length = mtd_info.size; |
|
||||||
|
|
||||||
/* erase block */ |
|
||||||
ret = ioctl(fd, MEMERASE, &erase_info); |
|
||||||
if (ret < 0) { |
|
||||||
fprintf(stderr, "failed to erase block: %i\n", ret); |
|
||||||
return -1; |
|
||||||
} |
|
||||||
|
|
||||||
i = 0; |
|
||||||
} |
|
||||||
|
|
||||||
memset(curr, 0xff, 16); |
|
||||||
|
|
||||||
curr->magic = BOOTCOUNT_MAGIC; |
|
||||||
curr->count = 0; |
|
||||||
curr->checksum = BOOTCOUNT_MAGIC; |
|
||||||
|
|
||||||
ret = pwrite(fd, curr, 16, i * 16); |
|
||||||
if (ret < 0) |
|
||||||
fprintf(stderr, "failed to write: %i\n", ret); |
|
||||||
sync(); |
|
||||||
out: |
|
||||||
close(fd); |
|
||||||
|
|
||||||
return 0; |
|
||||||
} |
|
@ -1,34 +0,0 @@ |
|||||||
#!/bin/sh /etc/rc.common |
|
||||||
# |
|
||||||
# This script sets auto_recovery to "yes" and resets the boot counter to 0. |
|
||||||
# As a golden rule, this should be the latest script to run at boot. For a |
|
||||||
# developer snapshot, it is fine to set auto_recovery here. But for a stable |
|
||||||
# release, this script must in fact turn off auto_recovery. |
|
||||||
# |
|
||||||
# Why? Because the custom sysupgrade script for the device will turn on |
|
||||||
# auto_recovery to "yes". And it's the job of this script to set the |
|
||||||
# boot boot_count to 0 and then disable auto_recovery, as that condition |
|
||||||
# means that the stable release went well. |
|
||||||
# |
|
||||||
# I have to repeat: this script should be changed for stable releases. |
|
||||||
|
|
||||||
START=99 |
|
||||||
boot() { |
|
||||||
. /lib/functions.sh |
|
||||||
|
|
||||||
case $(board_name) in |
|
||||||
linksys,ea6350v3) |
|
||||||
# make sure auto_recovery in uboot is always on |
|
||||||
IS_AUTO_RECOVERY="$(fw_printenv -n auto_recovery)" |
|
||||||
if [ "$IS_AUTO_RECOVERY" != "yes" ] ; then |
|
||||||
fw_setenv auto_recovery yes |
|
||||||
echo "Linksys EA6350v3: fw_setenv: auto_recovery has been set to yes" |
|
||||||
fi |
|
||||||
# reset the boot counter |
|
||||||
fw_setenv boot_count 0 |
|
||||||
mtd resetbc s_env |
|
||||||
echo "Linksys EA6350v3: boot counter has been reset" |
|
||||||
echo "Linksys EA6350v3: boot_part=$(fw_printenv -n boot_part)" |
|
||||||
;; |
|
||||||
esac |
|
||||||
} |
|
@ -0,0 +1,13 @@ |
|||||||
|
#!/bin/sh /etc/rc.common |
||||||
|
|
||||||
|
START=99 |
||||||
|
|
||||||
|
start() { |
||||||
|
. /lib/functions.sh |
||||||
|
|
||||||
|
case $(board_name) in |
||||||
|
linksys,ea8500) |
||||||
|
mtd resetbc s_env || true |
||||||
|
;; |
||||||
|
esac |
||||||
|
} |
@ -1,19 +0,0 @@ |
|||||||
#!/bin/sh /etc/rc.common |
|
||||||
# Copyright (C) 2015 OpenWrt.org |
|
||||||
|
|
||||||
START=97 |
|
||||||
boot() { |
|
||||||
. /lib/functions.sh |
|
||||||
|
|
||||||
case $(board_name) in |
|
||||||
linksys,ea8500) |
|
||||||
# make sure auto_recovery in uboot is always on |
|
||||||
AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" |
|
||||||
if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then |
|
||||||
fw_setenv auto_recovery yes |
|
||||||
fi |
|
||||||
# reset the boot counter |
|
||||||
mtd resetbc s_env |
|
||||||
;; |
|
||||||
esac |
|
||||||
} |
|
@ -0,0 +1,14 @@ |
|||||||
|
#!/bin/sh /etc/rc.common |
||||||
|
|
||||||
|
START=99 |
||||||
|
|
||||||
|
start() { |
||||||
|
. /lib/functions.sh |
||||||
|
|
||||||
|
case $(board_name) in |
||||||
|
linksys,audi|\ |
||||||
|
linksys,viper) |
||||||
|
mtd resetbc s_env || true |
||||||
|
;; |
||||||
|
esac |
||||||
|
} |
@ -1,19 +0,0 @@ |
|||||||
#!/bin/sh /etc/rc.common |
|
||||||
# Copyright (C) 2015 OpenWrt.org |
|
||||||
|
|
||||||
START=97 |
|
||||||
boot() { |
|
||||||
. /lib/functions.sh |
|
||||||
|
|
||||||
case $(board_name) in |
|
||||||
linksys,audi|linksys,viper) |
|
||||||
# make sure auto_recovery in uboot is always on |
|
||||||
AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" |
|
||||||
if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then |
|
||||||
fw_setenv auto_recovery yes |
|
||||||
fi |
|
||||||
# reset the boot counter |
|
||||||
mtd resetbc s_env |
|
||||||
;; |
|
||||||
esac |
|
||||||
} |
|
@ -0,0 +1,18 @@ |
|||||||
|
#!/bin/sh /etc/rc.common |
||||||
|
|
||||||
|
START=99 |
||||||
|
|
||||||
|
start() { |
||||||
|
. /lib/functions.sh |
||||||
|
|
||||||
|
case $(board_name) in |
||||||
|
linksys,caiman |\ |
||||||
|
linksys,cobra |\ |
||||||
|
linksys,mamba |\ |
||||||
|
linksys,rango |\ |
||||||
|
linksys,shelby |\ |
||||||
|
linksys,venom) |
||||||
|
mtd resetbc s_env || true |
||||||
|
;; |
||||||
|
esac |
||||||
|
} |
@ -1,20 +0,0 @@ |
|||||||
#!/bin/sh /etc/rc.common |
|
||||||
# Copyright (C) 2015-2016 OpenWrt.org |
|
||||||
# Copyright (C) 2016 LEDE-Project.org |
|
||||||
|
|
||||||
START=97 |
|
||||||
boot() { |
|
||||||
. /lib/functions.sh |
|
||||||
|
|
||||||
case $(board_name) in |
|
||||||
linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom) |
|
||||||
# make sure auto_recovery in uboot is always on |
|
||||||
AUTO_RECOVERY_ENA="`fw_printenv -n auto_recovery`" |
|
||||||
if [ "$AUTO_RECOVERY_ENA" != "yes" ] ; then |
|
||||||
fw_setenv auto_recovery yes |
|
||||||
fi |
|
||||||
# reset the boot counter |
|
||||||
mtd resetbc s_env |
|
||||||
;; |
|
||||||
esac |
|
||||||
} |
|
Loading…
Reference in new issue