From patchwork Wed Nov 5 07:58:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 5232961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 15EDD9F295 for ; Wed, 5 Nov 2014 09:08:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 521D62015A for ; Wed, 5 Nov 2014 09:08:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7FFC920145 for ; Wed, 5 Nov 2014 09:08:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XlwXl-0002qw-5f; Wed, 05 Nov 2014 09:06:21 +0000 Received: from mail-bn1bon0137.outbound.protection.outlook.com ([157.56.111.137] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XlwXF-0002Cb-E7 for linux-arm-kernel@lists.infradead.org; Wed, 05 Nov 2014 09:05:50 +0000 Received: from BN3PR0301CA0042.namprd03.prod.outlook.com (25.160.180.180) by BY2PR03MB330.namprd03.prod.outlook.com (10.141.139.18) with Microsoft SMTP Server (TLS) id 15.1.11.9; Wed, 5 Nov 2014 09:05:24 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::171) by BN3PR0301CA0042.outlook.office365.com (2a01:111:e400:4000::52) with Microsoft SMTP Server (TLS) id 15.1.11.14 via Frontend Transport; Wed, 5 Nov 2014 09:05:24 +0000 Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server (TLS) id 15.1.6.13 via Frontend Transport; Wed, 5 Nov 2014 09:05:23 +0000 Received: from shlinux2.ap.freescale.net (shlinux2.ap.freescale.net [10.192.224.44]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id sA5957Qu031871; Wed, 5 Nov 2014 02:05:20 -0700 From: Dong Aisheng To: Subject: [PATCH V1 4/4] can: m_can: allow to send std frame on CAN FD mode Date: Wed, 5 Nov 2014 15:58:46 +0800 Message-ID: <1415174326-6623-4-git-send-email-b29396@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415174326-6623-1-git-send-email-b29396@freescale.com> References: <1415174326-6623-1-git-send-email-b29396@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(189002)(199003)(104016003)(110136001)(106466001)(120916001)(95666004)(105606002)(107046002)(229853001)(2351001)(97736003)(88136002)(99396003)(93916002)(77156002)(84676001)(33646002)(89996001)(64706001)(87936001)(50986999)(76176999)(68736004)(31966008)(104166001)(50466002)(21056001)(26826002)(47776003)(20776003)(19580405001)(46102003)(6806004)(102836001)(48376002)(50226001)(44976005)(4396001)(19580395003)(87286001)(62966003)(92566001)(36756003)(92726001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB330; H:tx30smr01.am.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB330; X-Exchange-Antispam-Report-Test: UriScan:; X-Forefront-PRVS: 0386B406AA Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=Aisheng.Dong@freescale.com; X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141105_010549_757096_032D252A X-CRM114-Status: UNSURE ( 8.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: netdev@vger.kernel.org, varkabhadram@gmail.com, mkl@pengutronix.de, linux-arm-kernel@lists.infradead.org, socketcan@hartkopp.net, b29396@freescale.com, wg@grandegger.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/net/can/m_can/m_can.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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); }