forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/drivers/crypto/rockchip/rk_crypto_v3_ahash.c
....@@ -56,8 +56,8 @@
5656 CRYPTO_WRITE(rk_dev, CRYPTO_RST_CTL, tmp | tmp_mask);
5757
5858 /* This is usually done in 20 clock cycles */
59
- ret = readl_poll_timeout_atomic(rk_dev->reg + CRYPTO_RST_CTL,
60
- tmp, !tmp, 0, pool_timeout_us);
59
+ ret = read_poll_timeout_atomic(CRYPTO_READ, tmp, !tmp, 0, pool_timeout_us,
60
+ false, rk_dev, CRYPTO_RST_CTL);
6161 if (ret)
6262 dev_err(rk_dev->dev, "cipher reset pool timeout %ums.",
6363 pool_timeout_us);
....@@ -72,11 +72,13 @@
7272
7373 CRYPTO_TRACE();
7474
75
- ret = readl_poll_timeout_atomic(rk_dev->reg + CRYPTO_MID_VALID,
75
+ ret = read_poll_timeout_atomic(CRYPTO_READ,
7676 reg_ctrl,
7777 reg_ctrl & CRYPTO_HASH_MID_IS_VALID,
78
- RK_POLL_PERIOD_US,
79
- RK_POLL_TIMEOUT_US);
78
+ 0,
79
+ RK_POLL_TIMEOUT_US,
80
+ false, rk_dev, CRYPTO_MID_VALID);
81
+
8082 CRYPTO_WRITE(rk_dev, CRYPTO_MID_VALID_SWITCH,
8183 CRYPTO_MID_VALID_ENABLE << CRYPTO_WRITE_MASK_SHIFT);
8284 if (ret) {
....@@ -362,11 +364,11 @@
362364
363365 memset(ctx->priv, 0x00, sizeof(struct rk_hash_mid_data));
364366
365
- ret = readl_poll_timeout_atomic(rk_dev->reg + CRYPTO_HASH_VALID,
366
- reg_ctrl,
367
- reg_ctrl & CRYPTO_HASH_IS_VALID,
368
- RK_POLL_PERIOD_US,
369
- RK_POLL_TIMEOUT_US);
367
+ ret = read_poll_timeout_atomic(CRYPTO_READ, reg_ctrl,
368
+ reg_ctrl & CRYPTO_HASH_IS_VALID,
369
+ RK_POLL_PERIOD_US,
370
+ RK_POLL_TIMEOUT_US, false,
371
+ rk_dev, CRYPTO_HASH_VALID);
370372 if (ret)
371373 goto exit;
372374