Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Zulkifli, Muhammad Husaini" <muhammad.husaini.zulkifli@intel.com>
To:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>
CC:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        "Hadi Salim, Jamal" <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        "Gomes, Vinicius" <vinicius.gomes@intel.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        "Gerhard Engleder" <gerhard@engleder-embedded.com>,
        "Nambiar, Amritha" <amritha.nambiar@intel.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Roger Quadros <rogerq@kernel.org>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        "Sit, Michael Wei Hong" <michael.wei.hong.sit@intel.com>,
        "Ismail, Mohammad Athari" <mohammad.athari.ismail@intel.com>,
        Oleksij Rempel <linux@rempel-privat.de>,
        "Keller, Jacob E" <jacob.e.keller@intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Lunn <andrew@lunn.ch>,
        "Florian Fainelli" <f.fainelli@gmail.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        "UNGLinuxDriver@microchip.com" <UNGLinuxDriver@microchip.com>,
        "Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
        "Nguyen, Anthony L" <anthony.l.nguyen@intel.com>,
        Horatiu Vultur <horatiu.vultur@microchip.com>,
        Jose Abreu <joabreu@synopsys.com>,
        Maxime Coquelin <mcoquelin.stm32@gmail.com>,
        "intel-wired-lan@lists.osuosl.org" <intel-wired-lan@lists.osuosl.org>
Subject: RE: [PATCH net-next 2/5] net/sched: taprio: replace
 tc_taprio_qopt_offload :: enable with a "cmd" enum
Thread-Topic: [PATCH net-next 2/5] net/sched: taprio: replace
 tc_taprio_qopt_offload :: enable with a "cmd" enum
Thread-Index: AQHZktgAC7WC0zvhxUetMgWSS2amiK9ywvjw
Date:   Tue, 30 May 2023 12:45:08 +0000
Message-ID: <SJ1PR11MB6180833367FDCB3090AC957DB84B9@SJ1PR11MB6180.namprd11.prod.outlook.com>
References: <20230530091948.1408477-1-vladimir.oltean@nxp.com>
 <20230530091948.1408477-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230530091948.1408477-3-vladimir.oltean@nxp.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?K/VrHvAfjNTDCnuOJTQxUwix/YfnflRVr8IR/jjwRu0MvYn4usY/a93nG9Tj?=
 =?us-ascii?Q?BFhmYTgAi0eK7Y68ISWXwFADa/bPAFnPuzyxnksFRhE0FXI1H7v14UVQ0C7i?=
 =?us-ascii?Q?jtQ9ZTqKiEJt6DGjoVSRdWothliBelLl50/WMfwAZrzT8Q761K5+HY2NKYKX?=
 =?us-ascii?Q?jBO8qMsd0SdlFKxZ8fuHb16BCE9FSd+WEkSVA2mLdahjiPfRHI/F6bVFacTb?=
 =?us-ascii?Q?1+9URNmoo1Y3dKtRu103EARjsYw1j4+P8IJrVbVX8jzFY23B38VuxOdJgnhP?=
 =?us-ascii?Q?Ujto175Vn8l3H5EsMvWmqM3qyZPDcZD4poZz9QNnHzmXeCq3Uyv3WLGVu+hw?=
 =?us-ascii?Q?mxY+Q6t1H+oPJ/gO8ozycwbzjPZg6IsSKN++5VPgd4Oyak2+UIHq0Mc/etDN?=
 =?us-ascii?Q?e5WuOfVRiCQvLlmhK1E45+iBVOhHCmQc8EdkdOMoTLlv1svMT7WwM28V1Xav?=
 =?us-ascii?Q?bu1UM45Okpqvs6Hy6YmOKOP99fmED6aI7Qzbl+QW2uCJNmyL5IKTfdOKa7zB?=
 =?us-ascii?Q?vFOPFAnmA3l1VHzWK+8XBJQeu/sA0ciMkUxt3x8PgqITHcBXqCuIqENnxhhU?=
 =?us-ascii?Q?htVUQFSHKrRqpSpIZZ03rug7Xcx0xcNY+AZJOulZ5NFIuNUFGFpJ4Ct4Qg4v?=
 =?us-ascii?Q?fDN+4KwmJG7pJuIBsXprjcrsDZpK9xgaeux431wYKwc62SMucasETL0loIko?=
 =?us-ascii?Q?GoWe3aq3FDgVaWvAhNxCrwC8dC0SVRA/JulmMx5yt4fKzstKZtopzcO2CeRg?=
 =?us-ascii?Q?IsKIROvkyiTQwfiV70HveO8OnvsVGwJcbOXirosheIWNBoa8DaBQUBImk0GB?=
 =?us-ascii?Q?jCZgnihzlNKDRFtFvgFG65foPsK3MEXFxR7C7qOj3qq/BEiJYIOF9OXoWsHe?=
 =?us-ascii?Q?ViQ9u8Bm545Gr2zUMHmguCwn6jSIetBXiNeKVXl6YX5W6GIStioH9/8q687G?=
 =?us-ascii?Q?SplW74u/SlGsjY93jK8ds6FVfNdLqlqRHLghAl+AIYMrJS62/Qh79vFq1TiE?=
 =?us-ascii?Q?4Ti3wJZ4vxtBTxMXb2bHvWagoXPL7t53PTnytbqkcImnyUm7CrSlBNc4wB68?=
 =?us-ascii?Q?SZ8H3ryDHX3mfNzbzrSQl7XbrVRhW69RsOX22m9TfKd1AhGsjTFeBjbUQi1v?=
 =?us-ascii?Q?lqo35AskRrqH3KtVa18TpaBSTMvI7xpOaoPNiK/8FoCicvmzlgRLNdHZbOzh?=
 =?us-ascii?Q?1cmMLOhheTJIGzaHhvQIop1K4AggNupZNq1LyQ0holuAXn3KF/0NNInDm8Yk?=
 =?us-ascii?Q?WNfx+kaTq7X5a+cSa8bsfwpyNHtLAkDE+SeGFHvO6m/gmQcDoSFm+DaNMOor?=
 =?us-ascii?Q?ZyoA7m6xd3L07hUvlRi0RCIIiVhiVTnIYLia7CuZqQnjFMz1u5/l47g7G8Kb?=
 =?us-ascii?Q?ykw2p+HFerXyzTHOicFwjDnx0uV4dth7Hve3OOa2aCH0VHoDkhOb1GMaPSmD?=
 =?us-ascii?Q?N/OoE3h9uSKrhlH3Jeos1O3+HF7G9XQtYEPC339zK175nQHAcOOzXjYSXM3N?=
 =?us-ascii?Q?fjDZ4NUq6oYJVnmIIdK2bqZUuOlA3brFeMXU7D/ZDIWbumNi4PIXnRcUsXEa?=
 =?us-ascii?Q?u97nktWWNCZwjNkP+4c7W2yGL6+C2vSDzQxab1NHYjYPiCByabgEKrWdPu/b?=
 =?us-ascii?Q?2ma8lzBJBZRci4oXOkS643Y=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ1PR11MB6180.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 60ff2efb-30b2-4a19-bdc2-08db610bb346
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2023 12:45:08.3191
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 6YgwxWuMFhXp7/VCdeMzU2+zlu1ja3U3whjcTNidwHdhoBLB1ncfzM8wxe0PUZp/mCKrdcAmFXGQ2GluUAgbaKHi3mZv9Iz22+qkclqb989ShQRGAaN3TZzmm/qNmwsp
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4611
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> Inspired from struct flow_cls_offload :: cmd, in order for taprio to be a=
ble to
> report statistics (which is future work), it seems that we need to drill =
one step
> further with the ndo_setup_tc(TC_SETUP_QDISC_TAPRIO)
> multiplexing, and pass the command as part of the common portion of the
> muxed structure.
>=20
> Since we already have an "enable" variable in tc_taprio_qopt_offload, ref=
actor
> all drivers to check for "cmd" instead of "enable", and reject every othe=
r
> command except "replace" and "destroy" - to be future proof.
>=20
> Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>

Reviewed-by: Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com=
>

> ---
>  drivers/net/dsa/hirschmann/hellcreek.c             | 14 +++++++++-----
>  drivers/net/dsa/ocelot/felix_vsc9959.c             |  4 +++-
>  drivers/net/dsa/sja1105/sja1105_tas.c              |  7 +++++--
>  drivers/net/ethernet/engleder/tsnep_selftests.c    | 12 ++++++------
>  drivers/net/ethernet/engleder/tsnep_tc.c           |  4 +++-
>  drivers/net/ethernet/freescale/enetc/enetc_qos.c   |  6 +++++-
>  drivers/net/ethernet/intel/igc/igc_main.c          | 13 +++++++++++--
>  .../net/ethernet/microchip/lan966x/lan966x_tc.c    | 10 ++++++++--
>  drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c    |  7 +++++--
>  drivers/net/ethernet/ti/am65-cpsw-qos.c            | 11 ++++++++---
>  include/net/pkt_sched.h                            |  7 ++++++-
>  net/sched/sch_taprio.c                             |  4 ++--
>  12 files changed, 71 insertions(+), 28 deletions(-)
>=20
> diff --git a/drivers/net/dsa/hirschmann/hellcreek.c
> b/drivers/net/dsa/hirschmann/hellcreek.c
> index 595a548bb0a8..af50001ccdd4 100644
> --- a/drivers/net/dsa/hirschmann/hellcreek.c
> +++ b/drivers/net/dsa/hirschmann/hellcreek.c
> @@ -1885,13 +1885,17 @@ static int hellcreek_port_setup_tc(struct
> dsa_switch *ds, int port,
>  	case TC_SETUP_QDISC_TAPRIO: {
>  		struct tc_taprio_qopt_offload *taprio =3D type_data;
>=20
> -		if (!hellcreek_validate_schedule(hellcreek, taprio))
> -			return -EOPNOTSUPP;
> +		switch (taprio->cmd) {
> +		case TAPRIO_CMD_REPLACE:
> +			if (!hellcreek_validate_schedule(hellcreek, taprio))
> +				return -EOPNOTSUPP;
>=20
> -		if (taprio->enable)
>  			return hellcreek_port_set_schedule(ds, port, taprio);
> -
> -		return hellcreek_port_del_schedule(ds, port);
> +		case TAPRIO_CMD_DESTROY:
> +			return hellcreek_port_del_schedule(ds, port);
> +		default:
> +			return -EOPNOTSUPP;
> +		}
>  	}
>  	default:
>  		return -EOPNOTSUPP;
> diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c
> b/drivers/net/dsa/ocelot/felix_vsc9959.c
> index 030738fef60e..5de6a27052fc 100644
> --- a/drivers/net/dsa/ocelot/felix_vsc9959.c
> +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
> @@ -1411,7 +1411,7 @@ static int vsc9959_qos_port_tas_set(struct ocelot
> *ocelot, int port,
>=20
>  	mutex_lock(&ocelot->tas_lock);
>=20
> -	if (!taprio->enable) {
> +	if (taprio->cmd =3D=3D TAPRIO_CMD_DESTROY) {
>  		ocelot_port_mqprio(ocelot, port, &taprio->mqprio);
>  		ocelot_rmw_rix(ocelot, 0, QSYS_TAG_CONFIG_ENABLE,
>  			       QSYS_TAG_CONFIG, port);
> @@ -1423,6 +1423,8 @@ static int vsc9959_qos_port_tas_set(struct ocelot
> *ocelot, int port,
>=20
>  		mutex_unlock(&ocelot->tas_lock);
>  		return 0;
> +	} else if (taprio->cmd !=3D TAPRIO_CMD_REPLACE) {
> +		return -EOPNOTSUPP;
>  	}
>=20
>  	ret =3D ocelot_port_mqprio(ocelot, port, &taprio->mqprio); diff --git
> a/drivers/net/dsa/sja1105/sja1105_tas.c
> b/drivers/net/dsa/sja1105/sja1105_tas.c
> index e6153848a950..d7818710bc02 100644
> --- a/drivers/net/dsa/sja1105/sja1105_tas.c
> +++ b/drivers/net/dsa/sja1105/sja1105_tas.c
> @@ -516,10 +516,11 @@ int sja1105_setup_tc_taprio(struct dsa_switch *ds,
> int port,
>  	/* Can't change an already configured port (must delete qdisc first).
>  	 * Can't delete the qdisc from an unconfigured port.
>  	 */
> -	if (!!tas_data->offload[port] =3D=3D admin->enable)
> +	if ((!!tas_data->offload[port] && admin->cmd =3D=3D
> TAPRIO_CMD_REPLACE) ||
> +	    (!tas_data->offload[port] && admin->cmd =3D=3D
> TAPRIO_CMD_DESTROY))
>  		return -EINVAL;
>=20
> -	if (!admin->enable) {
> +	if (admin->cmd =3D=3D TAPRIO_CMD_DESTROY) {
>  		taprio_offload_free(tas_data->offload[port]);
>  		tas_data->offload[port] =3D NULL;
>=20
> @@ -528,6 +529,8 @@ int sja1105_setup_tc_taprio(struct dsa_switch *ds, in=
t
> port,
>  			return rc;
>=20
>  		return sja1105_static_config_reload(priv,
> SJA1105_SCHEDULING);
> +	} else if (admin->cmd !=3D TAPRIO_CMD_REPLACE) {
> +		return -EOPNOTSUPP;
>  	}
>=20
>  	/* The cycle time extension is the amount of time the last cycle from d=
iff
> --git a/drivers/net/ethernet/engleder/tsnep_selftests.c
> b/drivers/net/ethernet/engleder/tsnep_selftests.c
> index 1581d6b22232..8a9145f93147 100644
> --- a/drivers/net/ethernet/engleder/tsnep_selftests.c
> +++ b/drivers/net/ethernet/engleder/tsnep_selftests.c
> @@ -329,7 +329,7 @@ static bool disable_taprio(struct tsnep_adapter
> *adapter)
>  	int retval;
>=20
>  	memset(&qopt, 0, sizeof(qopt));
> -	qopt.enable =3D 0;
> +	qopt.cmd =3D TAPRIO_CMD_DESTROY;
>  	retval =3D tsnep_tc_setup(adapter->netdev, TC_SETUP_QDISC_TAPRIO,
> &qopt);
>  	if (retval)
>  		return false;
> @@ -360,7 +360,7 @@ static bool tsnep_test_taprio(struct tsnep_adapter
> *adapter)
>  	for (i =3D 0; i < 255; i++)
>  		qopt->entries[i].command =3D TC_TAPRIO_CMD_SET_GATES;
>=20
> -	qopt->enable =3D 1;
> +	qopt->cmd =3D TAPRIO_CMD_REPLACE;
>  	qopt->base_time =3D ktime_set(0, 0);
>  	qopt->cycle_time =3D 1500000;
>  	qopt->cycle_time_extension =3D 0;
> @@ -382,7 +382,7 @@ static bool tsnep_test_taprio(struct tsnep_adapter
> *adapter)
>  	if (!run_taprio(adapter, qopt, 100))
>  		goto failed;
>=20
> -	qopt->enable =3D 1;
> +	qopt->cmd =3D TAPRIO_CMD_REPLACE;
>  	qopt->base_time =3D ktime_set(0, 0);
>  	qopt->cycle_time =3D 411854;
>  	qopt->cycle_time_extension =3D 0;
> @@ -406,7 +406,7 @@ static bool tsnep_test_taprio(struct tsnep_adapter
> *adapter)
>  	if (!run_taprio(adapter, qopt, 100))
>  		goto failed;
>=20
> -	qopt->enable =3D 1;
> +	qopt->cmd =3D TAPRIO_CMD_REPLACE;
>  	qopt->base_time =3D ktime_set(0, 0);
>  	delay_base_time(adapter, qopt, 12);
>  	qopt->cycle_time =3D 125000;
> @@ -457,7 +457,7 @@ static bool tsnep_test_taprio_change(struct
> tsnep_adapter *adapter)
>  	for (i =3D 0; i < 255; i++)
>  		qopt->entries[i].command =3D TC_TAPRIO_CMD_SET_GATES;
>=20
> -	qopt->enable =3D 1;
> +	qopt->cmd =3D TAPRIO_CMD_REPLACE;
>  	qopt->base_time =3D ktime_set(0, 0);
>  	qopt->cycle_time =3D 100000;
>  	qopt->cycle_time_extension =3D 0;
> @@ -610,7 +610,7 @@ static bool tsnep_test_taprio_extension(struct
> tsnep_adapter *adapter)
>  	for (i =3D 0; i < 255; i++)
>  		qopt->entries[i].command =3D TC_TAPRIO_CMD_SET_GATES;
>=20
> -	qopt->enable =3D 1;
> +	qopt->cmd =3D TAPRIO_CMD_REPLACE;
>  	qopt->base_time =3D ktime_set(0, 0);
>  	qopt->cycle_time =3D 100000;
>  	qopt->cycle_time_extension =3D 50000;
> diff --git a/drivers/net/ethernet/engleder/tsnep_tc.c
> b/drivers/net/ethernet/engleder/tsnep_tc.c
> index d083e6684f12..745b191a5540 100644
> --- a/drivers/net/ethernet/engleder/tsnep_tc.c
> +++ b/drivers/net/ethernet/engleder/tsnep_tc.c
> @@ -325,7 +325,7 @@ static int tsnep_taprio(struct tsnep_adapter *adapter=
,
>  	if (!adapter->gate_control)
>  		return -EOPNOTSUPP;
>=20
> -	if (!qopt->enable) {
> +	if (qopt->cmd =3D=3D TAPRIO_CMD_DESTROY) {
>  		/* disable gate control if active */
>  		mutex_lock(&adapter->gate_control_lock);
>=20
> @@ -337,6 +337,8 @@ static int tsnep_taprio(struct tsnep_adapter *adapter=
,
>  		mutex_unlock(&adapter->gate_control_lock);
>=20
>  		return 0;
> +	} else if (qopt->cmd !=3D TAPRIO_CMD_REPLACE) {
> +		return -EOPNOTSUPP;
>  	}
>=20
>  	retval =3D tsnep_validate_gcl(qopt);
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> index 83c27bbbc6ed..7aad824f4da7 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
> @@ -65,7 +65,7 @@ static int enetc_setup_taprio(struct net_device *ndev,
>  	gcl_len =3D admin_conf->num_entries;
>=20
>  	tge =3D enetc_rd(hw, ENETC_PTGCR);
> -	if (!admin_conf->enable) {
> +	if (admin_conf->cmd =3D=3D TAPRIO_CMD_DESTROY) {
>  		enetc_wr(hw, ENETC_PTGCR, tge & ~ENETC_PTGCR_TGE);
>  		enetc_reset_ptcmsdur(hw);
>=20
> @@ -138,6 +138,10 @@ int enetc_setup_tc_taprio(struct net_device *ndev,
> void *type_data)
>  	struct enetc_ndev_priv *priv =3D netdev_priv(ndev);
>  	int err, i;
>=20
> +	if (taprio->cmd !=3D TAPRIO_CMD_REPLACE &&
> +	    taprio->cmd !=3D TAPRIO_CMD_DESTROY)
> +		return -EOPNOTSUPP;
> +
>  	/* TSD and Qbv are mutually exclusive in hardware */
>  	for (i =3D 0; i < priv->num_tx_rings; i++)
>  		if (priv->tx_ring[i]->tsd_enable)
> diff --git a/drivers/net/ethernet/intel/igc/igc_main.c
> b/drivers/net/ethernet/intel/igc/igc_main.c
> index c5ef1edcf548..88145c30c919 100644
> --- a/drivers/net/ethernet/intel/igc/igc_main.c
> +++ b/drivers/net/ethernet/intel/igc/igc_main.c
> @@ -6113,9 +6113,18 @@ static int igc_save_qbv_schedule(struct
> igc_adapter *adapter,
>  	size_t n;
>  	int i;
>=20
> -	adapter->qbv_enable =3D qopt->enable;
> +	switch (qopt->cmd) {
> +	case TAPRIO_CMD_REPLACE:
> +		adapter->qbv_enable =3D true;
> +		break;
> +	case TAPRIO_CMD_DESTROY:
> +		adapter->qbv_enable =3D false;
> +		break;
> +	default:
> +		return -EOPNOTSUPP;
> +	}
>=20
> -	if (!qopt->enable)
> +	if (!adapter->qbv_enable)
>  		return igc_tsn_clear_schedule(adapter);
>=20
>  	if (qopt->base_time < 0)
> diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_tc.c
> b/drivers/net/ethernet/microchip/lan966x/lan966x_tc.c
> index cf0cc7562d04..ee652f2d2359 100644
> --- a/drivers/net/ethernet/microchip/lan966x/lan966x_tc.c
> +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_tc.c
> @@ -21,8 +21,14 @@ static int lan966x_tc_setup_qdisc_mqprio(struct
> lan966x_port *port,  static int lan966x_tc_setup_qdisc_taprio(struct
> lan966x_port *port,
>  					 struct tc_taprio_qopt_offload
> *taprio)  {
> -	return taprio->enable ? lan966x_taprio_add(port, taprio) :
> -				lan966x_taprio_del(port);
> +	switch (taprio->cmd) {
> +	case TAPRIO_CMD_REPLACE:
> +		return lan966x_taprio_add(port, taprio);
> +	case TAPRIO_CMD_DESTROY:
> +		return lan966x_taprio_del(port);
> +	default:
> +		return -EOPNOTSUPP;
> +	}
>  }
>=20
>  static int lan966x_tc_setup_qdisc_tbf(struct lan966x_port *port, diff --=
git
> a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
> index 9d55226479b4..ac41ef4cbd2f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
> @@ -966,8 +966,11 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
>  		return -EOPNOTSUPP;
>  	}
>=20
> -	if (!qopt->enable)
> +	if (qopt->cmd =3D=3D TAPRIO_CMD_DESTROY)
>  		goto disable;
> +	else if (qopt->cmd !=3D TAPRIO_CMD_REPLACE)
> +		return -EOPNOTSUPP;
> +
>  	if (qopt->num_entries >=3D dep)
>  		return -EINVAL;
>  	if (!qopt->cycle_time)
> @@ -988,7 +991,7 @@ static int tc_setup_taprio(struct stmmac_priv *priv,
>=20
>  	mutex_lock(&priv->plat->est->lock);
>  	priv->plat->est->gcl_size =3D size;
> -	priv->plat->est->enable =3D qopt->enable;
> +	priv->plat->est->enable =3D qopt->cmd =3D=3D TAPRIO_CMD_REPLACE;
>  	mutex_unlock(&priv->plat->est->lock);
>=20
>  	for (i =3D 0; i < size; i++) {
> diff --git a/drivers/net/ethernet/ti/am65-cpsw-qos.c
> b/drivers/net/ethernet/ti/am65-cpsw-qos.c
> index 3a908db6e5b2..eced87fa261c 100644
> --- a/drivers/net/ethernet/ti/am65-cpsw-qos.c
> +++ b/drivers/net/ethernet/ti/am65-cpsw-qos.c
> @@ -450,7 +450,7 @@ static int am65_cpsw_configure_taprio(struct
> net_device *ndev,
>=20
>  	am65_cpsw_est_update_state(ndev);
>=20
> -	if (!est_new->taprio.enable) {
> +	if (est_new->taprio.cmd =3D=3D TAPRIO_CMD_DESTROY) {
>  		am65_cpsw_stop_est(ndev);
>  		return ret;
>  	}
> @@ -476,7 +476,7 @@ static int am65_cpsw_configure_taprio(struct
> net_device *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.enable);
> +	am65_cpsw_est_set(ndev, est_new->taprio.cmd =3D=3D
> TAPRIO_CMD_REPLACE);
>=20
>  	if (tact =3D=3D TACT_PROG) {
>  		ret =3D am65_cpsw_timer_set(ndev, est_new); @@ -520,7
> +520,7 @@ static int am65_cpsw_set_taprio(struct net_device *ndev, void
> *type_data)
>  	am65_cpsw_cp_taprio(taprio, &est_new->taprio);
>  	ret =3D am65_cpsw_configure_taprio(ndev, est_new);
>  	if (!ret) {
> -		if (taprio->enable) {
> +		if (taprio->cmd =3D=3D TAPRIO_CMD_REPLACE) {
>  			devm_kfree(&ndev->dev, port->qos.est_admin);
>=20
>  			port->qos.est_admin =3D est_new;
> @@ -564,8 +564,13 @@ static void am65_cpsw_est_link_up(struct net_device
> *ndev, int link_speed)  static int am65_cpsw_setup_taprio(struct net_devi=
ce
> *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;
>=20
> +	if (taprio->cmd !=3D TAPRIO_CMD_REPLACE &&
> +	    taprio->cmd !=3D TAPRIO_CMD_DESTROY)
> +		return -EOPNOTSUPP;
> +
>  	if (!IS_ENABLED(CONFIG_TI_AM65_CPSW_TAS))
>  		return -ENODEV;
>=20
> diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index
> f436688b6efc..f5fb11da357b 100644
> --- a/include/net/pkt_sched.h
> +++ b/include/net/pkt_sched.h
> @@ -185,6 +185,11 @@ struct tc_taprio_caps {
>  	bool broken_mqprio:1;
>  };
>=20
> +enum tc_taprio_qopt_cmd {
> +	TAPRIO_CMD_REPLACE,
> +	TAPRIO_CMD_DESTROY,
> +};
> +
>  struct tc_taprio_sched_entry {
>  	u8 command; /* TC_TAPRIO_CMD_* */
>=20
> @@ -196,7 +201,7 @@ struct tc_taprio_sched_entry {  struct
> tc_taprio_qopt_offload {
>  	struct tc_mqprio_qopt_offload mqprio;
>  	struct netlink_ext_ack *extack;
> -	u8 enable;
> +	enum tc_taprio_qopt_cmd cmd;
>  	ktime_t base_time;
>  	u64 cycle_time;
>  	u64 cycle_time_extension;
> diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index
> d29e6785854d..06bf4c6355a5 100644
> --- a/net/sched/sch_taprio.c
> +++ b/net/sched/sch_taprio.c
> @@ -1524,7 +1524,7 @@ static int taprio_enable_offload(struct net_device
> *dev,
>  			       "Not enough memory for enabling offload mode");
>  		return -ENOMEM;
>  	}
> -	offload->enable =3D 1;
> +	offload->cmd =3D TAPRIO_CMD_REPLACE;
>  	offload->extack =3D extack;
>  	mqprio_qopt_reconstruct(dev, &offload->mqprio.qopt);
>  	offload->mqprio.extack =3D extack;
> @@ -1572,7 +1572,7 @@ static int taprio_disable_offload(struct net_device
> *dev,
>  			       "Not enough memory to disable offload mode");
>  		return -ENOMEM;
>  	}
> -	offload->enable =3D 0;
> +	offload->cmd =3D TAPRIO_CMD_DESTROY;
>=20
>  	err =3D ops->ndo_setup_tc(dev, TC_SETUP_QDISC_TAPRIO, offload);
>  	if (err < 0) {
> --
> 2.34.1