|
 |
9be752b |
From cc4ee91d46158a4b43a03883ec36b77c03793e85 Mon Sep 17 00:00:00 2001
|
|
|
9be752b |
From: Patrick Uiterwijk <patrick@puiterwijk.org>
|
|
|
9be752b |
Date: Fri, 25 Mar 2016 23:05:10 +0000
|
|
|
9be752b |
Subject: [PATCH 1/2] net: dsa: mv88e6xxx: Introduce
|
|
|
9be752b |
_mv88e6xxx_phy_page_{read,write}
|
|
|
9be752b |
|
|
|
9be752b |
Add versions of the phy_page_read and _write functions to
|
|
|
9be752b |
be used in a context where the SMI mutex is held.
|
|
|
9be752b |
|
|
|
9be752b |
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
|
|
9be752b |
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
|
|
9be752b |
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
|
|
|
9be752b |
---
|
|
|
9be752b |
drivers/net/dsa/mv88e6xxx.c | 49 +++++++++++++++++++++++++++++++++------------
|
|
|
9be752b |
1 file changed, 36 insertions(+), 13 deletions(-)
|
|
|
9be752b |
|
|
|
9be752b |
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
|
|
|
9be752b |
index fa086e0..86a2029 100644
|
|
|
9be752b |
--- a/drivers/net/dsa/mv88e6xxx.c
|
|
|
9be752b |
+++ b/drivers/net/dsa/mv88e6xxx.c
|
|
|
9be752b |
@@ -2264,6 +2264,38 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
|
|
|
9be752b |
mutex_unlock(&ps->smi_mutex);
|
|
|
9be752b |
}
|
|
|
9be752b |
|
|
|
9be752b |
+static int _mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
|
|
9be752b |
+ int reg, int val)
|
|
|
9be752b |
+{
|
|
|
9be752b |
+ int ret;
|
|
|
9be752b |
+
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
|
9be752b |
+ if (ret < 0)
|
|
|
9be752b |
+ goto restore_page_0;
|
|
|
9be752b |
+
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
|
|
9be752b |
+restore_page_0:
|
|
|
9be752b |
+ _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
|
9be752b |
+
|
|
|
9be752b |
+ return ret;
|
|
|
9be752b |
+}
|
|
|
9be752b |
+
|
|
|
9be752b |
+static int _mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page,
|
|
|
9be752b |
+ int reg)
|
|
|
9be752b |
+{
|
|
|
9be752b |
+ int ret;
|
|
|
9be752b |
+
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
|
9be752b |
+ if (ret < 0)
|
|
|
9be752b |
+ goto restore_page_0;
|
|
|
9be752b |
+
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
|
|
9be752b |
+restore_page_0:
|
|
|
9be752b |
+ _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
|
9be752b |
+
|
|
|
9be752b |
+ return ret;
|
|
|
9be752b |
+}
|
|
|
9be752b |
+
|
|
|
9be752b |
static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
|
|
|
9be752b |
{
|
|
|
9be752b |
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
|
|
9be752b |
@@ -2714,13 +2746,9 @@ int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg)
|
|
|
9be752b |
int ret;
|
|
|
9be752b |
|
|
|
9be752b |
mutex_lock(&ps->smi_mutex);
|
|
|
9be752b |
- ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
|
9be752b |
- if (ret < 0)
|
|
|
9be752b |
- goto error;
|
|
|
9be752b |
- ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
|
|
9be752b |
-error:
|
|
|
9be752b |
- _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_page_read(ds, port, page, reg);
|
|
|
9be752b |
mutex_unlock(&ps->smi_mutex);
|
|
|
9be752b |
+
|
|
|
9be752b |
return ret;
|
|
|
9be752b |
}
|
|
|
9be752b |
|
|
|
9be752b |
@@ -2731,14 +2759,9 @@ int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
|
|
9be752b |
int ret;
|
|
|
9be752b |
|
|
|
9be752b |
mutex_lock(&ps->smi_mutex);
|
|
|
9be752b |
- ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
|
9be752b |
- if (ret < 0)
|
|
|
9be752b |
- goto error;
|
|
|
9be752b |
-
|
|
|
9be752b |
- ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
|
|
9be752b |
-error:
|
|
|
9be752b |
- _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
|
9be752b |
+ ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val);
|
|
|
9be752b |
mutex_unlock(&ps->smi_mutex);
|
|
|
9be752b |
+
|
|
|
9be752b |
return ret;
|
|
|
9be752b |
}
|
|
|
9be752b |
|
|
|
9be752b |
--
|
|
|
9be752b |
2.5.0
|
|
|
9be752b |
|