From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8D2B0454E9 for ; Tue, 25 Jun 2024 02:02:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 893ED4279C; Tue, 25 Jun 2024 02:02:21 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 3A98D40EDD for ; Tue, 25 Jun 2024 02:02:21 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4249196a361so12223825e9.0 for ; Mon, 24 Jun 2024 17:02:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273741; x=1719878541; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nugvh7ccbAnnOttw7ji7iTwRIk+g9LNx2stWHcgjqRA=; b=e266zg2zBsnmei3RAAZ2h2QypoH67hX+qW0FRItCWJvk1wg5X8OGOC25WM3MZS0pnh 54FtyNUrRPV4/b62rYZ7LBW5TFNSVmFo0ZE109K7JPgK1QOHtSSOrWmtwp483W5Vsjmw qbV2SlbO2ILcmUvE8SeoOUWP03aajR0OirVaPefdcio2M/jhST0wwiRDUZWFUnK0ArTg Hyx8UPmsgKoLp7nTHV1WW3y7cXM2+rca3NpL+SqROQSmlOy6apURYGeJQY8INGPOnICT P/4J/whXn/QDJEcXY3ut8FokuDY2BQ5iza6M3lzK3R5LpS5mLMaumMjKgnu2+dFJD435 GVWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273741; x=1719878541; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nugvh7ccbAnnOttw7ji7iTwRIk+g9LNx2stWHcgjqRA=; b=KTmpvhnCb984ZI6UM4TQWOw9l3HLV2fgLmzr3s3DBlOhg0YpFxXwehBtPDdTMsR9cg 7K2LfpoQ1rKts0jl7hImyMqKamxoF8FOZRXeExLL+a6Rg8b5ROZ3WoSZRAq1xK0jGS8+ A6NddLYgBH5qeFScTbEp2XBrh4F5NtEk44gnQU8pJWuEekXflbx68butQRbK1tXaA8rt VQDQHHZHyKjdXk0NLd5g9HT0poz7jyiVSBZTkPq4IGb6BHXSHBfdhIu0p9XUkwgQ6XWy 8wLaLIUaJKtZC4nRyCPiNhk2nOVZcvFcIz4b6lvDs4/VBfAD17KglM+I0ju0Rl8aGWUV gG6A== X-Gm-Message-State: AOJu0YzvmEfUPKPqk5o9YBdK+Xo9eNuvo6OeG91zSxsqVpMGp+wHGFgI 1WdRyuf0psRSdEsnw2FKmiHR4hhzDflw/2htlBArF20sPaFS5Es5E2bNhu9s X-Google-Smtp-Source: AGHT+IG12iq6vdzIcSj5zCGRT3XPculog5zBfJhFT2+AKtKHmXkB5RJizxVts/b1WcaeHeZwK9GXFg== X-Received: by 2002:a05:600c:2d53:b0:424:81dd:6c69 with SMTP id 5b1f17b1804b1-4248cc5d58amr35817485e9.35.1719273740787; Mon, 24 Jun 2024 17:02:20 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-424819227a8sm156780285e9.48.2024.06.24.17.02.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:02:20 -0700 (PDT) From: luca.boccassi@gmail.com To: Rahul Bhansali Cc: dpdk stable Subject: patch 'net/cnxk: fix promiscuous state after MAC change' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:46 +0100 Message-Id: <20240624235907.885628-60-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e0da7a253dbd6dac1cba895d81742a50313e44fc Thanks. Luca Boccassi --- >From e0da7a253dbd6dac1cba895d81742a50313e44fc Mon Sep 17 00:00:00 2001 From: Rahul Bhansali Date: Tue, 28 May 2024 14:02:46 +0530 Subject: [PATCH] net/cnxk: fix promiscuous state after MAC change [ upstream commit 5f1bce00fddffc63e5634891df2b02859c010944 ] If promiscuous mode is enabled and default MAC address is set again then promiscuous mode gets disabled in hardware. This change will restore promiscuous behavior after configuring default MAC address. Fixes: 5fe86db2a0dd ("net/cnxk: support MAC address set") Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cnxk_ethdev_ops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index be29b385a4..5fd39149cb 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -413,6 +413,13 @@ cnxk_nix_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr) roc_nix_npc_mac_addr_set(nix, dev->mac_addr); goto exit; } + + if (eth_dev->data->promiscuous) { + rc = roc_nix_mac_promisc_mode_enable(nix, true); + if (rc) + plt_err("Failed to setup promisc mode in mac, rc=%d(%s)", rc, + roc_error_msg_get(rc)); + } } /* Update mac address to cnxk ethernet device */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.843038050 +0100 +++ 0060-net-cnxk-fix-promiscuous-state-after-MAC-change.patch 2024-06-25 00:22:13.213186220 +0100 @@ -1 +1 @@ -From 5f1bce00fddffc63e5634891df2b02859c010944 Mon Sep 17 00:00:00 2001 +From e0da7a253dbd6dac1cba895d81742a50313e44fc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f1bce00fddffc63e5634891df2b02859c010944 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c8260fcb9c..b1093dd584 100644 +index be29b385a4..5fd39149cb 100644 @@ -24 +25 @@ -@@ -451,6 +451,13 @@ cnxk_nix_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr) +@@ -413,6 +413,13 @@ cnxk_nix_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr)