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 86333A0093 for ; Tue, 19 May 2020 14:58:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6F5631C1E4; Tue, 19 May 2020 14:58:32 +0200 (CEST) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by dpdk.org (Postfix) with ESMTP id D0A561C1E4 for ; Tue, 19 May 2020 14:58:31 +0200 (CEST) Received: by mail-wr1-f46.google.com with SMTP id j5so15850636wrq.2 for ; Tue, 19 May 2020 05:58:31 -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:mime-version :content-transfer-encoding; bh=Db9g3X6s/0WQ0cUDs8dIF6VJha771NrG+bVeXrMrrhk=; b=NcyVcsLvRCl2iIWYo5IkqEtzMexeYUbyGQlk966Hxl3E8OvnrM+7Heo2dAFUJB1xGC kHj7N5UaciEY7WnvqS/qbfsOpDZGTiYBbW51t6AvT1h9ng4d1iKureqln2MJ+MTqaJfn 6OMvUYdLZ829DAMkIMIHJb1+Q5SXNEmjBnzkJ3AxQZp+UuJmZ7WleiAmnFNl3O45cbF+ e/ulfANYj1hTcEusLCGGiLvQbMKYWWz0CQEAdsSIf0WWIg1gVnt0YAujll+D91VPDGn7 KsW94bQ9wbyUkpOkwah/9K7+kYakOhJmL1OKzwElnhF6LrZDXgPstWZoxG/pZnUr6kQ7 dsmA== 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:mime-version :content-transfer-encoding; bh=Db9g3X6s/0WQ0cUDs8dIF6VJha771NrG+bVeXrMrrhk=; b=GBhtpp2wU2EFQx79jP+b5/ijZqqBIHcG2LC3VaHVqSAL0yPh5HztWtD9QZTeOIhBNg 9r8ObmdgXeJ/0DsmGXoyKgAK5/DgSR7rXKW+5sLeeDaZBVXJ1wKfbX6ZxY12U9rXrWzP ZVLmxbHmEFBPXvbeEW/qJK/Ak8b1SmsoInlA4SsujZEhsIa1lHjboBL5wYWm90pJdRCI GJ1rYweKfn25cDyyZ7plKJvgw/xpxmmr4pzyjMOt6oP4YXiWbzme4TjrZObre0V6iUo3 UezhyEzOS2RqXo0t6oNJCdfSEShutFQpdNwQxtF1Cn3I6trrGJbfZjwtcThR0RijT1iH ongQ== X-Gm-Message-State: AOAM531nA1fjA/cfUAn1kjMFJ0CefTFVhO8mcvjBAtIkdJBsPwKbN5Hc JVnuVx69O6sbeoyCqOLN4rE= X-Google-Smtp-Source: ABdhPJz33Vk2WDlhxkZ9LA5YvprwPwKhrCRVNLiOkNYe/mF/UAohYnvuj+42S7radANdx1TPCNq3GA== X-Received: by 2002:a5d:674f:: with SMTP id l15mr26121634wrw.339.1589893111563; Tue, 19 May 2020 05:58:31 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o26sm21429726wro.83.2020.05.19.05.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:58:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Timothy Redaelli Cc: Anoob Joseph , dpdk stable Date: Tue, 19 May 2020 13:53:11 +0100 Message-Id: <20200519125804.104349-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/octeontx2: fix build with gcc 10' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 295ba7d0c39bdf783ef7590d3668e773a61b3349 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 13:50:41 +0100 Subject: [PATCH] crypto/octeontx2: fix build with gcc 10 [ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ] GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton") Signed-off-by: Timothy Redaelli Acked-by: Anoob Joseph --- drivers/crypto/octeontx2/otx2_cryptodev.c | 2 ++ drivers/crypto/octeontx2/otx2_cryptodev.h | 2 +- drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c index 7b8add1bfc..417eda6de6 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev.c @@ -24,6 +24,8 @@ int otx2_cpt_logtype; +uint8_t otx2_cryptodev_driver_id; + static struct rte_pci_id pci_id_cpt_table[] = { { RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h index 8e0ebc292a..c0aa661b3b 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev.h +++ b/drivers/crypto/octeontx2/otx2_cryptodev.h @@ -38,6 +38,6 @@ extern int otx2_cpt_logtype; /* * Crypto device driver ID */ -uint8_t otx2_cryptodev_driver_id; +extern uint8_t otx2_cryptodev_driver_id; #endif /* _OTX2_CRYPTODEV_H_ */ diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h index a2724f7227..f83e36b486 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h @@ -16,6 +16,6 @@ enum otx2_cpt_egrp { OTX2_CPT_EGRP_AE = 2 }; -struct rte_cryptodev_ops otx2_cpt_ops; +extern struct rte_cryptodev_ops otx2_cpt_ops; #endif /* _OTX2_CRYPTODEV_OPS_H_ */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:18.919553903 +0100 +++ 0001-crypto-octeontx2-fix-build-with-gcc-10.patch 2020-05-19 13:56:18.167500883 +0100 @@ -1,14 +1,15 @@ -From 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 Mon Sep 17 00:00:00 2001 +From 295ba7d0c39bdf783ef7590d3668e773a61b3349 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 5 Feb 2020 13:50:41 +0100 Subject: [PATCH] crypto/octeontx2: fix build with gcc 10 +[ upstream commit 983ab2b5d05c40a7b1a4da2200fd028e99796ee7 ] + GCC 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton") -Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli Acked-by: Anoob Joseph