From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: netdev@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org
Subject: [PATCH 4/5] sh_eth: add sh_eth_cpu_data::no_tx_cntr flag
Date: Sat, 24 Mar 2018 23:11:19 +0300 [thread overview]
Message-ID: <a6ddaada-59fa-3a38-7c69-87891bba9cad@cogentembedded.com> (raw)
In-Reply-To: <b3706a51-27a4-d78b-998d-9440637ac216@cogentembedded.com>
RZ/A1H (R7S72100) Ether controller doesn't seem to have the TX counter
registers like TROCR/CDCR/LCCR (or at least they are still undocumented
like some TSU registers), so we bail out of sh_eth_get_stats() early in
this case. Currently we are calling sh_eth_is_rz_fast_ether() in order
to check for this, but it would be simpler to check the new 'no_tx_cntrs'
bitfield in the 'struct sh_eth_cpu_data'; then we'd be able to remove
sh_eth_is_rz_fast_ether() as there would be no callers left...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
drivers/net/ethernet/renesas/sh_eth.c | 8 ++------
drivers/net/ethernet/renesas/sh_eth.h | 1 +
2 files changed, 3 insertions(+), 6 deletions(-)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net-next/drivers/net/ethernet/renesas/sh_eth.c
@@ -455,11 +455,6 @@ static bool sh_eth_is_gether(struct sh_e
return mdp->reg_offset == sh_eth_offset_gigabit;
}
-static bool sh_eth_is_rz_fast_ether(struct sh_eth_private *mdp)
-{
- return mdp->reg_offset == sh_eth_offset_fast_rz;
-}
-
static void sh_eth_select_mii(struct net_device *ndev)
{
struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -614,6 +609,7 @@ static struct sh_eth_cpu_data r7s72100_d
.xdfar_rw = 1,
.hw_checksum = 1,
.tsu = 1,
+ .no_tx_cntrs = 1,
};
static void sh_eth_chip_reset_r8a7740(struct net_device *ndev)
@@ -2534,7 +2530,7 @@ static struct net_device_stats *sh_eth_g
{
struct sh_eth_private *mdp = netdev_priv(ndev);
- if (sh_eth_is_rz_fast_ether(mdp))
+ if (mdp->cd->no_tx_cntrs)
return &ndev->stats;
if (!mdp->is_opened)
Index: net-next/drivers/net/ethernet/renesas/sh_eth.h
===================================================================
--- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h
+++ net-next/drivers/net/ethernet/renesas/sh_eth.h
@@ -514,6 +514,7 @@ struct sh_eth_cpu_data {
unsigned rmiimode:1; /* EtherC has RMIIMODE register */
unsigned rtrate:1; /* EtherC has RTRATE register */
unsigned magic:1; /* EtherC has ECMR.MPDE and ECSR.MPD */
+ unsigned no_tx_cntrs:1; /* EtherC DOES NOT have TX error counters */
unsigned dual_port:1; /* Dual EtherC/E-DMAC */
};
next prev parent reply other threads:[~2018-03-24 20:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-24 20:04 [PATCH 0/2] sh_eth: unify the SoC feature checks Sergei Shtylyov
2018-03-24 20:07 ` [PATCH 1/5] sh_eth: add sh_eth_cpu_data::soft_reset() method Sergei Shtylyov
2018-03-24 20:08 ` [PATCH 2/5] sh_eth: add sh_eth_cpu_data::edtrr_trns value Sergei Shtylyov
2018-03-24 20:09 ` [PATCH 3/5] sh_eth: add sh_eth_cpu_data::xdfar_rw flag Sergei Shtylyov
2018-03-24 20:11 ` Sergei Shtylyov [this message]
2018-03-24 20:15 ` [PATCH 4/5] sh_eth: add sh_eth_cpu_data::no_tx_cntr flag Sergei Shtylyov
2018-03-24 20:12 ` [PATCH 5/5] sh_eth: add sh_eth_cpu_data::cexcr flag Sergei Shtylyov
2018-03-24 20:14 ` [PATCH 0/2] sh_eth: unify the SoC feature checks Sergei Shtylyov
2018-03-24 20:30 ` Sergei Shtylyov
2018-03-26 16:34 ` David Miller
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=a6ddaada-59fa-3a38-7c69-87891bba9cad@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=netdev@vger.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).