From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v3] net/bnxt: remove redefinition of page size
Date: Fri, 17 Apr 2020 09:30:50 -0700 [thread overview]
Message-ID: <20200417163050.87846-1-ajit.khaparde@broadcom.com> (raw)
PAGE_SIZE is a common macro and cause redefinition errors.
Replace such occurrences.
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
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 */
--
2.21.1 (Apple Git-122.3)
reply other threads:[~2020-04-17 16:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200417163050.87846-1-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).