github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 18:13:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

can: rockchip_canfd: add support for CAN_CTRLMODE_BERR_REPORTING

Browse Source 
Add support for Bus Error Reporting.

Tested-by: Alibek Omarov <a1ba.omarov@gmail.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patch.msgid.link/20240904-rockchip-canfd-v5-20-8ae22bcb27cc@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2023-12-19 12:33:30 +01:00
parent edf1dd18c8
commit e3b5fa0f08
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/can/rockchip/rockchip_canfd-core.c
View File

@ -293,6 +293,12 @@ static void rkcanfd_chip_start(struct rkcanfd_priv *priv)
RKCANFD_REG_INT_OVERLOAD_INT |
RKCANFD_REG_INT_TX_FINISH_INT;
/* Do not mask the bus error interrupt if the bus error
* reporting is requested.
*/
if (!(priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING))
priv->reg_int_mask_default |= RKCANFD_REG_INT_ERROR_INT;
memset(&priv->bec, 0x0, sizeof(priv->bec));
rkcanfd_chip_fifo_setup(priv);
@ -533,14 +539,16 @@ static int rkcanfd_handle_error_int(struct rkcanfd_priv *priv)
if (!reg_ec)
return 0;
skb = rkcanfd_alloc_can_err_skb(priv, &cf, &timestamp);
if (cf) {
struct can_berr_counter bec;
if (priv->can.ctrlmode & CAN_CTRLMODE_BERR_REPORTING) {
skb = rkcanfd_alloc_can_err_skb(priv, &cf, &timestamp);
if (cf) {
struct can_berr_counter bec;
rkcanfd_get_berr_counter_corrected(priv, &bec);
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT;
cf->data[6] = bec.txerr;
cf->data[7] = bec.rxerr;
rkcanfd_get_berr_counter_corrected(priv, &bec);
cf->can_id |= CAN_ERR_PROT | CAN_ERR_BUSERROR | CAN_ERR_CNT;
cf->data[6] = bec.txerr;
cf->data[7] = bec.rxerr;
}
}
rkcanfd_handle_error_int_reg_ec(priv, cf, reg_ec);
@ -899,7 +907,8 @@ static int rkcanfd_probe(struct platform_device *pdev)
priv->can.clock.freq = clk_get_rate(priv->clks[0].clk);
priv->can.bittiming_const = &rkcanfd_bittiming_const;
priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const;
priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK;
priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
CAN_CTRLMODE_BERR_REPORTING;
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
priv->can.do_set_mode = rkcanfd_set_mode;