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 5DA29A04DD for ; Wed, 28 Oct 2020 11:55:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 51F32CAAA; Wed, 28 Oct 2020 11:55:41 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by dpdk.org (Postfix) with ESMTP id 1BD11CAC0 for ; Wed, 28 Oct 2020 11:55:39 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id a72so4095539wme.5 for ; Wed, 28 Oct 2020 03:55:39 -0700 (PDT) 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=zY9mvstq3bVDuGSA1bnsRyk0UFzkuYL4E3LO+w7UhqU=; b=qlQFFuXs4Ep1E/3f3QuV+sF4TXlmxnM+YlIBU6L6HBMgaxNJFf8IRjzQDE6c4B5EAW Zh/82e90KpzrcbITMbpjzdrb3YW+9wr+K70lJVjIqiA9Ki6Br1GRSD3AmjbPy/s5JStf dBpgkSTAlgrhyJdL0oY1Nm2mRwVPJRjpWKvRGBgoDoeg45mlBvXOThwydCZTiJ+ceLay sZatkWM29gVgbi83hHGH6vxbYAcbEUUGdysO1L/1FPcOOoUqH3h4Kpo2oamMWqq6XXDL 2M80zWpXC5kSCtIAbnP1sIPoVcScaw1RB1KkHft9PBiEbdDqkU5eAPpwIymBQ04tWd5M 7mjQ== 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=zY9mvstq3bVDuGSA1bnsRyk0UFzkuYL4E3LO+w7UhqU=; b=BXqovf+/5mTpoN0AlT/Y4cy4qWpwD2Vt30bGQJG2COxz3uw8uMTzRAVKHVDGRzzGCJ w92cb+OXIngSLuyh6/IMzDTNPvr+fgleHauY4bSwNwVd2pIWFi/tKaezepVqw9Vi7289 VuYslBSSoTI7aIoMwSnR3vy/xEd0+0lSadaTqaSYxjMNI5k374vlJG2BUfjzvRnPkZ4W 9Qf5PaIF0LDhH66G5BzeEzxjFnQQKxH5Getb0Hi0WhXHcL4P3pnb94un5H5o5sHWQjTI XI0FlnYZTXw7wKQZ5+Xh7+2/MkpK8FpG9AlgvvK4Lh7OdKPKuValB7XD8kRE6CUkTTOJ O1EA== X-Gm-Message-State: AOAM531Vhe5tDV/2cvhJnZuVQv7UEnt6WS437Jy33erjJ8cA5n+9zs5G BjderK+NRvTQhmTLFJr4EN/0tHLmaJG5YRnn X-Google-Smtp-Source: ABdhPJyHPqgzV08vbVY4DeS1SRug+WhuchNMsYLs6mtBzLXTdMD47rZUq50pwXHJEXDgQq1HEVjBrw== X-Received: by 2002:a1c:96ca:: with SMTP id y193mr7468592wmd.22.1603882537811; Wed, 28 Oct 2020 03:55:37 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h62sm3588628wrh.82.2020.10.28.03.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:55:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Rasesh Mody Cc: Souvik Dey , dpdk stable Date: Wed, 28 Oct 2020 10:45:39 +0000 Message-Id: <20201028104606.3504127-180-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnx2x: add QLogic vendor id for BCM57840' 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 10/30/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 6373e6571ebb373139c6904836b2e29fdbe1b448 Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Mon, 12 Oct 2020 15:48:14 -0700 Subject: [PATCH] net/bnx2x: add QLogic vendor id for BCM57840 [ upstream commit 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b ] Add QLogic vendor id support for BCM57840 device ids. Fixes: 9fb557035d90 ("bnx2x: enable PMD build") Reported-by: Souvik Dey Signed-off-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x_ethdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index 7864b5b80a..8a1a3fc7f9 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -20,6 +20,7 @@ int bnx2x_logtype_driver; * The set of PCI devices this driver supports */ #define BROADCOM_PCI_VENDOR_ID 0x14E4 +#define QLOGIC_PCI_VENDOR_ID 0x1077 static const struct rte_pci_id pci_id_bnx2x_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57800) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57711) }, @@ -27,11 +28,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_OBS) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) }, + { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_2_20) }, #ifdef RTE_LIBRTE_BNX2X_MF_SUPPORT { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_MF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_MF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_MF) }, + { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_MF) }, #endif { .vendor_id = 0, } }; @@ -41,6 +44,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_VF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_VF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_VF) }, + { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_VF) }, { .vendor_id = 0, } }; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:17.295759596 +0000 +++ 0180-net-bnx2x-add-QLogic-vendor-id-for-BCM57840.patch 2020-10-28 10:35:11.788834205 +0000 @@ -1,12 +1,13 @@ -From 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b Mon Sep 17 00:00:00 2001 +From 6373e6571ebb373139c6904836b2e29fdbe1b448 Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Mon, 12 Oct 2020 15:48:14 -0700 Subject: [PATCH] net/bnx2x: add QLogic vendor id for BCM57840 +[ upstream commit 9bb607af360e4572e0b64bc2a3edc8c8c6e9e14b ] + Add QLogic vendor id support for BCM57840 device ids. Fixes: 9fb557035d90 ("bnx2x: enable PMD build") -Cc: stable@dpdk.org Reported-by: Souvik Dey Signed-off-by: Rasesh Mody @@ -15,10 +16,10 @@ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c -index 40225b2f44..ce9df87489 100644 +index 7864b5b80a..8a1a3fc7f9 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c -@@ -17,6 +17,7 @@ +@@ -20,6 +20,7 @@ int bnx2x_logtype_driver; * The set of PCI devices this driver supports */ #define BROADCOM_PCI_VENDOR_ID 0x14E4 @@ -26,7 +27,7 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57800) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57711) }, -@@ -24,11 +25,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { +@@ -27,11 +28,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_OBS) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) }, @@ -40,7 +41,7 @@ #endif { .vendor_id = 0, } }; -@@ -38,6 +41,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = { +@@ -41,6 +44,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = { { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_VF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_VF) }, { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },