From: Daniel Golle <daniel@makrotopia.org> To: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, "Andrew Lunn" <andrew@lunn.ch>, "Arınç Ünal" <arinc.unal@arinc9.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, "Eric Dumazet" <edumazet@google.com>, "Jakub Kicinski" <kuba@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Sean Wang" <sean.wang@mediatek.com>, "Landen Chao" <Landen.Chao@mediatek.com>, "DENG Qingfang" <dqfext@gmail.com>, "Philipp Zabel" <p.zabel@pengutronix.de> Cc: Sam Shih <Sam.Shih@mediatek.com>, Lorenzo Bianconi <lorenzo@kernel.org>, John Crispin <john@phrozen.org>, Felix Fietkau <nbd@nbd.name> Subject: [PATCH net-next 03/15] net: dsa: mt7530: use unlocked regmap accessors Date: Thu, 30 Mar 2023 16:20:05 +0100 [thread overview] Message-ID: <4fcca663d13c38679b615d4a1a76bf5d5d885304.1680180959.git.daniel@makrotopia.org> (raw) In-Reply-To: <cover.1680180959.git.daniel@makrotopia.org> Instead of wrapping the locked register accessor functions, use the unlocked variants and add locking wrapper functions to let regmap handle the locking. This is a preparation towards being able to always use regmap to access switch registers instead of open-coded accessor functions. Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- drivers/net/dsa/mt7530.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 5685c71bc9173..d8b041d79f2b7 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2900,7 +2900,7 @@ static int mt7530_regmap_read(void *context, unsigned int reg, unsigned int *val { struct mt7530_priv *priv = context; - *val = mt7530_read(priv, reg); + *val = mt7530_mii_read(priv, reg); return 0; }; @@ -2908,23 +2908,25 @@ static int mt7530_regmap_write(void *context, unsigned int reg, unsigned int val { struct mt7530_priv *priv = context; - mt7530_write(priv, reg, val); + mt7530_mii_write(priv, reg, val); return 0; }; -static int mt7530_regmap_update_bits(void *context, unsigned int reg, - unsigned int mask, unsigned int val) +static void +mt7530_mdio_regmap_lock(void *mdio_lock) { - struct mt7530_priv *priv = context; + mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED); +} - mt7530_rmw(priv, reg, mask, val); - return 0; -}; +static void +mt7530_mdio_regmap_unlock(void *mdio_lock) +{ + mutex_unlock(mdio_lock); +} static const struct regmap_bus mt7531_regmap_bus = { .reg_write = mt7530_regmap_write, .reg_read = mt7530_regmap_read, - .reg_update_bits = mt7530_regmap_update_bits, }; static int @@ -2950,6 +2952,9 @@ mt7531_create_sgmii(struct mt7530_priv *priv) mt7531_pcs_config[i]->reg_stride = 4; mt7531_pcs_config[i]->reg_base = MT7531_SGMII_REG_BASE(5 + i); mt7531_pcs_config[i]->max_register = 0x17c; + mt7531_pcs_config[i]->lock = mt7530_mdio_regmap_lock; + mt7531_pcs_config[i]->unlock = mt7530_mdio_regmap_unlock; + mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock; regmap = devm_regmap_init(priv->dev, &mt7531_regmap_bus, priv, -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Golle <daniel@makrotopia.org> To: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, linux-kernel@vger.kernel.org, "Andrew Lunn" <andrew@lunn.ch>, "Arınç Ünal" <arinc.unal@arinc9.com>, "Florian Fainelli" <f.fainelli@gmail.com>, "Vladimir Oltean" <olteanv@gmail.com>, "David S. Miller" <davem@davemloft.net>, "Eric Dumazet" <edumazet@google.com>, "Jakub Kicinski" <kuba@kernel.org>, "Paolo Abeni" <pabeni@redhat.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, "Sean Wang" <sean.wang@mediatek.com>, "Landen Chao" <Landen.Chao@mediatek.com>, "DENG Qingfang" <dqfext@gmail.com>, "Philipp Zabel" <p.zabel@pengutronix.de> Cc: Sam Shih <Sam.Shih@mediatek.com>, Lorenzo Bianconi <lorenzo@kernel.org>, John Crispin <john@phrozen.org>, Felix Fietkau <nbd@nbd.name> Subject: [PATCH net-next 03/15] net: dsa: mt7530: use unlocked regmap accessors Date: Thu, 30 Mar 2023 16:20:05 +0100 [thread overview] Message-ID: <4fcca663d13c38679b615d4a1a76bf5d5d885304.1680180959.git.daniel@makrotopia.org> (raw) In-Reply-To: <cover.1680180959.git.daniel@makrotopia.org> Instead of wrapping the locked register accessor functions, use the unlocked variants and add locking wrapper functions to let regmap handle the locking. This is a preparation towards being able to always use regmap to access switch registers instead of open-coded accessor functions. Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- drivers/net/dsa/mt7530.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 5685c71bc9173..d8b041d79f2b7 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2900,7 +2900,7 @@ static int mt7530_regmap_read(void *context, unsigned int reg, unsigned int *val { struct mt7530_priv *priv = context; - *val = mt7530_read(priv, reg); + *val = mt7530_mii_read(priv, reg); return 0; }; @@ -2908,23 +2908,25 @@ static int mt7530_regmap_write(void *context, unsigned int reg, unsigned int val { struct mt7530_priv *priv = context; - mt7530_write(priv, reg, val); + mt7530_mii_write(priv, reg, val); return 0; }; -static int mt7530_regmap_update_bits(void *context, unsigned int reg, - unsigned int mask, unsigned int val) +static void +mt7530_mdio_regmap_lock(void *mdio_lock) { - struct mt7530_priv *priv = context; + mutex_lock_nested(mdio_lock, MDIO_MUTEX_NESTED); +} - mt7530_rmw(priv, reg, mask, val); - return 0; -}; +static void +mt7530_mdio_regmap_unlock(void *mdio_lock) +{ + mutex_unlock(mdio_lock); +} static const struct regmap_bus mt7531_regmap_bus = { .reg_write = mt7530_regmap_write, .reg_read = mt7530_regmap_read, - .reg_update_bits = mt7530_regmap_update_bits, }; static int @@ -2950,6 +2952,9 @@ mt7531_create_sgmii(struct mt7530_priv *priv) mt7531_pcs_config[i]->reg_stride = 4; mt7531_pcs_config[i]->reg_base = MT7531_SGMII_REG_BASE(5 + i); mt7531_pcs_config[i]->max_register = 0x17c; + mt7531_pcs_config[i]->lock = mt7530_mdio_regmap_lock; + mt7531_pcs_config[i]->unlock = mt7530_mdio_regmap_unlock; + mt7531_pcs_config[i]->lock_arg = &priv->bus->mdio_lock; regmap = devm_regmap_init(priv->dev, &mt7531_regmap_bus, priv, -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-30 15:21 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-30 15:19 [PATCH net-next 00/15] net: dsa: add support for MT7988 Daniel Golle 2023-03-30 15:19 ` Daniel Golle 2023-03-30 15:19 ` [PATCH net-next 01/15] net: dsa: mt7530: make some noise if register read fails Daniel Golle 2023-03-30 15:19 ` Daniel Golle 2023-03-30 20:58 ` Andrew Lunn 2023-03-30 20:58 ` Andrew Lunn 2023-03-30 15:19 ` [PATCH net-next 02/15] net: dsa: mt7530: refactor SGMII PCS creation Daniel Golle 2023-03-30 15:19 ` Daniel Golle 2023-03-30 20:59 ` Andrew Lunn 2023-03-30 20:59 ` Andrew Lunn 2023-03-30 15:20 ` Daniel Golle [this message] 2023-03-30 15:20 ` [PATCH net-next 03/15] net: dsa: mt7530: use unlocked regmap accessors Daniel Golle 2023-03-30 21:01 ` Andrew Lunn 2023-03-30 21:01 ` Andrew Lunn 2023-03-30 15:20 ` [PATCH net-next 04/15] net: dsa: mt7530: use regmap to access switch register space Daniel Golle 2023-03-30 15:20 ` Daniel Golle 2023-03-30 21:02 ` Andrew Lunn 2023-03-30 21:02 ` Andrew Lunn 2023-03-31 2:28 ` Daniel Golle 2023-03-31 2:28 ` Daniel Golle 2023-03-30 15:21 ` [PATCH net-next 05/15] net: dsa: mt7530: move SGMII PCS creation to mt7530_probe function Daniel Golle 2023-03-30 15:21 ` Daniel Golle 2023-03-30 21:02 ` Andrew Lunn 2023-03-30 21:02 ` Andrew Lunn 2023-03-30 15:21 ` [PATCH net-next 06/15] net: dsa: mt7530: introduce mutex helpers Daniel Golle 2023-03-30 15:21 ` Daniel Golle 2023-03-30 15:21 ` [PATCH net-next 07/15] net: dsa: mt7530: move p5_intf_modes() function to mt7530.c Daniel Golle 2023-03-30 15:21 ` Daniel Golle 2023-03-30 15:22 ` [PATCH net-next 08/15] net: dsa: mt7530: introduce mt7530_probe_common helper function Daniel Golle 2023-03-30 15:22 ` Daniel Golle 2023-03-30 15:22 ` [PATCH net-next 09/15] net: dsa: mt7530: introduce mt7530_remove_common " Daniel Golle 2023-03-30 15:22 ` Daniel Golle 2023-03-30 15:22 ` [PATCH net-next 10/15] net: dsa: mt7530: split-off common parts from mt7531_setup Daniel Golle 2023-03-30 15:22 ` Daniel Golle 2023-03-30 15:22 ` [PATCH net-next 11/15] net: dsa: mt7530: introduce separate MDIO driver Daniel Golle 2023-03-30 15:22 ` Daniel Golle 2023-03-30 15:23 ` [PATCH net-next 12/15] net: dsa: mt7530: skip locking if MDIO bus isn't present Daniel Golle 2023-03-30 15:23 ` Daniel Golle 2023-03-30 15:23 ` [PATCH net-next 13/15] net: dsa: mt7530: add support for 10G link modes for CPU port Daniel Golle 2023-03-30 15:23 ` Daniel Golle 2023-04-01 8:56 ` Arınç ÜNAL 2023-04-01 8:56 ` Arınç ÜNAL 2023-04-01 13:05 ` Daniel Golle 2023-04-01 13:05 ` Daniel Golle 2023-03-30 15:23 ` [PATCH net-next 14/15] net: dsa: mt7530: introduce driver for MT7988 built-in switch Daniel Golle 2023-03-30 15:23 ` Daniel Golle 2023-03-30 21:03 ` Andrew Lunn 2023-03-30 21:03 ` Andrew Lunn 2023-03-31 5:50 ` Arınç ÜNAL 2023-03-31 5:50 ` Arınç ÜNAL 2023-03-31 10:16 ` Daniel Golle 2023-03-31 10:16 ` Daniel Golle 2023-03-31 12:06 ` Arınç ÜNAL 2023-03-31 12:06 ` Arınç ÜNAL 2023-03-31 12:45 ` Andrew Lunn 2023-03-31 12:45 ` Andrew Lunn 2023-03-31 13:18 ` Arınç ÜNAL 2023-03-31 13:18 ` Arınç ÜNAL 2023-03-31 13:19 ` Arınç ÜNAL 2023-03-31 13:19 ` Arınç ÜNAL 2023-03-31 14:10 ` Daniel Golle 2023-03-31 14:10 ` Daniel Golle 2023-03-31 14:11 ` Arınç ÜNAL 2023-03-31 14:11 ` Arınç ÜNAL 2023-03-31 20:07 ` Arınç ÜNAL 2023-03-31 20:07 ` Arınç ÜNAL 2023-03-31 20:33 ` Daniel Golle 2023-03-31 20:33 ` Daniel Golle 2023-04-01 8:05 ` Luiz Angelo Daros de Luca 2023-04-01 8:05 ` Luiz Angelo Daros de Luca 2023-03-30 15:23 ` [PATCH 15/15] dt-bindings: net: dsa: mediatek,mt7530: add mediatek,mt7988-switch Daniel Golle 2023-03-30 15:23 ` Daniel Golle 2023-03-31 5:27 ` Arınç ÜNAL 2023-03-31 5:27 ` Arınç ÜNAL 2023-04-03 18:23 ` Daniel Golle 2023-04-03 18:23 ` Daniel Golle 2023-03-31 5:27 ` [PATCH net-next 00/15] net: dsa: add support for MT7988 Arınç ÜNAL 2023-03-31 5:27 ` Arınç ÜNAL
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4fcca663d13c38679b615d4a1a76bf5d5d885304.1680180959.git.daniel@makrotopia.org \ --to=daniel@makrotopia.org \ --cc=Landen.Chao@mediatek.com \ --cc=Sam.Shih@mediatek.com \ --cc=andrew@lunn.ch \ --cc=angelogioacchino.delregno@collabora.com \ --cc=arinc.unal@arinc9.com \ --cc=davem@davemloft.net \ --cc=dqfext@gmail.com \ --cc=edumazet@google.com \ --cc=f.fainelli@gmail.com \ --cc=john@phrozen.org \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux@armlinux.org.uk \ --cc=lorenzo@kernel.org \ --cc=matthias.bgg@gmail.com \ --cc=nbd@nbd.name \ --cc=netdev@vger.kernel.org \ --cc=olteanv@gmail.com \ --cc=p.zabel@pengutronix.de \ --cc=pabeni@redhat.com \ --cc=sean.wang@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.