From: Andrew Lunn <andrew@lunn.ch>
To: Ansuel Smith <ansuelsmth@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Vivien Didelot <vivien.didelot@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Russell King <linux@armlinux.org.uk>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH net-next v3 07/20] net: dsa: qca8k: handle error with qca8k_rmw operation
Date: Wed, 5 May 2021 02:46:23 +0200 [thread overview]
Message-ID: <YJHq346ATRgV2BZp@lunn.ch> (raw)
In-Reply-To: <20210504222915.17206-7-ansuelsmth@gmail.com>
> -static void
> +static int
> qca8k_reg_set(struct qca8k_priv *priv, u32 reg, u32 val)
> {
> - qca8k_rmw(priv, reg, 0, val);
> + int ret;
> +
> + ret = qca8k_rmw(priv, reg, 0, val);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
Maybe return qca8k_rmw(priv, reg, 0, val); ??
> -static void
> +static int
> qca8k_reg_clear(struct qca8k_priv *priv, u32 reg, u32 val)
> {
> - qca8k_rmw(priv, reg, val, 0);
> + int ret;
> +
> + ret = qca8k_rmw(priv, reg, val, 0);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> }
Maybe return qca8k_rmw(priv, reg, val, 0);
> @@ -1249,17 +1280,20 @@ qca8k_port_bridge_join(struct dsa_switch *ds, int port, struct net_device *br)
> /* Add this port to the portvlan mask of the other ports
> * in the bridge
> */
> - qca8k_reg_set(priv,
> - QCA8K_PORT_LOOKUP_CTRL(i),
> - BIT(port));
> + ret = qca8k_reg_set(priv,
> + QCA8K_PORT_LOOKUP_CTRL(i),
> + BIT(port));
> + if (ret)
> + return ret;
> if (i != port)
> port_mask |= BIT(i);
> }
> +
> /* Add all other ports to this ports portvlan mask */
> - qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> - QCA8K_PORT_LOOKUP_MEMBER, port_mask);
> + ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> + QCA8K_PORT_LOOKUP_MEMBER, port_mask);
>
> - return 0;
> + return ret < 0 ? ret : 0;
Can this is simplified to
return = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
QCA8K_PORT_LOOKUP_MEMBER, port_mask);
> @@ -1396,18 +1430,19 @@ qca8k_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
> struct netlink_ext_ack *extack)
> {
> struct qca8k_priv *priv = ds->priv;
> + int ret;
>
> if (vlan_filtering) {
> - qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> - QCA8K_PORT_LOOKUP_VLAN_MODE,
> - QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE);
> + ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> + QCA8K_PORT_LOOKUP_VLAN_MODE,
> + QCA8K_PORT_LOOKUP_VLAN_MODE_SECURE);
> } else {
> - qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> - QCA8K_PORT_LOOKUP_VLAN_MODE,
> - QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
> + ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
> + QCA8K_PORT_LOOKUP_VLAN_MODE,
> + QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
> }
>
> - return 0;
> + return ret < 0 ? ret : 0;
What does qca8k_rmw() actually return?
Andrew
next prev parent reply other threads:[~2021-05-05 0:46 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 22:28 [RFC PATCH net-next v3 01/20] net: mdio: ipq8064: clean whitespaces in define Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 02/20] net: mdio: ipq8064: add regmap config to disable REGCACHE Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 03/20] net: mdio: ipq8064: enlarge sleep after read/write operation Ansuel Smith
2021-05-04 22:28 ` [RFC PATCH net-next v3 04/20] net: dsa: qca8k: handle qca8k_set_page errors Ansuel Smith
2021-05-05 0:25 ` Andrew Lunn
2021-05-05 0:26 ` Andrew Lunn
2021-05-04 22:28 ` [RFC PATCH net-next v3 05/20] net: dsa: qca8k: handle error with qca8k_read operation Ansuel Smith
2021-05-05 0:36 ` Andrew Lunn
2021-05-05 0:44 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 06/20] net: dsa: qca8k: handle error with qca8k_write operation Ansuel Smith
2021-05-05 0:41 ` Andrew Lunn
2021-05-05 0:47 ` Ansuel Smith
2021-05-06 11:19 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 07/20] net: dsa: qca8k: handle error with qca8k_rmw operation Ansuel Smith
2021-05-05 0:46 ` Andrew Lunn [this message]
2021-05-05 0:51 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 08/20] net: dsa: qca8k: add support for qca8327 switch Ansuel Smith
2021-05-05 0:48 ` Andrew Lunn
2021-05-06 11:20 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 09/20] devicetree: net: dsa: qca8k: Document new compatible qca8327 Ansuel Smith
2021-05-05 0:48 ` Andrew Lunn
2021-05-06 21:07 ` Rob Herring
2021-05-04 22:29 ` [RFC PATCH net-next v3 10/20] net: dsa: qca8k: add priority tweak to qca8337 switch Ansuel Smith
2021-05-05 0:53 ` Andrew Lunn
2021-05-06 11:16 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 11/20] net: dsa: qca8k: add GLOBAL_FC settings needed for qca8327 Ansuel Smith
2021-05-05 0:54 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH net-next v3 12/20] net: dsa: qca8k: add support for switch rev Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 13/20] net: dsa: qca8k: make rgmii delay configurable Ansuel Smith
2021-05-05 1:00 ` Andrew Lunn
2021-05-05 1:07 ` Ansuel Smith
2021-05-06 11:10 ` Vladimir Oltean
2021-05-06 21:53 ` Ansuel Smith
2021-05-07 8:51 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 14/20] net: dsa: qca8k: clear MASTER_EN after phy read/write Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 15/20] net: dsa: qca8k: dsa: qca8k: protect MASTER busy_wait with mdio mutex Ansuel Smith
2021-05-05 1:04 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH net-next v3 16/20] net: dsa: qca8k: enlarge mdio delay and timeout Ansuel Smith
2021-05-06 11:27 ` Vladimir Oltean
2021-05-04 22:29 ` [RFC PATCH net-next v3 17/20] net: phy: phylink: permit to pass dev_flags to phylink_connect_phy Ansuel Smith
2021-05-04 22:33 ` Florian Fainelli
2021-05-05 0:35 ` Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 18/20] net: dsa: slave: pass dev_flags also to internal PHY Ansuel Smith
2021-05-04 22:29 ` [RFC PATCH net-next v3 19/20] net: dsa: qca8k: pass switch_revision info to phy dev_flags Ansuel Smith
2021-05-06 11:24 ` Vladimir Oltean
2021-05-07 23:26 ` Ansuel Smith
2021-05-07 23:33 ` Russell King - ARM Linux admin
2021-05-07 23:51 ` Ansuel Smith
2021-05-08 17:31 ` Andrew Lunn
2021-05-08 18:26 ` Vladimir Oltean
2021-05-08 19:39 ` Russell King - ARM Linux admin
2021-05-08 20:55 ` Andrew Lunn
2021-05-07 9:44 ` Russell King - ARM Linux admin
2021-05-04 22:29 ` [RFC PATCH net-next v3 20/20] net: phy: add qca8k driver for qca8k switch internal PHY Ansuel Smith
2021-05-05 1:11 ` Andrew Lunn
2021-05-05 1:17 ` Ansuel Smith
2021-05-05 12:06 ` Andrew Lunn
2021-05-04 22:29 ` [RFC PATCH next-next v3 00/20] Multiple improvement to qca8k stability Ansuel Smith
2021-05-05 0:17 ` [RFC PATCH net-next v3 01/20] net: mdio: ipq8064: clean whitespaces in define Andrew Lunn
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=YJHq346ATRgV2BZp@lunn.ch \
--to=andrew@lunn.ch \
--cc=ansuelsmth@gmail.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=vivien.didelot@gmail.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).