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 2BB77A04C7; Tue, 15 Sep 2020 16:07:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6CD5F1BF83; Tue, 15 Sep 2020 16:07:53 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 067E81BF7F for ; Tue, 15 Sep 2020 16:07:52 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id c3so1405745plz.5 for ; Tue, 15 Sep 2020 07:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=54YNZ/ZAvlyvDsgGu9O6D5HqsAQoVO7Ts8OWGxzfjxs=; b=Fo7u0Va7JQLxUUBdIngfLjHoig1GdElppbyI1QG8n1yqFUNBXbB0YHY/9a2ABtB8fM 835oATijlBw1yxSE8Ze8b3Z6bwQm1mwGCOzpDjNC8OmQzI75vgqBZseDJkr27ig92rE2 53hQoecXiG1iqe5/nIYA8x0bkRfq3XVV3SDdQ= 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=54YNZ/ZAvlyvDsgGu9O6D5HqsAQoVO7Ts8OWGxzfjxs=; b=D2VQmWRNDBgghl5YBJR0FOSHRmaDLYbHdbvOfaOzjwY4EJRLoYsy7/31XSgK3gMhgy bETMy8ZHFO2shQ++G8srgRiCG+KXRbvecmyyrSfXI0VR3JVxUNsNrO+aXuCo5RBQiiO0 tpBDUCeEwTFHcGo1GaaEQSURKyAPZquob/0Wj+T1qMdEzGyxWFggRyiwKuRZOTGlNOaH JFKIRHXx78YVtImLqDuAuzMEFu31UBQCrdxVBFVegWVwxhosOVbMDleZNZi11ZxFcIAp 9sokcrXlWh8dBk9PqJe0wMd4OGuTsaWE0f4Qn2O9bpUmZQe/iv2BlvlzLazVqMhMq47s l8Bw== X-Gm-Message-State: AOAM531Hbamd5xmmu4glgc8M+Rt/XmLDc46FuTCXtCcN9jvBkL6aDgir qilkx9v4q71OmIwTcNPcpb8FZw== X-Google-Smtp-Source: ABdhPJxI3jx7NsGHZI1x3b5ae97OpF43RnOZmrL3KCjcKBnq90YxQUCsbJDodORRAvLGBWAgi+SI4Q== X-Received: by 2002:a17:902:b685:b029:d1:e5f8:81e1 with SMTP id c5-20020a170902b685b02900d1e5f881e1mr1699130pls.83.1600178871096; Tue, 15 Sep 2020 07:07:51 -0700 (PDT) Received: from localhost.localdomain ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id gg19sm12074726pjb.49.2020.09.15.07.07.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 07:07:50 -0700 (PDT) From: Lance Richardson To: Ajit Khaparde , Somnath Kotur Cc: dev@dpdk.org, ferruh.yigit@intel.com Date: Tue, 15 Sep 2020 10:07:35 -0400 Message-Id: <20200915140735.209826-1-lance.richardson@broadcom.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] net/bnxt: fix powerpc build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" A previous commit broke compilation for builds other than x86 and aarch64. Fix by moving macro definitions to more appropriate header files. Fixes: 479387565605 ("net/bnxt: improve small ring sizes support") Signed-off-by: Lance Richardson --- drivers/net/bnxt/bnxt_rxq.c | 1 - drivers/net/bnxt/bnxt_rxq.h | 3 +++ drivers/net/bnxt/bnxt_rxr.c | 1 - drivers/net/bnxt/bnxt_rxr.h | 3 +++ drivers/net/bnxt/bnxt_rxtx_vec_common.h | 4 ---- drivers/net/bnxt/bnxt_txq.c | 1 - drivers/net/bnxt/bnxt_txq.h | 3 +++ 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 57ba9a157..793a47d11 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -14,7 +14,6 @@ #include "bnxt_rxq.h" #include "bnxt_rxr.h" #include "bnxt_vnic.h" -#include "bnxt_rxtx_vec_common.h" #include "hsi_struct_def_dpdk.h" /* diff --git a/drivers/net/bnxt/bnxt_rxq.h b/drivers/net/bnxt/bnxt_rxq.h index 96c6e06a5..fae92ea45 100644 --- a/drivers/net/bnxt/bnxt_rxq.h +++ b/drivers/net/bnxt/bnxt_rxq.h @@ -6,6 +6,9 @@ #ifndef _BNXT_RQX_H_ #define _BNXT_RQX_H_ +/* Maximum receive burst supported in vector mode. */ +#define RTE_BNXT_MAX_RX_BURST 64U + struct bnxt; struct bnxt_rx_ring_info; struct bnxt_cp_ring_info; diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 89a964a49..ca3e0a521 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -20,7 +20,6 @@ #ifdef RTE_LIBRTE_IEEE1588 #include "bnxt_hwrm.h" #endif -#include "bnxt_rxtx_vec_common.h" #include #include diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h index 4f5e23b85..250033690 100644 --- a/drivers/net/bnxt/bnxt_rxr.h +++ b/drivers/net/bnxt/bnxt_rxr.h @@ -167,6 +167,9 @@ static inline uint16_t bnxt_tpa_start_agg_id(struct bnxt *bp, #define BNXT_RX_POST_THRESH 32 +/* Number of descriptors to process per inner loop in vector mode. */ +#define RTE_BNXT_DESCS_PER_LOOP 4U + enum pkt_hash_types { PKT_HASH_TYPE_NONE, /* Undefined type */ PKT_HASH_TYPE_L2, /* Input: src_MAC, dest_MAC */ diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_common.h b/drivers/net/bnxt/bnxt_rxtx_vec_common.h index 8c10fdfa1..4a48152fc 100644 --- a/drivers/net/bnxt/bnxt_rxtx_vec_common.h +++ b/drivers/net/bnxt/bnxt_rxtx_vec_common.h @@ -9,10 +9,6 @@ #include "bnxt_rxq.h" #include "bnxt_rxr.h" -#define RTE_BNXT_MAX_RX_BURST 64U -#define RTE_BNXT_MAX_TX_BURST 64U -#define RTE_BNXT_DESCS_PER_LOOP 4U - #define TX_BD_FLAGS_CMPL ((1 << TX_BD_LONG_FLAGS_BD_CNT_SFT) | \ TX_BD_SHORT_FLAGS_COAL_NOW | \ TX_BD_SHORT_TYPE_TX_BD_SHORT | \ diff --git a/drivers/net/bnxt/bnxt_txq.c b/drivers/net/bnxt/bnxt_txq.c index 42930abbf..bdc7ffaaa 100644 --- a/drivers/net/bnxt/bnxt_txq.c +++ b/drivers/net/bnxt/bnxt_txq.c @@ -11,7 +11,6 @@ #include "bnxt_ring.h" #include "bnxt_txq.h" #include "bnxt_txr.h" -#include "bnxt_rxtx_vec_common.h" /* * TX Queues diff --git a/drivers/net/bnxt/bnxt_txq.h b/drivers/net/bnxt/bnxt_txq.h index 83a98536d..9f849fc71 100644 --- a/drivers/net/bnxt/bnxt_txq.h +++ b/drivers/net/bnxt/bnxt_txq.h @@ -6,6 +6,9 @@ #ifndef _BNXT_TXQ_H_ #define _BNXT_TXQ_H_ +/* Maximum transmit burst for vector mode. */ +#define RTE_BNXT_MAX_TX_BURST 64U + struct bnxt_tx_ring_info; struct bnxt_cp_ring_info; struct bnxt_tx_queue { -- 2.25.1