#define BF(value, field) (((value) << BO_##field) & BM_##field)
#define WRITE_POSTAMBLE_US 2
+#define MXC_OTP_BUSY_TIMEOUT 1000
-static void wait_busy(struct ocotp_regs *regs, unsigned int delay_us)
+static bool wait_busy(struct ocotp_regs *regs, unsigned int delay_us)
{
- while (readl(®s->ctrl) & BM_CTRL_BUSY)
+ unsigned long start;
+ u32 reg;
+
+ start = get_timer_masked();
+ while ((reg = readl(®s->ctrl)) & BM_CTRL_BUSY) {
udelay(delay_us);
+ if (get_timer(start) > MXC_OTP_BUSY_TIMEOUT)
+ break;
+ }
+ if (!(reg & BM_CTRL_BUSY))
+ return 1;
+ return !(readl(®s->ctrl) & BM_CTRL_BUSY);
}
static void clear_error(struct ocotp_regs *regs)
*regs = (struct ocotp_regs *)OCOTP_BASE_ADDR;
if (bank >= ARRAY_SIZE((*regs)->bank) ||
- word >= ARRAY_SIZE((*regs)->bank[0].fuse_regs) >> 2 ||
+ word >= ARRAY_SIZE((*regs)->bank[0].fuse_regs) ||
!assert) {
printf("mxc_ocotp %s(): Invalid argument\n", caller);
return -EINVAL;
enable_ocotp_clk(1);
- wait_busy(*regs, 1);
- clear_error(*regs);
+ if (wait_busy(*regs, 1))
+ clear_error(*regs);
+ else
+ return -ETIMEDOUT;
return 0;
}
err = !!(readl(®s->ctrl) & BM_CTRL_ERROR);
clear_error(regs);
-
enable_ocotp_clk(0);
if (err) {
setup_direct_access(regs, bank, word, false);
writel(BM_READ_CTRL_READ_FUSE, ®s->read_ctrl);
- wait_busy(regs, 1);
- *val = readl(®s->read_fuse_data);
+ if (wait_busy(regs, 1))
+ *val = readl(®s->read_fuse_data);
+ else
+ *val = ~0;
return finish_access(regs, __func__);
}