From patchwork Fri Apr 17 16:30:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 68800 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F5AEA0597; Fri, 17 Apr 2020 18:31:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 386C51EA05; Fri, 17 Apr 2020 18:31:00 +0200 (CEST) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 38F1C1EA02 for ; Fri, 17 Apr 2020 18:30:59 +0200 (CEST) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 9D42E30C1C8 for ; Fri, 17 Apr 2020 09:19:34 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 9D42E30C1C8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1587140374; bh=cjtt6tIrSa297IE/aqkEUjzUxTP/9MtMWhJ+ZpO/Ufo=; h=From:To:Subject:Date:From; b=rg2UZ/xQ5aEi0p1lVkLet3EE/AQsSUqJ8/cV7huWVyFzTr3W6lHvrfihfHsFCRO2r R8ToZFZMEGDWBvi87qI0x6N0mKFQk5RS25KpRA2cYSDxts0puKeqieYjz+4XrsGM+V DnMQqh5Nd0oAv/UOocNO0Qt93dRpIdfz19KQS1m4= Received: from localhost.localdomain (unknown [10.230.185.215]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id F0AC114008C for ; Fri, 17 Apr 2020 09:30:53 -0700 (PDT) From: Ajit Khaparde To: dev@dpdk.org Date: Fri, 17 Apr 2020 09:30:50 -0700 Message-Id: <20200417163050.87846-1-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3] net/bnxt: remove redefinition of page size 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" PAGE_SIZE is a common macro and cause redefinition errors. Replace such occurrences. Signed-off-by: Ajit Khaparde --- v2->v3: Fixed a typo in commit message. --- drivers/net/bnxt/tf_core/tf_tbl.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnxt/tf_core/tf_tbl.h b/drivers/net/bnxt/tf_core/tf_tbl.h index cb7ce9d17..5d3ea71f4 100644 --- a/drivers/net/bnxt/tf_core/tf_tbl.h +++ b/drivers/net/bnxt/tf_core/tf_tbl.h @@ -79,30 +79,30 @@ struct tf_tbl_scope_cb { /** Hardware Page sizes supported for EEM: 4K, 8K, 64K, 256K, 1M, 2M, 4M, 1G. * Round-down other page sizes to the lower hardware page size supported. */ -#define PAGE_SHIFT 22 /** 2M */ +#define BNXT_PAGE_SHIFT 22 /** 2M */ -#if (PAGE_SHIFT < 12) /** < 4K >> 4K */ +#if (BNXT_PAGE_SHIFT < 12) /** < 4K >> 4K */ #define TF_EM_PAGE_SHIFT 12 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_4K -#elif (PAGE_SHIFT <= 13) /** 4K, 8K */ +#elif (BNXT_PAGE_SHIFT <= 13) /** 4K, 8K */ #define TF_EM_PAGE_SHIFT 13 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_8K -#elif (PAGE_SHIFT < 16) /** 16K, 32K >> 8K */ +#elif (BNXT_PAGE_SHIFT < 16) /** 16K, 32K >> 8K */ #define TF_EM_PAGE_SHIFT 15 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_32K -#elif (PAGE_SHIFT <= 17) /** 64K, 128K >> 64K */ +#elif (BNXT_PAGE_SHIFT <= 17) /** 64K, 128K >> 64K */ #define TF_EM_PAGE_SHIFT 16 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_64K -#elif (PAGE_SHIFT <= 19) /** 256K, 512K >> 256K */ +#elif (BNXT_PAGE_SHIFT <= 19) /** 256K, 512K >> 256K */ #define TF_EM_PAGE_SHIFT 18 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_256K -#elif (PAGE_SHIFT <= 21) /** 1M */ +#elif (BNXT_PAGE_SHIFT <= 21) /** 1M */ #define TF_EM_PAGE_SHIFT 20 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_1M -#elif (PAGE_SHIFT <= 22) /** 2M, 4M */ +#elif (BNXT_PAGE_SHIFT <= 22) /** 2M, 4M */ #define TF_EM_PAGE_SHIFT 21 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_2M -#elif (PAGE_SHIFT <= 29) /** 8M ... 512M >> 4M */ +#elif (BNXT_PAGE_SHIFT <= 29) /** 8M ... 512M >> 4M */ #define TF_EM_PAGE_SHIFT 22 #define TF_EM_PAGE_SIZE_ENUM HWRM_TF_CTXT_MEM_RGTR_INPUT_PAGE_SIZE_4M #else /** >= 1G >> 1G */