From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH 03/13] net/nfp: remove the redundant macro about CPP target
Date: Mon, 10 Apr 2023 19:00:05 +0800 [thread overview]
Message-ID: <20230410110015.2973660-4-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20230410110015.2973660-1-chaoyong.he@corigine.com>
Remove the redundancy define NFP6000_CPPTGT_ in nfp_resid.h,
the same define NFP_CPP_TARGET_ are exist in nfp6000.h, we
choose to keep them to sync with the kernel driver.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
.../net/nfp/nfpcore/nfp-common/nfp_resid.h | 11 -----
drivers/net/nfp/nfpcore/nfp_target.c | 44 +++++++++----------
2 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h
index 394a7628e0..ac2bf0335d 100644
--- a/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h
+++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_resid.h
@@ -48,17 +48,6 @@
#define NFP_CHIP_REVISION_C0 0x20
#define NFP_CHIP_REVISION_PF 0xff /* Maximum possible revision */
-/* CPP Targets for each chip architecture */
-#define NFP6000_CPPTGT_NBI 1
-#define NFP6000_CPPTGT_VQDR 2
-#define NFP6000_CPPTGT_ILA 6
-#define NFP6000_CPPTGT_MU 7
-#define NFP6000_CPPTGT_PCIE 9
-#define NFP6000_CPPTGT_ARM 10
-#define NFP6000_CPPTGT_CRYPTO 12
-#define NFP6000_CPPTGT_CTXPB 14
-#define NFP6000_CPPTGT_CLS 15
-
/*
* Wildcard indicating a CPP read or write action
*
diff --git a/drivers/net/nfp/nfpcore/nfp_target.c b/drivers/net/nfp/nfpcore/nfp_target.c
index 3f7ddfb5e9..611848e233 100644
--- a/drivers/net/nfp/nfpcore/nfp_target.c
+++ b/drivers/net/nfp/nfpcore/nfp_target.c
@@ -489,26 +489,26 @@ nfp_target_pushpull(uint32_t cpp_id,
uint64_t address)
{
switch (NFP_CPP_ID_TARGET_of(cpp_id)) {
- case NFP6000_CPPTGT_NBI:
+ case NFP_CPP_TARGET_NBI:
return nfp6000_nbi(cpp_id, address);
- case NFP6000_CPPTGT_VQDR:
+ case NFP_CPP_TARGET_QDR:
return target_rw(cpp_id, P32, 24, 4);
- case NFP6000_CPPTGT_ILA:
+ case NFP_CPP_TARGET_ILA:
return nfp6000_ila(cpp_id);
- case NFP6000_CPPTGT_MU:
+ case NFP_CPP_TARGET_MU:
return nfp6000_mu(cpp_id, address);
- case NFP6000_CPPTGT_PCIE:
+ case NFP_CPP_TARGET_PCIE:
return nfp6000_pci(cpp_id);
- case NFP6000_CPPTGT_ARM:
+ case NFP_CPP_TARGET_ARM:
if (address < 0x10000)
return target_rw(cpp_id, P64, 1, 1);
else
return target_rw(cpp_id, P32, 1, 1);
- case NFP6000_CPPTGT_CRYPTO:
+ case NFP_CPP_TARGET_CRYPTO:
return nfp6000_crypto(cpp_id);
- case NFP6000_CPPTGT_CTXPB:
+ case NFP_CPP_TARGET_CT_XPB:
return nfp6000_cap_xpb(cpp_id);
- case NFP6000_CPPTGT_CLS:
+ case NFP_CPP_TARGET_CLS:
return nfp6000_cls(cpp_id);
case 0:
return target_rw(cpp_id, P32, 4, 4);
@@ -719,7 +719,7 @@ nfp_encode_basic(uint64_t *addr,
switch (mode) {
case 0:
- if (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {
+ if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
/*
* In this specific mode we'd rather not modify the
* address but we can verify if the existing contents
@@ -737,7 +737,7 @@ nfp_encode_basic(uint64_t *addr,
*addr |= (((uint64_t)dest_island) << iid_lsb) & value;
return 0;
case 1:
- if (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {
+ if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
mode, addr40, isld1, isld0);
}
@@ -757,7 +757,7 @@ nfp_encode_basic(uint64_t *addr,
return -ENODEV;
case 2:
- if (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {
+ if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
/* iid<0> = addr<30> = channel<0> */
/* channel<1> = addr<31> = Index */
return nfp_encode_basic_qdr(*addr, cpp_tgt, dest_island,
@@ -777,7 +777,7 @@ nfp_encode_basic(uint64_t *addr,
return nfp_encode_basic_search(addr, dest_island, isld,
iid_lsb, idx_lsb, 2);
case 3:
- if (cpp_tgt == NFP6000_CPPTGT_VQDR && addr40 == 0) {
+ if (cpp_tgt == NFP_CPP_TARGET_QDR && addr40 == 0) {
/*
* iid<0> = addr<29> = data
* iid<1> = addr<30> = channel<0>
@@ -924,19 +924,19 @@ nfp_cppat_addr_encode(uint64_t *addr,
uint64_t value;
switch (cpp_tgt) {
- case NFP6000_CPPTGT_NBI:
- case NFP6000_CPPTGT_VQDR:
- case NFP6000_CPPTGT_ILA:
- case NFP6000_CPPTGT_PCIE:
- case NFP6000_CPPTGT_ARM:
- case NFP6000_CPPTGT_CRYPTO:
- case NFP6000_CPPTGT_CLS:
+ case NFP_CPP_TARGET_NBI:
+ case NFP_CPP_TARGET_QDR:
+ case NFP_CPP_TARGET_ILA:
+ case NFP_CPP_TARGET_PCIE:
+ case NFP_CPP_TARGET_ARM:
+ case NFP_CPP_TARGET_CRYPTO:
+ case NFP_CPP_TARGET_CLS:
return nfp_encode_basic(addr, dest_island, cpp_tgt, mode,
addr40, isld1, isld0);
- case NFP6000_CPPTGT_MU:
+ case NFP_CPP_TARGET_MU:
return nfp_encode_mu(addr, dest_island, mode, addr40,
isld1, isld0);
- case NFP6000_CPPTGT_CTXPB:
+ case NFP_CPP_TARGET_CT_XPB:
if (mode != 1 || addr40 != 0)
return -EINVAL;
--
2.39.1
next prev parent reply other threads:[~2023-04-10 11:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 11:00 [PATCH 00/13] Sync the kernel driver logic Chaoyong He
2023-04-10 11:00 ` [PATCH 01/13] net/nfp: define correct size for configuration BAR Chaoyong He
2023-04-10 11:00 ` [PATCH 02/13] net/nfp: move shared target logic to own source file Chaoyong He
2023-04-10 11:00 ` Chaoyong He [this message]
2023-04-10 11:00 ` [PATCH 04/13] net/nfp: drop usage of return error helpers Chaoyong He
2023-04-10 11:00 ` [PATCH 05/13] net/nfp: use generic macros for array size and to set bits Chaoyong He
2023-04-10 11:00 ` [PATCH 06/13] net/nfp: remove dead code related to CPP Chaoyong He
2023-04-10 11:00 ` [PATCH 07/13] net/nfp: remove duplicated nffw defines Chaoyong He
2023-04-10 11:00 ` [PATCH 08/13] net/nfp: move NFD3 logic to own source file Chaoyong He
2023-04-10 11:00 ` [PATCH 09/13] net/nfp: adjust the coding style for NFD3 Chaoyong He
2023-04-10 11:00 ` [PATCH 10/13] net/nfp: rename macro name of NFD3 Tx descriptor Chaoyong He
2023-04-10 11:00 ` [PATCH 11/13] net/nfp: move NFDk logic to own source file Chaoyong He
2023-04-10 11:00 ` [PATCH 12/13] net/nfp: adjust the coding style for NFDk Chaoyong He
2023-04-10 11:00 ` [PATCH 13/13] net/nfp: modify the logic of some NFDk function Chaoyong He
2023-05-11 14:47 ` [PATCH 00/13] Sync the kernel driver logic Niklas Söderlund
2023-05-12 14:37 ` 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=20230410110015.2973660-4-chaoyong.he@corigine.com \
--to=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).