From patchwork Wed Mar 2 10:42:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 590925 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9AFD214090A for ; Wed, 2 Mar 2016 21:43:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754915AbcCBKmy (ORCPT ); Wed, 2 Mar 2016 05:42:54 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:38971 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753332AbcCBKmu (ORCPT ); Wed, 2 Mar 2016 05:42:50 -0500 Received: from mail.nefkom.net (unknown [192.168.8.184]) by mail-out.m-online.net (Postfix) with ESMTP id 3qFX3D4L60z3hkFv; Wed, 2 Mar 2016 11:42:48 +0100 (CET) X-Auth-Info: RfpaIWtRUnAa3jKYtLQND+qHr7jraEid6A4Hc6Ui+HE= Received: from chi.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3qFX3C0fFCzvdWt; Wed, 2 Mar 2016 11:42:47 +0100 (CET) From: Marek Vasut To: linux-can@vger.kernel.org Cc: netdev@vger.kernel.org, Marek Vasut , Marc Kleine-Budde , Mark Rutland , Oliver Hartkopp , Wolfgang Grandegger Subject: [PATCH V2 2/4] net: can: ifi: Fix TX DLC configuration Date: Wed, 2 Mar 2016 11:42:37 +0100 Message-Id: <1456915359-6775-3-git-send-email-marex@denx.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456915359-6775-1-git-send-email-marex@denx.de> References: <1456915359-6775-1-git-send-email-marex@denx.de> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The TX DLC, the transmission length information, was not written into the transmit configuration register. When using the CAN core with different CAN controller, the receiving CAN controller will receive only the ID part of the CAN frame, but no data at all. This patch adds the TX DLC into the register to fix this issue. Signed-off-by: Marek Vasut Cc: Marc Kleine-Budde Cc: Mark Rutland Cc: Oliver Hartkopp Cc: Wolfgang Grandegger --- V2: - Use can_len2dlc() unconditionally to sanitize DLC in the TX path - The CAN_CTRLMODE_CANFD_NON_ISO can only ever be set if the CANFD_CTRLMODE_CANFD is set. Use only the later for checking if the core transmits in CANFD mode. --- drivers/net/can/ifi_canfd/ifi_canfd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c index 72f5205..4bbc7d9 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -772,12 +772,11 @@ static netdev_tx_t ifi_canfd_start_xmit(struct sk_buff *skb, txid = cf->can_id & CAN_SFF_MASK; } - if (priv->can.ctrlmode & (CAN_CTRLMODE_FD | CAN_CTRLMODE_FD_NON_ISO)) { - if (can_is_canfd_skb(skb)) { - txdlc |= IFI_CANFD_TXFIFO_DLC_EDL; - if (cf->flags & CANFD_BRS) - txdlc |= IFI_CANFD_TXFIFO_DLC_BRS; - } + txdlc |= can_len2dlc(cf->len); + if ((priv->can.ctrlmode & CAN_CTRLMODE_FD) && can_is_canfd_skb(skb)) { + txdlc |= IFI_CANFD_TXFIFO_DLC_EDL; + if (cf->flags & CANFD_BRS) + txdlc |= IFI_CANFD_TXFIFO_DLC_BRS; } if (cf->can_id & CAN_RTR_FLAG)