From: John Crispin <john@openwrt.org>
Date: Mon, 1 Dec 2014 16:15:08 +0000 (+0000)
Subject: ar8216: factor out reg_port_stats_base parameters to ar8xxx_chip
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ecd27db7573fd76347ef62c6d3bacba600e1c0cc;p=librecmc%2Flibrecmc.git

ar8216: factor out reg_port_stats_base parameters to ar8xxx_chip

Factor out reg_port_stats_base parameters to ar8xxx_chip.
Remove related chip_is_... checks.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

SVN-Revision: 43471
---

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 961803c285..558b9f7718 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -76,6 +76,10 @@ struct ar8xxx_chip {
 	bool config_at_probe;
 	bool mii_lo_first;
 
+	/* parameters to calculate REG_PORT_STATS_BASE */
+	unsigned reg_port_stats_start;
+	unsigned reg_port_stats_length;
+
 	int (*hw_init)(struct ar8xxx_priv *priv);
 	void (*cleanup)(struct ar8xxx_priv *priv);
 
@@ -577,13 +581,8 @@ ar8xxx_mib_fetch_port_stat(struct ar8xxx_priv *priv, int port, bool flush)
 
 	lockdep_assert_held(&priv->mib_lock);
 
-	if (chip_is_ar8327(priv) || chip_is_ar8337(priv))
-		base = AR8327_REG_PORT_STATS_BASE(port);
-	else if (chip_is_ar8236(priv) ||
-		 chip_is_ar8316(priv))
-		base = AR8236_REG_PORT_STATS_BASE(port);
-	else
-		base = AR8216_REG_PORT_STATS_BASE(port);
+	base = priv->chip->reg_port_stats_start +
+	       priv->chip->reg_port_stats_length * port;
 
 	mib_stats = &priv->mib_stats[port * priv->chip->num_mibs];
 	for (i = 0; i < priv->chip->num_mibs; i++) {
@@ -885,6 +884,9 @@ ar8216_init_port(struct ar8xxx_priv *priv, int port)
 static const struct ar8xxx_chip ar8216_chip = {
 	.caps = AR8XXX_CAP_MIB_COUNTERS,
 
+	.reg_port_stats_start = 0x19000,
+	.reg_port_stats_length = 0xa0,
+
 	.hw_init = ar8216_hw_init,
 	.init_globals = ar8216_init_globals,
 	.init_port = ar8216_init_port,
@@ -953,6 +955,10 @@ ar8236_init_globals(struct ar8xxx_priv *priv)
 
 static const struct ar8xxx_chip ar8236_chip = {
 	.caps = AR8XXX_CAP_MIB_COUNTERS,
+
+	.reg_port_stats_start = 0x20000,
+	.reg_port_stats_length = 0x100,
+
 	.hw_init = ar8216_hw_init,
 	.init_globals = ar8236_init_globals,
 	.init_port = ar8216_init_port,
@@ -1038,6 +1044,10 @@ ar8316_init_globals(struct ar8xxx_priv *priv)
 
 static const struct ar8xxx_chip ar8316_chip = {
 	.caps = AR8XXX_CAP_GIGE | AR8XXX_CAP_MIB_COUNTERS,
+
+	.reg_port_stats_start = 0x20000,
+	.reg_port_stats_length = 0x100,
+
 	.hw_init = ar8316_hw_init,
 	.init_globals = ar8316_init_globals,
 	.init_port = ar8216_init_port,
@@ -1831,6 +1841,9 @@ static const struct ar8xxx_chip ar8327_chip = {
 	.config_at_probe = true,
 	.mii_lo_first = true,
 
+	.reg_port_stats_start = 0x1000,
+	.reg_port_stats_length = 0x100,
+
 	.hw_init = ar8327_hw_init,
 	.cleanup = ar8327_cleanup,
 	.init_globals = ar8327_init_globals,
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.h b/target/linux/generic/files/drivers/net/phy/ar8216.h
index ca6b2f2915..f6df7c88e5 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.h
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.h
@@ -164,8 +164,6 @@
 #define AR8216_REG_PORT_RATE(_i)	(AR8216_PORT_OFFSET(_i) + 0x000c)
 #define AR8216_REG_PORT_PRIO(_i)	(AR8216_PORT_OFFSET(_i) + 0x0010)
 
-#define AR8216_REG_PORT_STATS_BASE(_i)	(0x19000 + (_i) * 0xa0)
-
 #define AR8216_STATS_RXBROAD		0x00
 #define AR8216_STATS_RXPAUSE		0x04
 #define AR8216_STATS_RXMULTI		0x08
@@ -217,8 +215,6 @@
 #define   AR8236_PORT_VLAN2_VLAN_MODE	BITS(30, 2)
 #define   AR8236_PORT_VLAN2_VLAN_MODE_S	30
 
-#define AR8236_REG_PORT_STATS_BASE(_i)	(0x20000 + (_i) * 0x100)
-
 #define AR8236_STATS_RXBROAD		0x00
 #define AR8236_STATS_RXPAUSE		0x04
 #define AR8236_STATS_RXMULTI		0x08
@@ -455,8 +451,6 @@
 #define AR8327_REG_PORT_HOL_CTRL1(_i)		(0x974 + (_i) * 0x8)
 #define   AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN	BIT(16)
 
-#define AR8327_REG_PORT_STATS_BASE(_i)		(0x1000 + (_i) * 0x100)
-
 #define AR8337_PAD_MAC06_EXCHANGE_EN		BIT(31)
 
 /* port speed */