From mboxrd@z Thu Jan 1 00:00:00 1970 From: Patrick Uiterwijk Subject: [PATCH 1/2] net: dsa: mv88e6xxx: Introduce _mv88e6xxx_phy_page_{read,write} Date: Sat, 26 Mar 2016 00:10:03 +0000 Message-ID: <1458951004-27424-1-git-send-email-patrick@puiterwijk.org> Cc: linux@arm.linux.org.uk, vivien.didelot@savoirfairelinux.com, andrew@lunn.ch, netdev@vger.kernel.org, dennis@ausil.us, pbrobinson@gmail.com, Patrick Uiterwijk To: linux@roeck-us.net, davem@davemloft.net Return-path: Received: from mail-wm0-f43.google.com ([74.125.82.43]:34657 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752696AbcCZAKI (ORCPT ); Fri, 25 Mar 2016 20:10:08 -0400 Received: by mail-wm0-f43.google.com with SMTP id p65so39894857wmp.1 for ; Fri, 25 Mar 2016 17:10:07 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Add versions of the phy_page_read and _write functions to be used in a context where the SMI mutex is held. Signed-off-by: Patrick Uiterwijk --- drivers/net/dsa/mv88e6xxx.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index fa086e0..13db5d8 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -2708,37 +2708,59 @@ int mv88e6xxx_switch_reset(struct dsa_switch *ds, bool ppu_active) return 0; } -int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg) +static int _mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, + int reg) { - struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); int ret; - mutex_lock(&ps->smi_mutex); ret = _mv88e6xxx_phy_write_indirect(ds, port, 0x16, page); if (ret < 0) - goto error; + goto clear; ret = _mv88e6xxx_phy_read_indirect(ds, port, reg); -error: +clear: _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0); - mutex_unlock(&ps->smi_mutex); + return ret; } -int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page, - int reg, int val) +int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg) { struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); int ret; mutex_lock(&ps->smi_mutex); + ret = _mv88e6xxx_phy_page_read(ds, port, page, reg); + mutex_unlock(&ps->smi_mutex); + + return ret; +} + +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 error; + goto clear; ret = _mv88e6xxx_phy_write_indirect(ds, port, reg, val); -error: +clear: _mv88e6xxx_phy_write_indirect(ds, port, 0x16, 0x0); + + return ret; +} + +int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page, + int reg, int val) +{ + struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); + int ret; + + mutex_lock(&ps->smi_mutex); + ret = _mv88e6xxx_phy_page_write(ds, port, page, reg, val); mutex_unlock(&ps->smi_mutex); + return ret; } -- 2.7.4