96 lines
2.7 KiB
Diff
96 lines
2.7 KiB
Diff
From 4d1b08a69350d40e0aa14baba4797ef175295718 Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Wed, 30 Mar 2016 12:40:54 +0100
|
|
Subject: [PATCH 1/2] net: dsa: mv88e6xxx: Introduce
|
|
_mv88e6xxx_phy_page_{read,write}
|
|
|
|
Add versions of the phy_page_read and _write functions to
|
|
be used in a context where the SMI mutex is held.
|
|
|
|
Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
|
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
|
|
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
|
|
---
|
|
drivers/net/dsa/mv88e6xxx.c | 49 +++++++++++++++++++++++++++++++++------------
|
|
1 file changed, 36 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
|
|
index 512c8c0..3dcfe13 100644
|
|
--- a/drivers/net/dsa/mv88e6xxx.c
|
|
+++ b/drivers/net/dsa/mv88e6xxx.c
|
|
@@ -1929,6 +1929,38 @@ static void mv88e6xxx_bridge_work(struct work_struct *work)
|
|
}
|
|
}
|
|
|
|
+static int _mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
|
+ int reg, int val)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
+ if (ret < 0)
|
|
+ goto restore_page_0;
|
|
+
|
|
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
|
+restore_page_0:
|
|
+ _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int _mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page,
|
|
+ int reg)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
+ if (ret < 0)
|
|
+ goto restore_page_0;
|
|
+
|
|
+ ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
|
+restore_page_0:
|
|
+ _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port)
|
|
{
|
|
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
|
@@ -2383,13 +2415,9 @@ int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg)
|
|
int ret;
|
|
|
|
mutex_lock(&ps->smi_mutex);
|
|
- ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
- if (ret < 0)
|
|
- goto error;
|
|
- ret = _mv88e6xxx_phy_read_indirect(ds, port, reg);
|
|
-error:
|
|
- _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
+ ret = _mv88e6xxx_phy_page_read(ds, port, page, reg);
|
|
mutex_unlock(&ps->smi_mutex);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
@@ -2400,14 +2428,9 @@ int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
|
int ret;
|
|
|
|
mutex_lock(&ps->smi_mutex);
|
|
- ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page);
|
|
- if (ret < 0)
|
|
- goto error;
|
|
-
|
|
- ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val);
|
|
-error:
|
|
- _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0);
|
|
+ ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val);
|
|
mutex_unlock(&ps->smi_mutex);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.7.3
|
|
|