diff options
| author | Marc Kleine-Budde <[email protected]> | 2024-09-11 10:58:28 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <[email protected]> | 2024-09-11 10:58:28 +0200 |
| commit | 2b2a9a08f8f0b904ea2bc61db3374421b0f944a6 (patch) | |
| tree | efb16b8735043855d1ff2c99d297c8ee0df7fa61 | |
| parent | 709cbd5bb49b54c3d73c1a89b8ebce09c10ed2ed (diff) | |
| parent | a63e10462af67257b99b5330b32d1a47583803e2 (diff) | |
Merge patch series "can: rockchip_canfd: rework delay calculation and decoding of error code register"
Marc Kleine-Budde <[email protected]> says:
This series updates the delay calculation for the timekeeping delayed
work and fixes the decoding of the error code register.
Link: https://patch.msgid.link/20240911-can-rockchip_canfd-fixes-v1-0-5ce385b5ab10@pengutronix.de
Signed-off-by: Marc Kleine-Budde <[email protected]>
| -rw-r--r-- | drivers/net/can/rockchip/rockchip_canfd-core.c | 4 | ||||
| -rw-r--r-- | drivers/net/can/rockchip/rockchip_canfd-timestamp.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/can/rockchip/rockchip_canfd-core.c b/drivers/net/can/rockchip/rockchip_canfd-core.c index 6883153e8fc1..df18c85fc078 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-core.c +++ b/drivers/net/can/rockchip/rockchip_canfd-core.c @@ -491,11 +491,9 @@ rkcanfd_handle_error_int_reg_ec(struct rkcanfd_priv *priv, struct can_frame *cf, else if (reg_ec & RKCANFD_REG_ERROR_CODE_TX_CRC) cf->data[3] = CAN_ERR_PROT_LOC_CRC_SEQ; else if (reg_ec & RKCANFD_REG_ERROR_CODE_TX_ACK_EOF) - cf->data[3] = CAN_ERR_PROT_LOC_ACK; + cf->data[3] = CAN_ERR_PROT_LOC_ACK_DEL; else if (reg_ec & RKCANFD_REG_ERROR_CODE_TX_ACK) cf->data[3] = CAN_ERR_PROT_LOC_ACK; - else if (reg_ec & RKCANFD_REG_ERROR_CODE_TX_ACK_EOF) - cf->data[3] = CAN_ERR_PROT_LOC_ACK_DEL; /* RKCANFD_REG_ERROR_CODE_TX_ERROR */ else if (reg_ec & RKCANFD_REG_ERROR_CODE_TX_OVERLOAD) cf->data[2] |= CAN_ERR_PROT_OVERLOAD; diff --git a/drivers/net/can/rockchip/rockchip_canfd-timestamp.c b/drivers/net/can/rockchip/rockchip_canfd-timestamp.c index fb1a8f4e6217..43d4b5721812 100644 --- a/drivers/net/can/rockchip/rockchip_canfd-timestamp.c +++ b/drivers/net/can/rockchip/rockchip_canfd-timestamp.c @@ -71,8 +71,8 @@ void rkcanfd_timestamp_init(struct rkcanfd_priv *priv) max_cycles = div_u64(ULLONG_MAX, cc->mult); max_cycles = min(max_cycles, cc->mask); - work_delay_ns = div_u64(clocksource_cyc2ns(max_cycles, cc->mult, cc->shift), 3); - priv->work_delay_jiffies = nsecs_to_jiffies(work_delay_ns); + work_delay_ns = clocksource_cyc2ns(max_cycles, cc->mult, cc->shift); + priv->work_delay_jiffies = div_u64(work_delay_ns, 3u * NSEC_PER_SEC / HZ); INIT_DELAYED_WORK(&priv->timestamp, rkcanfd_timestamp_work); netdev_dbg(priv->ndev, "clock=%lu.%02luMHz bitrate=%lu.%02luMBit/s div=%u rate=%lu.%02luMHz mult=%u shift=%u delay=%lus\n", |