mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-07 19:40:39 +00:00
20a924d2ae
The new EEE patch is accepted upstream, so backport it and replace the current one. Cc: René van Dorst <opensource@vdorst.com> Signed-off-by: DENG Qingfang <dqfext@gmail.com>
121 lines
3.8 KiB
Diff
121 lines
3.8 KiB
Diff
From 40b5d2f15c091fa9c854acde91ad2acb504027d7 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Ren=C3=A9=20van=20Dorst?= <opensource@vdorst.com>
|
|
Date: Mon, 12 Apr 2021 08:50:31 +0200
|
|
Subject: [PATCH] net: dsa: mt7530: Add support for EEE features
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This patch adds EEE support.
|
|
|
|
Signed-off-by: René van Dorst <opensource@vdorst.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 46 +++++++++++++++++++++++++++++++++++++++-
|
|
drivers/net/dsa/mt7530.h | 11 ++++++++++
|
|
2 files changed, 56 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -1406,7 +1406,8 @@ static void mt7530_phylink_mac_config(st
|
|
mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
|
|
mcr_new = mcr_cur;
|
|
mcr_new &= ~(PMCR_FORCE_SPEED_1000 | PMCR_FORCE_SPEED_100 |
|
|
- PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN);
|
|
+ PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN |
|
|
+ PMCR_FORCE_EEE1G | PMCR_FORCE_EEE100);
|
|
mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
|
|
PMCR_BACKPR_EN | PMCR_FORCE_MODE;
|
|
|
|
@@ -1430,6 +1431,17 @@ static void mt7530_phylink_mac_config(st
|
|
mcr_new |= PMCR_RX_FC_EN;
|
|
}
|
|
|
|
+ if (mode == MLO_AN_PHY) {
|
|
+ switch (state->speed) {
|
|
+ case SPEED_1000:
|
|
+ mcr_new |= PMCR_FORCE_EEE1G;
|
|
+ break;
|
|
+ case SPEED_100:
|
|
+ mcr_new |= PMCR_FORCE_EEE100;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (mcr_new != mcr_cur)
|
|
mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
|
|
}
|
|
@@ -1555,6 +1567,36 @@ mt7530_phylink_mac_link_state(struct dsa
|
|
return 1;
|
|
}
|
|
|
|
+static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
|
|
+ struct ethtool_eee *e)
|
|
+{
|
|
+ struct mt7530_priv *priv = ds->priv;
|
|
+ u32 eeecr = mt7530_read(priv, MT7530_PMEEECR_P(port));
|
|
+
|
|
+ e->tx_lpi_enabled = !(eeecr & LPI_MODE_EN);
|
|
+ e->tx_lpi_timer = GET_LPI_THRESH(eeecr);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,
|
|
+ struct ethtool_eee *e)
|
|
+{
|
|
+ struct mt7530_priv *priv = ds->priv;
|
|
+ u32 set, mask = LPI_THRESH_MASK | LPI_MODE_EN;
|
|
+
|
|
+ if (e->tx_lpi_timer > 0xFFF)
|
|
+ return -EINVAL;
|
|
+
|
|
+ set = SET_LPI_THRESH(e->tx_lpi_timer);
|
|
+ if (!e->tx_lpi_enabled)
|
|
+ /* Force LPI Mode without a delay */
|
|
+ set |= LPI_MODE_EN;
|
|
+ mt7530_rmw(priv, MT7530_PMEEECR_P(port), mask, set);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static const struct dsa_switch_ops mt7530_switch_ops = {
|
|
.get_tag_protocol = mtk_get_tag_protocol,
|
|
.setup = mt7530_setup,
|
|
@@ -1582,6 +1624,8 @@ static const struct dsa_switch_ops mt753
|
|
.phylink_mac_config = mt7530_phylink_mac_config,
|
|
.phylink_mac_link_down = mt7530_phylink_mac_link_down,
|
|
.phylink_mac_link_up = mt7530_phylink_mac_link_up,
|
|
+ .get_mac_eee = mt753x_get_mac_eee,
|
|
+ .set_mac_eee = mt753x_set_mac_eee,
|
|
};
|
|
|
|
static const struct of_device_id mt7530_of_match[] = {
|
|
--- a/drivers/net/dsa/mt7530.h
|
|
+++ b/drivers/net/dsa/mt7530.h
|
|
@@ -212,6 +212,8 @@ enum mt7530_vlan_port_attr {
|
|
#define PMCR_RX_EN BIT(13)
|
|
#define PMCR_BACKOFF_EN BIT(9)
|
|
#define PMCR_BACKPR_EN BIT(8)
|
|
+#define PMCR_FORCE_EEE1G BIT(7)
|
|
+#define PMCR_FORCE_EEE100 BIT(6)
|
|
#define PMCR_TX_FC_EN BIT(5)
|
|
#define PMCR_RX_FC_EN BIT(4)
|
|
#define PMCR_FORCE_SPEED_1000 BIT(3)
|
|
@@ -221,6 +223,15 @@ enum mt7530_vlan_port_attr {
|
|
#define PMCR_SPEED_MASK (PMCR_FORCE_SPEED_100 | \
|
|
PMCR_FORCE_SPEED_1000)
|
|
|
|
+#define MT7530_PMEEECR_P(x) (0x3004 + (x) * 0x100)
|
|
+#define WAKEUP_TIME_1000(x) (((x) & 0xFF) << 24)
|
|
+#define WAKEUP_TIME_100(x) (((x) & 0xFF) << 16)
|
|
+#define LPI_THRESH_MASK GENMASK(15, 4)
|
|
+#define LPI_THRESH_SHT 4
|
|
+#define SET_LPI_THRESH(x) (((x) << LPI_THRESH_SHT) & LPI_THRESH_MASK)
|
|
+#define GET_LPI_THRESH(x) (((x) & LPI_THRESH_MASK) >> LPI_THRESH_SHT)
|
|
+#define LPI_MODE_EN BIT(0)
|
|
+
|
|
#define MT7530_PMSR_P(x) (0x3008 + (x) * 0x100)
|
|
#define PMSR_EEE1G BIT(7)
|
|
#define PMSR_EEE100M BIT(6)
|