From patchwork Fri Jan 29 22:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 87569 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org 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 Reviewed-by: Ferruh Yigit --- 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)) From patchwork Fri Jan 29 22:44:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 87570 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4C1BBA09E4; Fri, 29 Jan 2021 23:45:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 390F44069F; Fri, 29 Jan 2021 23:45:04 +0100 (CET) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id 40A4B40697 for ; Fri, 29 Jan 2021 23:45:02 +0100 (CET) Received: by mail-pf1-f175.google.com with SMTP id m6so7144828pfk.1 for ; Fri, 29 Jan 2021 14:45:02 -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:in-reply-to:references :in-reply-to:references; bh=ik41/F2A4B3kZEoQ7HdRoI4fq9mG/AX0jkmS0JveGTk=; b=WabEq0siLIUic+sp0m62mNDqv0XiSO0ebNcwHIynPNHDUp1wI2rCx8Tjc1Omii1e2h Ha1Kv8AYbf7lwytRLIYqC/hkNHVm1DbUSv8DhwT2waHCh506JszCuDqTcdswKcemnWg7 Nd/5Z47QHDKieABlkEADR1PUJ0f1v9A2WMs60i7OhuYqSyVHQTOFwF6/tVDuaLfn+3wG Ncy7cwLwqO9sYtRLdx2q8VDCg5ZwUYrKFGTH46o63jN0NbbIuF7ORj6Yq1qcEbAG5PlU 4bNPHPUc4SonAd9zDJGivYmd2DbfwfXY3DTvxkjz3ovVJ1BgZNbItR6PvFiKjSxHuvL4 jwZw== 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:in-reply-to :references:in-reply-to:references; bh=ik41/F2A4B3kZEoQ7HdRoI4fq9mG/AX0jkmS0JveGTk=; b=lsIeukbNAZWqZk9aFkZAB9XiGpYvRcGjG+lT4hypBYgMR4Szuib7GHvGpM9rdiObhE qoZfJgkOvJkkJXmPg0FxuMwNvs8LAYMTxkbTIEbL4+1Ok3dv6GWrkhZVkPqxtp6j1jHS YWcVgyDzgjN2GvVdZv5dKboBg0xMoAv9hvme7r9NmtwjEQkIAOCJ1A5ZIL3Z/99K09lr 0+vBtLw7zeux1k2rjObwYlHtKYawCL+6b9J5VuHPfqDsBnZZKAZ0E/MxPyprX5DkK7nk Myx97IKIWQ+HwnmGHIFBNF5JQ8bxj0zM0cbYSTJLeuu7kIUtaNui9PvmN/b5u6R7etNk mpUw== X-Gm-Message-State: AOAM530d1ewwvcds6WUmh2kUhwn0MopByHMpOGfG7xfnsm3DbRVsboqm gEWchYAYuRUM+So+630vAhsOksP4SAnu9w== X-Google-Smtp-Source: ABdhPJxtQrT0LlfAdARbYN+iSVtTraKzzOvVserfRVlZrpM15PhUkdULbEljWVDErS1kBfJMP416KQ== X-Received: by 2002:a63:7050:: with SMTP id a16mr6937955pgn.164.1611960301160; Fri, 29 Jan 2021 14:45:01 -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.45.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 14:45:00 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Fri, 29 Jan 2021 14:44:33 -0800 Message-Id: <20210129224434.71536-2-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210129224434.71536-1-aboyer@pensando.io> References: <20210129224434.71536-1-aboyer@pensando.io> In-Reply-To: <20210118203508.1332-5-aboyer@pensando.io> References: <20210118203508.1332-5-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v2 4/13] net/ionic: use the existing array-size macro 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" Using the RTE_DIM() macro makes the code clearer. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_dev.c | 10 ++++------ drivers/net/ionic/ionic_ethdev.c | 3 +-- drivers/net/ionic/ionic_lif.c | 9 +++------ drivers/net/ionic/ionic_main.c | 32 +++++++++++--------------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c index aba1713fbc..a9f9e2faf9 100644 --- a/drivers/net/ionic/ionic_dev.c +++ b/drivers/net/ionic/ionic_dev.c @@ -87,9 +87,8 @@ void ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) { union ionic_dev_cmd_comp *comp = mem; - unsigned int i; - uint32_t comp_size = sizeof(comp->words) / - sizeof(comp->words[0]); + uint32_t comp_size = RTE_DIM(comp->words); + uint32_t i; for (i = 0; i < comp_size; i++) comp->words[i] = ioread32(&idev->dev_cmd->comp.words[i]); @@ -98,9 +97,8 @@ ionic_dev_cmd_comp(struct ionic_dev *idev, void *mem) void ionic_dev_cmd_go(struct ionic_dev *idev, union ionic_dev_cmd *cmd) { - unsigned int i; - uint32_t cmd_size = sizeof(cmd->words) / - sizeof(cmd->words[0]); + uint32_t cmd_size = RTE_DIM(cmd->words); + uint32_t i; IONIC_PRINT(DEBUG, "Sending %s (%d) via dev_cmd", ionic_opcode_to_str(cmd->cmd.opcode), cmd->cmd.opcode); diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index a5b2301e46..747082a263 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -207,8 +207,7 @@ static const struct rte_ionic_xstats_name_off rte_ionic_xstats_strings[] = { tx_desc_data_error)}, }; -#define IONIC_NB_HW_STATS (sizeof(rte_ionic_xstats_strings) / \ - sizeof(rte_ionic_xstats_strings[0])) +#define IONIC_NB_HW_STATS RTE_DIM(rte_ionic_xstats_strings) static int ionic_dev_fw_version_get(struct rte_eth_dev *eth_dev, diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 3e2edde35d..8dd49b6628 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -1824,13 +1824,10 @@ ionic_lif_identify(struct ionic_adapter *adapter) struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; union ionic_lif_config *cfg = &ident->lif.eth.config; + uint32_t lif_words = RTE_DIM(ident->lif.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; - unsigned int i; - unsigned int lif_words = sizeof(ident->lif.words) / - sizeof(ident->lif.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int nwords; ionic_dev_cmd_lif_identify(idev, IONIC_LIF_TYPE_CLASSIC, IONIC_IDENTITY_VERSION_1); diff --git a/drivers/net/ionic/ionic_main.c b/drivers/net/ionic/ionic_main.c index 3f15a6f2f2..3f1a764888 100644 --- a/drivers/net/ionic/ionic_main.c +++ b/drivers/net/ionic/ionic_main.c @@ -263,15 +263,11 @@ ionic_identify(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; - int err = 0; - uint32_t i; - unsigned int nwords; - uint32_t drv_size = sizeof(ident->drv.words) / - sizeof(ident->drv.words[0]); - uint32_t cmd_size = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - uint32_t dev_size = sizeof(ident->dev.words) / - sizeof(ident->dev.words[0]); + uint32_t drv_size = RTE_DIM(ident->drv.words); + uint32_t cmd_size = RTE_DIM(idev->dev_cmd->data); + uint32_t dev_size = RTE_DIM(ident->dev.words); + uint32_t i, nwords; + int err; memset(ident, 0, sizeof(*ident)); @@ -323,12 +319,9 @@ ionic_port_identify(struct ionic_adapter *adapter) { struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; - unsigned int port_words = sizeof(ident->port.words) / - sizeof(ident->port.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int i; - unsigned int nwords; + uint32_t port_words = RTE_DIM(ident->port.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; ionic_dev_cmd_port_identify(idev); @@ -374,12 +367,9 @@ ionic_port_init(struct ionic_adapter *adapter) struct ionic_dev *idev = &adapter->idev; struct ionic_identity *ident = &adapter->ident; char z_name[RTE_MEMZONE_NAMESIZE]; - unsigned int config_words = sizeof(ident->port.config.words) / - sizeof(ident->port.config.words[0]); - unsigned int cmd_words = sizeof(idev->dev_cmd->data) / - sizeof(idev->dev_cmd->data[0]); - unsigned int nwords; - unsigned int i; + uint32_t config_words = RTE_DIM(ident->port.config.words); + uint32_t cmd_words = RTE_DIM(idev->dev_cmd->data); + uint32_t i, nwords; int err; if (idev->port_info) From patchwork Fri Jan 29 22:44:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Boyer X-Patchwork-Id: 87571 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88810A09E4; Fri, 29 Jan 2021 23:45:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FFA52400F8; Fri, 29 Jan 2021 23:45:15 +0100 (CET) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mails.dpdk.org (Postfix) with ESMTP id C4CA640699 for ; Fri, 29 Jan 2021 23:45:14 +0100 (CET) Received: by mail-pf1-f175.google.com with SMTP id e19so7131587pfh.6 for ; Fri, 29 Jan 2021 14:45:14 -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:in-reply-to:references :in-reply-to:references; bh=RM/vNljZgZ/++4KUDvhxCRqVjQytvvOkjdxVyZHSr74=; b=ribDY3JA3FcwYZ/F6pxTRa+OUkopXopPUB5/aKU3UH2DS5c00o0zivpYS07KW82qDQ eTVDh6f4f3SikH+184+9uRL4kGubdWsS8C9amkCSzpW7qgIBmWFWuz8V2t8ivRvRWuKF D2W1NnH4tT32qfCepPB4ne1qPxITzFXdeNb2z1dHQ5PAIj+IFeAeqaigb2Pb/95tfkpa BuLmuR/iJtjULKcUYJTrBguz29+WLJfxFKOcRXUlXmot5d2yf9p3t/Bt3+IUQY4AvX5p sE+Pzr2hoWgGoTD9eCsG7HXbna9ZlF0Rpl4KnuCUwOqX9BV8hXtttOWzKstdo544zebE cZ2Q== 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:in-reply-to :references:in-reply-to:references; bh=RM/vNljZgZ/++4KUDvhxCRqVjQytvvOkjdxVyZHSr74=; b=Dcf0zBDHtV3cLPtFd52kdsDNO0IkG+wpi0Ip8NlrhY2XPuI7wzMKy6KrqR91TCUKW/ wHIX4G1ORiPnyxthg/ee2SqnnLJhBPUEPqPXhT88R5mU+1QA2iRt/NBGag3AgsR0HfsH BMaxTzloQmXxGm3gL2QTUVFp6Q4e/va/+QPqJyDaPiVZTytuMZi9HmT/kPSNJ2xXAdMf +xsQUH1a6WZeEez4jmpxZSsxzx6fqLCUf4X6azK3cxXZf4O78JHnPmVnu0qGlwvQqap6 rLzNbiq7rVs/3cmQRBRORwjlC6ldD6gZekfrLvfSLwaTqRAdimleMtNIkDL6GC4fz5+i 13+g== X-Gm-Message-State: AOAM531YE8zXtiLgCsal8up3GvR5Pj3nUUcbJz/4huKZA4t9uhuKZBpM VCYPpVXpIyUkiESVJwjGYrQFAfXSn+491A== X-Google-Smtp-Source: ABdhPJxI6I8QAtAYtmiJaGKBBlOG9Iq45APHgjxv/I/5rtlnNe+neyBjQoDg6nUCYMeW+7bNwkSdyQ== X-Received: by 2002:a63:f953:: with SMTP id q19mr6739158pgk.120.1611960313779; Fri, 29 Jan 2021 14:45:13 -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.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jan 2021 14:45:13 -0800 (PST) From: Andrew Boyer To: dev@dpdk.org Cc: Alfredo Cardigliano , Andrew Boyer Date: Fri, 29 Jan 2021 14:44:34 -0800 Message-Id: <20210129224434.71536-3-aboyer@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210129224434.71536-1-aboyer@pensando.io> References: <20210129224434.71536-1-aboyer@pensando.io> In-Reply-To: <20210118203508.1332-7-aboyer@pensando.io> References: <20210118203508.1332-7-aboyer@pensando.io> Subject: [dpdk-dev] [PATCH v2 6/13] net/ionic: clean up Tx queue version support 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" The ionic PMD only supports Tx queue version 1 or greater. Version 1 introduced a new SGL format with support for more fragments per descriptor. Add release notes and an explanation to the docs. Signed-off-by: Andrew Boyer --- doc/guides/nics/ionic.rst | 4 ++++ doc/guides/rel_notes/release_21_02.rst | 11 +++++++++++ drivers/net/ionic/ionic_dev.h | 2 +- drivers/net/ionic/ionic_ethdev.c | 8 ++++---- drivers/net/ionic/ionic_lif.c | 7 ++++++- drivers/net/ionic/ionic_rxtx.c | 8 ++++---- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/doc/guides/nics/ionic.rst b/doc/guides/nics/ionic.rst index 3b93592c39..0c6147983f 100644 --- a/doc/guides/nics/ionic.rst +++ b/doc/guides/nics/ionic.rst @@ -25,6 +25,10 @@ on the host, check for the PCI devices: b5:00.0 Ethernet controller: Device 1dd8:1002 b6:00.0 Ethernet controller: Device 1dd8:1002 +Firmware Support +---------------- + +The ionic PMD requires firmware which supports 16 segment transmit SGLs. This support was added prior to version 1.0. For help upgrading older versions, please contact Pensando support. Building DPDK ------------- diff --git a/doc/guides/rel_notes/release_21_02.rst b/doc/guides/rel_notes/release_21_02.rst index 23dcb370be..76aaf8cbf9 100644 --- a/doc/guides/rel_notes/release_21_02.rst +++ b/doc/guides/rel_notes/release_21_02.rst @@ -138,6 +138,17 @@ New Features * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2 crypto PMD lookaside protocol offload for IPsec. +* **Updated the Pensando ionic driver.** + + Updated the Pensando ionic driver with new features and improvements, including: + + * Fixed bugs related to link autonegotiation. + * Fixed bugs related to port start/stop and queue start/stop. + * Added support for probing the supported queue versions. Note that + extremely old (pre-1.0) firmware will no longer be usable with the PMD. + * Removed unused code. + * Reduced device startup time. + Removed Items ------------- diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h index e13b6c82cc..bacbe3f053 100644 --- a/drivers/net/ionic/ionic_dev.h +++ b/drivers/net/ionic/ionic_dev.h @@ -107,7 +107,7 @@ static inline void ionic_struct_size_checks(void) /* I/O */ RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_desc) != 16); - RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_sg_desc) != 128); + RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_sg_desc_v1) != 256); RTE_BUILD_BUG_ON(sizeof(struct ionic_txq_comp) != 16); RTE_BUILD_BUG_ON(sizeof(struct ionic_rxq_desc) != 16); diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c index 747082a263..83c9dd690a 100644 --- a/drivers/net/ionic/ionic_ethdev.c +++ b/drivers/net/ionic/ionic_ethdev.c @@ -70,12 +70,12 @@ static const struct rte_eth_desc_lim rx_desc_lim = { .nb_align = 1, }; -static const struct rte_eth_desc_lim tx_desc_lim = { +static const struct rte_eth_desc_lim tx_desc_lim_v1 = { .nb_max = IONIC_MAX_RING_DESC, .nb_min = IONIC_MIN_RING_DESC, .nb_align = 1, - .nb_seg_max = IONIC_TX_MAX_SG_ELEMS, - .nb_mtu_seg_max = IONIC_TX_MAX_SG_ELEMS, + .nb_seg_max = IONIC_TX_MAX_SG_ELEMS_V1, + .nb_mtu_seg_max = IONIC_TX_MAX_SG_ELEMS_V1, }; static const struct eth_dev_ops ionic_eth_dev_ops = { @@ -440,7 +440,7 @@ ionic_dev_info_get(struct rte_eth_dev *eth_dev, 0; dev_info->rx_desc_lim = rx_desc_lim; - dev_info->tx_desc_lim = tx_desc_lim; + dev_info->tx_desc_lim = tx_desc_lim_v1; /* Driver-preferred Rx/Tx parameters */ dev_info->default_rxportconf.burst_size = 32; diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c index 8dd49b6628..2a6c494c9d 100644 --- a/drivers/net/ionic/ionic_lif.c +++ b/drivers/net/ionic/ionic_lif.c @@ -761,7 +761,7 @@ ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t index, uint16_t ntxq_descs, ntxq_descs, sizeof(struct ionic_txq_desc), sizeof(struct ionic_txq_comp), - sizeof(struct ionic_txq_sg_desc), + sizeof(struct ionic_txq_sg_desc_v1), &lif->txqcqs[index]); if (err) return err; @@ -925,6 +925,11 @@ ionic_lif_alloc(struct ionic_lif *lif) ionic_lif_queue_identify(lif); + if (lif->qtype_info[IONIC_QTYPE_TXQ].version < 1) { + IONIC_PRINT(ERR, "FW too old, please upgrade"); + return -ENXIO; + } + IONIC_PRINT(DEBUG, "Allocating Lif Info"); rte_spinlock_init(&lif->adminq_lock); diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index c8191e6c01..b8b3364d11 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -317,9 +317,9 @@ static struct ionic_txq_desc * ionic_tx_tso_next(struct ionic_queue *q, struct ionic_txq_sg_elem **elem) { struct ionic_txq_desc *desc_base = q->base; - struct ionic_txq_sg_desc *sg_desc_base = q->sg_base; + struct ionic_txq_sg_desc_v1 *sg_desc_base = q->sg_base; struct ionic_txq_desc *desc = &desc_base[q->head_idx]; - struct ionic_txq_sg_desc *sg_desc = &sg_desc_base[q->head_idx]; + struct ionic_txq_sg_desc_v1 *sg_desc = &sg_desc_base[q->head_idx]; *elem = sg_desc->elems; return desc; @@ -456,9 +456,9 @@ ionic_tx(struct ionic_qcq *txq, struct rte_mbuf *txm, { struct ionic_queue *q = &txq->q; struct ionic_txq_desc *desc_base = q->base; - struct ionic_txq_sg_desc *sg_desc_base = q->sg_base; + struct ionic_txq_sg_desc_v1 *sg_desc_base = q->sg_base; struct ionic_txq_desc *desc = &desc_base[q->head_idx]; - struct ionic_txq_sg_desc *sg_desc = &sg_desc_base[q->head_idx]; + struct ionic_txq_sg_desc_v1 *sg_desc = &sg_desc_base[q->head_idx]; struct ionic_txq_sg_elem *elem = sg_desc->elems; struct ionic_tx_stats *stats = IONIC_Q_TO_TX_STATS(q); struct rte_mbuf *txm_seg;