* [PATCH 0/3] introduce bootcount support
@ 2013-09-20 4:45 Jean-Christophe PLAGNIOL-VILLARD
2013-09-20 4:46 ` [PATCH 1/3] misc: add bootcount framework Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 7+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:45 UTC (permalink / raw)
To: barebox
Hi,
when you want to detect boot faillure you need to count the number of
boot and if the linux boot correctly it will clear it
The following changes since commit fe4117357f8f304a08b957eded8ede9db8dafdcf:
Add missing dependency ENV_HANDLING for OF_BAREBOX_DRIVER option (2013-09-18 10:24:29 +0200)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git delivery/bootcount
for you to fetch changes up to b8c33aa7d8de3feaf2bf358ae33e8eb1612e2465:
animeo_ip: add bootcount support (2013-09-20 12:41:33 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
misc: add bootcount framework
misc: add somfy bootcount support
animeo_ip: add bootcount support
arch/arm/boards/animeo_ip/init.c | 2 ++
arch/arm/configs/animeo_ip_defconfig | 2 ++
drivers/misc/Kconfig | 7 +++++
drivers/misc/Makefile | 2 ++
drivers/misc/bootcount.c | 24 +++++++++++++++++
drivers/misc/somfy_bootcount.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
include/bootcount.h | 21 +++++++++++++++
7 files changed, 196 insertions(+)
create mode 100644 drivers/misc/bootcount.c
create mode 100644 drivers/misc/somfy_bootcount.c
create mode 100644 include/bootcount.h
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] misc: add bootcount framework 2013-09-20 4:45 [PATCH 0/3] introduce bootcount support Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 ` Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 2/3] misc: add somfy bootcount support Jean-Christophe PLAGNIOL-VILLARD ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 UTC (permalink / raw) To: barebox Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/misc/Kconfig | 3 +++ drivers/misc/Makefile | 1 + drivers/misc/bootcount.c | 24 ++++++++++++++++++++++++ include/bootcount.h | 21 +++++++++++++++++++++ 4 files changed, 49 insertions(+) create mode 100644 drivers/misc/bootcount.c create mode 100644 include/bootcount.h diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 606490b..a972ba4 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -15,4 +15,7 @@ config JTAG help Controls JTAG chains connected to I/O pins +config BOOTCOUNT + bool + endif # MISC_DEVICES diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index b085577..fa668c1 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,3 +3,4 @@ # obj-$(CONFIG_JTAG) += jtag.o +obj-$(CONFIG_BOOTCOUNT) += bootcount.o diff --git a/drivers/misc/bootcount.c b/drivers/misc/bootcount.c new file mode 100644 index 0000000..0205d00 --- /dev/null +++ b/drivers/misc/bootcount.c @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * GPLv2 Only + */ + +#include <common.h> +#include <init.h> +#include <bootcount.h> + +static struct bootcount_driver *bd; + +void bootcount_register(struct bootcount_driver *drv) +{ + bd = drv; +} + +static int bootcount_inc(void) +{ + if (bd) + bd->inc(bd); + return 0; +} +late_initcall(bootcount_inc); diff --git a/include/bootcount.h b/include/bootcount.h new file mode 100644 index 0000000..16e61c5 --- /dev/null +++ b/include/bootcount.h @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * GPLv2 Only + */ + +#ifndef __BOOTCOUNT_H__ +#define __BOOTCOUNT_H__ + +struct bootcount_driver { + void (*inc)(struct bootcount_driver *d); + void *priv; +}; + +#ifdef CONFIG_BOOTCOUNT +void bootcount_register(struct bootcount_driver *d); +#else +static inline void bootcount_register(struct bootcount_driver *d) {} +#endif + +#endif /* __BOOTCOUNT_H__ */ -- 1.8.4.rc1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] misc: add somfy bootcount support 2013-09-20 4:46 ` [PATCH 1/3] misc: add bootcount framework Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 ` Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 3/3] animeo_ip: add " Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 7:23 ` [PATCH 1/3] misc: add bootcount framework Sascha Hauer 2 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 UTC (permalink / raw) To: barebox we support different boot mode - normal - normal_forced - update - rescue - usb - network - test each of them need to be checked this will allow to decide what is the next boot mode during the boot sequence Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- drivers/misc/Kconfig | 4 ++ drivers/misc/Makefile | 1 + drivers/misc/somfy_bootcount.c | 138 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 drivers/misc/somfy_bootcount.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index a972ba4..44b7af0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -18,4 +18,8 @@ config JTAG config BOOTCOUNT bool +config SOMFY_BOOTCOUNT + tristate "Somfy Boot Count" + select BOOTCOUNT + endif # MISC_DEVICES diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index fa668c1..4e2e6cc 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_JTAG) += jtag.o obj-$(CONFIG_BOOTCOUNT) += bootcount.o +obj-$(CONFIG_SOMFY_BOOTCOUNT) += somfy_bootcount.o diff --git a/drivers/misc/somfy_bootcount.c b/drivers/misc/somfy_bootcount.c new file mode 100644 index 0000000..3771ab7 --- /dev/null +++ b/drivers/misc/somfy_bootcount.c @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + * + * GPLv2 Only + */ + +#include <common.h> +#include <driver.h> +#include <init.h> +#include <io.h> +#include <errno.h> +#include <bootcount.h> + +#define SOMFY_BOOTCOUNT_UPDATE (0x5550) << 16 +#define SOMFY_BOOTCOUNT_RESCUE (0x5245) << 16 +#define SOMFY_BOOTCOUNT_USB (0x5542) << 16 +#define SOMFY_BOOTCOUNT_NETWORK (0x4E54) << 16 +#define SOMFY_BOOTCOUNT_TEST (0x5445) << 16 +#define SOMFY_BOOTCOUNT_NORMAL (0xb001) << 16 +#define SOMFY_BOOTCOUNT_NORMAL_FORCED (0xb002) << 16 + +static u32 somfy_boot_mode_mask[] = { + SOMFY_BOOTCOUNT_NORMAL, + SOMFY_BOOTCOUNT_NORMAL_FORCED, + SOMFY_BOOTCOUNT_UPDATE, + SOMFY_BOOTCOUNT_RESCUE, + SOMFY_BOOTCOUNT_USB, + SOMFY_BOOTCOUNT_NETWORK, + SOMFY_BOOTCOUNT_TEST, +}; + +static const char *somfy_boot_modes[] = { + "normal", + "normal_forced", + "update", + "rescue", + "usb", + "network", + "test", +}; + +struct somfy_bootcount { + struct device_d *dev; + int mode; + int count; + void __iomem *base; + struct bootcount_driver drv; +}; + +static void somfy_bootcount_set(struct somfy_bootcount *sb) +{ + u32 val; + + val = somfy_boot_mode_mask[sb->mode] | (sb->count & 0xffff); + + writel(val, sb->base); +} + +static int somfy_bootcount_mode_set(struct param_d *p, void *priv) +{ + struct somfy_bootcount *sb = priv; + + sb->count = 0; + somfy_bootcount_set(sb); + + return 0; +} + +static int somfy_bootcount_count_set(struct param_d *p, void *priv) +{ + struct somfy_bootcount *sb = priv; + + somfy_bootcount_set(sb); + + return 0; +} + +static void somfy_bootcount_parse(struct somfy_bootcount *sb) +{ + u32 val; + int i; + + val = readl(sb->base); + + for (i = 0; i < ARRAY_SIZE(somfy_boot_mode_mask); i++) { + u32 mask = somfy_boot_mode_mask[i]; + + if ((val & 0xffff0000) == mask) + goto found; + } + + return; + +found: + sb->mode = i; + sb->count = val & 0xffff; +} + +static void somfy_bootcount_inc(struct bootcount_driver *d) +{ + struct somfy_bootcount *sb = d->priv; + + sb->count++; + somfy_bootcount_set(sb); +} + + +static int somfy_bootcount_probe(struct device_d *dev) +{ + struct somfy_bootcount *sb; + + sb = xzalloc(sizeof(*sb)); + sb->base = dev_request_mem_region(dev, 0); + sb->dev = dev; + + sb->drv.priv = sb; + sb->drv.inc = somfy_bootcount_inc; + bootcount_register(&sb->drv); + somfy_bootcount_parse(sb); + + dev_add_param_int(dev, "count", somfy_bootcount_count_set, + NULL, &sb->count, "%d", sb); + dev_add_param_enum(dev, "mode", somfy_bootcount_mode_set, + NULL, &sb->mode, somfy_boot_modes, ARRAY_SIZE(somfy_boot_modes), sb); + + return 0; +} + +static struct driver_d somfy_bootcount_driver = { + .name = "somfy_bootcount", + .probe = somfy_bootcount_probe, +}; + +static int somfy_bootcount_init(void) +{ + return platform_driver_register(&somfy_bootcount_driver); +} +postcore_initcall(somfy_bootcount_init); -- 1.8.4.rc1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] animeo_ip: add bootcount support 2013-09-20 4:46 ` [PATCH 1/3] misc: add bootcount framework Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 2/3] misc: add somfy bootcount support Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 ` Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 7:23 ` [PATCH 1/3] misc: add bootcount framework Sascha Hauer 2 siblings, 0 replies; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 4:46 UTC (permalink / raw) To: barebox when updating to defaultenv-2 we will use it to decide what to boot Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> --- arch/arm/boards/animeo_ip/init.c | 2 ++ arch/arm/configs/animeo_ip_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index 56b8df2..08fef58 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -219,6 +219,8 @@ static int animeo_ip_devices_init(void) animeo_ip_add_device_mci(); animeo_ip_add_device_buttons(); animeo_ip_add_device_led(); + add_generic_device("somfy_bootcount", DEVICE_ID_SINGLE, NULL, AT91SAM9260_BASE_GPBR + 2 * 4, + 4, IORESOURCE_MEM, NULL); armlinux_set_bootparams((void *)(AT91_CHIPSELECT_1 + 0x100)); /* diff --git a/arch/arm/configs/animeo_ip_defconfig b/arch/arm/configs/animeo_ip_defconfig index 23e7278..f4463b7 100644 --- a/arch/arm/configs/animeo_ip_defconfig +++ b/arch/arm/configs/animeo_ip_defconfig @@ -68,6 +68,8 @@ CONFIG_UBI=y CONFIG_MCI=y CONFIG_MCI_STARTUP=y CONFIG_MCI_ATMEL=y +CONFIG_MISC_DEVICES=y +CONFIG_SOMFY_BOOTCOUNT=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_GPIO_BICOLOR=y -- 1.8.4.rc1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] misc: add bootcount framework 2013-09-20 4:46 ` [PATCH 1/3] misc: add bootcount framework Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 2/3] misc: add somfy bootcount support Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 3/3] animeo_ip: add " Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 7:23 ` Sascha Hauer 2013-09-20 8:01 ` Jean-Christophe PLAGNIOL-VILLARD 2 siblings, 1 reply; 7+ messages in thread From: Sascha Hauer @ 2013-09-20 7:23 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox On Fri, Sep 20, 2013 at 06:46:15AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > --- > drivers/misc/Kconfig | 3 +++ > drivers/misc/Makefile | 1 + > drivers/misc/bootcount.c | 24 ++++++++++++++++++++++++ > include/bootcount.h | 21 +++++++++++++++++++++ > 4 files changed, 49 insertions(+) > create mode 100644 drivers/misc/bootcount.c > create mode 100644 include/bootcount.h > > diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > index 606490b..a972ba4 100644 > --- a/drivers/misc/Kconfig > +++ b/drivers/misc/Kconfig > @@ -15,4 +15,7 @@ config JTAG > help > Controls JTAG chains connected to I/O pins > > +config BOOTCOUNT > + bool > + > endif # MISC_DEVICES > diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile > index b085577..fa668c1 100644 > --- a/drivers/misc/Makefile > +++ b/drivers/misc/Makefile > @@ -3,3 +3,4 @@ > # > > obj-$(CONFIG_JTAG) += jtag.o > +obj-$(CONFIG_BOOTCOUNT) += bootcount.o > diff --git a/drivers/misc/bootcount.c b/drivers/misc/bootcount.c > new file mode 100644 > index 0000000..0205d00 > --- /dev/null > +++ b/drivers/misc/bootcount.c > @@ -0,0 +1,24 @@ > +/* > + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > + * > + * GPLv2 Only > + */ > + > +#include <common.h> > +#include <init.h> > +#include <bootcount.h> > + > +static struct bootcount_driver *bd; > + > +void bootcount_register(struct bootcount_driver *drv) > +{ > + bd = drv; > +} > + > +static int bootcount_inc(void) > +{ > + if (bd) > + bd->inc(bd); > + return 0; > +} > +late_initcall(bootcount_inc); This 'framework' in it's current state doesn't make much sense. It doesn't even have support for reading the actual count back which I would see as one of the minimum requirements for this. Also it's not clear what exactly this boot counter counts. Is it the number of boots since the beginning of time? Or is it the boot counter since the last power cycle or since the RTC Backup battery was last changed? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] misc: add bootcount framework 2013-09-20 7:23 ` [PATCH 1/3] misc: add bootcount framework Sascha Hauer @ 2013-09-20 8:01 ` Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 12:39 ` Sascha Hauer 0 siblings, 1 reply; 7+ messages in thread From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 8:01 UTC (permalink / raw) To: Sascha Hauer; +Cc: barebox On 09:23 Fri 20 Sep , Sascha Hauer wrote: > On Fri, Sep 20, 2013 at 06:46:15AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > --- > > drivers/misc/Kconfig | 3 +++ > > drivers/misc/Makefile | 1 + > > drivers/misc/bootcount.c | 24 ++++++++++++++++++++++++ > > include/bootcount.h | 21 +++++++++++++++++++++ > > 4 files changed, 49 insertions(+) > > create mode 100644 drivers/misc/bootcount.c > > create mode 100644 include/bootcount.h > > > > diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig > > index 606490b..a972ba4 100644 > > --- a/drivers/misc/Kconfig > > +++ b/drivers/misc/Kconfig > > @@ -15,4 +15,7 @@ config JTAG > > help > > Controls JTAG chains connected to I/O pins > > > > +config BOOTCOUNT > > + bool > > + > > endif # MISC_DEVICES > > diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile > > index b085577..fa668c1 100644 > > --- a/drivers/misc/Makefile > > +++ b/drivers/misc/Makefile > > @@ -3,3 +3,4 @@ > > # > > > > obj-$(CONFIG_JTAG) += jtag.o > > +obj-$(CONFIG_BOOTCOUNT) += bootcount.o > > diff --git a/drivers/misc/bootcount.c b/drivers/misc/bootcount.c > > new file mode 100644 > > index 0000000..0205d00 > > --- /dev/null > > +++ b/drivers/misc/bootcount.c > > @@ -0,0 +1,24 @@ > > +/* > > + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> > > + * > > + * GPLv2 Only > > + */ > > + > > +#include <common.h> > > +#include <init.h> > > +#include <bootcount.h> > > + > > +static struct bootcount_driver *bd; > > + > > +void bootcount_register(struct bootcount_driver *drv) > > +{ > > + bd = drv; > > +} > > + > > +static int bootcount_inc(void) > > +{ > > + if (bd) > > + bd->inc(bd); > > + return 0; > > +} > > +late_initcall(bootcount_inc); > > This 'framework' in it's current state doesn't make much sense. It > doesn't even have support for reading the actual count back which I > would see as one of the minimum requirements for this. I let the driver handle this we can move this here if you want > > Also it's not clear what exactly this boot counter counts. Is it the > number of boots since the beginning of time? Or is it the boot counter > since the last power cycle or since the RTC Backup battery was last > changed? the boot count is alway how many time the system start the number will depend on you system if you use an env it;s will be since ever. If you use a regsiter it will be since ever if register is a backup powered register or since power on the comportement will depend on the implementation and the hardware feature for somfy it's since ever as we use a backup register which is powered by a backup battery Best Regards, J. _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] misc: add bootcount framework 2013-09-20 8:01 ` Jean-Christophe PLAGNIOL-VILLARD @ 2013-09-20 12:39 ` Sascha Hauer 0 siblings, 0 replies; 7+ messages in thread From: Sascha Hauer @ 2013-09-20 12:39 UTC (permalink / raw) To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox On Fri, Sep 20, 2013 at 10:01:27AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 09:23 Fri 20 Sep , Sascha Hauer wrote: > > > > This 'framework' in it's current state doesn't make much sense. It > > doesn't even have support for reading the actual count back which I > > would see as one of the minimum requirements for this. > > I let the driver handle this > > we can move this here if you want If you want to make this a framework then make sure the users interact with the framework and not with the drivers. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-09-20 12:39 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-09-20 4:45 [PATCH 0/3] introduce bootcount support Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 1/3] misc: add bootcount framework Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 2/3] misc: add somfy bootcount support Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 4:46 ` [PATCH 3/3] animeo_ip: add " Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 7:23 ` [PATCH 1/3] misc: add bootcount framework Sascha Hauer 2013-09-20 8:01 ` Jean-Christophe PLAGNIOL-VILLARD 2013-09-20 12:39 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox