Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
can: rename get_can_dlc() macro with can_cc_dlc2len()
The get_can_dlc() macro is used to ensure the payload length information of
the Classical CAN frame to be max 8 bytes (the CAN_MAX_DLEN).
Rename the macro and use the correct constant in preparation of the len/dlc
cleanup for Classical CAN frames.
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20201110101852.1973-3-socketcan@hartkopp.net
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
authored by
Oliver Hartkopp
and committed by
Marc Kleine-Budde
69d98969
ea780056
+45
-45
+1
-1
drivers/net/can/at91_can.c
+1
-1
drivers/net/can/at91_can.c
···
580
580
cf->can_id = (reg_mid >> 18) & CAN_SFF_MASK;
581
581
582
582
reg_msr = at91_read(priv, AT91_MSR(mb));
583
-
cf->can_dlc = get_can_dlc((reg_msr >> 16) & 0xf);
583
+
cf->can_dlc = can_cc_dlc2len((reg_msr >> 16) & 0xf);
584
584
585
585
if (reg_msr & AT91_MSR_MRTR)
586
586
cf->can_id |= CAN_RTR_FLAG;
+1
-1
drivers/net/can/c_can/c_can.c
+1
-1
drivers/net/can/c_can/c_can.c
+1
-1
drivers/net/can/cc770/cc770.c
+1
-1
drivers/net/can/cc770/cc770.c
+1
-1
drivers/net/can/flexcan.c
+1
-1
drivers/net/can/flexcan.c
···
1005
1005
if (reg_ctrl & FLEXCAN_MB_CNT_BRS)
1006
1006
cfd->flags |= CANFD_BRS;
1007
1007
} else {
1008
-
cfd->len = get_can_dlc((reg_ctrl >> 16) & 0xf);
1008
+
cfd->len = can_cc_dlc2len((reg_ctrl >> 16) & 0xf);
1009
1009
1010
1010
if (reg_ctrl & FLEXCAN_MB_CNT_RTR)
1011
1011
cfd->can_id |= CAN_RTR_FLAG;
+1
-1
drivers/net/can/grcan.c
+1
-1
drivers/net/can/grcan.c
···
1201
1201
cf->can_id = ((slot[0] & GRCAN_MSG_BID)
1202
1202
>> GRCAN_MSG_BID_BIT);
1203
1203
}
1204
-
cf->can_dlc = get_can_dlc((slot[1] & GRCAN_MSG_DLC)
1204
+
cf->can_dlc = can_cc_dlc2len((slot[1] & GRCAN_MSG_DLC)
1205
1205
>> GRCAN_MSG_DLC_BIT);
1206
1206
if (rtr) {
1207
1207
cf->can_id |= CAN_RTR_FLAG;
+1
-1
drivers/net/can/ifi_canfd/ifi_canfd.c
+1
-1
drivers/net/can/ifi_canfd/ifi_canfd.c
+2
-2
drivers/net/can/janz-ican3.c
+2
-2
drivers/net/can/janz-ican3.c
···
916
916
917
917
cf->can_id |= desc->data[0] << 3;
918
918
cf->can_id |= (desc->data[1] & 0xe0) >> 5;
919
-
cf->can_dlc = get_can_dlc(desc->data[1] & ICAN3_CAN_DLC_MASK);
919
+
cf->can_dlc = can_cc_dlc2len(desc->data[1] & ICAN3_CAN_DLC_MASK);
920
920
memcpy(cf->data, &desc->data[2], cf->can_dlc);
921
921
} else {
922
-
cf->can_dlc = get_can_dlc(desc->data[0] & ICAN3_CAN_DLC_MASK);
922
+
cf->can_dlc = can_cc_dlc2len(desc->data[0] & ICAN3_CAN_DLC_MASK);
923
923
if (desc->data[0] & ICAN3_EFF_RTR)
924
924
cf->can_id |= CAN_RTR_FLAG;
925
925
+1
-1
drivers/net/can/m_can/m_can.c
+1
-1
drivers/net/can/m_can/m_can.c
+1
-1
drivers/net/can/mscan/mscan.c
+1
-1
drivers/net/can/mscan/mscan.c
···
312
312
if (can_id & 1)
313
313
frame->can_id |= CAN_RTR_FLAG;
314
314
315
-
frame->can_dlc = get_can_dlc(in_8(®s->rx.dlr) & 0xf);
315
+
frame->can_dlc = can_cc_dlc2len(in_8(®s->rx.dlr) & 0xf);
316
316
317
317
if (!(frame->can_id & CAN_RTR_FLAG)) {
318
318
void __iomem *data = ®s->rx.dsr1_0;
+2
-2
drivers/net/can/pch_can.c
+2
-2
drivers/net/can/pch_can.c
···
683
683
if (id2 & PCH_ID2_DIR)
684
684
cf->can_id |= CAN_RTR_FLAG;
685
685
686
-
cf->can_dlc = get_can_dlc((ioread32(&priv->regs->
686
+
cf->can_dlc = can_cc_dlc2len((ioread32(&priv->regs->
687
687
ifregs[0].mcont)) & 0xF);
688
688
689
689
for (i = 0; i < cf->can_dlc; i += 2) {
···
715
715
iowrite32(PCH_CMASK_RX_TX_GET | PCH_CMASK_CLRINTPND,
716
716
&priv->regs->ifregs[1].cmask);
717
717
pch_can_rw_msg_obj(&priv->regs->ifregs[1].creq, int_stat);
718
-
dlc = get_can_dlc(ioread32(&priv->regs->ifregs[1].mcont) &
718
+
dlc = can_cc_dlc2len(ioread32(&priv->regs->ifregs[1].mcont) &
719
719
PCH_IF_MCONT_DLC);
720
720
stats->tx_bytes += dlc;
721
721
stats->tx_packets++;
+1
-1
drivers/net/can/peak_canfd/peak_canfd.c
+1
-1
drivers/net/can/peak_canfd/peak_canfd.c
···
259
259
if (rx_msg_flags & PUCAN_MSG_EXT_DATA_LEN)
260
260
cf_len = can_dlc2len(get_canfd_dlc(pucan_msg_get_dlc(msg)));
261
261
else
262
-
cf_len = get_can_dlc(pucan_msg_get_dlc(msg));
262
+
cf_len = can_cc_dlc2len(pucan_msg_get_dlc(msg));
263
263
264
264
/* if this frame is an echo, */
265
265
if (rx_msg_flags & PUCAN_MSG_LOOPED_BACK) {
+1
-1
drivers/net/can/rcar/rcar_can.c
+1
-1
drivers/net/can/rcar/rcar_can.c
···
659
659
cf->can_id = (data >> RCAR_CAN_SID_SHIFT) & CAN_SFF_MASK;
660
660
661
661
dlc = readb(&priv->regs->mb[RCAR_CAN_RX_FIFO_MBX].dlc);
662
-
cf->can_dlc = get_can_dlc(dlc);
662
+
cf->can_dlc = can_cc_dlc2len(dlc);
663
663
if (data & RCAR_CAN_RTR) {
664
664
cf->can_id |= CAN_RTR_FLAG;
665
665
} else {
+2
-2
drivers/net/can/rcar/rcar_canfd.c
+2
-2
drivers/net/can/rcar/rcar_canfd.c
···
1448
1448
if (sts & RCANFD_RFFDSTS_RFFDF)
1449
1449
cf->len = can_dlc2len(RCANFD_RFPTR_RFDLC(dlc));
1450
1450
else
1451
-
cf->len = get_can_dlc(RCANFD_RFPTR_RFDLC(dlc));
1451
+
cf->len = can_cc_dlc2len(RCANFD_RFPTR_RFDLC(dlc));
1452
1452
1453
1453
if (sts & RCANFD_RFFDSTS_RFESI) {
1454
1454
cf->flags |= CANFD_ESI;
···
1464
1464
rcar_canfd_get_data(priv, cf, RCANFD_F_RFDF(ridx, 0));
1465
1465
}
1466
1466
} else {
1467
-
cf->len = get_can_dlc(RCANFD_RFPTR_RFDLC(dlc));
1467
+
cf->len = can_cc_dlc2len(RCANFD_RFPTR_RFDLC(dlc));
1468
1468
if (id & RCANFD_RFID_RFRTR)
1469
1469
cf->can_id |= CAN_RTR_FLAG;
1470
1470
else
+1
-1
drivers/net/can/sja1000/sja1000.c
+1
-1
drivers/net/can/sja1000/sja1000.c
+1
-1
drivers/net/can/softing/softing_main.c
+1
-1
drivers/net/can/softing/softing_main.c
+1
-1
drivers/net/can/spi/hi311x.c
+1
-1
drivers/net/can/spi/hi311x.c
···
341
341
}
342
342
343
343
/* Data length */
344
-
frame->can_dlc = get_can_dlc(buf[HI3110_FIFO_WOTIME_DLC_OFF] & 0x0F);
344
+
frame->can_dlc = can_cc_dlc2len(buf[HI3110_FIFO_WOTIME_DLC_OFF] & 0x0F);
345
345
346
346
if (buf[HI3110_FIFO_WOTIME_ID_OFF + 3] & HI3110_FIFO_WOTIME_ID_RTR)
347
347
frame->can_id |= CAN_RTR_FLAG;
+2
-2
drivers/net/can/spi/mcp251x.c
+2
-2
drivers/net/can/spi/mcp251x.c
···
664
664
for (i = 1; i < RXBDAT_OFF; i++)
665
665
buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
666
666
667
-
len = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
667
+
len = can_cc_dlc2len(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
668
668
for (; i < (RXBDAT_OFF + len); i++)
669
669
buf[i] = mcp251x_read_reg(spi, RXBCTRL(buf_idx) + i);
670
670
} else {
···
720
720
frame->can_id |= CAN_RTR_FLAG;
721
721
}
722
722
/* Data length */
723
-
frame->can_dlc = get_can_dlc(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
723
+
frame->can_dlc = can_cc_dlc2len(buf[RXBDLC_OFF] & RXBDLC_LEN_MASK);
724
724
memcpy(frame->data, buf + RXBDAT_OFF, frame->can_dlc);
725
725
726
726
priv->net->stats.rx_packets++;
+1
-1
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+1
-1
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+1
-1
drivers/net/can/sun4i_can.c
+1
-1
drivers/net/can/sun4i_can.c
···
475
475
return;
476
476
477
477
fi = readl(priv->base + SUN4I_REG_BUF0_ADDR);
478
-
cf->can_dlc = get_can_dlc(fi & 0x0F);
478
+
cf->can_dlc = can_cc_dlc2len(fi & 0x0F);
479
479
if (fi & SUN4I_MSG_EFF_FLAG) {
480
480
dreg = SUN4I_REG_BUF5_ADDR;
481
481
id = (readl(priv->base + SUN4I_REG_BUF1_ADDR) << 21) |
+1
-1
drivers/net/can/ti_hecc.c
+1
-1
drivers/net/can/ti_hecc.c
···
566
566
data = hecc_read_mbx(priv, mbxno, HECC_CANMCF);
567
567
if (data & HECC_CANMCF_RTR)
568
568
cf->can_id |= CAN_RTR_FLAG;
569
-
cf->can_dlc = get_can_dlc(data & 0xF);
569
+
cf->can_dlc = can_cc_dlc2len(data & 0xF);
570
570
571
571
data = hecc_read_mbx(priv, mbxno, HECC_CANMDL);
572
572
*(__be32 *)(cf->data) = cpu_to_be32(data);
+1
-1
drivers/net/can/usb/ems_usb.c
+1
-1
drivers/net/can/usb/ems_usb.c
···
306
306
return;
307
307
308
308
cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
309
-
cf->can_dlc = get_can_dlc(msg->msg.can_msg.length & 0xF);
309
+
cf->can_dlc = can_cc_dlc2len(msg->msg.can_msg.length & 0xF);
310
310
311
311
if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME ||
312
312
msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME)
+1
-1
drivers/net/can/usb/esd_usb2.c
+1
-1
drivers/net/can/usb/esd_usb2.c
+1
-1
drivers/net/can/usb/gs_usb.c
+1
-1
drivers/net/can/usb/gs_usb.c
+2
-2
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+2
-2
drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
···
1180
1180
if (flags & KVASER_USB_HYDRA_CF_FLAG_OVERRUN)
1181
1181
kvaser_usb_can_rx_over_error(priv->netdev);
1182
1182
1183
-
cf->can_dlc = get_can_dlc(cmd->rx_can.dlc);
1183
+
cf->can_dlc = can_cc_dlc2len(cmd->rx_can.dlc);
1184
1184
1185
1185
if (flags & KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME)
1186
1186
cf->can_id |= CAN_RTR_FLAG;
···
1257
1257
if (flags & KVASER_USB_HYDRA_CF_FLAG_ESI)
1258
1258
cf->flags |= CANFD_ESI;
1259
1259
} else {
1260
-
cf->len = get_can_dlc(dlc);
1260
+
cf->len = can_cc_dlc2len(dlc);
1261
1261
}
1262
1262
1263
1263
if (flags & KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME)
+2
-2
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
+2
-2
drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
···
978
978
else
979
979
cf->can_id &= CAN_SFF_MASK;
980
980
981
-
cf->can_dlc = get_can_dlc(cmd->u.leaf.log_message.dlc);
981
+
cf->can_dlc = can_cc_dlc2len(cmd->u.leaf.log_message.dlc);
982
982
983
983
if (cmd->u.leaf.log_message.flags & MSG_FLAG_REMOTE_FRAME)
984
984
cf->can_id |= CAN_RTR_FLAG;
···
996
996
cf->can_id |= CAN_EFF_FLAG;
997
997
}
998
998
999
-
cf->can_dlc = get_can_dlc(rx_data[5]);
999
+
cf->can_dlc = can_cc_dlc2len(rx_data[5]);
1000
1000
1001
1001
if (cmd->u.rx_can_header.flag & MSG_FLAG_REMOTE_FRAME)
1002
1002
cf->can_id |= CAN_RTR_FLAG;
+1
-1
drivers/net/can/usb/mcba_usb.c
+1
-1
drivers/net/can/usb/mcba_usb.c
+1
-1
drivers/net/can/usb/peak_usb/pcan_usb.c
+1
-1
drivers/net/can/usb/peak_usb/pcan_usb.c
+1
-1
drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+1
-1
drivers/net/can/usb/peak_usb/pcan_usb_fd.c
+4
-4
drivers/net/can/usb/ucan.c
+4
-4
drivers/net/can/usb/ucan.c
···
303
303
struct ucan_urb_context *context_array;
304
304
};
305
305
306
-
static u8 ucan_get_can_dlc(struct ucan_can_msg *msg, u16 len)
306
+
static u8 ucan_can_cc_dlc2len(struct ucan_can_msg *msg, u16 len)
307
307
{
308
308
if (le32_to_cpu(msg->id) & CAN_RTR_FLAG)
309
-
return get_can_dlc(msg->dlc);
309
+
return can_cc_dlc2len(msg->dlc);
310
310
else
311
-
return get_can_dlc(len - (UCAN_IN_HDR_SIZE + sizeof(msg->id)));
311
+
return can_cc_dlc2len(len - (UCAN_IN_HDR_SIZE + sizeof(msg->id)));
312
312
}
313
313
314
314
static void ucan_release_context_array(struct ucan_priv *up)
···
614
614
cf->can_id = canid;
615
615
616
616
/* compute DLC taking RTR_FLAG into account */
617
-
cf->can_dlc = ucan_get_can_dlc(&m->msg.can_msg, len);
617
+
cf->can_dlc = ucan_can_cc_dlc2len(&m->msg.can_msg, len);
618
618
619
619
/* copy the payload of non RTR frames */
620
620
if (!(cf->can_id & CAN_RTR_FLAG) || (cf->can_id & CAN_ERR_FLAG))
+1
-1
drivers/net/can/usb/usb_8dev.c
+1
-1
drivers/net/can/usb/usb_8dev.c
+2
-2
drivers/net/can/xilinx_can.c
+2
-2
drivers/net/can/xilinx_can.c
···
759
759
XCAN_DLCR_DLC_SHIFT;
760
760
761
761
/* Change Xilinx CAN data length format to socketCAN data format */
762
-
cf->can_dlc = get_can_dlc(dlc);
762
+
cf->can_dlc = can_cc_dlc2len(dlc);
763
763
764
764
/* Change Xilinx CAN ID format to socketCAN ID format */
765
765
if (id_xcan & XCAN_IDR_IDE_MASK) {
···
835
835
cf->len = can_dlc2len((dlc & XCAN_DLCR_DLC_MASK) >>
836
836
XCAN_DLCR_DLC_SHIFT);
837
837
else
838
-
cf->len = get_can_dlc((dlc & XCAN_DLCR_DLC_MASK) >>
838
+
cf->len = can_cc_dlc2len((dlc & XCAN_DLCR_DLC_MASK) >>
839
839
XCAN_DLCR_DLC_SHIFT);
840
840
841
841
/* Change Xilinx CAN ID format to socketCAN ID format */
+4
-4
include/linux/can/dev.h
+4
-4
include/linux/can/dev.h
···
98
98
}
99
99
100
100
/*
101
-
* get_can_dlc(value) - helper macro to cast a given data length code (dlc)
102
-
* to u8 and ensure the dlc value to be max. 8 bytes.
101
+
* can_cc_dlc2len(value) - convert a given data length code (dlc) of a
102
+
* Classical CAN frame into a valid data length of max. 8 bytes.
103
103
*
104
104
* To be used in the CAN netdriver receive path to ensure conformance with
105
105
* ISO 11898-1 Chapter 8.4.2.3 (DLC field)
106
106
*/
107
-
#define get_can_dlc(i) (min_t(u8, (i), CAN_MAX_DLC))
108
-
#define get_canfd_dlc(i) (min_t(u8, (i), CANFD_MAX_DLC))
107
+
#define can_cc_dlc2len(dlc) (min_t(u8, (dlc), CAN_MAX_DLEN))
108
+
#define get_canfd_dlc(dlc) (min_t(u8, (dlc), CANFD_MAX_DLC))
109
109
110
110
/* Check for outgoing skbs that have not been created by the CAN subsystem */
111
111
static inline bool can_skb_headroom_valid(struct net_device *dev,