| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1432863742-18427-4-git-send-email-mathieu@codeaurora.org>
Date: Thu, 28 May 2015 18:42:18 -0700
From: Mathieu Olivari <mathieu@...eaurora.org>
To: robh+dt@...nel.org, pawel.moll@....com, mark.rutland@....com,
ijc+devicetree@...lion.org.uk, galak@...eaurora.org,
davem@...emloft.net, mathieu@...eaurora.org, andrew@...n.ch,
f.fainelli@...il.com, linux@...ck-us.net, gang.chen.5i5j@...il.com,
jiri@...nulli.us, leitec@...ticky.com, fabf@...net.be,
alexander.h.duyck@...el.com, pavel.nakonechny@...tlab.ru,
joe@...ches.com, sfeldma@...il.com, nbd@...nwrt.org,
juhosg@...nwrt.org
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org
Subject: [PATCH 3/7] net: dsa: ar8xxx: add regmap support
All switch registers can now be dumped using regmap/debugfs.
\# cat /sys/kernel/debug/regmap/<mdiobus>/registers
0000: 00001302
0004: ...
...
Signed-off-by: Mathieu Olivari <mathieu@...eaurora.org>
---
drivers/net/dsa/Kconfig | 1 +
drivers/net/dsa/ar8xxx.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/dsa/ar8xxx.h | 5 ++++
3 files changed, 66 insertions(+)
diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 2aae541..17fb296 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -68,6 +68,7 @@ config NET_DSA_BCM_SF2
config NET_DSA_AR8XXX
tristate "Qualcomm Atheros AR8XXX Ethernet switch family support"
depends on NET_DSA
+ select REGMAP
---help---
This enables support for the Qualcomm Atheros AR8XXX Ethernet
switch chips.
diff --git a/drivers/net/dsa/ar8xxx.c b/drivers/net/dsa/ar8xxx.c
index 2f0fa4d..327abd4 100644
--- a/drivers/net/dsa/ar8xxx.c
+++ b/drivers/net/dsa/ar8xxx.c
@@ -176,6 +176,57 @@ static char *ar8xxx_probe(struct device *host_dev, int sw_addr)
}
}
+static int ar8xxx_regmap_read(void *ctx, uint32_t reg, uint32_t *val)
+{
+ struct dsa_switch *ds = (struct dsa_switch *)ctx;
+
+ *val = ar8xxx_read(ds, reg);
+
+ return 0;
+}
+
+static int ar8xxx_regmap_write(void *ctx, uint32_t reg, uint32_t val)
+{
+ struct dsa_switch *ds = (struct dsa_switch *)ctx;
+
+ ar8xxx_write(ds, reg, val);
+
+ return 0;
+}
+
+static const struct regmap_range ar8xxx_readable_ranges[] = {
+ regmap_reg_range(0x0000, 0x00e4), /* Global control */
+ regmap_reg_range(0x0100, 0x0168), /* EEE control */
+ regmap_reg_range(0x0200, 0x0270), /* Parser control */
+ regmap_reg_range(0x0400, 0x0454), /* ACL */
+ regmap_reg_range(0x0600, 0x0718), /* Lookup */
+ regmap_reg_range(0x0800, 0x0b70), /* QM */
+ regmap_reg_range(0x0C00, 0x0c80), /* PKT */
+ regmap_reg_range(0x1000, 0x10ac), /* MIB - Port0 */
+ regmap_reg_range(0x1100, 0x11ac), /* MIB - Port1 */
+ regmap_reg_range(0x1200, 0x12ac), /* MIB - Port2 */
+ regmap_reg_range(0x1300, 0x13ac), /* MIB - Port3 */
+ regmap_reg_range(0x1400, 0x14ac), /* MIB - Port4 */
+ regmap_reg_range(0x1500, 0x15ac), /* MIB - Port5 */
+ regmap_reg_range(0x1600, 0x16ac), /* MIB - Port6 */
+
+};
+
+static struct regmap_access_table ar8xxx_readable_table = {
+ .yes_ranges = ar8xxx_readable_ranges,
+ .n_yes_ranges = ARRAY_SIZE(ar8xxx_readable_ranges),
+};
+
+struct regmap_config ar8xxx_regmap_config = {
+ .reg_bits = 16,
+ .val_bits = 32,
+ .reg_stride = 4,
+ .max_register = 0x16ac, /* end MIB - Port6 range */
+ .reg_read = ar8xxx_regmap_read,
+ .reg_write = ar8xxx_regmap_write,
+ .rd_table = &ar8xxx_readable_table,
+};
+
static int ar8xxx_set_pad_ctrl(struct dsa_switch *ds, int port, int mode)
{
int reg;
@@ -219,9 +270,17 @@ static int ar8xxx_set_pad_ctrl(struct dsa_switch *ds, int port, int mode)
static int ar8xxx_setup(struct dsa_switch *ds)
{
+ struct ar8xxx_priv *priv = ds_to_priv(ds);
struct net_device *netdev = ds->dst->pd->of_netdev;
int ret, i, phy_mode;
+ /* Start by setting up the register mapping */
+ priv->regmap = devm_regmap_init(ds->master_dev, NULL, ds,
+ &ar8xxx_regmap_config);
+
+ if (IS_ERR(priv->regmap))
+ pr_warn("regmap initialization failed");
+
/* Initialize CPU port pad mode (xMII type, delays...) */
phy_mode = of_get_phy_mode(netdev->dev.parent->of_node);
if (phy_mode < 0) {
@@ -365,6 +424,7 @@ static void ar8xxx_poll_link(struct dsa_switch *ds)
static struct dsa_switch_driver ar8xxx_switch_driver = {
.tag_protocol = DSA_TAG_PROTO_NONE,
+ .priv_size = sizeof(struct ar8xxx_priv),
.probe = ar8xxx_probe,
.setup = ar8xxx_setup,
.set_addr = ar8xxx_set_addr,
diff --git a/drivers/net/dsa/ar8xxx.h b/drivers/net/dsa/ar8xxx.h
index 7c7a125..98cc7ed 100644
--- a/drivers/net/dsa/ar8xxx.h
+++ b/drivers/net/dsa/ar8xxx.h
@@ -17,6 +17,11 @@
#define __AR8XXX_H
#include <linux/delay.h>
+#include <linux/regmap.h>
+
+struct ar8xxx_priv {
+ struct regmap *regmap;
+};
struct ar8xxx_mib_desc {
unsigned int size;
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists