From: Markus Schneider-Pargmann <msp@baylibre.com>
To: "Chandrasekar Ramakrishnan" <rcsekar@samsung.com>,
"Marc Kleine-Budde" <mkl@pengutronix.de>,
"Vincent Mailhol" <mailhol.vincent@wanadoo.fr>,
"David S . Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Markus Schneider-Pargmann" <msp@baylibre.com>,
"Martin Hundebøll" <martin@geanix.com>,
"Michal Kubiak" <michal.kubiak@intel.com>,
"Simon Horman" <horms@kernel.org>,
"Tony Lindgren" <tony@atomide.com>, "Judith Mendez" <jm@ti.com>
Cc: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>,
Linux regression tracking <regressions@leemhuis.info>,
linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] can: m_can: Limit coalescing to peripheral instances
Date: Fri, 26 Jul 2024 21:59:44 +0200 [thread overview]
Message-ID: <20240726195944.2414812-8-msp@baylibre.com> (raw)
In-Reply-To: <20240726195944.2414812-1-msp@baylibre.com>
The use of coalescing for non-peripheral chips in the current
implementation is limited to non-existing. Disable the possibility to
set coalescing through ethtool.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
drivers/net/can/m_can/m_can.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 7c9ad9f7174e..663eb4247029 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -2182,7 +2182,7 @@ static int m_can_set_coalesce(struct net_device *dev,
return 0;
}
-static const struct ethtool_ops m_can_ethtool_ops = {
+static const struct ethtool_ops m_can_ethtool_ops_coalescing = {
.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS_IRQ |
ETHTOOL_COALESCE_RX_MAX_FRAMES_IRQ |
ETHTOOL_COALESCE_TX_USECS_IRQ |
@@ -2193,18 +2193,20 @@ static const struct ethtool_ops m_can_ethtool_ops = {
.set_coalesce = m_can_set_coalesce,
};
-static const struct ethtool_ops m_can_ethtool_ops_polling = {
+static const struct ethtool_ops m_can_ethtool_ops = {
.get_ts_info = ethtool_op_get_ts_info,
};
-static int register_m_can_dev(struct net_device *dev)
+static int register_m_can_dev(struct m_can_classdev *cdev)
{
+ struct net_device *dev = cdev->net;
+
dev->flags |= IFF_ECHO; /* we support local echo */
dev->netdev_ops = &m_can_netdev_ops;
- if (dev->irq)
- dev->ethtool_ops = &m_can_ethtool_ops;
+ if (dev->irq && cdev->is_peripheral)
+ dev->ethtool_ops = &m_can_ethtool_ops_coalescing;
else
- dev->ethtool_ops = &m_can_ethtool_ops_polling;
+ dev->ethtool_ops = &m_can_ethtool_ops;
return register_candev(dev);
}
@@ -2390,7 +2392,7 @@ int m_can_class_register(struct m_can_classdev *cdev)
if (ret)
goto rx_offload_del;
- ret = register_m_can_dev(cdev->net);
+ ret = register_m_can_dev(cdev);
if (ret) {
dev_err(cdev->dev, "registering %s failed (err=%d)\n",
cdev->net->name, ret);
--
2.45.2
prev parent reply other threads:[~2024-07-26 20:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-26 19:59 [PATCH 0/7] can: m_can: Fix polling and other issues Markus Schneider-Pargmann
2024-07-26 19:59 ` [PATCH 1/7] can: m_can: Reset coalescing during suspend/resume Markus Schneider-Pargmann
2024-07-26 19:59 ` [PATCH 2/7] can: m_can: Remove coalesing disable in isr during suspend Markus Schneider-Pargmann
2024-07-26 19:59 ` [PATCH 3/7] can: m_can: Remove m_can_rx_peripheral indirection Markus Schneider-Pargmann
2024-07-26 19:59 ` [PATCH 4/7] can: m_can: Do not cancel timer from within timer Markus Schneider-Pargmann
2024-07-27 9:32 ` kernel test robot
2024-07-26 19:59 ` [PATCH 5/7] can: m_can: disable_all_interrupts, not clear active_interrupts Markus Schneider-Pargmann
2024-07-26 19:59 ` [PATCH 6/7] can: m_can: Reset cached active_interrupts on start Markus Schneider-Pargmann
2024-07-26 19:59 ` Markus Schneider-Pargmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240726195944.2414812-8-msp@baylibre.com \
--to=msp@baylibre.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jm@ti.com \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mailhol.vincent@wanadoo.fr \
--cc=martin@geanix.com \
--cc=matthias.schiffer@ew.tq-group.com \
--cc=michal.kubiak@intel.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rcsekar@samsung.com \
--cc=regressions@leemhuis.info \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®