rockchip: efuse: add RK3288/RK3328 support
Subsystems (3)
cover rockchip: efuse: add RK3288/RK3328 support
This extends rockchip efuse driver with support for RK3288 and RK3328.
Patch 1 and 2 was picked from vendor u-boot and updated to work with mainline u-boot.
Patch 3 updates and enable the efuse node in rk3288.dtsi.
This makes it possible to get a persisted ethaddr using:
CONFIG_MISC=y
CONFIG_MISC_INIT_R=y
CONFIG_ROCKCHIP_EFUSE=y
CONFIG_SHA256=y
Best regards,
Jonas
Francis Fan (1):
rockchip: efuse: add support for RK3288 non-secure efuse
Jonas Karlman (1):
rockchip: dts: rk3288: enable efuse node
Joseph Chen (1):
rockchip: efuse: add support for RK3328 non-secure efuse
arch/arm/dts/rk3288.dtsi | 3 +- drivers/misc/rockchip-efuse.c | 158 +++++++++++++++++++++++++++++++++- 2 files changed, 155 insertions(+), 6 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 rockchip: efuse: add support for RK3288 non-secure efuse
From: Francis Fan <[email protected]>
Extend rockchip efuse driver with support for RK3288 non-secure efuse.
--- drivers/misc/rockchip-efuse.c | 91 +++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-)
drivers/misc/rockchip-efuse.c +87 -4
@@ -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_PGENB BIT(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 , &efuse->ctrl); +udelay (1 ); + +while (size--) { +writel (readl (&efuse->ctrl) & + (~(RK3288_A_MASK <<RK3288_A_SHIFT )), + &efuse->ctrl); +/* set addr */ +writel (readl (&efuse->ctrl) | + ((offset++ &RK3288_A_MASK ) <<RK3288_A_SHIFT ), + &efuse->ctrl); +udelay (1 ); +/* strobe low to high */ +writel (readl (&efuse->ctrl) | +RK3288_STROBE , &efuse->ctrl); +ndelay (60 ); +/* read data */ + *buffer++ =readl (&efuse->dout); +/* reset strobe to low */ +writel (readl (&efuse->ctrl) & + (~RK3288_STROBE ), &efuse->ctrl); +udelay (1 ); + } + +/* Switch to standby mode */ +writel (RK3288_PGENB |RK3288_CSB , &efuse->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)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3188-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3228-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3288-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3368-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3399-efuse" , + .data = (ulong)&rockchip_rk3399_efuse_read, + }, {} };
Signature · 1 line
2.17.1
PATCH 1/3 rockchip: efuse: add support for RK3288 non-secure efuse
Hi Jonas,
Quoted 20 lines · Jonas Karlman
From: Francis Fan <[email protected]>
Extend rockchip efuse driver with support for RK3288 non-secure efuse.
Signed-off-by Francis Fan <[email protected]>Signed-off-by Cody Xie <[email protected]>Signed-off-by Jonas Karlman <[email protected]>--- drivers/misc/rockchip-efuse.c | 91 +++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-)drivers/misc/rockchip-efuse.c +0
-0@@ -27,6 +27,17 @@#define RK3399_STROBE BIT(1)#define RK3399_CSB BIT(0)
drivers/misc/rockchip-efuse.c line 39
Quoted 10 lines
drivers/misc/rockchip-efuse.c +10
-0+#define RK3288_A_SHIFT 6 +#define RK3288_A_MASK 0x3ff +#define RK3288_NFUSES 32 +#define RK3288_BYTES_PER_FUSE 1 +#define RK3288_PGENB BIT(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?
drivers/misc/rockchip-efuse.c static int dump_efuses(struct cmd_tbl *cmdtp, int flag, · line 67
Quoted 10 lines
drivers/misc/rockchip-efuse.c +2
-1+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
Quoted 29 lines
drivers/misc/rockchip-efuse.c +14
-1int 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 */
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 163
Quoted 10 lines
drivers/misc/rockchip-efuse.c +10
-0+writel (RK3288_LOAD |RK3288_PGENB , &efuse->ctrl); +udelay (1 ); + +while (size--) { +writel (readl (&efuse->ctrl) & + (~(RK3288_A_MASK <<RK3288_A_SHIFT )), + &efuse->ctrl); +/* set addr */ + writel(readl(&efuse->ctrl) | + ((offset++ & RK3288_A_MASK) << RK3288_A_SHIFT),
Can offset++ go@the end of this loop?
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 168
Quoted 5 lines
drivers/misc/rockchip-efuse.c +5
-0+ &efuse->ctrl); +udelay (1 ); +/* strobe low to high */ +writel (readl (&efuse->ctrl) | +RK3288_STROBE , &efuse->ctrl);
setbits_le32(&efuse->ctrl), RK3288_STROBE)l;
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 174
Quoted 6 lines
drivers/misc/rockchip-efuse.c +6
-0+ndelay (60 ); +/* read data */ + *buffer++ =readl (&efuse->dout); +/* reset strobe to low */ +writel (readl (&efuse->ctrl) & + (~RK3288_STROBE ), &efuse->ctrl);
clrbits_le32
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 179
Quoted 5 lines
drivers/misc/rockchip-efuse.c +5
-0+udelay (1 ); + } + +/* Switch to standby mode */ +writel (RK3288_PGENB |RK3288_CSB , &efuse->ctrl);
as above
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 188
Quoted 9 lines
drivers/misc/rockchip-efuse.c +5
-1+ +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;
drivers/misc/rockchip-efuse.c static int rockchip_rk3399_efuse_read(struct udevice *dev, int offset, · line 193
Quoted 6 lines
drivers/misc/rockchip-efuse.c +6
-0+ + efuse_read = (EFUSE_READ )dev_get_driver_data (dev); +if (!efuse_read) +return -ENOSYS ; + +return (*efuse_read)(dev, offset, buf, size);
Drop the *
drivers/misc/rockchip-efuse.c static int rockchip_efuse_ofdata_to_platdata(struct udevice *dev) · line 211
Quoted 11 lines
drivers/misc/rockchip-efuse.c +3
-1}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)&rockchip_rk3288_efuse_read,
You could use an enum to set the type, but it's up to you.
Quoted 25 lines
drivers/misc/rockchip-efuse.c +21
-1+ }, + { + .compatible = "rockchip,rk3188-efuse", + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible = "rockchip,rk3228-efuse", + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible = "rockchip,rk3288-efuse", + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible = "rockchip,rk3368-efuse", + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible = "rockchip,rk3399-efuse", + .data = (ulong)&rockchip_rk3399_efuse_read, + }, {} }; --
Quoted 2 lines
2.17.1
Regards,
Simon
PATCH 1/3 rockchip: efuse: add support for RK3288 non-secure efuse
In reply to Jonas KarlmanHi Jonas,
??? Could you help to format the coding style as required so that we
can merge this patch to the mainline?
Thanks,
- Kever
Quoted 144 lines · Jonas Karlman
From: Francis Fan <[email protected]>
Extend rockchip efuse driver with support for RK3288 non-secure efuse.
Signed-off-by Francis Fan <[email protected]>Signed-off-by Cody Xie <[email protected]>Signed-off-by Jonas Karlman <[email protected]>--- drivers/misc/rockchip-efuse.c | 91 +++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-)drivers/misc/rockchip-efuse.c +87
-4@@ -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_PGENB BIT(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 , &efuse->ctrl); +udelay (1 ); + +while (size--) { +writel (readl (&efuse->ctrl) & + (~(RK3288_A_MASK <<RK3288_A_SHIFT )), + &efuse->ctrl); +/* set addr */ +writel (readl (&efuse->ctrl) | + ((offset++ &RK3288_A_MASK ) <<RK3288_A_SHIFT ), + &efuse->ctrl); +udelay (1 ); +/* strobe low to high */ +writel (readl (&efuse->ctrl) | +RK3288_STROBE , &efuse->ctrl); +ndelay (60 ); +/* read data */ + *buffer++ =readl (&efuse->dout); +/* reset strobe to low */ +writel (readl (&efuse->ctrl) & + (~RK3288_STROBE ), &efuse->ctrl); +udelay (1 ); + } + +/* Switch to standby mode */ +writel (RK3288_PGENB |RK3288_CSB , &efuse->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)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3188-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3228-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3288-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3368-efuse" , + .data = (ulong)&rockchip_rk3288_efuse_read, + }, + { + .compatible ="rockchip,rk3399-efuse" , + .data = (ulong)&rockchip_rk3399_efuse_read, + }, {} };
PATCH 2/3 rockchip: efuse: add support for RK3328 non-secure efuse
In reply to Jonas KarlmanFrom: Joseph Chen <[email protected]>
Extend rockchip efuse driver with support for RK3328 non-secure efuse.
--- drivers/misc/rockchip-efuse.c | 67 +++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)
drivers/misc/rockchip-efuse.c +67 -0
@@ -13,6 +13,7 @@#include <dm.h> #include <linux/bitops.h> #include <linux/delay.h> +#include <malloc.h> #include <misc.h> #define RK3399_A_SHIFT 16
@@ -36,6 +37,13 @@#define RK3288_STROBE BIT(1)#define RK3288_CSB BIT(0) +#define RK3328_INT_STATUS 0x0018 +#define RK3328_DOUT 0x0020 +#define RK3328_AUTO_CTRL 0x0024 +#define RK3328_INT_FINISH BIT(0) +#define RK3328_AUTO_ENB BIT(0) +#define RK3328_AUTO_RD BIT(1) +typedef int (*EFUSE_READ )(struct udevice *dev,int offset,void *buf,int size);struct rockchip_efuse_regs {
@@ -46,6 +54,10 @@ struct rockchip_efuse_regs {u32 jtag_pass;/* 0x10 JTAG password */ u32 strobe_finish_ctrl;/* 0x14 efuse strobe finish control register */ +u32 int_status;/* 0x18 */ +u32 reserved;/* 0x1c */ +u32 dout2;/* 0x20 */ +u32 auto_ctrl;/* 0x24 */ };struct rockchip_efuse_platdata {
@@ -181,6 +193,57 @@ static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset,return 0 ; } +static int rockchip_rk3328_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; +unsigned int addr_start, addr_end, addr_offset, addr_len; +u32 out_value, status; +u8 *buffer; +int ret =0 , i =0 , j =0 ; + +/* Max non-secure Byte */ +if (size >32 ) + size =32 ; + +/* 128 Byte efuse, 96 Byte for secure, 32 Byte for non-secure */ + offset +=96 ; + addr_start =rounddown (offset,RK3399_BYTES_PER_FUSE ) / +RK3399_BYTES_PER_FUSE ; + addr_end =roundup (offset + size,RK3399_BYTES_PER_FUSE ) / +RK3399_BYTES_PER_FUSE ; + addr_offset = offset %RK3399_BYTES_PER_FUSE ; + addr_len = addr_end - addr_start; + + buffer =calloc (1 ,sizeof (*buffer) * addr_len *RK3399_BYTES_PER_FUSE ); +if (!buffer) +return -ENOMEM ; + +for (j =0 ; j < addr_len; j++) { +writel (RK3328_AUTO_RD |RK3328_AUTO_ENB | + ((addr_start++ &RK3399_A_MASK ) <<RK3399_A_SHIFT ), + &efuse->auto_ctrl); +udelay (5 ); + status =readl (&efuse->int_status); +if (!(status &RK3328_INT_FINISH )) { + ret = -EIO ; + goto err; + } + out_value =readl (&efuse->dout2); +writel (RK3328_INT_FINISH , &efuse->int_status); + +memcpy (&buffer[i], &out_value,RK3399_BYTES_PER_FUSE ); + i +=RK3399_BYTES_PER_FUSE ; + } +memcpy (buf, buffer + addr_offset, size); +err: +free (buffer); + +return ret; +} +static int rockchip_efuse_read (struct udevice *dev,int offset,void *buf,int size) {
@@ -226,6 +289,10 @@ static const struct udevice_id rockchip_efuse_ids[] = { .compatible = "rockchip,rk3368-efuse", .data = (ulong)&rockchip_rk3288_efuse_read, }, + { + .compatible = "rockchip,rk3328-efuse", + .data = (ulong)&rockchip_rk3328_efuse_read, + }, { .compatible = "rockchip,rk3399-efuse", .data = (ulong)&rockchip_rk3399_efuse_read,
Signature · 1 line
2.17.1
PATCH 2/3 rockchip: efuse: add support for RK3328 non-secure efuse
Hi Jonas,
Quoted 49 lines · Jonas Karlman
From: Joseph Chen <[email protected]>
Extend rockchip efuse driver with support for RK3328 non-secure efuse.
Signed-off-by Joseph Chen <[email protected]>Signed-off-by Jonas Karlman <[email protected]>--- drivers/misc/rockchip-efuse.c | 67 +++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+)drivers/misc/rockchip-efuse.c +12
-0@@ -13,6 +13,7 @@#include <dm.h> #include <linux/bitops.h> #include <linux/delay.h> +#include <malloc.h> #include <misc.h> #define RK3399_A_SHIFT 16@@ -36,6 +37,13 @@#define RK3288_STROBE BIT(1)#define RK3288_CSB BIT(0) +#define RK3328_INT_STATUS 0x0018 +#define RK3328_DOUT 0x0020 +#define RK3328_AUTO_CTRL 0x0024 +#define RK3328_INT_FINISH BIT(0) +#define RK3328_AUTO_ENB BIT(0) +#define RK3328_AUTO_RD BIT(1) +typedef int (*EFUSE_READ )(struct udevice *dev,int offset,void *buf,int size);struct rockchip_efuse_regs {@@ -46,6 +54,10 @@ struct rockchip_efuse_regs {u32 jtag_pass;/* 0x10 JTAG password */ u32 strobe_finish_ctrl;/* 0x14 efuse strobe finish control register */ +u32 int_status;/* 0x18 */ +u32 reserved;/* 0x1c */ +u32 dout2;/* 0x20 */ +u32 auto_ctrl;/* 0x24 */ };struct rockchip_efuse_platdata {
drivers/misc/rockchip-efuse.c static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, · line 197
Quoted 5 lines
drivers/misc/rockchip-efuse.c +2
-0@@ -181,6 +193,57 @@ static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset,return 0 ; } +static int rockchip_rk3328_efuse_read (struct udevice *dev,int offset, +void *buf,int size)
Is this a completely different algorithm from rk3399, or just different parameters?
drivers/misc/rockchip-efuse.c static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, · line 205
Quoted 8 lines
drivers/misc/rockchip-efuse.c +8
-0+{ +struct rockchip_efuse_platdata *plat =dev_get_platdata (dev); +struct rockchip_efuse_regs *efuse = + (struct rockchip_efuse_regs *)plat->base; +unsigned int addr_start, addr_end, addr_offset, addr_len; +u32 out_value, status; +u8 *buffer; +int ret =0 , i =0 , j =0 ;
Don't init unless needed.
Quoted 11 lines
drivers/misc/rockchip-efuse.c +11
-0+ +/* Max non-secure Byte */ +if (size >32 ) + size =32 ; + +/* 128 Byte efuse, 96 Byte for secure, 32 Byte for non-secure */ + offset +=96 ; + addr_start =rounddown (offset,RK3399_BYTES_PER_FUSE ) / +RK3399_BYTES_PER_FUSE ; + addr_end =roundup (offset + size,RK3399_BYTES_PER_FUSE ) / +RK3399_BYTES_PER_FUSE ;
drivers/misc/rockchip-efuse.c static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, · line 226
Quoted 10 lines
drivers/misc/rockchip-efuse.c +10
-0+ addr_offset = offset %RK3399_BYTES_PER_FUSE ; + addr_len = addr_end - addr_start; + + buffer =calloc (1 ,sizeof (*buffer) * addr_len *RK3399_BYTES_PER_FUSE ); +if (!buffer) +return -ENOMEM ; + +for (j =0 ; j < addr_len; j++) { + writel(RK3328_AUTO_RD | RK3328_AUTO_ENB | + ((addr_start++ & RK3399_A_MASK) << RK3399_A_SHIFT),
Move addr_start to end of loop
drivers/misc/rockchip-efuse.c static int rockchip_rk3288_efuse_read(struct udevice *dev, int offset, · line 238
Quoted 12 lines
drivers/misc/rockchip-efuse.c +12
-0+ &efuse->auto_ctrl); +udelay (5 ); + status =readl (&efuse->int_status); +if (!(status &RK3328_INT_FINISH )) { + ret = -EIO ; + goto err; + } + out_value =readl (&efuse->dout2); +writel (RK3328_INT_FINISH , &efuse->int_status); + +memcpy (&buffer[i], &out_value,RK3399_BYTES_PER_FUSE ); + i +=RK3399_BYTES_PER_FUSE ;
Please use a proper descriptive variable name instead of i.
Quoted 23 lines
drivers/misc/rockchip-efuse.c +12
-1+ } +memcpy (buf, buffer + addr_offset, size); +err: +free (buffer); + +return ret; +} +static int rockchip_efuse_read (struct udevice *dev,int offset,void *buf,int size) {@@ -226,6 +289,10 @@ static const struct udevice_id rockchip_efuse_ids[] = { .compatible = "rockchip,rk3368-efuse", .data = (ulong)&rockchip_rk3288_efuse_read, }, + { + .compatible = "rockchip,rk3328-efuse", + .data = (ulong)&rockchip_rk3328_efuse_read, + }, { .compatible = "rockchip,rk3399-efuse", .data = (ulong)&rockchip_rk3399_efuse_read, --
Quoted 2 lines
2.17.1
Regards,
Simon
PATCH 3/3 rockchip: dts: rk3288: enable efuse node
In reply to Jonas KarlmanEnable efuse node so that boards can use cpu id in efuse as a source for serial# and ethaddr.
--- arch/arm/dts/rk3288.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/dts/rk3288.dtsi +1 -2
@@ -919,8 +919,7 @@ efuse: efuse at ffb40000 { compatible = "rockchip,rk3288-efuse"; - reg = <0xffb40000 0x10000>; - status = "disabled"; + reg = <0xffb40000 0x20>; }; gic: interrupt-controller at ffc01000 {
Signature · 1 line
2.17.1
PATCH 3/3 rockchip: dts: rk3288: enable efuse node
Quoted 8 lines · Jonas Karlman
Enable efuse node so that boards can use cpu id in efuse as a source for serial# and ethaddr.
Signed-off-by Jonas Karlman <[email protected]>--- arch/arm/dts/rk3288.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)