From patchwork Tue Mar 7 11:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Machon X-Patchwork-Id: 65381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2375101wrd; Tue, 7 Mar 2023 03:30:01 -0800 (PST) X-Google-Smtp-Source: AK7set+7M5lznhwxbXBAtjOKVUp5ZZmRRMEjozBgN+okvMN0hwWoV/ZAmWpPLATGxtWY/2THjlqU X-Received: by 2002:a17:907:7f0b:b0:888:7ac8:c0f4 with SMTP id qf11-20020a1709077f0b00b008887ac8c0f4mr13559217ejc.25.1678188601503; Tue, 07 Mar 2023 03:30:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678188601; cv=none; d=google.com; s=arc-20160816; b=P4Bz00Gq1AjbCsO8X+cC1SmP+WLPNUAp0amCpGEHCTFAi1Bwiv/jUKcFzzqtGeegKZ AE3umC9jesnj4rU9O3avC/OykHxdrJBZ67BbB0Xo5rnsMxXeU2AmmRoiWV8+z/3/kbx/ bP2iWI3aSG2vKAFExwZxl9p6jk5w5GNn953zGmGuy2uq63ZQh+yUxWs6eKJmpT5ErHxy OpnA5AvAyOE7BGwkFMVCYXUq8f+SHnUcf2QxVxU6CX6SNm+VbA7yAU2lq+9ZPqteUdMO obS5+RHnqSG5pTVU7AvYjstHEYFrCFSEASXiHT6aIq+UcggHJrfemJ/CWHwsNZnKupFK GByw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=J6+B28nutAo7+RIy6MCNWUsKsWt9J12T956UgSefUmk=; b=vNh5NU7jZbnl+IxzYMa7P/+Js3QxEaLz5TFxyOJHtEon4pC2hDmaxvGhp37RLpr+Qp 5A1y3r+t7tyXJ8uPECuBgtmAz1WqNanjWj6VIn3lfmpSx7vc35et5H0CQteb0JINA9V2 0aWmkaUPsNSexV7JQPDbES4JJ9cVICds7TDFV+BjWNFRsT2htSvAYueRQxkfwYs9KCUh 1l1BQQ7uc6kkBLoYvGzPZpg+NDDkLVhPBBzWjYVngsSMMA31n5OBen9U3i488r5DxRPT cvHKlrJ0/h6vwNXTqa6SzN1h7PNpPYGy3O4GNH+d+54gN23kGXM8Taro7y93xTUZZMvk /+xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=fGk3d1X4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kv7-20020a17090778c700b008d3248226besi11566823ejc.554.2023.03.07.03.29.37; Tue, 07 Mar 2023 03:30:01 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=fGk3d1X4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230054AbjCGLV2 (ORCPT + 99 others); Tue, 7 Mar 2023 06:21:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229525AbjCGLVU (ORCPT ); Tue, 7 Mar 2023 06:21:20 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95F4F30B11; Tue, 7 Mar 2023 03:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1678188073; x=1709724073; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=eCfUgtTxJ2t2NJLQ6fRvVzcuPMgRk/uF6FvhuOQIZow=; b=fGk3d1X47cO0LJuHD/Ysknf/qoI/G3WING6BYp7y9lHHYQMkr7wGZrHa K7n1jriMC082Bvtw6UUrc+OtLfHa2qkm83hWVOSQwynUi0USpNZCithAe wFzmTs9EYGMOYPJ0LwjTuqx4lM+4nlRQd1gpAZt7vXzwWZ/5aRK23Teua 4Okp5Do0ExJFCm0qTcKohwLN2ejK1MC+uv7rdo8iAaDu4TWTgQosntIf5 i6ByyHCJXq08ID99VVw4oxprVtNjEkye98aOVH5TeeFHn8JyhjYMZtTJr o/4kn1Rtbj9dm1O8nOObxB6vGufecn2D2d56/9hytXZWNvJoFzLZWSUgW g==; X-IronPort-AV: E=Sophos;i="5.98,240,1673938800"; d="scan'208";a="200344170" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Mar 2023 04:21:12 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 7 Mar 2023 04:21:11 -0700 Received: from DEN-LT-70577.microchip.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2507.16 via Frontend Transport; Tue, 7 Mar 2023 04:21:09 -0700 From: Daniel Machon To: CC: , , , , , , , , , , , Subject: [PATCH net] net: microchip: sparx5: fix deletion of existing DSCP mappings Date: Tue, 7 Mar 2023 12:21:03 +0100 Message-ID: <20230307112103.2733285-1-daniel.machon@microchip.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759708291017597281?= X-GMAIL-MSGID: =?utf-8?q?1759708291017597281?= Fix deletion of existing DSCP mappings in the APP table. Adding and deleting DSCP entries are replicated per-port, since the mapping table is global for all ports in the chip. Whenever a mapping for a DSCP value already exists, the old mapping is deleted first. However, it is only deleted for the specified port. Fix this by calling sparx5_dcb_ieee_delapp() instead of dcb_ieee_delapp() as it ought to be. Reproduce: // Map and remap DSCP value 63 $ dcb app add dev eth0 dscp-prio 63:1 $ dcb app add dev eth0 dscp-prio 63:2 $ dcb app show dev eth0 dscp-prio dscp-prio 63:2 $ dcb app show dev eth1 dscp-prio dscp-prio 63:1 63:2 <-- 63:1 should not be there Fixes: 8dcf69a64118 ("net: microchip: sparx5: add support for offloading dscp table") Signed-off-by: Daniel Machon Reviewed-by: Simon Horman --- .../ethernet/microchip/sparx5/sparx5_dcb.c | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c b/drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c index 871a3e62f852..2d763664dcda 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c @@ -249,6 +249,21 @@ static int sparx5_dcb_ieee_dscp_setdel(struct net_device *dev, return 0; } +static int sparx5_dcb_ieee_delapp(struct net_device *dev, struct dcb_app *app) +{ + int err; + + if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP) + err = sparx5_dcb_ieee_dscp_setdel(dev, app, dcb_ieee_delapp); + else + err = dcb_ieee_delapp(dev, app); + + if (err < 0) + return err; + + return sparx5_dcb_app_update(dev); +} + static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app) { struct dcb_app app_itr; @@ -264,7 +279,7 @@ static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app) if (prio) { app_itr = *app; app_itr.priority = prio; - dcb_ieee_delapp(dev, &app_itr); + sparx5_dcb_ieee_delapp(dev, &app_itr); } if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP) @@ -281,21 +296,6 @@ static int sparx5_dcb_ieee_setapp(struct net_device *dev, struct dcb_app *app) return err; } -static int sparx5_dcb_ieee_delapp(struct net_device *dev, struct dcb_app *app) -{ - int err; - - if (app->selector == IEEE_8021QAZ_APP_SEL_DSCP) - err = sparx5_dcb_ieee_dscp_setdel(dev, app, dcb_ieee_delapp); - else - err = dcb_ieee_delapp(dev, app); - - if (err < 0) - return err; - - return sparx5_dcb_app_update(dev); -} - static int sparx5_dcb_setapptrust(struct net_device *dev, u8 *selectors, int nselectors) {