From: Oliver Neukum <oneukum@suse.com>
To: hayeswang@realtek.com, grundler@chromium.org,
davem@davemloft.net, netdev@vger.kernel.org,
linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>, Roland Dreier <roland@kernel.org>
Subject: [PATCHv2 3/3] CDC-NCM: record speed in status method
Date: Thu, 21 Jan 2021 13:57:31 +0100 [thread overview]
Message-ID: <20210121125731.19425-4-oneukum@suse.com> (raw)
In-Reply-To: <20210121125731.19425-1-oneukum@suse.com>
The driver has a status method for receiving speed updates.
The framework, however, had support functions only for devices
that reported their speed upon an explicit query over a MDIO
interface.
CDC_NCM however gets direct notifications from the device.
As new support functions have become available, we shall now
record such notifications and tell the usbnet framework
to make direct use of them without going through the PHY layer.
v2: adjusted to recent changes
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Tested-by: Roland Dreier <roland@kernel.org>
---
drivers/net/usb/cdc_ncm.c | 29 ++++-------------------------
1 file changed, 4 insertions(+), 25 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 04174704bf7c..9b5bb8ae5eb8 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -142,7 +142,7 @@ static const struct ethtool_ops cdc_ncm_ethtool_ops = {
.get_sset_count = cdc_ncm_get_sset_count,
.get_strings = cdc_ncm_get_strings,
.get_ethtool_stats = cdc_ncm_get_ethtool_stats,
- .get_link_ksettings = usbnet_get_link_ksettings_mdio,
+ .get_link_ksettings = usbnet_get_link_ksettings_internal,
.set_link_ksettings = usbnet_set_link_ksettings_mdio,
};
@@ -1827,30 +1827,9 @@ cdc_ncm_speed_change(struct usbnet *dev,
uint32_t rx_speed = le32_to_cpu(data->DLBitRRate);
uint32_t tx_speed = le32_to_cpu(data->ULBitRate);
- /* if the speed hasn't changed, don't report it.
- * RTL8156 shipped before 2021 sends notification about every 32ms.
- */
- if (dev->rx_speed == rx_speed && dev->tx_speed == tx_speed)
- return;
-
- dev->rx_speed = rx_speed;
- dev->tx_speed = tx_speed;
-
- /*
- * Currently the USB-NET API does not support reporting the actual
- * device speed. Do print it instead.
- */
- if ((tx_speed > 1000000) && (rx_speed > 1000000)) {
- netif_info(dev, link, dev->net,
- "%u mbit/s downlink %u mbit/s uplink\n",
- (unsigned int)(rx_speed / 1000000U),
- (unsigned int)(tx_speed / 1000000U));
- } else {
- netif_info(dev, link, dev->net,
- "%u kbit/s downlink %u kbit/s uplink\n",
- (unsigned int)(rx_speed / 1000U),
- (unsigned int)(tx_speed / 1000U));
- }
+ /* RTL8156 shipped before 2021 sends notification about every 32ms. */
+ dev->rxspeed = rx_speed;
+ dev->txspeed = tx_speed;
}
static void cdc_ncm_status(struct usbnet *dev, struct urb *urb)
--
2.26.2
next prev parent reply other threads:[~2021-01-21 13:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 12:57 [PATCHv2 0/3] usbnet: speed reporting for devices without MDIO Oliver Neukum
2021-01-21 12:57 ` [PATCHv2 1/3] usbnet: specify naming of usbnet_set/get_link_ksettings Oliver Neukum
2021-01-22 1:10 ` Andrew Lunn
2021-01-26 9:42 ` Oliver Neukum
2021-01-26 13:34 ` Andrew Lunn
2021-01-21 12:57 ` [PATCHv2 2/3] usbnet: add method for reporting speed without MDIO Oliver Neukum
2021-01-22 1:35 ` Grant Grundler
2021-01-22 2:56 ` Grant Grundler
2021-01-21 12:57 ` Oliver Neukum [this message]
2021-01-22 3:02 ` [PATCHv2 3/3] CDC-NCM: record speed in status method Grant Grundler
2021-01-22 1:29 ` [PATCHv2 0/3] usbnet: speed reporting for devices without MDIO Andrew Lunn
2021-01-22 2:10 ` Grant Grundler
2021-02-09 23:47 ` Grant Grundler
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=20210121125731.19425-4-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=davem@davemloft.net \
--cc=grundler@chromium.org \
--cc=hayeswang@realtek.com \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=roland@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).