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 1A99242ECF for ; Thu, 20 Jul 2023 17:34:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 17FC940685; Thu, 20 Jul 2023 17:34:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id D166D400D6 for ; Thu, 20 Jul 2023 17:34:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689867254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s7blje4OOOOhsRwqRw1kK2I+qvjoEwEOXX7mH2qMfhQ=; b=HAYpMjP862c5ForCPPfZkxg09w+Xrvpf/KRwRdFplzZQohNOYUPOxPkcQ6q06gKNtFXCv0 k7QmBDwT6PNPZvXPOT3CzsxZKfZq5regEmISQez+xPrPUWK6aZ0ZI8LvwRsYamldTLaqZO tu6N8ydAVJ8/0i9sUav1XQJkEt6tGik= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-0DK_lKYuPri3KDdCEuQ2DA-1; Thu, 20 Jul 2023 11:22:45 -0400 X-MC-Unique: 0DK_lKYuPri3KDdCEuQ2DA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF9C31C172B3; Thu, 20 Jul 2023 15:22:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DFDE492C13; Thu, 20 Jul 2023 15:22:17 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix interrupt enable mask' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:42 +0100 Message-ID: <20230720151942.262154-91-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5b72e18f0a8ed4396965de14b18f7d5c0b4c0df6 Thanks. Kevin --- >From 5b72e18f0a8ed4396965de14b18f7d5c0b4c0df6 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Wed, 14 Jun 2023 10:34:22 +0800 Subject: [PATCH] net/txgbe: fix interrupt enable mask [ upstream commit 646b058472cdfb503a0c555ed2e0f891c05437a7 ] When using no LSC mode, GPIO interrupt can still cause txgbe_dev_interrupt_delayed_handler() to be called, with TXGBE_FLAG_NEED_LINK_UPDATE to be set. So add a LSC condition on intr->mask_misc. Fixes: 2fc745e6b606 ("net/txgbe: add interrupt operation") Fixes: d3bb4a04eac1 ("net/txgbe: add SFP hotplug identification") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index acc29071f0..c5793e21b5 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3134,5 +3134,6 @@ txgbe_dev_interrupt_delayed_handler(void *param) /* restore original mask */ - intr->mask_misc |= TXGBE_ICRMISC_LSC; + if (dev->data->dev_conf.intr_conf.lsc == 1) + intr->mask_misc |= TXGBE_ICRMISC_LSC; intr->mask = intr->mask_orig; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:06.050910815 +0100 +++ 0091-net-txgbe-fix-interrupt-enable-mask.patch 2023-07-20 16:17:54.981751815 +0100 @@ -1 +1 @@ -From 646b058472cdfb503a0c555ed2e0f891c05437a7 Mon Sep 17 00:00:00 2001 +From 5b72e18f0a8ed4396965de14b18f7d5c0b4c0df6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 646b058472cdfb503a0c555ed2e0f891c05437a7 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index a3d7461951..5eff1a766e 100644 +index acc29071f0..c5793e21b5 100644 @@ -24 +25 @@ -@@ -3233,5 +3233,6 @@ txgbe_dev_interrupt_delayed_handler(void *param) +@@ -3134,5 +3134,6 @@ txgbe_dev_interrupt_delayed_handler(void *param)