Skip to content

Commit 99acfa8

Browse files
arinc9davem330
authored andcommitted
net: dsa: mt7530: refactor MT7530_PMEEECR_P()
The MT7530_PMEEECR_P() register is on MT7530, MT7531, and the switch on the MT7988 SoC. Rename the definition for them to MT753X_PMEEECR_P(). Use the FIELD_PREP and FIELD_GET macros. Rename GET_LPI_THRESH() and SET_LPI_THRESH() to LPI_THRESH_GET() and LPI_THRESH_SET(). Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 379f7bf commit 99acfa8

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

drivers/net/dsa/mt7530.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3051,10 +3051,10 @@ static int mt753x_get_mac_eee(struct dsa_switch *ds, int port,
30513051
struct ethtool_keee *e)
30523052
{
30533053
struct mt7530_priv *priv = ds->priv;
3054-
u32 eeecr = mt7530_read(priv, MT7530_PMEEECR_P(port));
3054+
u32 eeecr = mt7530_read(priv, MT753X_PMEEECR_P(port));
30553055

30563056
e->tx_lpi_enabled = !(eeecr & LPI_MODE_EN);
3057-
e->tx_lpi_timer = GET_LPI_THRESH(eeecr);
3057+
e->tx_lpi_timer = LPI_THRESH_GET(eeecr);
30583058

30593059
return 0;
30603060
}
@@ -3068,11 +3068,11 @@ static int mt753x_set_mac_eee(struct dsa_switch *ds, int port,
30683068
if (e->tx_lpi_timer > 0xFFF)
30693069
return -EINVAL;
30703070

3071-
set = SET_LPI_THRESH(e->tx_lpi_timer);
3071+
set = LPI_THRESH_SET(e->tx_lpi_timer);
30723072
if (!e->tx_lpi_enabled)
30733073
/* Force LPI Mode without a delay */
30743074
set |= LPI_MODE_EN;
3075-
mt7530_rmw(priv, MT7530_PMEEECR_P(port), mask, set);
3075+
mt7530_rmw(priv, MT753X_PMEEECR_P(port), mask, set);
30763076

30773077
return 0;
30783078
}

drivers/net/dsa/mt7530.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -364,13 +364,14 @@ enum mt7530_vlan_port_acc_frm {
364364
PMCR_FORCE_SPEED_100 | \
365365
PMCR_FORCE_FDX | PMCR_FORCE_LNK)
366366

367-
#define MT7530_PMEEECR_P(x) (0x3004 + (x) * 0x100)
368-
#define WAKEUP_TIME_1000(x) (((x) & 0xFF) << 24)
369-
#define WAKEUP_TIME_100(x) (((x) & 0xFF) << 16)
367+
#define MT753X_PMEEECR_P(x) (0x3004 + (x) * 0x100)
368+
#define WAKEUP_TIME_1000_MASK GENMASK(31, 24)
369+
#define WAKEUP_TIME_1000(x) FIELD_PREP(WAKEUP_TIME_1000_MASK, x)
370+
#define WAKEUP_TIME_100_MASK GENMASK(23, 16)
371+
#define WAKEUP_TIME_100(x) FIELD_PREP(WAKEUP_TIME_100_MASK, x)
370372
#define LPI_THRESH_MASK GENMASK(15, 4)
371-
#define LPI_THRESH_SHT 4
372-
#define SET_LPI_THRESH(x) (((x) << LPI_THRESH_SHT) & LPI_THRESH_MASK)
373-
#define GET_LPI_THRESH(x) (((x) & LPI_THRESH_MASK) >> LPI_THRESH_SHT)
373+
#define LPI_THRESH_GET(x) FIELD_GET(LPI_THRESH_MASK, x)
374+
#define LPI_THRESH_SET(x) FIELD_PREP(LPI_THRESH_MASK, x)
374375
#define LPI_MODE_EN BIT(0)
375376

376377
#define MT7530_PMSR_P(x) (0x3008 + (x) * 0x100)

0 commit comments

Comments
 (0)