From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7950DA055A for ; Thu, 27 Feb 2020 10:35:15 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72CD91C01; Thu, 27 Feb 2020 10:35:15 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 7A9451BFF2 for ; Thu, 27 Feb 2020 10:35:12 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id m3so2559316wmi.0 for ; Thu, 27 Feb 2020 01:35:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FcVXbf6aDldTIUZXbAAA/FrDo6+7oCSV4RlNuL/1I+g=; b=hF9dbD5s8miuE/8zyMIGVPjjwyIC5Sx7D/xwppDg6leJIah2nu83XAPwQvLdgXcJzy wRLuxUbpvnCBiKPkhbEl2PE1sK9Ik2oFcLKXzDjwpG8LfEHKoCm81U3xd30VWahS4MHo MNMsJZxBNmQZvnVwEkzfQ8fclRzyRMuoRym38uYYJKsEqH6z1WeBkw9sWryIqsHGL2Zi PbSBUB7+ufZ3CbHPm9rs6gGlj3EbYZPkpwJpvVT+Mz4ux05A7d5dtcjD1xmtZkWba28L 0RHsHZl9Vkq1gaND0JqLh+o2CyPf1977B0q3Rn2P7UCKFiD3lrxij0YqNAFg3UTbUp96 p6Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FcVXbf6aDldTIUZXbAAA/FrDo6+7oCSV4RlNuL/1I+g=; b=Wv6QWaMxbzFyL+RFlv5e2I5pEiVirJTjd8qp966E63e5TBqCnTim0ym8f1GNR1zrwm 3KQT/3/8Ti9y4M13C5dPsDme5Sx2PGRYlEsRHa5Hw4ALuaFZUfB1ZkTia2sQK2rPwXcw 5Pif1xkIleTHwAi+cyrJGMpbwGzeXeX98SR31XLSQn5Q+2nehhefrLXis0Rz9X8z0bDP CuubE7XsoTWMsIGjIULFMXfxOz1h+uPufmdMOL2A3SmsQd753kMj7nxzm1/zgpJznUmD 9rLCBPes6lYXVIrzuq6R5V++BAN5LT22VY+XYr/8NNMaEZE1BqhAHE8EwViiBvirMTIF vxXw== X-Gm-Message-State: APjAAAWejyrrwmG6IkS9b5Cszlqw9/Q3d0MqQk+BP2kRCes3lzrX6loR FA31I84WRX34IUFUvzeyu1U= X-Google-Smtp-Source: APXvYqxlEp8OAPmSqpCJzMIhe7nWhU8CRRkt+BpVWfoIYSku0puNydO0d6aJgoh30hYNCktA6JJZmA== X-Received: by 2002:a05:600c:2c06:: with SMTP id q6mr4337866wmg.154.1582796112239; Thu, 27 Feb 2020 01:35:12 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h13sm7906965wrw.54.2020.02.27.01.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:11 -0800 (PST) From: luca.boccassi@gmail.com To: Tao Zhu Cc: Xiaolong Ye , dpdk stable Date: Thu, 27 Feb 2020 09:33:44 +0000 Message-Id: <20200227093402.17690-24-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix queue MSI-X interrupt binding' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/29/20. 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. Thanks. Luca Boccassi --- >From bbf8f4015138f24afcb828e95ec1e0cd5da78391 Mon Sep 17 00:00:00 2001 From: Tao Zhu Date: Wed, 19 Feb 2020 18:17:12 +0800 Subject: [PATCH] net/ice: fix queue MSI-X interrupt binding [ upstream commit 8b0add355f4a38aefc272c995b949f1fe6f1a512 ] Operator '<<' should be used instead of '<' for shifting value to be set in MSI-X configuration register. Old code adds 1 on even MSI-X interrupt vector index used by queue, resulting in interrupt mapping error. Fixes: 65dfc889d86b ("net/ice: support Rx queue interruption") Signed-off-by: Tao Zhu Acked-by: Xiaolong Ye --- drivers/net/ice/ice_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 94a8277688..52cd20ed9e 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2599,9 +2599,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect, for (i = 0; i < nb_queue; i++) { /*do actual bind*/ val = (msix_vect & QINT_RQCTL_MSIX_INDX_M) | - (0 < QINT_RQCTL_ITR_INDX_S) | QINT_RQCTL_CAUSE_ENA_M; + (0 << QINT_RQCTL_ITR_INDX_S) | QINT_RQCTL_CAUSE_ENA_M; val_tx = (msix_vect & QINT_TQCTL_MSIX_INDX_M) | - (0 < QINT_TQCTL_ITR_INDX_S) | QINT_TQCTL_CAUSE_ENA_M; + (0 << QINT_TQCTL_ITR_INDX_S) | QINT_TQCTL_CAUSE_ENA_M; PMD_DRV_LOG(INFO, "queue %d is binding to vect %d", base_queue + i, msix_vect); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.595800836 +0000 +++ 0024-net-ice-fix-queue-MSI-X-interrupt-binding.patch 2020-02-27 09:31:55.747945962 +0000 @@ -1,8 +1,10 @@ -From 8b0add355f4a38aefc272c995b949f1fe6f1a512 Mon Sep 17 00:00:00 2001 +From bbf8f4015138f24afcb828e95ec1e0cd5da78391 Mon Sep 17 00:00:00 2001 From: Tao Zhu Date: Wed, 19 Feb 2020 18:17:12 +0800 Subject: [PATCH] net/ice: fix queue MSI-X interrupt binding +[ upstream commit 8b0add355f4a38aefc272c995b949f1fe6f1a512 ] + Operator '<<' should be used instead of '<' for shifting value to be set in MSI-X configuration register. @@ -10,7 +12,6 @@ resulting in interrupt mapping error. Fixes: 65dfc889d86b ("net/ice: support Rx queue interruption") -Cc: stable@dpdk.org Signed-off-by: Tao Zhu Acked-by: Xiaolong Ye @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c -index 8e9369e0a8..85ef83e926 100644 +index 94a8277688..52cd20ed9e 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c -@@ -2605,9 +2605,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect, +@@ -2599,9 +2599,9 @@ __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect, for (i = 0; i < nb_queue; i++) { /*do actual bind*/ val = (msix_vect & QINT_RQCTL_MSIX_INDX_M) |