Messages in this thread | | | Date | Tue, 14 Nov 2023 14:06:45 +0200 | Subject | Re: [PATCH net-next 1/3] net: ethernet: am65-cpsw: Add standard Ethernet MAC stats to ethtool | From | Roger Quadros <> |
| |
On 13/11/2023 18:42, Simon Horman wrote: > On Mon, Nov 13, 2023 at 01:07:06PM +0200, Roger Quadros wrote: >> Gets 'ethtool -S eth0 --groups eth-mac' command to work. >> >> Signed-off-by: Roger Quadros <rogerq@kernel.org> >> --- >> drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 26 +++++++++++++++++++++ >> 1 file changed, 26 insertions(+) >> >> diff --git a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c >> index c51e2af91f69..ac7276f0f77a 100644 >> --- a/drivers/net/ethernet/ti/am65-cpsw-ethtool.c >> +++ b/drivers/net/ethernet/ti/am65-cpsw-ethtool.c >> @@ -662,6 +662,31 @@ static void am65_cpsw_get_ethtool_stats(struct net_device *ndev, >> hw_stats[i].offset); >> } >> >> +static void am65_cpsw_get_eth_mac_stats(struct net_device *ndev, >> + struct ethtool_eth_mac_stats *s) >> +{ >> + struct am65_cpsw_port *port = am65_ndev_to_port(ndev); >> + struct am65_cpsw_stats_regs *stats; > > Hi Roger, > > I think that stats needs an __iomem annotation > to address the issues flagged by Sparse. > > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:671:15: warning: incorrect type in assignment (different address spaces) > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:671:15: expected struct am65_cpsw_stats_regs *stats > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:671:15: got void [noderef] __iomem *stat_base > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:673:34: warning: incorrect type in argument 1 (different address spaces) > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:673:34: expected void const volatile [noderef] __iomem *addr > drivers/net/ethernet/ti/am65-cpsw-ethtool.c:673:34: got unsigned int * > ...
Thanks for the catch Simon. I'll fix it up.
> >> + >> + stats = port->stat_base; >> + >> + s->FramesTransmittedOK = readl_relaxed(&stats->tx_good_frames); >> + s->SingleCollisionFrames = readl_relaxed(&stats->tx_single_coll_frames); >> + s->MultipleCollisionFrames = readl_relaxed(&stats->tx_mult_coll_frames); >> + s->FramesReceivedOK = readl_relaxed(&stats->rx_good_frames); >> + s->FrameCheckSequenceErrors = readl_relaxed(&stats->rx_crc_errors); >> + s->AlignmentErrors = readl_relaxed(&stats->rx_align_code_errors); >> + s->OctetsTransmittedOK = readl_relaxed(&stats->tx_octets); >> + s->FramesWithDeferredXmissions = readl_relaxed(&stats->tx_deferred_frames); >> + s->LateCollisions = readl_relaxed(&stats->tx_late_collisions); >> + s->CarrierSenseErrors = readl_relaxed(&stats->tx_carrier_sense_errors); >> + s->OctetsReceivedOK = readl_relaxed(&stats->rx_octets); >> + s->MulticastFramesXmittedOK = readl_relaxed(&stats->tx_multicast_frames); >> + s->BroadcastFramesXmittedOK = readl_relaxed(&stats->tx_broadcast_frames); >> + s->MulticastFramesReceivedOK = readl_relaxed(&stats->rx_multicast_frames); >> + s->BroadcastFramesReceivedOK = readl_relaxed(&stats->rx_broadcast_frames); >> +}; >> + >> static int am65_cpsw_get_ethtool_ts_info(struct net_device *ndev, >> struct ethtool_ts_info *info) >> { > > ...
-- cheers, -roger
| |