.. | .. |
---|
213 | 213 | |
---|
214 | 214 | rk_rng_writel(rk_rng, reg_ctrl, CRYPTO_V1_CTRL); |
---|
215 | 215 | |
---|
216 | | - ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V1_CTRL, reg_ctrl, |
---|
217 | | - !(reg_ctrl & CRYPTO_V1_RNG_START), |
---|
218 | | - ROCKCHIP_POLL_PERIOD_US, |
---|
219 | | - ROCKCHIP_POLL_TIMEOUT_US); |
---|
| 216 | + ret = read_poll_timeout(rk_rng_readl, reg_ctrl, |
---|
| 217 | + !(reg_ctrl & CRYPTO_V1_RNG_START), |
---|
| 218 | + ROCKCHIP_POLL_PERIOD_US, |
---|
| 219 | + ROCKCHIP_POLL_TIMEOUT_US, false, |
---|
| 220 | + rk_rng, CRYPTO_V1_CTRL); |
---|
| 221 | + |
---|
220 | 222 | if (ret < 0) |
---|
221 | 223 | goto out; |
---|
222 | 224 | |
---|
.. | .. |
---|
249 | 251 | rk_rng_writel(rk_rng, HIWORD_UPDATE(reg_ctrl, 0xffff, 0), |
---|
250 | 252 | CRYPTO_V2_RNG_CTL); |
---|
251 | 253 | |
---|
252 | | - ret = readl_poll_timeout(rk_rng->mem + CRYPTO_V2_RNG_CTL, reg_ctrl, |
---|
253 | | - !(reg_ctrl & CRYPTO_V2_RNG_START), |
---|
254 | | - ROCKCHIP_POLL_PERIOD_US, |
---|
255 | | - ROCKCHIP_POLL_TIMEOUT_US); |
---|
| 254 | + ret = read_poll_timeout(rk_rng_readl, reg_ctrl, |
---|
| 255 | + !(reg_ctrl & CRYPTO_V2_RNG_START), |
---|
| 256 | + ROCKCHIP_POLL_PERIOD_US, |
---|
| 257 | + ROCKCHIP_POLL_TIMEOUT_US, false, |
---|
| 258 | + rk_rng, CRYPTO_V2_RNG_CTL); |
---|
256 | 259 | if (ret < 0) |
---|
257 | 260 | goto out; |
---|
258 | 261 | |
---|
.. | .. |
---|
296 | 299 | udelay(10); |
---|
297 | 300 | |
---|
298 | 301 | /* wait for GENERATING and RESEEDING flag to clear */ |
---|
299 | | - readl_poll_timeout(rk_rng->mem + TRNG_V1_STAT, reg_ctrl, |
---|
300 | | - (reg_ctrl & mask) == TRNG_V1_STAT_SEEDED, |
---|
301 | | - ROCKCHIP_POLL_PERIOD_US, |
---|
302 | | - ROCKCHIP_POLL_TIMEOUT_US); |
---|
| 302 | + read_poll_timeout(rk_rng_readl, reg_ctrl, |
---|
| 303 | + (reg_ctrl & mask) == TRNG_V1_STAT_SEEDED, |
---|
| 304 | + ROCKCHIP_POLL_PERIOD_US, |
---|
| 305 | + ROCKCHIP_POLL_TIMEOUT_US, false, |
---|
| 306 | + rk_rng, TRNG_V1_STAT); |
---|
303 | 307 | } |
---|
304 | 308 | |
---|
305 | 309 | /* clear ISTAT flag because trng may auto reseeding when power on */ |
---|
.. | .. |
---|
337 | 341 | reg_ctrl = rk_rng_readl(rk_rng, TRNG_V1_ISTAT); |
---|
338 | 342 | if (!(reg_ctrl & TRNG_V1_ISTAT_RAND_RDY)) { |
---|
339 | 343 | /* wait RAND_RDY triggered */ |
---|
340 | | - ret = readl_poll_timeout(rk_rng->mem + TRNG_V1_ISTAT, reg_ctrl, |
---|
341 | | - (reg_ctrl & TRNG_V1_ISTAT_RAND_RDY), |
---|
342 | | - ROCKCHIP_POLL_PERIOD_US, |
---|
343 | | - ROCKCHIP_POLL_TIMEOUT_US); |
---|
| 344 | + ret = read_poll_timeout(rk_rng_readl, reg_ctrl, |
---|
| 345 | + (reg_ctrl & TRNG_V1_ISTAT_RAND_RDY), |
---|
| 346 | + ROCKCHIP_POLL_PERIOD_US, |
---|
| 347 | + ROCKCHIP_POLL_TIMEOUT_US, false, |
---|
| 348 | + rk_rng, TRNG_V1_ISTAT); |
---|
344 | 349 | if (ret < 0) |
---|
345 | 350 | goto out; |
---|
346 | 351 | } |
---|