| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 23 Oct 2020 12:56:26 +0200
From: Oleksij Rempel <o.rempel@...gutronix.de>
To: Andrew Lunn <andrew@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
Florian Fainelli <f.fainelli@...il.com>,
Heiner Kallweit <hkallweit1@...il.com>,
Jakub Kicinski <kuba@...nel.org>,
Oliver Hartkopp <socketcan@...tkopp.net>
Cc: Oleksij Rempel <o.rempel@...gutronix.de>,
David Jander <david@...tonic.nl>, kernel@...gutronix.de,
linux-kernel@...r.kernel.org, netdev@...r.kernel.org,
Russell King <linux@...linux.org.uk>, mkl@...gutronix.de,
Marek Vasut <marex@...x.de>, linux-can@...r.kernel.org
Subject: [RFC PATCH v1 6/6] can: flexcan: add ethtool support
Signed-off-by: Oleksij Rempel <o.rempel@...gutronix.de>
---
drivers/net/can/flexcan.c | 111 ++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index c320eed31322..8f487ac37f5e 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -247,6 +247,11 @@
/* support memory detection and correction */
#define FLEXCAN_QUIRK_SUPPORT_ECC BIT(10)
+#define FLEXCAN_DEFAULT_MSG_ENABLE \
+ (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | NETIF_MSG_TIMER \
+ NETIF_MSG_IFDOWN | NETIF_MSG_IFUP | NETIF_MSG_RX_ERR | \
+ NETIF_MSG_TX_ERR)
+
/* Structure of the message buffer */
struct flexcan_mb {
u32 can_ctrl;
@@ -369,6 +374,18 @@ struct flexcan_priv {
phy_interface_t phy_if_mode;
struct phylink *phylink;
struct phylink_config phylink_config;
+ u32 msg_enable;
+};
+
+struct flexcan_statistic {
+ unsigned short offset;
+ u32 mask;
+ const char name[ETH_GSTRING_LEN];
+};
+
+static const struct flexcan_statistic flexcan_statistics[] = {
+ { 0x001c, GENMASK(15, 7), "RX_ERR", },
+ { 0x001c, GENMASK(7, 0), "TX_ERR", },
};
static const struct flexcan_devtype_data fsl_p1010_devtype_data = {
@@ -492,6 +509,98 @@ static inline void flexcan_write_le(u32 val, void __iomem *addr)
iowrite32(val, addr);
}
+static void flexcan_get_drvinfo(struct net_device *ndev,
+ struct ethtool_drvinfo *info)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ strlcpy(info->driver, "flexcan", sizeof(info->driver));
+ strlcpy(info->bus_info, of_node_full_name(priv->dev->of_node),
+ sizeof(info->bus_info));
+}
+
+static int flexcan_get_link_ksettings(struct net_device *ndev,
+ struct ethtool_link_ksettings *kset)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ return phylink_ethtool_ksettings_get(priv->phylink, kset);
+}
+
+static int flexcan_set_link_ksettings(struct net_device *ndev,
+ const struct ethtool_link_ksettings *kset)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ return phylink_ethtool_ksettings_set(priv->phylink, kset);
+}
+
+static int flexcan_ethtool_nway_reset(struct net_device *ndev)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ return phylink_ethtool_nway_reset(priv->phylink);
+}
+
+static void flexcan_set_msglevel(struct net_device *ndev, u32 value)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ priv->msg_enable = value;
+}
+
+static u32 flexcan_get_msglevel(struct net_device *ndev)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+
+ return priv->msg_enable;
+}
+
+static void flexcan_ethtool_get_strings(struct net_device *netdev, u32 sset,
+ u8 *data)
+{
+ if (sset == ETH_SS_STATS) {
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(flexcan_statistics); i++)
+ memcpy(data + i * ETH_GSTRING_LEN,
+ flexcan_statistics[i].name, ETH_GSTRING_LEN);
+ }
+}
+
+static void flexcan_ethtool_get_stats(struct net_device *ndev,
+ struct ethtool_stats *stats, u64 *data)
+{
+ struct flexcan_priv *priv = netdev_priv(ndev);
+ struct flexcan_regs __iomem *regs = priv->regs;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(flexcan_statistics); i++)
+ *data++ = u32_get_bits(priv->read(regs + flexcan_statistics[i].offset),
+ flexcan_statistics[i].mask);
+}
+
+static int flexcan_ethtool_get_sset_count(struct net_device *ndev, int sset)
+{
+ if (sset == ETH_SS_STATS)
+ return ARRAY_SIZE(flexcan_statistics);
+ return -EOPNOTSUPP;
+}
+
+static const struct ethtool_ops flexcan_ethtool_ops = {
+ .get_drvinfo = flexcan_get_drvinfo,
+ .get_link = ethtool_op_get_link,
+ .get_ts_info = ethtool_op_get_ts_info,
+ .get_link_ksettings = flexcan_get_link_ksettings,
+ .set_link_ksettings = flexcan_set_link_ksettings,
+ .nway_reset = flexcan_ethtool_nway_reset,
+ .get_msglevel = flexcan_get_msglevel,
+ .set_msglevel = flexcan_set_msglevel,
+ .get_strings = flexcan_ethtool_get_strings,
+ .get_ethtool_stats = flexcan_ethtool_get_stats,
+ .get_sset_count = flexcan_ethtool_get_sset_count,
+};
+
static struct flexcan_mb __iomem *flexcan_get_mb(const struct flexcan_priv *priv,
u8 mb_index)
{
@@ -2122,6 +2231,7 @@ static int flexcan_probe(struct platform_device *pdev)
SET_NETDEV_DEV(dev, &pdev->dev);
dev->netdev_ops = &flexcan_netdev_ops;
+ dev->ethtool_ops = &flexcan_ethtool_ops;
dev->irq = irq;
dev->flags |= IFF_ECHO;
@@ -2150,6 +2260,7 @@ static int flexcan_probe(struct platform_device *pdev)
priv->devtype_data = devtype_data;
priv->reg_xceiver = reg_xceiver;
priv->phy_if_mode = phy_if_mode;
+ priv->msg_enable = netif_msg_init(-1, FLEXCAN_DEFAULT_MSG_ENABLE);
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_SUPPORT_FD) {
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD |
--
2.28.0
Powered by blists - more mailing lists