| Message ID | 1415174326-6623-4-git-send-email-b29396@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/05/2014 08:58 AM, Dong Aisheng wrote: > The current code sends all CAN frames on CAN FD format(with BRS or not) > if CAN_CTRLMODE_FD is enabled. > However, even CAN_CTRLMODE_FD is enabled, the can tool may still > send normal frames. > e.g. > ip link set can0 up type can bitrate 1000000 dbitrate 1000000 fd on > cansend can0 123#112233 > > Therefore sending normal CAN frame on FD format seems not reasonable > and the CAN FD incapable device may not be able to receive it correctly. > > The patch switches the M_CAN operation mode to ISO11898-1 instead of > staying on CAN FD operation mode by writing "11" to CMR bit if find > we're sending a normal can skb. With this patch applied and Olivre's version of 3/4, how does the application send CAN-FD frames? 1. witch on CAN-FD via "ip fd on" 2. write a struct canfd_frame Correct? What happens if: 3. write a struct can_frame A CAN frame is send? Oliver are you okay with this behaviour? Marc
On 05.11.2014 11:41, Marc Kleine-Budde wrote: > On 11/05/2014 08:58 AM, Dong Aisheng wrote: >> The current code sends all CAN frames on CAN FD format(with BRS or not) >> if CAN_CTRLMODE_FD is enabled. >> However, even CAN_CTRLMODE_FD is enabled, the can tool may still >> send normal frames. >> e.g. >> ip link set can0 up type can bitrate 1000000 dbitrate 1000000 fd on >> cansend can0 123#112233 >> >> Therefore sending normal CAN frame on FD format seems not reasonable >> and the CAN FD incapable device may not be able to receive it correctly. >> >> The patch switches the M_CAN operation mode to ISO11898-1 instead of >> staying on CAN FD operation mode by writing "11" to CMR bit if find >> we're sending a normal can skb. > > With this patch applied and Olivre's version of 3/4, how does the > application send CAN-FD frames? This patch becomes obsolete when we do it like in my answer of [3/4]. > 1. witch on CAN-FD via "ip fd on" With ip link set can0 type can fd on the netdevice switches to the MTU of CAN FD (72) instead of 16. This means that this netdevice can handle CAN frames (MTU 16) and CAN FD frames (MTU 72). When you send a standard CAN frame, e.g. cansend can0 123#112233 you would get a CAN 2.0 frame (dlc = 3) on the bus. When you send a CAN FD frame, e.g. cansend can0 123##0112233 you would get a CAN FD frame (dlc = 3) on the bus. With cansend can0 123##1112233 you would get a CAN FD frame (dlc = 3) with BRS on the bus. Whether it is CAN or CAN FD is given by checking skb->len for CAN_MTU of CANFD_MTU in the driver. Regards, Oliver > 2. write a struct canfd_frame > > Correct? > > What happens if: > 3. write a struct can_frame > > A CAN frame is send? > > Oliver are you okay with this behaviour? > > Marc >
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index f47c200..219c4b7 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -1080,10 +1080,14 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb, if (priv->can.ctrlmode & CAN_CTRLMODE_FD) { cccr = m_can_read(priv, M_CAN_CCCR); cccr &= ~(CCCR_CMR_MASK << CCCR_CMR_SHIFT); - if (cf->flags & CANFD_BRS) - cccr |= CCCR_CMR_CANFD_BRS << CCCR_CMR_SHIFT; - else - cccr |= CCCR_CMR_CANFD << CCCR_CMR_SHIFT; + if (can_is_canfd_skb(skb)) { + if (cf->flags & CANFD_BRS) + cccr |= CCCR_CMR_CANFD_BRS << CCCR_CMR_SHIFT; + else + cccr |= CCCR_CMR_CANFD << CCCR_CMR_SHIFT; + } else { + cccr |= CCCR_CMR_CAN << CCCR_CMR_SHIFT; + } m_can_write(priv, M_CAN_CCCR, cccr); }
The current code sends all CAN frames on CAN FD format(with BRS or not) if CAN_CTRLMODE_FD is enabled. However, even CAN_CTRLMODE_FD is enabled, the can tool may still send normal frames. e.g. ip link set can0 up type can bitrate 1000000 dbitrate 1000000 fd on cansend can0 123#112233 Therefore sending normal CAN frame on FD format seems not reasonable and the CAN FD incapable device may not be able to receive it correctly. The patch switches the M_CAN operation mode to ISO11898-1 instead of staying on CAN FD operation mode by writing "11" to CMR bit if find we're sending a normal can skb. Signed-off-by: Dong Aisheng <b29396@freescale.com> --- drivers/net/can/m_can/m_can.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)