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 05/11] net: stmmac: dwxgmac2: Add MAC loopback support
Date: Wed,  8 May 2019 09:51:05 +0200	[thread overview]
Message-ID: <12299cb8b9fdd4d4f482ab10e90b77625d70093e.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 dwxgmac2 core.

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/dwxgmac2.h      |  1 +
 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
index 085b700a4994..f629ccc8932a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
@@ -29,6 +29,7 @@
 #define XGMAC_CONFIG_GPSL		GENMASK(29, 16)
 #define XGMAC_CONFIG_GPSL_SHIFT		16
 #define XGMAC_CONFIG_S2KP		BIT(11)
+#define XGMAC_CONFIG_LM			BIT(10)
 #define XGMAC_CONFIG_IPC		BIT(9)
 #define XGMAC_CONFIG_JE			BIT(8)
 #define XGMAC_CONFIG_WD			BIT(7)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
index 64b8cb88ea45..c27b3ca052ea 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
@@ -321,6 +321,18 @@ static void dwxgmac2_set_filter(struct mac_device_info *hw,
 	writel(value, ioaddr + XGMAC_PACKET_FILTER);
 }
 
+static void dwxgmac2_set_mac_loopback(void __iomem *ioaddr, bool enable)
+{
+	u32 value = readl(ioaddr + XGMAC_RX_CONFIG);
+
+	if (enable)
+		value |= XGMAC_CONFIG_LM;
+	else
+		value &= ~XGMAC_CONFIG_LM;
+
+	writel(value, ioaddr + XGMAC_RX_CONFIG);
+}
+
 const struct stmmac_ops dwxgmac210_ops = {
 	.core_init = dwxgmac2_core_init,
 	.set_mac = dwxgmac2_set_mac,
@@ -350,6 +362,7 @@ const struct stmmac_ops dwxgmac210_ops = {
 	.pcs_get_adv_lp = NULL,
 	.debug = NULL,
 	.set_filter = dwxgmac2_set_filter,
+	.set_mac_loopback = dwxgmac2_set_mac_loopback,
 };
 
 int dwxgmac2_setup(struct stmmac_priv *priv)
-- 
2.7.4


  parent reply	other threads:[~2019-05-08  7:52 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 ` [PATCH net-next 04/11] net: stmmac: dwmac4/5: " Jose Abreu
2019-05-08  7:51 ` Jose Abreu [this message]
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=12299cb8b9fdd4d4f482ab10e90b77625d70093e.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 05/11] net: stmmac: dwxgmac2: 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).