Re: [PATCH v2 2/2] bootcount: Add pmic pfuze100 bootcount driver

2022-03-25 Thread Tom Rini
On Fri, Mar 18, 2022 at 12:04:38PM +0100, Philip Oberfichtner wrote:

> Use the MEMA - MEMD registers on the PFUZE100 as bootcount
> registers.
> 
> Based on work from Heiko Schocher .
> Signed-off-by: Philip Oberfichtner 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature


[PATCH v2 2/2] bootcount: Add pmic pfuze100 bootcount driver

2022-03-18 Thread Philip Oberfichtner
Use the MEMA - MEMD registers on the PFUZE100 as bootcount
registers.

Based on work from Heiko Schocher .
Signed-off-by: Philip Oberfichtner 

---

Changes in v2:
- Migrated bootcount driver to driver model
- Introduced error handling. Previously errors were ignored.

 drivers/bootcount/Kconfig |   7 ++
 drivers/bootcount/Makefile|   1 +
 drivers/bootcount/pmic_pfuze100.c | 161 ++
 3 files changed, 169 insertions(+)
 create mode 100644 drivers/bootcount/pmic_pfuze100.c

diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig
index 607027c968..509d01d41e 100644
--- a/drivers/bootcount/Kconfig
+++ b/drivers/bootcount/Kconfig
@@ -127,6 +127,13 @@ config DM_BOOTCOUNT_I2C_EEPROM
  pointing to the underlying i2c eeprom device) and an optional 'offset'
  property are supported.
 
+config DM_BOOTCOUNT_PMIC_PFUZE100
+   bool "Enable Bootcount driver for PMIC PFUZE100"
+   depends on DM_PMIC_PFUZE100
+   help
+ Enable support for the bootcounter using PMIC PFUZE100 registers.
+ This works only, if the PMIC is not connected.
+
 config DM_BOOTCOUNT_SPI_FLASH
bool "Support SPI flash devices as a backing store for bootcount"
depends on DM_SPI_FLASH
diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile
index 3a784bb0a6..b65959a384 100644
--- a/drivers/bootcount/Makefile
+++ b/drivers/bootcount/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_BOOTCOUNT_EXT)   += bootcount_ext.o
 obj-$(CONFIG_BOOTCOUNT_AM33XX_NVMEM)   += bootcount_nvmem.o
 
 obj-$(CONFIG_DM_BOOTCOUNT)  += bootcount-uclass.o
+obj-$(CONFIG_DM_BOOTCOUNT_PMIC_PFUZE100) += pmic_pfuze100.o
 obj-$(CONFIG_DM_BOOTCOUNT_RTC)  += rtc.o
 obj-$(CONFIG_DM_BOOTCOUNT_I2C_EEPROM)  += i2c-eeprom.o
 obj-$(CONFIG_DM_BOOTCOUNT_SPI_FLASH)   += spi-flash.o
diff --git a/drivers/bootcount/pmic_pfuze100.c 
b/drivers/bootcount/pmic_pfuze100.c
new file mode 100644
index 00..ad3bc03829
--- /dev/null
+++ b/drivers/bootcount/pmic_pfuze100.c
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (C) 2018-2022 Denx Software Engineering GmbH
+ * Heiko Schocher 
+ * Philip Oberfichtner 
+ *
+ * A bootcount driver using the registers MEMA - MEMD on the PFUZE100.
+ * This works only, if the PMIC is not connected.
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define PFUZE_BC_MAGIC 0xdead
+
+struct bootcount_pmic_priv {
+   struct udevice *pmic;
+};
+
+static int pfuze100_get_magic(struct udevice *dev, u32 *magic)
+{
+   int ret;
+
+   ret = pmic_reg_read(dev, PFUZE100_MEMA);
+   if (ret < 0)
+   return ret;
+   *magic = ret;
+
+   ret = pmic_reg_read(dev, PFUZE100_MEMB);
+   if (ret < 0)
+   return ret;
+   *magic += ret << 8;
+
+   return 0;
+}
+
+static int pfuze100_set_magic(struct udevice *dev)
+{
+   int ret;
+
+   ret = pmic_reg_write(dev, PFUZE100_MEMA, PFUZE_BC_MAGIC & 0xff);
+   if (ret)
+   return ret;
+
+   ret = pmic_reg_write(dev, PFUZE100_MEMB, (PFUZE_BC_MAGIC >> 8) & 0xff);
+   return ret;
+}
+
+static int pfuze100_get_value(struct udevice *dev, u32 *a)
+{
+   int ret;
+
+   ret = pmic_reg_read(dev, PFUZE100_MEMC);
+   if (ret < 0)
+   return ret;
+   *a = ret;
+
+   ret = pmic_reg_read(dev, PFUZE100_MEMD);
+   if (ret < 0)
+   return ret;
+   *a += ret << 8;
+
+   return 0;
+}
+
+static int pfuze100_set_value(struct udevice *dev, u32 val)
+{
+   int ret;
+
+   ret = pmic_reg_write(dev, PFUZE100_MEMC, val & 0xff);
+   if (ret)
+   return ret;
+
+   ret = pmic_reg_write(dev, PFUZE100_MEMD, (val >> 8) & 0xff);
+   return ret;
+}
+
+static int bootcount_pmic_set(struct udevice *dev, const u32 a)
+{
+   struct bootcount_pmic_priv *priv = dev_get_priv(dev);
+
+   if (pfuze100_set_magic(priv->pmic)) {
+   debug("%s: writing magic failed\n", __func__);
+   return -EIO;
+   }
+
+   if (pfuze100_set_value(priv->pmic, a)) {
+   debug("%s: writing value failed\n", __func__);
+   return -EIO;
+   }
+
+   return 0;
+}
+
+static int bootcount_pmic_get(struct udevice *dev, u32 *a)
+{
+   struct bootcount_pmic_priv *priv = dev_get_priv(dev);
+   u32 magic;
+
+   if (pfuze100_get_magic(priv->pmic, &magic)) {
+   debug("%s: reading magic failed\n", __func__);
+   return -EIO;
+   }
+
+   if (magic != PFUZE_BC_MAGIC) {
+   *a = 0;
+   return 0;
+   }
+
+   if (pfuze100_get_value(priv->pmic, a)) {
+   debug("%s: reading value failed\n", __func__);
+   return -EIO;
+   }
+
+   return 0;
+}
+
+static int bootcount_pmic_probe(struct udevice *dev)
+{
+   struct ofnode_phandle_args phandle_args;
+   struct bootcount_pmic_priv *priv = dev_get_pri