Re: [PATCH 1/3] rockchip: efuse: add support for RK3288 non-secure efuse

2020-10-30 Thread Kever Yang 

Hi Jonas,

    Could you help to format the coding style as required so that we 
can merge this patch to the mainline?



Thanks,
- Kever
On 2020/10/14 上午4:21, Jonas Karlman wrote:

From: Francis Fan 

Extend rockchip efuse driver with support for RK3288 non-secure efuse.

Signed-off-by: Francis Fan 
Signed-off-by: Cody Xie 
Signed-off-by: Jonas Karlman 
---
  drivers/misc/rockchip-efuse.c | 91 +--
  1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe..20423544d9 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -27,6 +27,17 @@
  #define RK3399_STROBE   BIT(1)
  #define RK3399_CSB  BIT(0)
  
+#define RK3288_A_SHIFT  6

+#define RK3288_A_MASK   0x3ff
+#define RK3288_NFUSES   32
+#define RK3288_BYTES_PER_FUSE   1
+#define RK3288_PGENBBIT(3)
+#define RK3288_LOAD BIT(2)
+#define RK3288_STROBE   BIT(1)
+#define RK3288_CSB  BIT(0)
+
+typedef int (*EFUSE_READ)(struct udevice *dev, int offset, void *buf, int 
size);
+
  struct rockchip_efuse_regs {
u32 ctrl;  /* 0x00  efuse control register */
u32 dout;  /* 0x04  efuse data out register */
@@ -53,7 +64,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
 */
  
  	struct udevice *dev;

-   u8 fuses[128];
+   u8 fuses[128] = {0};
int ret;
  
  	/* retrieve the device */

@@ -77,7 +88,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
  }
  
  U_BOOT_CMD(

-   rk3399_dump_efuses, 1, 1, dump_efuses,
+   rockchip_dump_efuses, 1, 1, dump_efuses,
"Dump the content of the efuses",
""
  );
@@ -127,10 +138,59 @@ static int rockchip_rk3399_efuse_read(struct udevice 
*dev, int offset,
return 0;
  }
  
+static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset,

+ void *buf, int size)
+{
+   struct rockchip_efuse_platdata *plat = dev_get_platdata(dev);
+   struct rockchip_efuse_regs *efuse =
+   (struct rockchip_efuse_regs *)plat->base;
+   u8 *buffer = buf;
+   int max_size = RK3288_NFUSES * RK3288_BYTES_PER_FUSE;
+
+   if (size > (max_size - offset))
+   size = max_size - offset;
+
+   /* Switch to read mode */
+   writel(RK3288_LOAD | RK3288_PGENB, >ctrl);
+   udelay(1);
+
+   while (size--) {
+   writel(readl(>ctrl) &
+   (~(RK3288_A_MASK << RK3288_A_SHIFT)),
+   >ctrl);
+   /* set addr */
+   writel(readl(>ctrl) |
+   ((offset++ & RK3288_A_MASK) << RK3288_A_SHIFT),
+   >ctrl);
+   udelay(1);
+   /* strobe low to high */
+   writel(readl(>ctrl) |
+   RK3288_STROBE, >ctrl);
+   ndelay(60);
+   /* read data */
+   *buffer++ = readl(>dout);
+   /* reset strobe to low */
+   writel(readl(>ctrl) &
+   (~RK3288_STROBE), >ctrl);
+   udelay(1);
+   }
+
+   /* Switch to standby mode */
+   writel(RK3288_PGENB | RK3288_CSB, >ctrl);
+
+   return 0;
+}
+
  static int rockchip_efuse_read(struct udevice *dev, int offset,
   void *buf, int size)
  {
-   return rockchip_rk3399_efuse_read(dev, offset, buf, size);
+   EFUSE_READ efuse_read = NULL;
+
+   efuse_read = (EFUSE_READ)dev_get_driver_data(dev);
+   if (!efuse_read)
+   return -ENOSYS;
+
+   return (*efuse_read)(dev, offset, buf, size);
  }
  
  static const struct misc_ops rockchip_efuse_ops = {

@@ -146,7 +206,30 @@ static int rockchip_efuse_ofdata_to_platdata(struct 
udevice *dev)
  }
  
  static const struct udevice_id rockchip_efuse_ids[] = {

-   { .compatible = "rockchip,rk3399-efuse" },
+   {
+   .compatible = "rockchip,rk3066a-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3188-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3228-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3288-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3368-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3399-efuse",
+   .data = (ulong)_rk3399_efuse_read,
+   },
{}
  };

Re: [PATCH 1/3] rockchip: efuse: add support for RK3288 non-secure efuse

2020-10-15 Thread Simon Glass 
Hi Jonas,

On Tue, 13 Oct 2020 at 14:21, Jonas Karlman  wrote:
>
> From: Francis Fan 
>
> Extend rockchip efuse driver with support for RK3288 non-secure efuse.
>
> Signed-off-by: Francis Fan 
> Signed-off-by: Cody Xie 
> Signed-off-by: Jonas Karlman 
> ---
>  drivers/misc/rockchip-efuse.c | 91 +--
>  1 file changed, 87 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
> index 46ce6305fe..20423544d9 100644
> --- a/drivers/misc/rockchip-efuse.c
> +++ b/drivers/misc/rockchip-efuse.c
> @@ -27,6 +27,17 @@
>  #define RK3399_STROBE   BIT(1)
>  #define RK3399_CSB  BIT(0)
>
> +#define RK3288_A_SHIFT  6
> +#define RK3288_A_MASK   0x3ff
> +#define RK3288_NFUSES   32
> +#define RK3288_BYTES_PER_FUSE   1
> +#define RK3288_PGENBBIT(3)
> +#define RK3288_LOAD BIT(2)
> +#define RK3288_STROBE   BIT(1)
> +#define RK3288_CSB  BIT(0)
> +
> +typedef int (*EFUSE_READ)(struct udevice *dev, int offset, void *buf, int 
> size);

Lower case, also how about efuse_read_func?

> +
>  struct rockchip_efuse_regs {
> u32 ctrl;  /* 0x00  efuse control register */
> u32 dout;  /* 0x04  efuse data out register */
> @@ -53,7 +64,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
>  */
>
> struct udevice *dev;
> -   u8 fuses[128];
> +   u8 fuses[128] = {0};

comment - what does this actually contain

> int ret;
>
> /* retrieve the device */
> @@ -77,7 +88,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
>  }
>
>  U_BOOT_CMD(
> -   rk3399_dump_efuses, 1, 1, dump_efuses,
> +   rockchip_dump_efuses, 1, 1, dump_efuses,
> "Dump the content of the efuses",
> ""
>  );
> @@ -127,10 +138,59 @@ static int rockchip_rk3399_efuse_read(struct udevice 
> *dev, int offset,
> return 0;
>  }
>
> +static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset,
> + void *buf, int size)
> +{
> +   struct rockchip_efuse_platdata *plat = dev_get_platdata(dev);
> +   struct rockchip_efuse_regs *efuse =
> +   (struct rockchip_efuse_regs *)plat->base;
> +   u8 *buffer = buf;
> +   int max_size = RK3288_NFUSES * RK3288_BYTES_PER_FUSE;
> +
> +   if (size > (max_size - offset))
> +   size = max_size - offset;
> +
> +   /* Switch to read mode */
> +   writel(RK3288_LOAD | RK3288_PGENB, >ctrl);
> +   udelay(1);
> +
> +   while (size--) {
> +   writel(readl(>ctrl) &
> +   (~(RK3288_A_MASK << RK3288_A_SHIFT)),
> +   >ctrl);
> +   /* set addr */
> +   writel(readl(>ctrl) |
> +   ((offset++ & RK3288_A_MASK) << 
> RK3288_A_SHIFT),

Can offset++ go at the end of this loop?

> +   >ctrl);
> +   udelay(1);
> +   /* strobe low to high */
> +   writel(readl(>ctrl) |
> +   RK3288_STROBE, >ctrl);

setbits_le32(>ctrl), RK3288_STROBE)l;

> +   ndelay(60);
> +   /* read data */
> +   *buffer++ = readl(>dout);
> +   /* reset strobe to low */
> +   writel(readl(>ctrl) &
> +   (~RK3288_STROBE), >ctrl);

clrbits_le32

> +   udelay(1);
> +   }
> +
> +   /* Switch to standby mode */
> +   writel(RK3288_PGENB | RK3288_CSB, >ctrl);

as above

> +
> +   return 0;
> +}
> +
>  static int rockchip_efuse_read(struct udevice *dev, int offset,
>void *buf, int size)
>  {
> -   return rockchip_rk3399_efuse_read(dev, offset, buf, size);
> +

 efuse_read = NULL;
> +
> +   efuse_read = (EFUSE_READ)dev_get_driver_data(dev);
> +   if (!efuse_read)
> +   return -ENOSYS;
> +
> +   return (*efuse_read)(dev, offset, buf, size);

Drop the *

>  }
>
>  static const struct misc_ops rockchip_efuse_ops = {
> @@ -146,7 +206,30 @@ static int rockchip_efuse_ofdata_to_platdata(struct 
> udevice *dev)
>  }
>
>  static const struct udevice_id rockchip_efuse_ids[] = {
> -   { .compatible = "rockchip,rk3399-efuse" },
> +   {
> +   .compatible = "rockchip,rk3066a-efuse",
> +   .data = (ulong)_rk3288_efuse_read,

You could use an enum to set the type, but it's up to you.

> +   },
> +   {
> +   .compatible = "rockchip,rk3188-efuse",
> +   .data = (ulong)_rk3288_efuse_read,
> +   },
> +   {
> +   .compatible = "rockchip,rk3228-efuse",
> +   .data = (ulong)_rk3288_efuse_read,
> +   },
> +   {
> +   .compatible = "rockchip,rk3288-efuse",
> +   .data = (ulong)_rk3288_efuse_read,
> +   },
> +   {
> +   .compatible

[PATCH 1/3] rockchip: efuse: add support for RK3288 non-secure efuse

2020-10-14 Thread Jonas Karlman 
From: Francis Fan 

Extend rockchip efuse driver with support for RK3288 non-secure efuse.

Signed-off-by: Francis Fan 
Signed-off-by: Cody Xie 
Signed-off-by: Jonas Karlman 
---
 drivers/misc/rockchip-efuse.c | 91 +--
 1 file changed, 87 insertions(+), 4 deletions(-)

diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c
index 46ce6305fe..20423544d9 100644
--- a/drivers/misc/rockchip-efuse.c
+++ b/drivers/misc/rockchip-efuse.c
@@ -27,6 +27,17 @@
 #define RK3399_STROBE   BIT(1)
 #define RK3399_CSB  BIT(0)
 
+#define RK3288_A_SHIFT  6
+#define RK3288_A_MASK   0x3ff
+#define RK3288_NFUSES   32
+#define RK3288_BYTES_PER_FUSE   1
+#define RK3288_PGENBBIT(3)
+#define RK3288_LOAD BIT(2)
+#define RK3288_STROBE   BIT(1)
+#define RK3288_CSB  BIT(0)
+
+typedef int (*EFUSE_READ)(struct udevice *dev, int offset, void *buf, int 
size);
+
 struct rockchip_efuse_regs {
u32 ctrl;  /* 0x00  efuse control register */
u32 dout;  /* 0x04  efuse data out register */
@@ -53,7 +64,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
 */
 
struct udevice *dev;
-   u8 fuses[128];
+   u8 fuses[128] = {0};
int ret;
 
/* retrieve the device */
@@ -77,7 +88,7 @@ static int dump_efuses(struct cmd_tbl *cmdtp, int flag,
 }
 
 U_BOOT_CMD(
-   rk3399_dump_efuses, 1, 1, dump_efuses,
+   rockchip_dump_efuses, 1, 1, dump_efuses,
"Dump the content of the efuses",
""
 );
@@ -127,10 +138,59 @@ static int rockchip_rk3399_efuse_read(struct udevice 
*dev, int offset,
return 0;
 }
 
+static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset,
+ void *buf, int size)
+{
+   struct rockchip_efuse_platdata *plat = dev_get_platdata(dev);
+   struct rockchip_efuse_regs *efuse =
+   (struct rockchip_efuse_regs *)plat->base;
+   u8 *buffer = buf;
+   int max_size = RK3288_NFUSES * RK3288_BYTES_PER_FUSE;
+
+   if (size > (max_size - offset))
+   size = max_size - offset;
+
+   /* Switch to read mode */
+   writel(RK3288_LOAD | RK3288_PGENB, >ctrl);
+   udelay(1);
+
+   while (size--) {
+   writel(readl(>ctrl) &
+   (~(RK3288_A_MASK << RK3288_A_SHIFT)),
+   >ctrl);
+   /* set addr */
+   writel(readl(>ctrl) |
+   ((offset++ & RK3288_A_MASK) << RK3288_A_SHIFT),
+   >ctrl);
+   udelay(1);
+   /* strobe low to high */
+   writel(readl(>ctrl) |
+   RK3288_STROBE, >ctrl);
+   ndelay(60);
+   /* read data */
+   *buffer++ = readl(>dout);
+   /* reset strobe to low */
+   writel(readl(>ctrl) &
+   (~RK3288_STROBE), >ctrl);
+   udelay(1);
+   }
+
+   /* Switch to standby mode */
+   writel(RK3288_PGENB | RK3288_CSB, >ctrl);
+
+   return 0;
+}
+
 static int rockchip_efuse_read(struct udevice *dev, int offset,
   void *buf, int size)
 {
-   return rockchip_rk3399_efuse_read(dev, offset, buf, size);
+   EFUSE_READ efuse_read = NULL;
+
+   efuse_read = (EFUSE_READ)dev_get_driver_data(dev);
+   if (!efuse_read)
+   return -ENOSYS;
+
+   return (*efuse_read)(dev, offset, buf, size);
 }
 
 static const struct misc_ops rockchip_efuse_ops = {
@@ -146,7 +206,30 @@ static int rockchip_efuse_ofdata_to_platdata(struct 
udevice *dev)
 }
 
 static const struct udevice_id rockchip_efuse_ids[] = {
-   { .compatible = "rockchip,rk3399-efuse" },
+   {
+   .compatible = "rockchip,rk3066a-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3188-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3228-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3288-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3368-efuse",
+   .data = (ulong)_rk3288_efuse_read,
+   },
+   {
+   .compatible = "rockchip,rk3399-efuse",
+   .data = (ulong)_rk3399_efuse_read,
+   },
{}
 };
 
-- 
2.17.1