From patchwork Mon May 5 16:26:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Quadros X-Patchwork-Id: 887693 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 037B425DCEC; Mon, 5 May 2025 16:26:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746462409; cv=none; b=mlzU7tH6V4tp45GPdjLVWnQbnAWbZ+E1R4fbbrtSJWR1n3Ba9yv3iQSMmeYHDb/Ut+LOw0VFrxZlKgOqal4RWQavaA8D0cs8U3Wgv09AMBnDAXf8pvBpbkDGNOPQj5WJTFubrCiqH+EHy3krvA9x8Z0KE0hVrlB+bcASjDW4WbQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746462409; c=relaxed/simple; bh=XODr01mBk67NGT5K13Cytm++Hq/blxxRyGOdquDJpL4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mPZklA08v7fGPk8E/7RliEwBDR+PlXIIhuv9K68wVBWum0vW6Y2Fi5nRWI9rtGR6zACFkLhS2RHWx9kJvocp4JKh7zOI6xp0UT0O9H3LH+6C/8c4/XhRCxGTF3c2c4831ponoqykOmpqW+XIl9vVirJU3kCX/KtvBt4GqKwC6m8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qqS5uUyl; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qqS5uUyl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C408C4CEE4; Mon, 5 May 2025 16:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746462408; bh=XODr01mBk67NGT5K13Cytm++Hq/blxxRyGOdquDJpL4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qqS5uUylBdTIF4Lj64x57u4EfOaQRDEvI8/p5zof67F9/lIq9IF/BTqsK1kb0xdy/ JeZA4BBNC9hlu9TLWxjG+J9R2/EpHo2ykDr3PnzLkpNbS/NOZaKjJd2h0vM+iW60xI /5pW+r6aj41DEbbWE21a19juHPb9RTR47r+sK062Pm3qf3Nbrfn/oSn02GNYB6VZhu FmyJv49XLy+WAvpmhrf0tKBx5HwSpbXS7xJlsFrU0xFjW4oTD+Pw8jFqt0lbp1OzQj OXtk3PTUcXOAgB57vi+N9qiDZZq23mslDIR7WFQcNQnCyPgtqIk6wYhVGAu5arJXJe ZvczoHWbI4vew== From: Roger Quadros Date: Mon, 05 May 2025 19:26:33 +0300 Subject: [PATCH net-next v2 3/9] net: ethernet: ti: cpsw_ale: return ALE index in cpsw_ale_vlan_add_modify() Precedence: bulk X-Mailing-List: linux-omap@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250505-am65-cpsw-rx-class-v2-3-5359ea025144@kernel.org> References: <20250505-am65-cpsw-rx-class-v2-0-5359ea025144@kernel.org> In-Reply-To: <20250505-am65-cpsw-rx-class-v2-0-5359ea025144@kernel.org> To: Siddharth Vadapalli , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Russell King , danishanwar@ti.com Cc: srk@ti.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Roger Quadros X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4563; i=rogerq@kernel.org; h=from:subject:message-id; bh=XODr01mBk67NGT5K13Cytm++Hq/blxxRyGOdquDJpL4=; b=owEBbQKS/ZANAwAIAdJaa9O+djCTAcsmYgBoGOa6FwLNbYchKsPQR5sUS7g1ukY1KSqi2NZRm MSir8ilsxyJAjMEAAEIAB0WIQRBIWXUTJ9SeA+rEFjSWmvTvnYwkwUCaBjmugAKCRDSWmvTvnYw kw4hEADSwMayGELoT4nXwP0HkwBWxJ1Va8NuPdkj7FpQEo96vuT+/26Xd+VUKQzlFWmoRtIZQFD 0tKfTPr0LOMwOE1DAwNstirqocAKfr847jfh+mz8XkmB4zFM5v5mOeUNDqrAI9AXsq1hnFSYVKn b+cZi8CUqMJRQH9s380YWUNJiWHzRqQPrIWsAA6V/5Tf4OyjAEsMHknIRdAVAvr4d5KdFykpA5Y 8BPaE8jRz/aNeVZIrfoVu8XEmajGEr92crh+bvk9qFtgDPTDrDPk9QesSuF0hRmzwSCtHKDrRZl TTVRI/eQJFUchWRHVkX7jU+aivy4nXNA9z0+1Vn6WiyaCwaeXkgPaefUEib48w58jMUHk0+5Ijh Omp//x2LLbXtWWpZxdtydQB1lvOXEQogec+Nln0AtlNv4UGWL/wQrdLNrDdPukeKKxoZKkEcMi3 9UKh3OD32+dbGgDI+OpVUNASb1a7MMtGdq7PdBIVCKBd+C6c41qPOafV0CqsQzgXRHCSTJw95y/ ovztIp7y8vojQIgw8snEMeHu2vkRAlcmaNY7ZcmiL1c48Hfp+bRD4rIE11kMnDEH9j6L+jHawD5 eESNGGidWm31ahMHVqWPDWG8/7AqAdHmvc6Bc59NOhrMcMKq9XnuJOnx/AgPa1Krre2WVQYqPKP dXb+lJMHqRS4z6Q== X-Developer-Key: i=rogerq@kernel.org; a=openpgp; fpr=412165D44C9F52780FAB1058D25A6BD3BE763093 Policer helpers will need to know what ALE index was used for the added VLAN entry. So return the ALE index instead of zero on success. Modify existing users to check for less than zero as error case. Signed-off-by: Roger Quadros --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 ++ drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 6 +++--- drivers/net/ethernet/ti/cpsw_ale.c | 10 +++++----- drivers/net/ethernet/ti/cpsw_switchdev.c | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 988ce9119306..41dc963493de 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -321,6 +321,8 @@ static int am65_cpsw_nuss_ndo_slave_add_vid(struct net_device *ndev, dev_info(common->dev, "Adding vlan %d to vlan filter\n", vid); ret = cpsw_ale_vlan_add_modify(common->ale, vid, port_mask, unreg_mcast, port_mask, 0); + if (ret > 0) + ret = 0; pm_runtime_put(common->dev); return ret; diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c index d4c56da98a6a..b284202bf480 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c +++ b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c @@ -175,7 +175,7 @@ static int am65_cpsw_port_vlan_add(struct am65_cpsw_port *port, bool untag, bool ret = cpsw_ale_vlan_add_modify(cpsw->ale, vid, port_mask, untag_mask, reg_mcast_mask, unreg_mcast_mask); - if (ret) { + if (ret < 0) { netdev_err(port->ndev, "Unable to add vlan\n"); return ret; } @@ -184,14 +184,14 @@ static int am65_cpsw_port_vlan_add(struct am65_cpsw_port *port, bool untag, bool cpsw_ale_add_ucast(cpsw->ale, port->slave.mac_addr, HOST_PORT_NUM, ALE_VLAN | ALE_SECURE, vid); if (!pvid) - return ret; + return 0; am65_cpsw_set_pvid(port, vid, 0, 0); netdev_dbg(port->ndev, "VID add: %s: vid:%u ports:%X\n", port->ndev->name, vid, port_mask); - return ret; + return 0; } static int am65_cpsw_port_vlan_del(struct am65_cpsw_port *port, u16 vid, diff --git a/drivers/net/ethernet/ti/cpsw_ale.c b/drivers/net/ethernet/ti/cpsw_ale.c index 0bdc95552410..952444b0c436 100644 --- a/drivers/net/ethernet/ti/cpsw_ale.c +++ b/drivers/net/ethernet/ti/cpsw_ale.c @@ -780,7 +780,7 @@ int cpsw_ale_vlan_add_modify(struct cpsw_ale *ale, u16 vid, int port_mask, u32 ale_entry[ALE_ENTRY_WORDS] = {0, 0, 0}; int reg_mcast_members, unreg_mcast_members; int vlan_members, untag_members; - int idx, ret = 0; + int idx; idx = cpsw_ale_match_vlan(ale, vid); if (idx >= 0) @@ -801,16 +801,16 @@ int cpsw_ale_vlan_add_modify(struct cpsw_ale *ale, u16 vid, int port_mask, reg_mcast_members = (reg_mcast_members & ~port_mask) | reg_mask; unreg_mcast_members = (unreg_mcast_members & ~port_mask) | unreg_mask; - ret = cpsw_ale_add_vlan(ale, vid, vlan_members, untag_members, + idx = cpsw_ale_add_vlan(ale, vid, vlan_members, untag_members, reg_mcast_members, unreg_mcast_members); - if (ret < 0) { + if (idx < 0) { dev_err(ale->params.dev, "Unable to add vlan\n"); - return ret; + return idx; } dev_dbg(ale->params.dev, "port mask 0x%x untag 0x%x\n", vlan_members, untag_mask); - return 0; + return idx; } void cpsw_ale_set_unreg_mcast(struct cpsw_ale *ale, int unreg_mcast_mask, diff --git a/drivers/net/ethernet/ti/cpsw_switchdev.c b/drivers/net/ethernet/ti/cpsw_switchdev.c index ce85f7610273..c767a47b2039 100644 --- a/drivers/net/ethernet/ti/cpsw_switchdev.c +++ b/drivers/net/ethernet/ti/cpsw_switchdev.c @@ -191,7 +191,7 @@ static int cpsw_port_vlan_add(struct cpsw_priv *priv, bool untag, bool pvid, ret = cpsw_ale_vlan_add_modify(cpsw->ale, vid, port_mask, untag_mask, reg_mcast_mask, unreg_mcast_mask); - if (ret) { + if (ret < 0) { dev_err(priv->dev, "Unable to add vlan\n"); return ret; } @@ -200,13 +200,13 @@ static int cpsw_port_vlan_add(struct cpsw_priv *priv, bool untag, bool pvid, cpsw_ale_add_ucast(cpsw->ale, priv->mac_addr, HOST_PORT_NUM, ALE_VLAN, vid); if (!pvid) - return ret; + return 0; cpsw_set_pvid(priv, vid, 0, 0); dev_dbg(priv->dev, "VID add: %s: vid:%u ports:%X\n", priv->ndev->name, vid, port_mask); - return ret; + return 0; } static int cpsw_port_vlan_del(struct cpsw_priv *priv, u16 vid,