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 5A6B4A04DB for ; Mon, 30 Nov 2020 12:50:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80248C910; Mon, 30 Nov 2020 12:50:37 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by dpdk.org (Postfix) with ESMTP id 018CF5928 for ; Mon, 30 Nov 2020 12:50:35 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id k14so15808647wrn.1 for ; Mon, 30 Nov 2020 03:50:34 -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=3ywK7SCr6tDeeu1x52ltpEwCmryEaMSet33DkUN42mg=; b=klV9tyxPsNUyxvJM2KjAt+gA8xQ8keA/fCxMCPNXyuPkVz6Fzjsfgqe1iV6N80AsUE q6UZOxkFGh0+wmluy9/NSlCOemDgvpUJ1aAWJO7EGcVfwORTkXaEFengrxdU8ksoULph NX/EG+NV87DmQzDtz9wzbWSca3+4MR6h/fojSmb65s6PbkkzG7kibZcTDvLmREF4OddF MdWr7/cbRFpQvRPLCYP+dzekcgfCMQ+EgJ8LM37AkY/H8sa0mHgrhEpTjMY9dJHXkTAe 8y601nA0cPzIR4OACBqo5KddHfQdUpMU9lAv45xeUL5I44aIy6BT3K9UWE9qwReYXML6 Dykw== 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=3ywK7SCr6tDeeu1x52ltpEwCmryEaMSet33DkUN42mg=; b=rxlRkinez6u/DmiWtIBLPGvcelnJbVyuxrRUYg6tSfXXuo7QJw9LXiKHniwnTqvF0j 8D3KpwcR0vKx6zSlummpwzcMWSzAKHDaj+Dspz3NZS/X5q6rArjc2G1CEC+MeGYG97Cy jqlDt8uUkvLAUQQVn6l8TjqcWc3x7vkLdMsPL0R4hwR0i4X00ifb0Iz4/8upYWOAyi0/ xjfzHJjqgcrbAREAckOG17aOxUEjle460mmi+b0uAMuST4LUfam5Df+Mu89usqaJKYAD N6odzx74PTbL7Yn140rX2TmSGEcCQ416alleHbGfPwQstsvRHVf37oD0AluiGt+gdezb yCXw== X-Gm-Message-State: AOAM532ZmK2HauzcV8Kkpjofkhg7N7b6kPQtFKsZ6znnhIcwVJZ0m/dq r+bb1lTv+WFlsxCxqLX3QQY= X-Google-Smtp-Source: ABdhPJy0UywIGw++9lSb/0AvCqvlU08i6+QAKK6b5MS52M24UXfJBTXgzQUOHgtTlPECQjmOiwv16Q== X-Received: by 2002:adf:ea50:: with SMTP id j16mr27877420wrn.283.1606737033662; Mon, 30 Nov 2020 03:50:33 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r1sm26855416wra.97.2020.11.30.03.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 03:50:32 -0800 (PST) From: luca.boccassi@gmail.com To: Guoyang Zhou Cc: dpdk stable Date: Mon, 30 Nov 2020 11:50:20 +0000 Message-Id: <20201130115027.64046-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201130115027.64046-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> <20201130115027.64046-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hinic/base: remove queue number limitation' has been queued to stable release 19.11.6 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.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 12/02/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. 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/6767e3c2cdbd4cde34f649aaff355de06003a912 Thanks. Luca Boccassi --- >From 6767e3c2cdbd4cde34f649aaff355de06003a912 Mon Sep 17 00:00:00 2001 From: Guoyang Zhou Date: Tue, 24 Nov 2020 14:45:33 +0800 Subject: [PATCH] net/hinic/base: remove queue number limitation [ upstream commit acf4aeafcef7baf187d980041ab9b23aa56733c1 ] The maximum number of queues on the chip can be any value greater than 0, it does not have to be the power of two, if it does not be fixed, dpdk initialization may be failed with OVS mode firmware. Fixes: 828d3e15a9dc ("net/hinic/base: support context and work queue") Signed-off-by: Guoyang Zhou --- drivers/net/hinic/base/hinic_pmd_nicio.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/hinic/base/hinic_pmd_nicio.c b/drivers/net/hinic/base/hinic_pmd_nicio.c index 1ce065c6f7..9d9f2a7a56 100644 --- a/drivers/net/hinic/base/hinic_pmd_nicio.c +++ b/drivers/net/hinic/base/hinic_pmd_nicio.c @@ -763,11 +763,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev) int err; max_qps = hinic_func_max_qnum(hwdev); - if ((max_qps & (max_qps - 1))) { - PMD_DRV_LOG(ERR, "wrong number of max_qps: %d", - max_qps); - return -EINVAL; - } nic_io->max_qps = max_qps; nic_io->num_qps = max_qps; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-30 11:49:30.459743934 +0000 +++ 0002-net-hinic-base-remove-queue-number-limitation.patch 2020-11-30 11:49:30.386271440 +0000 @@ -1 +1 @@ -From acf4aeafcef7baf187d980041ab9b23aa56733c1 Mon Sep 17 00:00:00 2001 +From 6767e3c2cdbd4cde34f649aaff355de06003a912 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit acf4aeafcef7baf187d980041ab9b23aa56733c1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 2736305156..162308b02f 100644 +index 1ce065c6f7..9d9f2a7a56 100644 @@ -22 +23 @@ -@@ -758,11 +758,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev) +@@ -763,11 +763,6 @@ static int hinic_alloc_nicio(struct hinic_hwdev *hwdev) @@ -27 +28 @@ -- PMD_DRV_LOG(ERR, "Wrong number of max_qps: %d", +- PMD_DRV_LOG(ERR, "wrong number of max_qps: %d",