From patchwork Sun Feb 28 10:38:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 388597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ABE2C433E0 for ; Sun, 28 Feb 2021 10:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 074CE64E56 for ; Sun, 28 Feb 2021 10:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbhB1Knb (ORCPT ); Sun, 28 Feb 2021 05:43:31 -0500 Received: from smtp-17.italiaonline.it ([213.209.10.17]:40263 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230468AbhB1Kjx (ORCPT ); Sun, 28 Feb 2021 05:39:53 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTilvZSZ; Sun, 28 Feb 2021 11:39:10 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508750; bh=qdqprpCrTgqGjjL1MPD2Trs9CbuR4PMIgLdSlLVKd3w=; h=From; b=BVHuokuFUwahbkxu/P4/NP1RNm1HX6GbTvxSxIuK0sbEPcOrtnDBoKbIn5Dw8hv6D NdpXHM7DDfbJJCIaf2wD3kp0TvcvnFV/K4WMwBROjf/PHmBfcxA2tGtgG8c2DShBtJ e766X+FTlkEpmqpsX5MTmN9vIFd1PTX3FIK9Nz+o9NTUQucRWpzKDRVQr4PEgcoakS M//jphmMfGwUYbGfaUNbBY1dufnzUvOdhXMje877GBlt4L6canbXJmfYOLccSqwCVy jBoxb1d7tqnn9UCHtFM4rz3nP9NpzpaBbeT5OxaZtl4vHyMFumZtuTxevebZr9UWPD q6Jzr6MtEzBMg== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72ce cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=sBSmD8KNhItU_oXWusYA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 1/6] can: c_can: remove unused code Date: Sun, 28 Feb 2021 11:38:50 +0100 Message-Id: <20210228103856.4089-2-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfBfdn0MAFYXUTT9rWnrZZsFBNZzaW6Gt1SyHLr1O1thZ+2m3NdtXD++Z7t/W8X8IBi4zrvE98Wpm0R7zAwtJFRvwa6sw72TfiEm5gJ8+HsLUdMe/y0YC 11crQcDsOYJ26ES4Z2dm0fUGSl/C5SEf2fDJ8dNzhVFi39Wllrq9LLNOvCluhWxNL7bmZ4u0w9S++GwBWY3WVnRLdyFLevNeN9zrNoQgIVyaVrtGl6ai+6mu b8JJCHWwhqiemSq6+Z9rAjNiXEpW9n1ind3ow+I+OZ+8/Y5DvelqcEZlLY8AfMHTD9kQX3i4K4nUwb7QNuaE2ngVCEiEdObb5IqJGLbG/UGye+zHNMIxvTuR MasSCjH++pzRwkNWUJCyyUgOzi0/SxBuzE7exZKUenRNZiEJP3KVnZZX1yCuP9FAL9pzHd1WK3ra+M1f1BeUAef7h0GvXohn5v74hrxmn3rIgMSe42ailMqW ebMMyxPD5nqTs98SulmNCVmvKQpBIDQC1gJ9e2aImamVefq8zKAsCEoh77Y6E+q5XX10Ovm6R2V0VXEndmyyt6bPtYdjVWNWmWLbZGf5S/r2w9P0rBhda5Qy vjw6EGxAdlj9P6Cbj/jDxBOUYmyIhCvUf6riVDLGqpq2wVbORrzOVik68kVTbzshjW9ANZwksgK64W/luXHqDKGIM9AEWipcRm3SQOdGEM8Qzw== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 9d23a9818cb1 ("can: c_can: Remove unused inline function") left behind C_CAN_MSG_OBJ_TX_LAST constant. Commit fa39b54ccf28 ("can: c_can: Get rid of pointless interrupts") left behind C_CAN_MSG_RX_LOW_LAST and C_CAN_MSG_OBJ_RX_SPLIT constants. The removed code also made a comment useless and misleading. Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/c_can/c_can.c | 3 +-- drivers/net/can/c_can/c_can.h | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index ef474bae47a1..a962ceefd44a 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -848,8 +848,7 @@ static inline u32 c_can_get_pending(struct c_can_priv *priv) * c_can core saves a received CAN message into the first free message * object it finds free (starting with the lowest). Bits NEWDAT and * INTPND are set for this message object indicating that a new message - * has arrived. To work-around this issue, we keep two groups of message - * objects whose partitioning is defined by C_CAN_MSG_OBJ_RX_SPLIT. + * has arrived. * * We clear the newdat bit right away. * diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h index 92213d3d96eb..90d3d2e7a086 100644 --- a/drivers/net/can/c_can/c_can.h +++ b/drivers/net/can/c_can/c_can.h @@ -32,11 +32,7 @@ C_CAN_MSG_OBJ_RX_NUM - 1) #define C_CAN_MSG_OBJ_TX_FIRST (C_CAN_MSG_OBJ_RX_LAST + 1) -#define C_CAN_MSG_OBJ_TX_LAST (C_CAN_MSG_OBJ_TX_FIRST + \ - C_CAN_MSG_OBJ_TX_NUM - 1) -#define C_CAN_MSG_OBJ_RX_SPLIT 9 -#define C_CAN_MSG_RX_LOW_LAST (C_CAN_MSG_OBJ_RX_SPLIT - 1) #define RECEIVE_OBJECT_BITS 0x0000ffff enum reg { From patchwork Sun Feb 28 10:38:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 389073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D79FC433E0 for ; Sun, 28 Feb 2021 10:56:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 001E364E10 for ; Sun, 28 Feb 2021 10:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230184AbhB1Kz6 (ORCPT ); Sun, 28 Feb 2021 05:55:58 -0500 Received: from smtp-17-i2.italiaonline.it ([213.209.12.17]:38491 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230075AbhB1Kz0 (ORCPT ); Sun, 28 Feb 2021 05:55:26 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTilvZSw; Sun, 28 Feb 2021 11:39:11 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508751; bh=ZwZwTipdZKxY6qGd4VuGRlxL2+9rpHSGnSFdq6NXms8=; h=From; b=nSbXqjkqcU9LUsYPQ/+GP+1e7pIX2R6aiL3JVO5yuS+esKOYcFbKXLBbIXBTFBG78 7v3urMgLf57pQ3wObHhUkBwLne04AYAQ5klA6349TA+sLZPlI21nWysGbwPA8nVzdr oAK75GmrXUQ4RQj9Q1/SfvaVqDo1OqP+qlbeNMlj4A8Qi14JOWD5eABjMCCZbBpxBV 40cYbMwvB9eK2N8ttHcgQgApSkbLGDRyueimo96MHEJUwhEKwz3u7oD/q+JhYZGcEs 89rXsY8/tcIlTcjggsQvclaJ2gQuH5JdHJ9WPubkmjAMqs4pUnzb1nRMIXCEYq4RkM p1O4RwPEvVteA== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72cf cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=AkCzXzlJzD4X874_W7gA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 2/6] can: c_can: fix indentation Date: Sun, 28 Feb 2021 11:38:51 +0100 Message-Id: <20210228103856.4089-3-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfIqDPzy/TaVyX1bg6cAUd+UcF9va+6YHkGmwVXEdQpTzkqIGram+k2SBaAZr/opzemVZTqRWGxRPqlgTzAq5Lje0vJ/hw33iF9qkLVWSFRsa+ELm4OfF WELfPqY1ZNiz+CrNzYnYHYhcQq3t8onaI5iL/Z8/bEDq0cN+GyPCN+UxHndHN0IOFsZBhK8f4J56W7+0wknJCeHWHNZTN5ptK1xBLUNGqy7OGFvVwVV76dwf 5YJlAMF2auKtsNud0Xg+8fQ4Iu30HEOUrt2VuOqCwRD0cXhbKixdWH9p8mYJOvs4lHDsK0ca5mPFpKK8P9HINPskgX16vmAZxR51SyfZitR34XTFrezRpUgu 3UQNjGyjvu5Aj0CAtp1KlCKFSaPg/3LFJGawwNFXiad6TMl5GXWLpHZQxzm8lLdvIDksdw+zJXRS6jrRL26et+jZRn1FrNl7aEkgNu0++YMtGjXQQhyg+sn0 DiVbCXG3UbqsaOcSiIHbQSW7NKLjXAm7r4RPOVtVrD+vNbOVe33+8uyX8F8MQEqqMErcsU6tcjmSOdaa87cJM6bOfZ+5OhRoIaEweVWm8H5dzYzGoAHTAkK0 JHjcyM4HZSnZcbFDjmQEM0ywX4qZAR5S37Ky/6rOM1PVaVuo3NEqf38Qwi1uCJf5KJUq/8rYbm0LHmgZdXmhrf6AmQkl2nCFcdCl/irOLrSlAg== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 524369e2391f ("can: c_can: remove obsolete STRICT_FRAME_ORDERING Kconfig option") left behind wrong indentation, fix it. Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/c_can/c_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index a962ceefd44a..dbcc1c1c92d6 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -786,7 +786,7 @@ static u32 c_can_adjust_pending(u32 pend) static inline void c_can_rx_object_get(struct net_device *dev, struct c_can_priv *priv, u32 obj) { - c_can_object_get(dev, IF_RX, obj, priv->comm_rcv_high); + c_can_object_get(dev, IF_RX, obj, priv->comm_rcv_high); } static inline void c_can_rx_finalize(struct net_device *dev, From patchwork Sun Feb 28 10:38:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 388595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BB0CC433E0 for ; Sun, 28 Feb 2021 10:55:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C838864D99 for ; Sun, 28 Feb 2021 10:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231162AbhB1KzA (ORCPT ); Sun, 28 Feb 2021 05:55:00 -0500 Received: from smtp-17-i2.italiaonline.it ([213.209.12.17]:58298 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231159AbhB1Kyy (ORCPT ); Sun, 28 Feb 2021 05:54:54 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTjlvZTR; Sun, 28 Feb 2021 11:39:12 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508752; bh=j7GRCoTejXM7B9fJVl1bTmRrEzrTT3KamKBLcuWoSdk=; h=From; b=S++09HtKOd7NsyUEvUogB7sfUX1HJKvL8E/LrFK+pX2BoNxUMwqxFzdo3U+4Fa9fz KhrB3p9/Ee6hd4jetSeVKQh1MlPiu3Rx4SnhlWmTt6Qb0x+CtkHLtYMZRWYaYP3CgY /Ryn/paSS2kUR7MVmSWuJjgVAZXK2+orTjU46ZyWEx8U3TVVcTf3G3FNsWs2EzRHeH rvpxv7tFY8qK6fIfTQgtO8oWWHyBco3kExz84LE08r1X6GvR0OClTgNcEaPutd8l7y 8lDalVh7PsZQxuJ8i1D7HXy9OafiKEG/vWIenOY22VmcyKZkH8VSzKM/bI2anu77zj Bp1hCA89BuK5A== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72d0 cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=6WxvSi62EpDuW4hn7DoA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 3/6] can: c_can: fix control interface used by c_can_do_tx Date: Sun, 28 Feb 2021 11:38:52 +0100 Message-Id: <20210228103856.4089-4-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfKf6mdjx4+1dDh8aTbBL1Or40zLaH6Q46OnNiVZTRbX6vXk7HMwz9iRKkagOahmfqD+nJPwMTuoYU5gTk9FCTvVLSY1FUSTThguPSDWHUH8hfVZxRwzG VOLn1uB0LZaq5Y0qMy1U8MRFbWOG/fSuKXK+aT07TSNXaAsID1qxdPOhWhs+hCqZAv9CWGcgSCQO8WrKc65LJaz1akGvQdU1i/mVP3R0RzydIKeLoFHp9L3J aCnAWYNZ9eZdmvgj7p319ROtPIU58y3VBFHPS3Mv1UVhoxoCg5gyUDNSluA6bIkCPgP31dk25AZdMUusL8cfrObWM/hFlkbZSPvH7mIdeFXT7eXhcFshz1MS xZOOi5tqCAJBpCj0Xz1VKtS9gr6XLSenbJdWyD/9XMyFmoxUb1tayptymlYLZt97VDQO+QcFk21uwvSjPv99Apykb2LJwntoKoIDMbL/Te/GQunPNhml9qYU EKzsMAHdPeDlaOq8YcNPUdNln0uGpzn01sxDh1DINR0iWV5TXOvBERRUmJ3eT14NT1dk7JHi4yD7ZPEFmSC9XEXiYZfG8E0F2GKRnjAhP3Zuf4qSGJ4UkY1q 4EqLiO4pcc2vx8hke6w+PSXxd2Wray6kr/0GgLJLZ57bB4xuK8RTEmRO/qeVATQN7vJiuUGHv7/qOUGHVPrznaB9yCK5QC9q/7wNcYA97gLR9Q== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org According to commit 640916db2bf7 ("can: c_can: Make it SMP safe") let RX use IF1 (i.e. IF_RX) and TX use IF2 (i.e. IF_TX). Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/c_can/c_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index dbcc1c1c92d6..69526c3a671c 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -732,7 +732,7 @@ static void c_can_do_tx(struct net_device *dev) idx--; pend &= ~(1 << idx); obj = idx + C_CAN_MSG_OBJ_TX_FIRST; - c_can_inval_tx_object(dev, IF_RX, obj); + c_can_inval_tx_object(dev, IF_TX, obj); can_get_echo_skb(dev, idx, NULL); bytes += priv->dlc[idx]; pkts++; From patchwork Sun Feb 28 10:38:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 389074 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75BF4C433E0 for ; Sun, 28 Feb 2021 10:53:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4679064D99 for ; Sun, 28 Feb 2021 10:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231151AbhB1Kxi (ORCPT ); Sun, 28 Feb 2021 05:53:38 -0500 Received: from smtp-17-i2.italiaonline.it ([213.209.12.17]:52480 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231149AbhB1KxL (ORCPT ); Sun, 28 Feb 2021 05:53:11 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTklvZU0; Sun, 28 Feb 2021 11:39:12 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508752; bh=BCMzyFPGjvLZKNUS2sizrsXN5C/G8I7qiN9C3GvALOQ=; h=From; b=pPaATL6SaqBU+PARPe8/2w2axAMxjc7srRVKrIWhp1Lr1DeJj1i4DPLj0zZXJDzvX gLQxcun5BkKHoOqWa14kRjs1UKbgc+jWubl7I/hlTg8eSlFX06qduvN3lToJJ+7h6d s9DOL2GJunzpwLWN3oGGATKMEyDCcxhrvPL7C69YoCvBcLtCfntTFZ6XO30gTZnjjD 8FK0EhbEPFJqsjNVNtxPiDHXyI9NaitVnoEMHN2IuoxUbh5wU9fQB6KheMbA39EWuL X+P37kjuWC/K6b1waA2GapoOGDl5LC0QPDa+mByTuGxJGOHPvhHrCZqRXppRrDdK4+ 0N3OOwrWRNJ9g== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72d0 cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=YyHhdtpqV3cun0yf7GkA:9 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 4/6] can: c_can: use 32-bit write to set arbitration register Date: Sun, 28 Feb 2021 11:38:53 +0100 Message-Id: <20210228103856.4089-5-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfKf6mdjx4+1dDh8aTbBL1Or40zLaH6Q46OnNiVZTRbX6vXk7HMwz9iRKkagOahmfqD+nJPwMTuoYU5gTk9FCTvVLSY1FUSTThguPSDWHUH8hfVZxRwzG VOLn1uB0LZaq5Y0qMy1U8MRFbWOG/fSuKXK+aT07TSNXaAsID1qxdPOhWhs+hCqZAv9CWGcgSCQO8WrKc65LJaz1akGvQdU1i/mVP3R0RzydIKeLoFHp9L3J aCnAWYNZ9eZdmvgj7p319ROtPIU58y3VBFHPS3Mv1UVhoxoCg5gyUDNSluA6bIkCPgP31dk25AZdMUusL8cfrObWM/hFlkbZSPvH7mIdeFXT7eXhcFshz1MS xZOOi5tqCAJBpCj0Xz1VKtS9gr6XLSenbJdWyD/9XMyFmoxUb1tayptymlYLZt97VDQO+QcFk21uwvSjPv99Apykb2LJwntoKoIDMbL/Te/GQunPNhml9qYU EKzsMAHdPeDlaOq8YcNPUdNln0uGpzn01sxDh1DINR0iWV5TXOvBERRUmJ3eT14NT1dk7JHi4yD7ZPEFmSC9XEXiYZfG8E0F2GKRnjAhP3Zuf4qSGJ4UkY1q 4EqLiO4pcc2vx8hke6w+PSXxd2Wray6kr/0GgLJLZ57bB4xuK8RTEmRO/qeVATQN7vJiuUGHv7/qOUGHVPrznaB9yCK5QC9q/7wNcYA97gLR9Q== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The arbitration register is already set up with 32-bit writes in the other parts of the code except for this point. Signed-off-by: Dario Binacchi --- (no changes since v1) drivers/net/can/c_can/c_can.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 69526c3a671c..7081cfaf62e2 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -297,8 +297,7 @@ static void c_can_inval_msg_object(struct net_device *dev, int iface, int obj) { struct c_can_priv *priv = netdev_priv(dev); - priv->write_reg(priv, C_CAN_IFACE(ARB1_REG, iface), 0); - priv->write_reg(priv, C_CAN_IFACE(ARB2_REG, iface), 0); + priv->write_reg32(priv, C_CAN_IFACE(ARB1_REG, iface), 0); c_can_inval_tx_object(dev, iface, obj); } From patchwork Sun Feb 28 10:38:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 388596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A98C1C433DB for ; Sun, 28 Feb 2021 10:50:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FB8364E55 for ; Sun, 28 Feb 2021 10:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231134AbhB1KuT (ORCPT ); Sun, 28 Feb 2021 05:50:19 -0500 Received: from smtp-17-i2.italiaonline.it ([213.209.12.17]:52305 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230489AbhB1Kj5 (ORCPT ); Sun, 28 Feb 2021 05:39:57 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTklvZUX; Sun, 28 Feb 2021 11:39:13 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508753; bh=9lwYBOOlEan677NxFk9bvwSj+eCuiJFEvaAgvnHZsBU=; h=From; b=SPSMkpe0cXH7VMaezIvDEapxjQRTfRhRuCIRjCp3Y7q8UIcq+t6BcRM0Q4cTYtE0H qiaFDDIkwjZGMmFDaB8xsDsrNSOW0Cg/8QvzhhW8h03yrHE5820kC8jDSpB1YnTXC7 JG/S2fvLLYJFCcZ7RaV9oHsMUxV8Jx6Ram7MK/+F9To71isAupyk+rPDbE4QkGyn5W 9O7Zf6aLbeHAnWOnH9EGJ6yihezbx/bvK4eWpD013Qb1AFgPVuo0M3dzXMjCLtoTH/ 3L4TnLsc7zCxjyQGse+RBhDtNtJa/aH0T/C2NSOFJa0mym72/XXeaKW+IVuSUlq/YR fqhMobI7bJTJA== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72d1 cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=QyXUC8HyAAAA:8 a=3axKsbaXVfasLmrsgWoA:9 a=AlnpUAtRvUPw4hiF:21 a=7iL2R0msYJN4DsIq:21 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 5/6] can: c_can: prepare to up the message objects number Date: Sun, 28 Feb 2021 11:38:54 +0100 Message-Id: <20210228103856.4089-6-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfMtgfoD11GRmxmTwHk6CA4xJ2FIHUYbkitTuHRUiwJbQyZapeubBQKOEzBse9y8YAOvKlzS1nBNfmFJBK/VWJ7r/vNFegrFoARRvSos6N85xiRieDZIK wiPhUoqpGnlPATmGP6SI5dIhidQM0g5BMvgqJiGU6nJbzEMywIyzVlAywQ5DeL/7BrLJHgZeJQ8wajk6P4nIw89anL3Gn3coiB1O47kzlKShbVpKdN7j6niU AkZdxqSEAcL/U6itSQuB9QvO+2i62hNsXwKS0QtrTcOAni4yt5atoZrz0+Ut3DLmO0eHcXGiabDHbyC2w+Wfhd0aOwz7xmKEbpCQUY1qf5UcFZqNY5dwQbdt Zzn7c2gxv7H+MTXIzC9tZZBg0jrPKJZ6rqpXfwWCjrwXTRqwIBGhWtfMYpeUs0FLdcZbPXSvALtbPWvdbPIrutugMjuAPJ4LIIsLEglL+7Yma5loM3TaKeOY 8ZQY5v8rUJZJQeOUEEHfeD6qePCgperhHWgZWOpRp0o5tiLMknQ2OtTBEllaOsITXQ50fGNrMaWsx926pJXUKkgcj/TDuDxZNDvP6VTKSvrXI9vDK5a31EuN Nwudre3C/Tjgi5dHSaVtZ5zz0YqX6JTFTaDMmDgDg4NFptBkgXMOCEbE1DZAId+CixAPyMbva+WliSMg0ISdg+06iCmx/tFDtSuLbuvhlcur6Q== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As pointed by commit c0a9f4d396c9 ("can: c_can: Reduce register access") the "driver casts the 16 message objects in stone, which is completely braindead as contemporary hardware has up to 128 message objects". The patch prepares the module to extend the number of message objects beyond the 32 currently managed. This was achieved by transforming the constants used to manage RX/TX messages into variables without changing the driver policy. Signed-off-by: Dario Binacchi Reported-by: kernel test robot --- Changes in v3: - Use unsigned int instead of int as type of the msg_obj_* fields in the c_can_priv structure. - Replace (u64)1 with 1UL in msg_obj_rx_mask setting. Changes in v2: - Fix compiling error reported by kernel test robot. - Add Reported-by tag. - Pass larger size to alloc_candev() routine to avoid an additional memory allocation/deallocation. drivers/net/can/c_can/c_can.c | 50 ++++++++++++++++---------- drivers/net/can/c_can/c_can.h | 23 ++++++------ drivers/net/can/c_can/c_can_pci.c | 2 +- drivers/net/can/c_can/c_can_platform.c | 2 +- 4 files changed, 43 insertions(+), 34 deletions(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 7081cfaf62e2..ede6f4d62095 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -173,9 +173,6 @@ /* Wait for ~1 sec for INIT bit */ #define INIT_WAIT_MS 1000 -/* napi related */ -#define C_CAN_NAPI_WEIGHT C_CAN_MSG_OBJ_RX_NUM - /* c_can lec values */ enum c_can_lec_type { LEC_NO_ERROR = 0, @@ -325,7 +322,7 @@ static void c_can_setup_tx_object(struct net_device *dev, int iface, * first, i.e. clear the MSGVAL flag in the arbiter. */ if (rtr != (bool)test_bit(idx, &priv->tx_dir)) { - u32 obj = idx + C_CAN_MSG_OBJ_TX_FIRST; + u32 obj = idx + priv->msg_obj_tx_first; c_can_inval_msg_object(dev, iface, obj); change_bit(idx, &priv->tx_dir); @@ -463,10 +460,10 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb, * prioritized. The lowest buffer number wins. */ idx = fls(atomic_read(&priv->tx_active)); - obj = idx + C_CAN_MSG_OBJ_TX_FIRST; + obj = idx + priv->msg_obj_tx_first; /* If this is the last buffer, stop the xmit queue */ - if (idx == C_CAN_MSG_OBJ_TX_NUM - 1) + if (idx == priv->msg_obj_tx_num - 1) netif_stop_queue(dev); /* * Store the message in the interface so we can call @@ -549,17 +546,18 @@ static int c_can_set_bittiming(struct net_device *dev) */ static void c_can_configure_msg_objects(struct net_device *dev) { + struct c_can_priv *priv = netdev_priv(dev); int i; /* first invalidate all message objects */ - for (i = C_CAN_MSG_OBJ_RX_FIRST; i <= C_CAN_NO_OF_OBJECTS; i++) + for (i = priv->msg_obj_rx_first; i <= priv->msg_obj_num; i++) c_can_inval_msg_object(dev, IF_RX, i); /* setup receive message objects */ - for (i = C_CAN_MSG_OBJ_RX_FIRST; i < C_CAN_MSG_OBJ_RX_LAST; i++) + for (i = priv->msg_obj_rx_first; i < priv->msg_obj_rx_last; i++) c_can_setup_receive_object(dev, IF_RX, i, 0, 0, IF_MCONT_RCV); - c_can_setup_receive_object(dev, IF_RX, C_CAN_MSG_OBJ_RX_LAST, 0, 0, + c_can_setup_receive_object(dev, IF_RX, priv->msg_obj_rx_last, 0, 0, IF_MCONT_RCV_EOB); } @@ -730,7 +728,7 @@ static void c_can_do_tx(struct net_device *dev) while ((idx = ffs(pend))) { idx--; pend &= ~(1 << idx); - obj = idx + C_CAN_MSG_OBJ_TX_FIRST; + obj = idx + priv->msg_obj_tx_first; c_can_inval_tx_object(dev, IF_TX, obj); can_get_echo_skb(dev, idx, NULL); bytes += priv->dlc[idx]; @@ -740,7 +738,7 @@ static void c_can_do_tx(struct net_device *dev) /* Clear the bits in the tx_active mask */ atomic_sub(clr, &priv->tx_active); - if (clr & (1 << (C_CAN_MSG_OBJ_TX_NUM - 1))) + if (clr & (1 << (priv->msg_obj_tx_num - 1))) netif_wake_queue(dev); if (pkts) { @@ -755,11 +753,11 @@ static void c_can_do_tx(struct net_device *dev) * raced with the hardware or failed to readout all upper * objects in the last run due to quota limit. */ -static u32 c_can_adjust_pending(u32 pend) +static u32 c_can_adjust_pending(u32 pend, u32 rx_mask) { u32 weight, lasts; - if (pend == RECEIVE_OBJECT_BITS) + if (pend == rx_mask) return pend; /* @@ -862,8 +860,7 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) * It is faster to read only one 16bit register. This is only possible * for a maximum number of 16 objects. */ - BUILD_BUG_ON_MSG(C_CAN_MSG_OBJ_RX_LAST > 16, - "Implementation does not support more message objects than 16"); + WARN_ON(priv->msg_obj_rx_last > 16); while (quota > 0) { if (!pend) { @@ -874,7 +871,8 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) * If the pending field has a gap, handle the * bits above the gap first. */ - toread = c_can_adjust_pending(pend); + toread = c_can_adjust_pending(pend, + priv->msg_obj_rx_mask); } else { toread = pend; } @@ -1205,17 +1203,31 @@ static int c_can_close(struct net_device *dev) return 0; } -struct net_device *alloc_c_can_dev(void) +struct net_device *alloc_c_can_dev(int msg_obj_num) { struct net_device *dev; struct c_can_priv *priv; + int msg_obj_tx_num = msg_obj_num / 2; - dev = alloc_candev(sizeof(struct c_can_priv), C_CAN_MSG_OBJ_TX_NUM); + dev = alloc_candev(sizeof(*priv) + sizeof(u32) * msg_obj_tx_num, + msg_obj_tx_num); if (!dev) return NULL; priv = netdev_priv(dev); - netif_napi_add(dev, &priv->napi, c_can_poll, C_CAN_NAPI_WEIGHT); + priv->msg_obj_num = msg_obj_num; + priv->msg_obj_rx_num = msg_obj_num - msg_obj_tx_num; + priv->msg_obj_rx_first = 1; + priv->msg_obj_rx_last = + priv->msg_obj_rx_first + priv->msg_obj_rx_num - 1; + priv->msg_obj_rx_mask = (1UL << priv->msg_obj_rx_num) - 1; + + priv->msg_obj_tx_num = msg_obj_tx_num; + priv->msg_obj_tx_first = priv->msg_obj_rx_last + 1; + priv->msg_obj_tx_last = + priv->msg_obj_tx_first + priv->msg_obj_tx_num - 1; + + netif_napi_add(dev, &priv->napi, c_can_poll, priv->msg_obj_rx_num); priv->dev = dev; priv->can.bittiming_const = &c_can_bittiming_const; diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h index 90d3d2e7a086..68295fab83d9 100644 --- a/drivers/net/can/c_can/c_can.h +++ b/drivers/net/can/c_can/c_can.h @@ -22,18 +22,7 @@ #ifndef C_CAN_H #define C_CAN_H -/* message object split */ #define C_CAN_NO_OF_OBJECTS 32 -#define C_CAN_MSG_OBJ_RX_NUM 16 -#define C_CAN_MSG_OBJ_TX_NUM 16 - -#define C_CAN_MSG_OBJ_RX_FIRST 1 -#define C_CAN_MSG_OBJ_RX_LAST (C_CAN_MSG_OBJ_RX_FIRST + \ - C_CAN_MSG_OBJ_RX_NUM - 1) - -#define C_CAN_MSG_OBJ_TX_FIRST (C_CAN_MSG_OBJ_RX_LAST + 1) - -#define RECEIVE_OBJECT_BITS 0x0000ffff enum reg { C_CAN_CTRL_REG = 0, @@ -193,6 +182,14 @@ struct c_can_priv { struct napi_struct napi; struct net_device *dev; struct device *device; + unsigned int msg_obj_num; + unsigned int msg_obj_rx_num; + unsigned int msg_obj_tx_num; + unsigned int msg_obj_rx_first; + unsigned int msg_obj_rx_last; + unsigned int msg_obj_tx_first; + unsigned int msg_obj_tx_last; + u32 msg_obj_rx_mask; atomic_t tx_active; atomic_t sie_pending; unsigned long tx_dir; @@ -209,10 +206,10 @@ struct c_can_priv { void (*raminit) (const struct c_can_priv *priv, bool enable); u32 comm_rcv_high; u32 rxmasked; - u32 dlc[C_CAN_MSG_OBJ_TX_NUM]; + u32 dlc[]; }; -struct net_device *alloc_c_can_dev(void); +struct net_device *alloc_c_can_dev(int msg_obj_num); void free_c_can_dev(struct net_device *dev); int register_c_can_dev(struct net_device *dev); void unregister_c_can_dev(struct net_device *dev); diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index 406b4847e5dc..3752f68d095e 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c @@ -149,7 +149,7 @@ static int c_can_pci_probe(struct pci_dev *pdev, } /* allocate the c_can device */ - dev = alloc_c_can_dev(); + dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS); if (!dev) { ret = -ENOMEM; goto out_iounmap; diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 05f425ceb53a..a5b9b1a93702 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -293,7 +293,7 @@ static int c_can_plat_probe(struct platform_device *pdev) } /* allocate the c_can device */ - dev = alloc_c_can_dev(); + dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS); if (!dev) { ret = -ENOMEM; goto exit; From patchwork Sun Feb 28 10:38:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 389075 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C36A1C433E0 for ; Sun, 28 Feb 2021 10:50:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88E0064E66 for ; Sun, 28 Feb 2021 10:50:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231142AbhB1Ku2 (ORCPT ); Sun, 28 Feb 2021 05:50:28 -0500 Received: from smtp-17-i2.italiaonline.it ([213.209.12.17]:51385 "EHLO libero.it" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230494AbhB1Kj6 (ORCPT ); Sun, 28 Feb 2021 05:39:58 -0500 Received: from passgat-Modern-14-A10M.homenet.telecomitalia.it ([87.20.116.197]) by smtp-17.iol.local with ESMTPA id GJTalhz13lChfGJTllvZV4; Sun, 28 Feb 2021 11:39:13 +0100 x-libjamoibt: 1601 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=libero.it; s=s2021; t=1614508753; bh=DAcsIcI1qqpEQyjajSihDV+gP9Q8Oe+cpX5SqQxGkZI=; h=From; b=Qe00kSCrmEyC7cQBaoubWCHyqqCEKq5KVHyx/HpoMyfs4gQKKnS/Nph72fE1P21yu +X513RVVQlTQbtVSuWn2xOWZpdJ3gCVnqjPfCC2E539q2CCbotZg2XMHm5xmmZlH4Q KCvDpbu1XC28TYDbhQ05kHPfnvIzTQq4U/e0mhmaD3hRmMr6OoqWxYHPgN1f4KxqRr aUo3nkIvUixy5NdPxHZ7XfWt4xYzy7kx22FwQqjhnQnM7OmSXY9TACbHcXhkzXJoQd CeLRy08YZr4FsfbJ1EkyJBDrNyKBX69/FfYqwlWQ2IykwXaD4vsrtIuQadj/ezgXRa bgtwnkZDK7Z8A== X-CNFS-Analysis: v=2.4 cv=S6McfKgP c=1 sm=1 tr=0 ts=603b72d1 cx=a_exe a=AVqmXbCQpuNSdJmApS5GbQ==:117 a=AVqmXbCQpuNSdJmApS5GbQ==:17 a=FEz_7PL0ERQs5GQP_jQA:9 a=oxaoH9BcOFauOGrG:21 a=Asb3xwQKlx4a7rY6:21 From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: Federico Vaga , Alexander Stein , Dario Binacchi , "David S. Miller" , Jakub Kicinski , Marc Kleine-Budde , Oliver Hartkopp , Vincent Mailhol , Wolfgang Grandegger , YueHaibing , Zhang Qilong , linux-can@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3 6/6] can: c_can: add support to 64 message objects Date: Sun, 28 Feb 2021 11:38:55 +0100 Message-Id: <20210228103856.4089-7-dariobin@libero.it> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210228103856.4089-1-dariobin@libero.it> References: <20210228103856.4089-1-dariobin@libero.it> X-CMAE-Envelope: MS4xfMtgfoD11GRmxmTwHk6CA4xJ2FIHUYbkitTuHRUiwJbQyZapeubBQKOEzBse9y8YAOvKlzS1nBNfmFJBK/VWJ7r/vNFegrFoARRvSos6N85xiRieDZIK wiPhUoqpGnlPATmGP6SI5dIhidQM0g5BMvgqJiGU6nJbzEMywIyzVlAywQ5DeL/7BrLJHgZeJQ8wajk6P4nIw89anL3Gn3coiB1O47kzlKShbVpKdN7j6niU AkZdxqSEAcL/U6itSQuB9QvO+2i62hNsXwKS0QtrTcOAni4yt5atoZrz0+Ut3DLmO0eHcXGiabDHbyC2w+Wfhd0aOwz7xmKEbpCQUY1qf5UcFZqNY5dwQbdt Zzn7c2gxv7H+MTXIzC9tZZBg0jrPKJZ6rqpXfwWCjrwXTRqwIBGhWtfMYpeUs0FLdcZbPXSvALtbPWvdbPIrutugMjuAPJ4LIIsLEglL+7Yma5loM3TaKeOY 8ZQY5v8rUJZJQeOUEEHfeD6qePCgperhHWgZWOpRp0o5tiLMknQ2OtTBEllaOsITXQ50fGNrMaWsx926pJXUKkgcj/TDuDxZNDvP6VTKSvrXI9vDK5a31EuN Nwudre3C/Tjgi5dHSaVtZ5zz0YqX6JTFTaDMmDgDg4NFptBkgXMOCEbE1DZAId+CixAPyMbva+WliSMg0ISdg+06iCmx/tFDtSuLbuvhlcur6Q== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org D_CAN controller supports 16, 32, 64 or 128 message objects, comparing to 32 on C_CAN. AM335x/AM437x Sitara processors and DRA7 SOC all instantiate a D_CAN controller with 64 message objects, as described in the "DCAN features" subsection of the CAN chapter of their technical reference manuals. The driver policy has been kept unchanged, and as in the previous version, the first half of the message objects is used for reception and the second for transmission. The I/O load is increased only in the case of 64 message objects, keeping it unchanged in the case of 32. Two 32-bit read accesses are in fact required, which however remained at 16-bit for configurations with 32 message objects. Signed-off-by: Dario Binacchi --- Changes in v3: - Use unsigned int instead of int as type of the msg_obj_num field in c_can_driver_data and c_can_pci_data structures. Changes in v2: - Add message objects number to PCI driver data. drivers/net/can/c_can/c_can.c | 19 +++++++++++-------- drivers/net/can/c_can/c_can.h | 5 +++-- drivers/net/can/c_can/c_can_pci.c | 6 +++++- drivers/net/can/c_can/c_can_platform.c | 6 +++++- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index ede6f4d62095..bb766904636b 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -723,8 +723,12 @@ static void c_can_do_tx(struct net_device *dev) struct net_device_stats *stats = &dev->stats; u32 idx, obj, pkts = 0, bytes = 0, pend, clr; - clr = pend = priv->read_reg(priv, C_CAN_INTPND2_REG); + if (priv->msg_obj_tx_last > 32) + pend = priv->read_reg32(priv, C_CAN_INTPND3_REG); + else + pend = priv->read_reg(priv, C_CAN_INTPND2_REG); + clr = pend; while ((idx = ffs(pend))) { idx--; pend &= ~(1 << idx); @@ -834,7 +838,12 @@ static int c_can_read_objects(struct net_device *dev, struct c_can_priv *priv, static inline u32 c_can_get_pending(struct c_can_priv *priv) { - u32 pend = priv->read_reg(priv, C_CAN_NEWDAT1_REG); + u32 pend; + + if (priv->msg_obj_rx_last > 16) + pend = priv->read_reg32(priv, C_CAN_NEWDAT1_REG); + else + pend = priv->read_reg(priv, C_CAN_NEWDAT1_REG); return pend; } @@ -856,12 +865,6 @@ static int c_can_do_rx_poll(struct net_device *dev, int quota) struct c_can_priv *priv = netdev_priv(dev); u32 pkts = 0, pend = 0, toread, n; - /* - * It is faster to read only one 16bit register. This is only possible - * for a maximum number of 16 objects. - */ - WARN_ON(priv->msg_obj_rx_last > 16); - while (quota > 0) { if (!pend) { pend = c_can_get_pending(priv); diff --git a/drivers/net/can/c_can/c_can.h b/drivers/net/can/c_can/c_can.h index 68295fab83d9..bd291e998a51 100644 --- a/drivers/net/can/c_can/c_can.h +++ b/drivers/net/can/c_can/c_can.h @@ -22,8 +22,6 @@ #ifndef C_CAN_H #define C_CAN_H -#define C_CAN_NO_OF_OBJECTS 32 - enum reg { C_CAN_CTRL_REG = 0, C_CAN_CTRL_EX_REG, @@ -61,6 +59,7 @@ enum reg { C_CAN_NEWDAT2_REG, C_CAN_INTPND1_REG, C_CAN_INTPND2_REG, + C_CAN_INTPND3_REG, C_CAN_MSGVAL1_REG, C_CAN_MSGVAL2_REG, C_CAN_FUNCTION_REG, @@ -122,6 +121,7 @@ static const u16 __maybe_unused reg_map_d_can[] = { [C_CAN_NEWDAT2_REG] = 0x9E, [C_CAN_INTPND1_REG] = 0xB0, [C_CAN_INTPND2_REG] = 0xB2, + [C_CAN_INTPND3_REG] = 0xB4, [C_CAN_MSGVAL1_REG] = 0xC4, [C_CAN_MSGVAL2_REG] = 0xC6, [C_CAN_IF1_COMREQ_REG] = 0x100, @@ -161,6 +161,7 @@ struct raminit_bits { struct c_can_driver_data { enum c_can_dev_id id; + unsigned int msg_obj_num; /* RAMINIT register description. Optional. */ const struct raminit_bits *raminit_bits; /* Array of START/DONE bit positions */ diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index 3752f68d095e..9415b12d26c8 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c @@ -31,6 +31,8 @@ enum c_can_pci_reg_align { struct c_can_pci_data { /* Specify if is C_CAN or D_CAN */ enum c_can_dev_id type; + /* Number of message objects */ + unsigned int msg_obj_num; /* Set the register alignment in the memory */ enum c_can_pci_reg_align reg_align; /* Set the frequency */ @@ -149,7 +151,7 @@ static int c_can_pci_probe(struct pci_dev *pdev, } /* allocate the c_can device */ - dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS); + dev = alloc_c_can_dev(c_can_pci_data->msg_obj_num); if (!dev) { ret = -ENOMEM; goto out_iounmap; @@ -253,6 +255,7 @@ static void c_can_pci_remove(struct pci_dev *pdev) static const struct c_can_pci_data c_can_sta2x11= { .type = BOSCH_C_CAN, + .msg_obj_num = 32, .reg_align = C_CAN_REG_ALIGN_32, .freq = 52000000, /* 52 Mhz */ .bar = 0, @@ -260,6 +263,7 @@ static const struct c_can_pci_data c_can_sta2x11= { static const struct c_can_pci_data c_can_pch = { .type = BOSCH_C_CAN, + .msg_obj_num = 32, .reg_align = C_CAN_REG_32, .freq = 50000000, /* 50 MHz */ .init = c_can_pci_reset_pch, diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index a5b9b1a93702..87a145b67a2f 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -192,10 +192,12 @@ static void c_can_hw_raminit(const struct c_can_priv *priv, bool enable) static const struct c_can_driver_data c_can_drvdata = { .id = BOSCH_C_CAN, + .msg_obj_num = 32, }; static const struct c_can_driver_data d_can_drvdata = { .id = BOSCH_D_CAN, + .msg_obj_num = 32, }; static const struct raminit_bits dra7_raminit_bits[] = { @@ -205,6 +207,7 @@ static const struct raminit_bits dra7_raminit_bits[] = { static const struct c_can_driver_data dra7_dcan_drvdata = { .id = BOSCH_D_CAN, + .msg_obj_num = 64, .raminit_num = ARRAY_SIZE(dra7_raminit_bits), .raminit_bits = dra7_raminit_bits, .raminit_pulse = true, @@ -217,6 +220,7 @@ static const struct raminit_bits am3352_raminit_bits[] = { static const struct c_can_driver_data am3352_dcan_drvdata = { .id = BOSCH_D_CAN, + .msg_obj_num = 64, .raminit_num = ARRAY_SIZE(am3352_raminit_bits), .raminit_bits = am3352_raminit_bits, }; @@ -293,7 +297,7 @@ static int c_can_plat_probe(struct platform_device *pdev) } /* allocate the c_can device */ - dev = alloc_c_can_dev(C_CAN_NO_OF_OBJECTS); + dev = alloc_c_can_dev(drvdata->msg_obj_num); if (!dev) { ret = -ENOMEM; goto exit;