linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC PATCH 3/3] arcnet: com20020: Add ethtool support
@ 2018-05-05 21:35 Andrea Greco
  2018-05-07  3:08 ` Tobin C. Harding
  0 siblings, 1 reply; 2+ messages in thread
From: Andrea Greco @ 2018-05-05 21:35 UTC (permalink / raw)
  To: m.grzeschik; +Cc: Andrea Greco, netdev, linux-kernel

From: Andrea Greco <a.greco@4sigma.it>

Setup ethtols for export com20020 diag register

Signed-off-by: Andrea Greco <a.greco@4sigma.it>
---
 drivers/net/arcnet/com20020-isa.c    |  1 +
 drivers/net/arcnet/com20020-membus.c |  1 +
 drivers/net/arcnet/com20020.c        | 29 +++++++++++++++++++++++++++++
 drivers/net/arcnet/com20020.h        |  1 +
 drivers/net/arcnet/com20020_cs.c     |  1 +
 include/uapi/linux/if_arcnet.h       |  6 ++++++
 6 files changed, 39 insertions(+)

diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
index 38fa60ddaf2e..44ab6dcccb58 100644
--- a/drivers/net/arcnet/com20020-isa.c
+++ b/drivers/net/arcnet/com20020-isa.c
@@ -154,6 +154,7 @@ static int __init com20020_init(void)
 		dev->dev_addr[0] = node;
 
 	dev->netdev_ops = &com20020_netdev_ops;
+	dev->ethtool_ops = &com20020_ethtool_ops;
 
 	lp = netdev_priv(dev);
 	lp->backplane = backplane;
diff --git a/drivers/net/arcnet/com20020-membus.c b/drivers/net/arcnet/com20020-membus.c
index 6e4a2f3a84f7..9eead734a3cf 100644
--- a/drivers/net/arcnet/com20020-membus.c
+++ b/drivers/net/arcnet/com20020-membus.c
@@ -91,6 +91,7 @@ static int com20020_probe(struct platform_device *pdev)
 
 	dev = alloc_arcdev(NULL);// Let autoassign name arc%d
 	dev->netdev_ops = &com20020_netdev_ops;
+	dev->ethtool_ops = &com20020_ethtool_ops;
 	lp = netdev_priv(dev);
 
 	lp->card_flags = ARC_CAN_10MBIT;/* pretend all of them can 10Mbit */
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
index abd32ed8ec9b..2089b45e81c8 100644
--- a/drivers/net/arcnet/com20020.c
+++ b/drivers/net/arcnet/com20020.c
@@ -201,6 +201,34 @@ const struct net_device_ops com20020_netdev_ops = {
 	.ndo_set_rx_mode = com20020_set_mc_list,
 };
 
+static int com20020_ethtool_regs_len(struct net_device *netdev)
+{
+	return sizeof(struct com20020_ethtool_regs);
+}
+
+static void com20020_ethtool_regs_read(struct net_device *dev,
+				       struct ethtool_regs *regs, void *p)
+{
+	struct arcnet_local *lp;
+	struct com20020_ethtool_regs *com_reg;
+
+	lp = netdev_priv(dev);
+	memset(p, 0, sizeof(struct com20020_ethtool_regs));
+
+	regs->version = 1;
+
+	com_reg = p;
+
+	com_reg->status = lp->hw.status(dev) & 0xFF;
+	com_reg->diag_register = (lp->hw.status(dev) >> 8) & 0xFF;
+	com_reg->reconf_count = lp->num_recons;
+}
+
+const struct ethtool_ops com20020_ethtool_ops = {
+	.get_regs = com20020_ethtool_regs_read,
+	.get_regs_len  = com20020_ethtool_regs_len,
+};
+
 /* Set up the struct net_device associated with this card.  Called after
  * probing succeeds.
  */
@@ -402,6 +430,7 @@ static void com20020_set_mc_list(struct net_device *dev)
 EXPORT_SYMBOL(com20020_check);
 EXPORT_SYMBOL(com20020_found);
 EXPORT_SYMBOL(com20020_netdev_ops);
+EXPORT_SYMBOL(com20020_ethtool_ops);
 #endif
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/arcnet/com20020.h b/drivers/net/arcnet/com20020.h
index 0bcc5d0a6903..a1024c8f8a1f 100644
--- a/drivers/net/arcnet/com20020.h
+++ b/drivers/net/arcnet/com20020.h
@@ -31,6 +31,7 @@
 int com20020_check(struct net_device *dev);
 int com20020_found(struct net_device *dev, int shared);
 extern const struct net_device_ops com20020_netdev_ops;
+extern const struct ethtool_ops com20020_ethtool_ops;
 
 /* The number of low I/O ports used by the card. */
 #define ARCNET_TOTAL_SIZE 8
diff --git a/drivers/net/arcnet/com20020_cs.c b/drivers/net/arcnet/com20020_cs.c
index cf607ffcf358..ae64f436fd54 100644
--- a/drivers/net/arcnet/com20020_cs.c
+++ b/drivers/net/arcnet/com20020_cs.c
@@ -233,6 +233,7 @@ static int com20020_config(struct pcmcia_device *link)
 	}
 
 	dev->irq = link->irq;
+	dev->ethtool_ops = &com20020_ethtool_ops;
 
 	ret = pcmcia_enable_device(link);
 	if (ret)
diff --git a/include/uapi/linux/if_arcnet.h b/include/uapi/linux/if_arcnet.h
index 683878036d76..790c0fa7386d 100644
--- a/include/uapi/linux/if_arcnet.h
+++ b/include/uapi/linux/if_arcnet.h
@@ -127,4 +127,10 @@ struct archdr {
 	} soft;
 };
 
+struct com20020_ethtool_regs {
+	__u8 status;
+	__u8 diag_register;
+	__u32 reconf_count;
+};
+
 #endif				/* _LINUX_IF_ARCNET_H */
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [RFC PATCH 3/3] arcnet: com20020: Add ethtool support
  2018-05-05 21:35 [RFC PATCH 3/3] arcnet: com20020: Add ethtool support Andrea Greco
@ 2018-05-07  3:08 ` Tobin C. Harding
  0 siblings, 0 replies; 2+ messages in thread
From: Tobin C. Harding @ 2018-05-07  3:08 UTC (permalink / raw)
  To: Andrea Greco; +Cc: m.grzeschik, Andrea Greco, netdev, linux-kernel

On Sat, May 05, 2018 at 11:35:29PM +0200, Andrea Greco wrote:
> From: Andrea Greco <a.greco@4sigma.it>
> 
> Setup ethtols for export com20020 diag register
> 
> Signed-off-by: Andrea Greco <a.greco@4sigma.it>
> ---
>  drivers/net/arcnet/com20020-isa.c    |  1 +
>  drivers/net/arcnet/com20020-membus.c |  1 +
>  drivers/net/arcnet/com20020.c        | 29 +++++++++++++++++++++++++++++
>  drivers/net/arcnet/com20020.h        |  1 +
>  drivers/net/arcnet/com20020_cs.c     |  1 +
>  include/uapi/linux/if_arcnet.h       |  6 ++++++
>  6 files changed, 39 insertions(+)
> 
> diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c
> index 38fa60ddaf2e..44ab6dcccb58 100644
> --- a/drivers/net/arcnet/com20020-isa.c
> +++ b/drivers/net/arcnet/com20020-isa.c
> @@ -154,6 +154,7 @@ static int __init com20020_init(void)
>  		dev->dev_addr[0] = node;
>  
>  	dev->netdev_ops = &com20020_netdev_ops;
> +	dev->ethtool_ops = &com20020_ethtool_ops;
>  
>  	lp = netdev_priv(dev);
>  	lp->backplane = backplane;
> diff --git a/drivers/net/arcnet/com20020-membus.c b/drivers/net/arcnet/com20020-membus.c
> index 6e4a2f3a84f7..9eead734a3cf 100644
> --- a/drivers/net/arcnet/com20020-membus.c
> +++ b/drivers/net/arcnet/com20020-membus.c
> @@ -91,6 +91,7 @@ static int com20020_probe(struct platform_device *pdev)
>  
>  	dev = alloc_arcdev(NULL);// Let autoassign name arc%d
>  	dev->netdev_ops = &com20020_netdev_ops;
> +	dev->ethtool_ops = &com20020_ethtool_ops;
>  	lp = netdev_priv(dev);
>  
>  	lp->card_flags = ARC_CAN_10MBIT;/* pretend all of them can 10Mbit */
> diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c
> index abd32ed8ec9b..2089b45e81c8 100644
> --- a/drivers/net/arcnet/com20020.c
> +++ b/drivers/net/arcnet/com20020.c
> @@ -201,6 +201,34 @@ const struct net_device_ops com20020_netdev_ops = {
>  	.ndo_set_rx_mode = com20020_set_mc_list,
>  };
>  
> +static int com20020_ethtool_regs_len(struct net_device *netdev)
> +{
> +	return sizeof(struct com20020_ethtool_regs);
> +}
> +
> +static void com20020_ethtool_regs_read(struct net_device *dev,
> +				       struct ethtool_regs *regs, void *p)
> +{
> +	struct arcnet_local *lp;
> +	struct com20020_ethtool_regs *com_reg;
> +
> +	lp = netdev_priv(dev);
> +	memset(p, 0, sizeof(struct com20020_ethtool_regs));

perhaps:

	struct arcnet_local *lp = netdev_priv(dev);
	struct com20020_ethtool_regs *com_reg = p;

	memset(com_reg, 0, sizeof(*com_reg));

> +
> +	regs->version = 1;

Should this function really have a side effect?  If so, perhaps it could
be commented.

> +
> +	com_reg = p;
> +
> +	com_reg->status = lp->hw.status(dev) & 0xFF;
> +	com_reg->diag_register = (lp->hw.status(dev) >> 8) & 0xFF;
> +	com_reg->reconf_count = lp->num_recons;
> +}
> +
> +const struct ethtool_ops com20020_ethtool_ops = {
> +	.get_regs = com20020_ethtool_regs_read,
> +	.get_regs_len  = com20020_ethtool_regs_len,
> +};
> +

Hope this helps,
Tobin.

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-07  3:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-05 21:35 [RFC PATCH 3/3] arcnet: com20020: Add ethtool support Andrea Greco
2018-05-07  3:08 ` Tobin C. Harding

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).