From: Nole Zhang <peng.zhang@corigine.com>
To: Chaoyong He <chaoyong.he@corigine.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: oss-drivers <oss-drivers@corigine.com>,
Niklas Soderlund <niklas.soderlund@corigine.com>
Subject: RE: [PATCH 1/8] net/nfp: break out function to report device information
Date: Mon, 16 Jan 2023 02:24:24 +0000 [thread overview]
Message-ID: <CO6PR13MB529051FE91B6EC660410EB71EFC19@CO6PR13MB5290.namprd13.prod.outlook.com> (raw)
In-Reply-To: <20221128065359.12737-2-chaoyong.he@corigine.com>
Hi all,
A gentle ping on this patch.
> -----Original Message-----
> From: Chaoyong He <chaoyong.he@corigine.com>
> Sent: 2022年11月28日 14:54
> To: dev@dpdk.org
> Cc: oss-drivers <oss-drivers@corigine.com>; Niklas Soderlund
> <niklas.soderlund@corigine.com>; Nole Zhang <peng.zhang@corigine.com>;
> Chaoyong He <chaoyong.he@corigine.com>
> Subject: [PATCH 1/8] net/nfp: break out function to report device
> information
>
> From: Peng Zhang <peng.zhang@corigine.com>
>
> The method to report device information to the log is the same for both
> physical and virtual functions. The implementation is however open coded in
> each code path, break out the reporting logic to a helper function to reduce
> code duplication.
>
> Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
> Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
> ---
> drivers/net/nfp/nfp_common.c | 27 +++++++++++++++++++++++++++
> drivers/net/nfp/nfp_common.h | 1 +
> drivers/net/nfp/nfp_ethdev.c | 23 +----------------------
> drivers/net/nfp/nfp_ethdev_vf.c | 23 +----------------------
> 4 files changed, 30 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
> index 71711bfa22..f112a70980 100644
> --- a/drivers/net/nfp/nfp_common.c
> +++ b/drivers/net/nfp/nfp_common.c
> @@ -188,6 +188,33 @@ nfp_net_configure(struct rte_eth_dev *dev)
> return 0;
> }
>
> +void
> +nfp_net_log_device_information(const struct nfp_net_hw *hw) {
> + PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d",
> + NFD_CFG_MAJOR_VERSION_of(hw->ver),
> + NFD_CFG_MINOR_VERSION_of(hw->ver), hw-
> >max_mtu);
> +
> + PMD_INIT_LOG(INFO,
> "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap,
> + hw->cap & NFP_NET_CFG_CTRL_PROMISC ?
> "PROMISC " : "",
> + hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT
> " : "",
> + hw->cap & NFP_NET_CFG_CTRL_L2MC ?
> "L2MCFILT " : "",
> + hw->cap & NFP_NET_CFG_CTRL_RXCSUM ?
> "RXCSUM " : "",
> + hw->cap & NFP_NET_CFG_CTRL_TXCSUM ?
> "TXCSUM " : "",
> + hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN
> " : "",
> + hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN
> " : "",
> + hw->cap & NFP_NET_CFG_CTRL_SCATTER ?
> "SCATTER " : "",
> + hw->cap & NFP_NET_CFG_CTRL_GATHER ?
> "GATHER " : "",
> + hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ?
> "LIVE_ADDR " : "",
> + hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " :
> "",
> + hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2
> " : "",
> + hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " :
> "",
> + hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " :
> "");
> +
> + PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u",
> + hw->max_rx_queues, hw->max_tx_queues); }
> +
> void
> nfp_net_enable_queues(struct rte_eth_dev *dev) { diff --git
> a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index
> 36c19b47e4..02612dbb58 100644
> --- a/drivers/net/nfp/nfp_common.h
> +++ b/drivers/net/nfp/nfp_common.h
> @@ -404,6 +404,7 @@ nfp_pci_queue(struct rte_pci_device *pdev, uint16_t
> queue)
> /* Prototypes for common NFP functions */ int nfp_net_reconfig(struct
> nfp_net_hw *hw, uint32_t ctrl, uint32_t update); int
> nfp_net_configure(struct rte_eth_dev *dev);
> +void nfp_net_log_device_information(const struct nfp_net_hw *hw);
> void nfp_net_enable_queues(struct rte_eth_dev *dev); void
> nfp_net_disable_queues(struct rte_eth_dev *dev); void
> nfp_net_params_setup(struct nfp_net_hw *hw); diff --git
> a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index
> 0956ea81df..f661819fc0 100644
> --- a/drivers/net/nfp/nfp_ethdev.c
> +++ b/drivers/net/nfp/nfp_ethdev.c
> @@ -619,33 +619,12 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
> else
> hw->rx_offset = nn_cfg_readl(hw,
> NFP_NET_CFG_RX_OFFSET_ADDR);
>
> - PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d",
> - NFD_CFG_MAJOR_VERSION_of(hw->ver),
> - NFD_CFG_MINOR_VERSION_of(hw->ver), hw-
> >max_mtu);
> -
> - PMD_INIT_LOG(INFO,
> "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap,
> - hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "",
> - hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "",
> - hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "",
> - hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "",
> - hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR
> " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : "");
> -
> hw->ctrl = 0;
>
> hw->stride_rx = stride;
> hw->stride_tx = stride;
>
> - PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u",
> - hw->max_rx_queues, hw->max_tx_queues);
> + nfp_net_log_device_information(hw);
>
> /* Initializing spinlock for reconfigs */
> rte_spinlock_init(&hw->reconfig_lock);
> diff --git a/drivers/net/nfp/nfp_ethdev_vf.c
> b/drivers/net/nfp/nfp_ethdev_vf.c index d1427b63bc..170f7eeb93 100644
> --- a/drivers/net/nfp/nfp_ethdev_vf.c
> +++ b/drivers/net/nfp/nfp_ethdev_vf.c
> @@ -376,33 +376,12 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev)
> else
> hw->rx_offset = nn_cfg_readl(hw,
> NFP_NET_CFG_RX_OFFSET_ADDR);
>
> - PMD_INIT_LOG(INFO, "VER: %u.%u, Maximum supported MTU: %d",
> - NFD_CFG_MAJOR_VERSION_of(hw->ver),
> - NFD_CFG_MINOR_VERSION_of(hw->ver), hw-
> >max_mtu);
> -
> - PMD_INIT_LOG(INFO,
> "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap,
> - hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "",
> - hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RXCSUM ? "RXCSUM " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " :
> "",
> - hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "",
> - hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "",
> - hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "",
> - hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR ? "LIVE_ADDR
> " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LSO ? "TSO " : "",
> - hw->cap & NFP_NET_CFG_CTRL_LSO2 ? "TSOv2 " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RSS ? "RSS " : "",
> - hw->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSSv2 " : "");
> -
> hw->ctrl = 0;
>
> hw->stride_rx = stride;
> hw->stride_tx = stride;
>
> - PMD_INIT_LOG(INFO, "max_rx_queues: %u, max_tx_queues: %u",
> - hw->max_rx_queues, hw->max_tx_queues);
> + nfp_net_log_device_information(hw);
>
> /* Initializing spinlock for reconfigs */
> rte_spinlock_init(&hw->reconfig_lock);
> --
> 2.29.3
next prev parent reply other threads:[~2023-01-16 2:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 6:53 [PATCH 0/8] Add the features for nfp include VLAN strip, QinQ strip, VLAN insert Chaoyong He
2022-11-28 6:53 ` [PATCH 1/8] net/nfp: break out function to report device information Chaoyong He
2023-01-16 2:24 ` Nole Zhang [this message]
2022-11-28 6:53 ` [PATCH 2/8] net/nfp: modify the logic of parse metadata Chaoyong He
2022-11-28 6:53 ` [PATCH 3/8] net/nfp: add new metadata type for achieving VLAN strip Chaoyong He
2022-11-28 6:53 ` [PATCH 4/8] net/nfp: add support for QinQ strip Chaoyong He
2022-11-28 6:53 ` [PATCH 5/8] net/nfp: add support for VLAN strip V2 Chaoyong He
2022-11-28 6:53 ` [PATCH 6/8] net/nfp: add support for VLAN insert with NFD3 Chaoyong He
2022-11-28 6:53 ` [PATCH 7/8] net/nfp: add support for VLAN insert V2 " Chaoyong He
2022-11-28 6:53 ` [PATCH 8/8] net/nfp: add support for VLAN insert with NFDk Chaoyong He
2023-01-24 16:28 ` [PATCH 0/8] Add the features for nfp include VLAN strip, QinQ strip, VLAN insert Ferruh Yigit
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=CO6PR13MB529051FE91B6EC660410EB71EFC19@CO6PR13MB5290.namprd13.prod.outlook.com \
--to=peng.zhang@corigine.com \
--cc=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=niklas.soderlund@corigine.com \
--cc=oss-drivers@corigine.com \
/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).