From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3C084A0A0A for ; Thu, 20 May 2021 11:55:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 315624069B; Thu, 20 May 2021 11:55:25 +0200 (CEST) Received: from relay.smtp-ext.broadcom.com (lpdvacalvio01.broadcom.com [192.19.229.182]) by mails.dpdk.org (Postfix) with ESMTP id 84E1140041 for ; Thu, 20 May 2021 11:55:23 +0200 (CEST) Received: from dhcp-10-123-153-22.dhcp.broadcom.net (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 3507024706 for ; Thu, 20 May 2021 02:55:21 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 3507024706 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1621504522; bh=XfK9/aKKbT94vHT0lziYV9rKWU/++icn7Z8kUNtT6ws=; h=From:To:Subject:Date:In-Reply-To:References:From; b=dIRwgo/XX8foJY2WzeV6QVr6AclVJZgl5AFhxI+X5C9gKiamGPlu6bLLQcxC5PRpP jXd1JzL3Kb5V3q39dwdn/lBnZooTyeTKDqVvo6+2lFzH6dIQizXyoeUh6fRF1PdS3c QXsPwgmcKmfzc6yQ1ixWBSWDrwzTsJPQMUDIErp4= From: Kalesh A P To: stable@dpdk.org Date: Thu, 20 May 2021 15:46:46 +0530 Message-Id: <20210520101654.3214-2-kalesh-anakkur.purayil@broadcom.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20210520101654.3214-1-kalesh-anakkur.purayil@broadcom.com> References: <20210520101654.3214-1-kalesh-anakkur.purayil@broadcom.com> Subject: [dpdk-stable] [PATCH 19.11 1/9] net/bnxt: fix build failures after merging patches X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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" From: Kalesh AP There is a build failure after merging patches to 19.11.9. Though the patches applies cleanly to 19.11 LTS repo, observed build failure because some macros are changed in upstream tree. Signed-off-by: Kalesh AP --- drivers/net/bnxt/bnxt_ethdev.c | 7 +++---- drivers/net/bnxt/bnxt_hwrm.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 524764e..26cc3dc 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -2417,14 +2417,13 @@ bnxt_rx_queue_count_op(struct rte_eth_dev *dev, uint16_t rx_queue_id) switch (cmpl_type) { case CMPL_BASE_TYPE_RX_L2: - case CMPL_BASE_TYPE_RX_L2_V2: agg_cnt = BNXT_RX_L2_AGG_BUFS(rxcmp); raw_cons = raw_cons + CMP_LEN(cmpl_type) + agg_cnt; desc++; break; case CMPL_BASE_TYPE_RX_TPA_END: - if (BNXT_CHIP_P5(rxq->bp)) { + if (BNXT_CHIP_THOR(rxq->bp)) { struct rx_tpa_v2_end_cmpl_hi *p5_tpa_end; p5_tpa_end = (void *)rxcmp; @@ -3474,12 +3473,12 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts) static int bnxt_clr_rx_ts(struct bnxt *bp, uint64_t *last_ts) { struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; - struct bnxt_pf_info *pf = bp->pf; + struct bnxt_pf_info *pf = &bp->pf; uint16_t port_id; int i = 0; uint32_t fifo; - if (!ptp || (bp->flags & BNXT_FLAG_CHIP_P5)) + if (!ptp || BNXT_CHIP_THOR(bp)) return -EINVAL; port_id = pf->port_id; diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 0d240b1..12f8107 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -5108,7 +5108,7 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp) bp->max_req_len = HWRM_MAX_REQ_LEN; bp->hwrm_cmd_timeout = SHORT_HWRM_CMD_TIMEOUT; - HWRM_PREP(&req, HWRM_VER_GET, BNXT_USE_CHIMP_MB); + HWRM_PREP(req, VER_GET, BNXT_USE_CHIMP_MB); req.hwrm_intf_maj = HWRM_VERSION_MAJOR; req.hwrm_intf_min = HWRM_VERSION_MINOR; req.hwrm_intf_upd = HWRM_VERSION_UPDATE; -- 2.10.1