From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Peng Zhang <peng.zhang@corigine.com>,
Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>
Subject: [PATCH 19/23] net/nfp: add support of ring pop and push
Date: Wed, 19 Jun 2024 17:58:26 +0800 [thread overview]
Message-ID: <20240619095830.3479757-20-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20240619095830.3479757-1-chaoyong.he@corigine.com>
From: Peng Zhang <peng.zhang@corigine.com>
Add support of ring pop and push, the ring memory is in firmware
side, we add this support to make it is possible to share resource
between PFs.
Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
---
drivers/net/nfp/nfpcore/nfp_rtsym.c | 103 +++++++++++++++++++++++++++
drivers/net/nfp/nfpcore/nfp_rtsym.h | 4 ++
drivers/net/nfp/nfpcore/nfp_target.c | 2 +
3 files changed, 109 insertions(+)
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c
index 2fedd4d9af..7d9cfb0d42 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c
@@ -706,3 +706,106 @@ nfp_rtsym_map(struct nfp_rtsym_table *rtbl,
{
return nfp_rtsym_map_offset(rtbl, name, 0, min_size, area);
}
+
+/**
+ * Pop a simple unsigned scalar value from ring
+ *
+ * Lookup the symbol table for ring base and address, then pop value base on
+ * the ring with cpp read and write operation.
+ *
+ * @param rtbl
+ * NFP run-time symbol table
+ * @param aux_name
+ * The auxiliary rtsym table name which can ensure ring base and address
+ * @param name
+ * The rtsym table name which can handle the ring
+ * @param value
+ * Pop this value from ring
+ *
+ * @return
+ * 0 on success, negative errno otherwise.
+ */
+int
+nfp_rtsym_readl_indirect(struct nfp_rtsym_table *rtbl,
+ const char *aux_name,
+ const char *name,
+ uint32_t *value)
+{
+ int ret;
+ uint32_t cpp_id;
+ const struct nfp_rtsym *sym;
+ const struct nfp_rtsym *aux_sym;
+
+ if (value == NULL)
+ return -EINVAL;
+
+ aux_sym = nfp_rtsym_lookup(rtbl, aux_name);
+ if (aux_sym == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to find symbol %s", aux_name);
+ return -ENOENT;
+ }
+
+ sym = nfp_rtsym_lookup(rtbl, name);
+ if (sym == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to find symbol %s", name);
+ return -ENOENT;
+ }
+
+ /* Ring Pop */
+ cpp_id = NFP_CPP_ISLAND_ID(aux_sym->target, 22, 0, aux_sym->domain);
+ ret = nfp_cpp_readl(rtbl->cpp, cpp_id, sym->addr, value);
+ if (ret != 0)
+ return -EIO;
+
+ return 0;
+}
+
+/**
+ * Push a simple unsigned scalar value to ring
+ *
+ * Lookup the symbol table for ring base and address, then Push value base on
+ * the ring with cpp read and write operation.
+ *
+ * @param rtbl
+ * NFP run-time symbol table
+ * @param aux_name
+ * The auxiliary rtsym table name which can ensure ring base and address
+ * @param name
+ * The rtsym table name which can handle the ring
+ * @param value
+ * Push this value to ring
+ *
+ * @return
+ * 0 on success, negative errno otherwise.
+ */
+int
+nfp_rtsym_writel_indirect(struct nfp_rtsym_table *rtbl,
+ const char *aux_name,
+ const char *name,
+ uint32_t value)
+{
+ int ret;
+ uint32_t cpp_id;
+ const struct nfp_rtsym *sym;
+ const struct nfp_rtsym *aux_sym;
+
+ aux_sym = nfp_rtsym_lookup(rtbl, aux_name);
+ if (aux_sym == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to find symbol %s", aux_name);
+ return -ENOENT;
+ }
+
+ sym = nfp_rtsym_lookup(rtbl, name);
+ if (sym == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to find symbol %s", name);
+ return -ENOENT;
+ }
+
+ /* Ring Put */
+ cpp_id = NFP_CPP_ISLAND_ID(aux_sym->target, 20, 0, aux_sym->domain);
+ ret = nfp_cpp_writel(rtbl->cpp, cpp_id, sym->addr, value);
+ if (ret != 0)
+ return -EIO;
+
+ return 0;
+}
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.h b/drivers/net/nfp/nfpcore/nfp_rtsym.h
index 3e8acdd38e..5b1ea53bea 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.h
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.h
@@ -42,5 +42,9 @@ uint8_t *nfp_rtsym_map(struct nfp_rtsym_table *rtbl, const char *name,
uint32_t min_size, struct nfp_cpp_area **area);
uint8_t *nfp_rtsym_map_offset(struct nfp_rtsym_table *rtbl, const char *name,
uint32_t offset, uint32_t min_size, struct nfp_cpp_area **area);
+int nfp_rtsym_readl_indirect(struct nfp_rtsym_table *rtbl, const char *aux_name,
+ const char *name, uint32_t *value);
+int nfp_rtsym_writel_indirect(struct nfp_rtsym_table *rtbl, const char *aux_name,
+ const char *name, uint32_t value);
#endif /* __NFP_RTSYM_H__ */
diff --git a/drivers/net/nfp/nfpcore/nfp_target.c b/drivers/net/nfp/nfpcore/nfp_target.c
index ea5b39a4b9..0e7a5cbb05 100644
--- a/drivers/net/nfp/nfpcore/nfp_target.c
+++ b/drivers/net/nfp/nfpcore/nfp_target.c
@@ -264,6 +264,8 @@ nfp6000_mu_emu(uint32_t cpp_id)
return PUSHPULL(P32, 0);
case NFP_CPP_ID(0, 18, 3): /* write_queue_ring */
return PUSHPULL(P32, 0);
+ case NFP_CPP_ID(0, 20, 0): /* put */
+ return PUSHPULL(P32, 0);
case NFP_CPP_ID(0, 20, 2): /* journal */
return PUSHPULL(P32, 0);
case NFP_CPP_ID(0, 21, 0): /* get */
--
2.39.1
next prev parent reply other threads:[~2024-06-19 10:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 9:58 [PATCH 00/23] support flower firmware with multiple PF Chaoyong He
2024-06-19 9:58 ` [PATCH 01/23] net/nfp: fix dereference of null pointer Chaoyong He
2024-06-19 9:58 ` [PATCH 02/23] net/nfp: disable ctrl VNIC queues Chaoyong He
2024-06-19 9:58 ` [PATCH 03/23] net/nfp: fix dereference of null pointer Chaoyong He
2024-06-19 9:58 ` [PATCH 04/23] net/nfp: fix repeat disable the port Chaoyong He
2024-06-19 9:58 ` [PATCH 05/23] net/nfp: fix repeat set the speed configure Chaoyong He
2024-06-19 9:58 ` [PATCH 06/23] net/nfp: make the logic simpler by adding local variable Chaoyong He
2024-06-19 9:58 ` [PATCH 07/23] net/nfp: rename the variable name Chaoyong He
2024-06-19 9:58 ` [PATCH 08/23] net/nfp: export function ID get interface Chaoyong He
2024-06-19 9:58 ` [PATCH 09/23] net/nfp: extract total phyports Chaoyong He
2024-06-19 9:58 ` [PATCH 10/23] net/nfp: extract the initialize helper function Chaoyong He
2024-06-19 9:58 ` [PATCH 11/23] net/nfp: get the VF configuration Chaoyong He
2024-06-19 9:58 ` [PATCH 12/23] net/nfp: refactor the logic of flower service Chaoyong He
2024-06-19 9:58 ` [PATCH 13/23] net/nfp: get the first VF ID of the PF Chaoyong He
2024-06-19 9:58 ` [PATCH 14/23] net/nfp: add the helper function to map rtsym with offset Chaoyong He
2024-06-19 9:58 ` [PATCH 15/23] net/nfp: add the VF table to record the VF information Chaoyong He
2024-06-19 9:58 ` [PATCH 16/23] net/nfp: support configuration of VF numbers Chaoyong He
2024-06-19 9:58 ` [PATCH 17/23] net/nfp: configure the VF queue Chaoyong He
2024-06-19 9:58 ` [PATCH 18/23] net/nfp: add check for numbers of VF representor port Chaoyong He
2024-06-19 9:58 ` Chaoyong He [this message]
2024-06-19 9:58 ` [PATCH 20/23] net/nfp: add resource share mode of host context Chaoyong He
2024-06-19 9:58 ` [PATCH 21/23] net/nfp: add resource share mode of mask ID Chaoyong He
2024-06-19 9:58 ` [PATCH 22/23] net/nfp: add device active command for nsp service Chaoyong He
2024-06-19 9:58 ` [PATCH 23/23] net/nfp: add support of flower firmware with multiple PF Chaoyong He
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=20240619095830.3479757-20-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@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).