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 E53C1A09E4; Fri, 29 Jan 2021 23:44:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A91674067B; Fri, 29 Jan 2021 23:44:48 +0100 (CET) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 55C1940395 for ; Fri, 29 Jan 2021 23:44:47 +0100 (CET) Received: by mail-pl1-f181.google.com with SMTP id e9so6146548plh.3 for ; Fri, 29 Jan 2021 14:44:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id; bh=ZgQMCXr0GT86G+6ToCDbSSEiJ+sLl/7or2fpUS3zHbc=; b=E0ordYhnpur1D3m/UbgVxLg6D4mHksA2f3Oko9mu+unEhWa6f1pNwWH4ylCoaLm2vi gW1gvFvnf6Vtuw1heSgsipktsokGaVG+HHB4lC0jRbZB8bqfUH3HWoE6vsZjrrfhUlN3 75tOJ+ALaAJ0RtWWomc6NJtOqDW+TkZ2/ZveXPqyZDzwdBJyy+EaB+TK4V6ZfJThIfVm PDy9QqDs3X2mAFtehR4LldlFpNNdE0UTawqIco+o/JivVK7HlO3Ttj+CdwEx+JodJPsN bQDeMNk6DLbIBKpLce/O/P2WN85Kn86J8BNoIDtB/a19G+gwPi6huMnTSCj2um+Rl6EF naUQ== 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; bh=ZgQMCXr0GT86G+6ToCDbSSEiJ+sLl/7or2fpUS3zHbc=; b=q8SD4bPqCVyg+UbMmPW94SK4P6yvbBgq1vquM1/0+rgdQy/y6pk3dFNATDqD0Yren7 hs2rn3NnwgRFoJ3ipGgZyNXlBg+GSQXnLCy34C7jFRJ/gbwAIz/YWHvZn9y9KlLIWdxc Joa2dix1ZED+7shJcbwgY3WuzP2+1FhxkkZuln8DPPgx5XHrcIrLKmEd7AqTlH0homhZ gAAolE/KdU5vbTsYnaLRWm7rWxlmwSvCyFT4huu+SJqBTS/CYLAnOakJ7RdfAdV8RYvR 5Maal24jkqYiKCMdUcZgFdo9shhe0Lo8R9NZcSKfEBxdbDB41Vb9Lb+K3AHzmZ5PV6PL o9Dg== X-Gm-Message-State: AOAM530DPyovD4zBsh8tgYn4ecF8GHX8c0ZbsqE+eRCmhJ9f0wRztR+2 rzbz/bzG/qqOW2eBh3epwqt35HjWmpKsPw== X-Google-Smtp-Source: ABdhPJw0yOanmGvf0ZehYYx0P50RaKMcD99LYB1ygmyxDd6F42yYLFp/Wceed0xzmbt9+ddmupRE7A== X-Received: by 2002:a17:902:9a93:b029:e0:e41:f088 with SMTP id w19-20020a1709029a93b02900e00e41f088mr6269226plp.55.1611960286238; Fri, 29 Jan 2021 14:44:46 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id i36sm10561557pgi.81.2021.01.29.14.44.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 14:44:45 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Fri, 29 Jan 2021 14:44:32 -0800 Message-Id: <20210129224434.71536-1-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] net: redefine array size macros X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Replace copies of size(arr)/size(arr[0]) with RTE_DIM(). Eventually all of these macro definitions should be removed. Signed-off-by: Andrew Boyer --- drivers/net/atlantic/atl_hw_regs.h | 2 +- drivers/net/axgbe/axgbe_common.h | 2 +- drivers/net/bnx2x/bnx2x.h | 2 +- drivers/net/bnx2x/elink.h | 2 +- drivers/net/ena/ena_ethdev.c | 2 +- drivers/net/enic/base/vnic_devcmd.h | 2 +- drivers/net/hns3/hns3_ethdev.h | 2 +- drivers/net/i40e/base/i40e_osdep.h | 2 +- drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h | 2 +- drivers/net/thunderx/base/nicvf_hw.h | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/atlantic/atl_hw_regs.h b/drivers/net/atlantic/atl_hw_regs.h index a2d6ca804e..4f6cd35774 100644 --- a/drivers/net/atlantic/atl_hw_regs.h +++ b/drivers/net/atlantic/atl_hw_regs.h @@ -26,7 +26,7 @@ #define mdelay rte_delay_ms #define udelay rte_delay_us -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#define ARRAY_SIZE(arr) RTE_DIM(arr) #define BIT(x) (1UL << (x)) #define AQ_HW_WAIT_FOR(_B_, _US_, _N_) \ diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index 91404ca01c..ef8706cf0f 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -42,7 +42,7 @@ #define BIT(nr) (1 << (nr)) #ifndef ARRAY_SIZE -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#define ARRAY_SIZE(arr) RTE_DIM(arr) #endif #define AXGBE_HZ 250 diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h index 69cc1430a4..e13ab15574 100644 --- a/drivers/net/bnx2x/bnx2x.h +++ b/drivers/net/bnx2x/bnx2x.h @@ -81,7 +81,7 @@ #endif #ifndef ARRAY_SIZE -#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#define ARRAY_SIZE(arr) RTE_DIM(arr) #endif #ifndef DIV_ROUND_UP #define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) diff --git a/drivers/net/bnx2x/elink.h b/drivers/net/bnx2x/elink.h index dd70ac6c66..6b2e85f1e1 100644 --- a/drivers/net/bnx2x/elink.h +++ b/drivers/net/bnx2x/elink.h @@ -86,7 +86,7 @@ extern void elink_cb_notify_link_changed(struct bnx2x_softc *sc); #define ELINK_EVENT_ID_SFP_UNQUALIFIED_MODULE 1 #define ELINK_EVENT_ID_SFP_POWER_FAULT 2 -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define ARRAY_SIZE(x) RTE_DIM(x) /* Debug prints */ #ifdef ELINK_DEBUG diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 20ff3653c6..b4b8794bcc 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -47,7 +47,7 @@ #define ENA_HASH_KEY_SIZE 40 #define ETH_GSTRING_LEN 32 -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define ARRAY_SIZE(x) RTE_DIM(x) #define ENA_MIN_RING_DESC 128 diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h index 96a7c22b21..3157bc8cb5 100644 --- a/drivers/net/enic/base/vnic_devcmd.h +++ b/drivers/net/enic/base/vnic_devcmd.h @@ -63,7 +63,7 @@ #define _CMD_VTYPE(cmd) (((cmd) >> _CMD_VTYPESHIFT) & _CMD_VTYPEMASK) #define _CMD_N(cmd) (((cmd) >> _CMD_NSHIFT) & _CMD_NMASK) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define ARRAY_SIZE(x) RTE_DIM(x) enum vnic_devcmd_cmd { CMD_NONE = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0), diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 0d17170fa7..db80c2391c 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -887,7 +887,7 @@ static inline uint32_t hns3_read_reg(void *base, uint32_t reg) #define hns3_read_dev(a, reg) \ hns3_read_reg((a)->io_base, (reg)) -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define ARRAY_SIZE(x) RTE_DIM(x) #define NEXT_ITEM_OF_ACTION(act, actions, index) \ do { \ diff --git a/drivers/net/i40e/base/i40e_osdep.h b/drivers/net/i40e/base/i40e_osdep.h index ec9712c3a7..230d400149 100644 --- a/drivers/net/i40e/base/i40e_osdep.h +++ b/drivers/net/i40e/base/i40e_osdep.h @@ -175,7 +175,7 @@ static inline uint64_t i40e_read64_addr(volatile void *addr) I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((a), (reg)), (value)) #define flush(a) i40e_read_addr(I40E_PCI_REG_ADDR((a), (I40E_GLGEN_STAT))) -#define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0])) +#define ARRAY_SIZE(arr) RTE_DIM(arr) /* memory allocation tracking */ struct i40e_dma_mem { diff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h index d46574b10e..7b64e2d32b 100644 --- a/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h +++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_platform.h @@ -23,7 +23,7 @@ #endif #ifndef ARRAY_SIZE -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#define ARRAY_SIZE(x) RTE_DIM(x) #endif #define NFP_ERRNO(err) (errno = (err), -1) diff --git a/drivers/net/thunderx/base/nicvf_hw.h b/drivers/net/thunderx/base/nicvf_hw.h index fd13ea84b6..d6f3a57703 100644 --- a/drivers/net/thunderx/base/nicvf_hw.h +++ b/drivers/net/thunderx/base/nicvf_hw.h @@ -17,7 +17,7 @@ #define PCI_SUB_DEVICE_ID_CN81XX_NICVF 0xA234 #define PCI_SUB_DEVICE_ID_CN83XX_NICVF 0xA334 -#define NICVF_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#define NICVF_ARRAY_SIZE(arr) RTE_DIM(arr) #define NICVF_GET_RX_STATS(reg) \ nicvf_reg_read(nic, NIC_VNIC_RX_STAT_0_13 | (reg << 3)) -- 2.17.1