LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jose Abreu <Jose.Abreu@synopsys.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jose Abreu <Jose.Abreu@synopsys.com>,
	Joao Pinto <Joao.Pinto@synopsys.com>,
	"David S . Miller" <davem@davemloft.net>,
	Giuseppe Cavallaro <peppe.cavallaro@st.com>,
	Alexandre Torgue <alexandre.torgue@st.com>
Subject: [PATCH net-next 04/11] net: stmmac: dwmac4/5: Add MAC loopback support
Date: Wed,  8 May 2019 09:51:04 +0200	[thread overview]
Message-ID: <01812f5cb5b8bdab3d7df3656b49f069dc7f5af1.1557300602.git.joabreu@synopsys.com> (raw)
In-Reply-To: <cover.1557300602.git.joabreu@synopsys.com>
In-Reply-To: <cover.1557300602.git.joabreu@synopsys.com>

In preparation for the addition of stmmac selftests we implement the MAC
loopback callback in dwmac4/5 cores.

Signed-off-by: Jose Abreu <joabreu@synopsys.com>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h      |  1 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
index eb013d54025a..3dddd7902b0f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
@@ -160,6 +160,7 @@ enum power_event {
 #define GMAC_CONFIG_PS			BIT(15)
 #define GMAC_CONFIG_FES			BIT(14)
 #define GMAC_CONFIG_DM			BIT(13)
+#define GMAC_CONFIG_LM			BIT(12)
 #define GMAC_CONFIG_DCRS		BIT(9)
 #define GMAC_CONFIG_TE			BIT(1)
 #define GMAC_CONFIG_RE			BIT(0)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index 7e5d5db0d516..2f1a2a6f9b33 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -701,6 +701,18 @@ static void dwmac4_debug(void __iomem *ioaddr, struct stmmac_extra_stats *x,
 		x->mac_gmii_rx_proto_engine++;
 }
 
+static void dwmac4_set_mac_loopback(void __iomem *ioaddr, bool enable)
+{
+	u32 value = readl(ioaddr + GMAC_CONFIG);
+
+	if (enable)
+		value |= GMAC_CONFIG_LM;
+	else
+		value &= ~GMAC_CONFIG_LM;
+
+	writel(value, ioaddr + GMAC_CONFIG);
+}
+
 const struct stmmac_ops dwmac4_ops = {
 	.core_init = dwmac4_core_init,
 	.set_mac = stmmac_set_mac,
@@ -730,6 +742,7 @@ const struct stmmac_ops dwmac4_ops = {
 	.pcs_get_adv_lp = dwmac4_get_adv_lp,
 	.debug = dwmac4_debug,
 	.set_filter = dwmac4_set_filter,
+	.set_mac_loopback = dwmac4_set_mac_loopback,
 };
 
 const struct stmmac_ops dwmac410_ops = {
@@ -761,6 +774,7 @@ const struct stmmac_ops dwmac410_ops = {
 	.pcs_get_adv_lp = dwmac4_get_adv_lp,
 	.debug = dwmac4_debug,
 	.set_filter = dwmac4_set_filter,
+	.set_mac_loopback = dwmac4_set_mac_loopback,
 };
 
 const struct stmmac_ops dwmac510_ops = {
@@ -797,6 +811,7 @@ const struct stmmac_ops dwmac510_ops = {
 	.safety_feat_dump = dwmac5_safety_feat_dump,
 	.rxp_config = dwmac5_rxp_config,
 	.flex_pps_config = dwmac5_flex_pps_config,
+	.set_mac_loopback = dwmac4_set_mac_loopback,
 };
 
 int dwmac4_setup(struct stmmac_priv *priv)
-- 
2.7.4


  parent reply	other threads:[~2019-05-08  7:51 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-08  7:51 [PATCH net-next 00/11] net: stmmac: Selftests Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 01/11] net: stmmac: Add MAC loopback callback to HWIF Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 02/11] net: stmmac: dwmac100: Add MAC loopback support Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 03/11] net: stmmac: dwmac1000: " Jose Abreu
2019-05-08  7:51 ` Jose Abreu [this message]
2019-05-08  7:51 ` [PATCH net-next 05/11] net: stmmac: dwxgmac2: " Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 06/11] net: stmmac: Switch MMC functions to HWIF callbacks Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 07/11] net: stmmac: dwmac1000: Also pass control frames while in promisc mode Jose Abreu
2019-05-08 12:04   ` Andrew Lunn
2019-05-08 14:53     ` Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 08/11] net: stmmac: dwmac4/5: " Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 09/11] net: stmmac: dwxgmac2: " Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 10/11] net: stmmac: Introduce selftests support Jose Abreu
2019-05-09  2:23   ` Andrew Lunn
2019-05-09  8:25     ` Jose Abreu
2019-05-09 12:21       ` Andrew Lunn
2019-05-09 15:11         ` Jose Abreu
2019-05-08  7:51 ` [PATCH net-next 11/11] net: stmmac: dwmac1000: Fix Hash Filter Jose Abreu
2019-05-08 15:46 ` [PATCH net-next 00/11] net: stmmac: Selftests David Miller
2019-05-08 19:50 ` Andrew Lunn
2019-05-09  8:17   ` Jose Abreu
2019-05-09 16:05     ` Jose Abreu
2019-05-09  9:04 ` Corentin Labbe
2019-05-09 10:11   ` Jose Abreu
2019-05-09 18:00     ` Corentin Labbe

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=01812f5cb5b8bdab3d7df3656b49f069dc7f5af1.1557300602.git.joabreu@synopsys.com \
    --to=jose.abreu@synopsys.com \
    --cc=Joao.Pinto@synopsys.com \
    --cc=alexandre.torgue@st.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=peppe.cavallaro@st.com \
    --subject='Re: [PATCH net-next 04/11] net: stmmac: dwmac4/5: Add MAC loopback support' \
    /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

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