From nobody Fri Dec 19 00:19:52 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0E59C4332F for ; Wed, 13 Dec 2023 11:08:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378836AbjLMLHz (ORCPT ); Wed, 13 Dec 2023 06:07:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378755AbjLMLHp (ORCPT ); Wed, 13 Dec 2023 06:07:45 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A33BEB for ; Wed, 13 Dec 2023 03:07:49 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E36E2C433D9; Wed, 13 Dec 2023 11:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702465668; bh=KOPQDsk9XUNOtuhmxFrdl3ZGEOdxDNHs96wnvr0GISA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2ynljVr9GmNzlClQa0ohfTkmLM2ToCI2Q1Zli+PKc2MAPfuba4SeHeGT+FcsRIZY bn+RrMbmuP+06AIDSoK5PVzIFjL9ycubto8nSA22wdPI9j4x9Pa7Nf0RcalPfsi46O wkE5eozycJAYCus9uSWmLlRV5SdMQuQV1oTRK35YveRSlXQlrYw0YGrp0FOyI+LHsD kUnAtv1Y6QPG5JpyY28eofmzd+XegzgxcE226RRxm4qwNG/u9gGYk7ruTl75DLed48 +RZy4mZHx3eu98CeRHDnmUC9oiJ6cxg2NHni5YaGYGFwYHz1QOW2Mw4/PGAlPOeGbX +DbEfRytTeLjw== From: Roger Quadros To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, shuah@kernel.org, vladimir.oltean@nxp.com Cc: s-vadapalli@ti.com, r-gunasekaran@ti.com, vigneshr@ti.com, srk@ti.com, horms@kernel.org, p-varis@ti.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, rogerq@kernel.org Subject: [PATCH v8 net-next 05/11] net: ethernet: am65-cpsw: cleanup TAPRIO handling Date: Wed, 13 Dec 2023 13:07:15 +0200 Message-Id: <20231213110721.69154-6-rogerq@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213110721.69154-1-rogerq@kernel.org> References: <20231213110721.69154-1-rogerq@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Handle offloading commands using switch-case in am65_cpsw_setup_taprio(). Move checks to am65_cpsw_taprio_replace(). Use NL_SET_ERR_MSG_MOD for error messages. Change error message from "Failed to set cycle time extension" to "cycle time extension not supported" Signed-off-by: Roger Quadros --- drivers/net/ethernet/ti/am65-cpsw-qos.c | 151 +++++++++++------------- 1 file changed, 71 insertions(+), 80 deletions(-) Changelog: v8: don't initialize ret =3D 0, tact =3D TACT_PROG v7: don't use "\n" in NL_SET_ERR_MSG_MOD() v6: initial commit diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c b/drivers/net/ethernet= /ti/am65-cpsw-qos.c index 4bc611cc4aad..2c97fa05a852 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-qos.c +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c @@ -428,7 +428,7 @@ static void am65_cpsw_stop_est(struct net_device *ndev) am65_cpsw_timer_stop(ndev); } =20 -static void am65_cpsw_purge_est(struct net_device *ndev) +static void am65_cpsw_taprio_destroy(struct net_device *ndev) { struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); =20 @@ -441,29 +441,66 @@ static void am65_cpsw_purge_est(struct net_device *nd= ev) port->qos.est_admin =3D NULL; } =20 -static int am65_cpsw_configure_taprio(struct net_device *ndev, - struct am65_cpsw_est *est_new) +static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from, + struct tc_taprio_qopt_offload *to) +{ + int i; + + *to =3D *from; + for (i =3D 0; i < from->num_entries; i++) + to->entries[i] =3D from->entries[i]; +} + +static int am65_cpsw_taprio_replace(struct net_device *ndev, + struct tc_taprio_qopt_offload *taprio) { struct am65_cpsw_common *common =3D am65_ndev_to_common(ndev); + struct netlink_ext_ack *extack =3D taprio->mqprio.extack; + struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); struct am65_cpts *cpts =3D common->cpts; - int ret =3D 0, tact =3D TACT_PROG; + struct am65_cpsw_est *est_new; + int ret, tact; =20 - am65_cpsw_est_update_state(ndev); + if (!netif_running(ndev)) { + NL_SET_ERR_MSG_MOD(extack, "interface is down, link speed unknown"); + return -ENETDOWN; + } =20 - if (est_new->taprio.cmd =3D=3D TAPRIO_CMD_DESTROY) { - am65_cpsw_stop_est(ndev); - return ret; + if (common->pf_p0_rx_ptype_rrobin) { + NL_SET_ERR_MSG_MOD(extack, + "p0-rx-ptype-rrobin flag conflicts with taprio qdisc"); + return -EINVAL; + } + + if (port->qos.link_speed =3D=3D SPEED_UNKNOWN) + return -ENOLINK; + + if (taprio->cycle_time_extension) { + NL_SET_ERR_MSG_MOD(extack, + "cycle time extension not supported"); + return -EOPNOTSUPP; } =20 + est_new =3D devm_kzalloc(&ndev->dev, + struct_size(est_new, taprio.entries, taprio->num_entries), + GFP_KERNEL); + if (!est_new) + return -ENOMEM; + + am65_cpsw_cp_taprio(taprio, &est_new->taprio); + + am65_cpsw_est_update_state(ndev); + ret =3D am65_cpsw_est_check_scheds(ndev, est_new); if (ret < 0) - return ret; + goto fail; =20 tact =3D am65_cpsw_timer_act(ndev, est_new); if (tact =3D=3D TACT_NEED_STOP) { - dev_err(&ndev->dev, - "Can't toggle estf timer, stop taprio first"); - return -EINVAL; + NL_SET_ERR_MSG_MOD(extack, + "Can't toggle estf timer, stop taprio first"); + ret =3D -EINVAL; + goto fail; } =20 if (tact =3D=3D TACT_PROG) @@ -476,62 +513,24 @@ static int am65_cpsw_configure_taprio(struct net_devi= ce *ndev, am65_cpsw_est_set_sched_list(ndev, est_new); am65_cpsw_port_est_assign_buf_num(ndev, est_new->buf); =20 - am65_cpsw_est_set(ndev, est_new->taprio.cmd =3D=3D TAPRIO_CMD_REPLACE); + am65_cpsw_est_set(ndev, 1); =20 if (tact =3D=3D TACT_PROG) { ret =3D am65_cpsw_timer_set(ndev, est_new); if (ret) { - dev_err(&ndev->dev, "Failed to set cycle time"); - return ret; + NL_SET_ERR_MSG_MOD(extack, + "Failed to set cycle time"); + goto fail; } } =20 - return ret; -} - -static void am65_cpsw_cp_taprio(struct tc_taprio_qopt_offload *from, - struct tc_taprio_qopt_offload *to) -{ - int i; - - *to =3D *from; - for (i =3D 0; i < from->num_entries; i++) - to->entries[i] =3D from->entries[i]; -} - -static int am65_cpsw_set_taprio(struct net_device *ndev, void *type_data) -{ - struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); - struct tc_taprio_qopt_offload *taprio =3D type_data; - struct am65_cpsw_est *est_new; - int ret =3D 0; - - if (taprio->cycle_time_extension) { - dev_err(&ndev->dev, "Failed to set cycle time extension"); - return -EOPNOTSUPP; - } - - est_new =3D devm_kzalloc(&ndev->dev, - struct_size(est_new, taprio.entries, taprio->num_entries), - GFP_KERNEL); - if (!est_new) - return -ENOMEM; - - am65_cpsw_cp_taprio(taprio, &est_new->taprio); - ret =3D am65_cpsw_configure_taprio(ndev, est_new); - if (!ret) { - if (taprio->cmd =3D=3D TAPRIO_CMD_REPLACE) { - devm_kfree(&ndev->dev, port->qos.est_admin); + devm_kfree(&ndev->dev, port->qos.est_admin); + port->qos.est_admin =3D est_new; =20 - port->qos.est_admin =3D est_new; - } else { - devm_kfree(&ndev->dev, est_new); - am65_cpsw_purge_est(ndev); - } - } else { - devm_kfree(&ndev->dev, est_new); - } + return 0; =20 +fail: + devm_kfree(&ndev->dev, est_new); return ret; } =20 @@ -558,34 +557,26 @@ static void am65_cpsw_est_link_up(struct net_device *= ndev, int link_speed) return; =20 purge_est: - am65_cpsw_purge_est(ndev); + am65_cpsw_taprio_destroy(ndev); } =20 static int am65_cpsw_setup_taprio(struct net_device *ndev, void *type_data) { - struct am65_cpsw_port *port =3D am65_ndev_to_port(ndev); struct tc_taprio_qopt_offload *taprio =3D type_data; - struct am65_cpsw_common *common =3D port->common; - - if (taprio->cmd !=3D TAPRIO_CMD_REPLACE && - taprio->cmd !=3D TAPRIO_CMD_DESTROY) - return -EOPNOTSUPP; - - if (!netif_running(ndev)) { - dev_err(&ndev->dev, "interface is down, link speed unknown\n"); - return -ENETDOWN; - } - - if (common->pf_p0_rx_ptype_rrobin) { - dev_err(&ndev->dev, - "p0-rx-ptype-rrobin flag conflicts with taprio qdisc\n"); - return -EINVAL; + int err =3D 0; + + switch (taprio->cmd) { + case TAPRIO_CMD_REPLACE: + err =3D am65_cpsw_taprio_replace(ndev, taprio); + break; + case TAPRIO_CMD_DESTROY: + am65_cpsw_taprio_destroy(ndev); + break; + default: + err =3D -EOPNOTSUPP; } =20 - if (port->qos.link_speed =3D=3D SPEED_UNKNOWN) - return -ENOLINK; - - return am65_cpsw_set_taprio(ndev, type_data); + return err; } =20 static int am65_cpsw_tc_query_caps(struct net_device *ndev, void *type_dat= a) --=20 2.34.1