diff mbox series

[v3,4/5] common/cnxk: link REE support to ROC files

Message ID 20211129195931.14815-5-lironh@marvell.com (mailing list archive)
State Superseded
Headers show
Series [v3,1/5] common/cnxk: add REE HW definitions | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Liron Himi Nov. 29, 2021, 7:59 p.m. UTC
From: Liron Himi <lironh@marvell.com>

add references to REE files from ROC files

Signed-off-by: Liron Himi <lironh@marvell.com>
---
 drivers/common/cnxk/meson.build     |  1 +
 drivers/common/cnxk/roc_api.h       |  4 ++++
 drivers/common/cnxk/roc_constants.h |  2 ++
 drivers/common/cnxk/roc_platform.c  |  1 +
 drivers/common/cnxk/roc_platform.h  |  2 ++
 drivers/common/cnxk/roc_priv.h      |  3 +++
 drivers/common/cnxk/version.map     | 18 +++++++++++++++++-
 7 files changed, 30 insertions(+), 1 deletion(-)

Comments

Jerin Jacob Dec. 6, 2021, 5:07 a.m. UTC | #1
On Tue, Nov 30, 2021 at 1:30 AM <lironh@marvell.com> wrote:
>
> From: Liron Himi <lironh@marvell.com>
>
> add references to REE files from ROC files
>
> Signed-off-by: Liron Himi <lironh@marvell.com>
> ---
>         cnxk_logtype_nix;
>         cnxk_logtype_npa;
>         cnxk_logtype_npc;
> +       cnxk_logtype_ree;
>         cnxk_logtype_sso;
>         cnxk_logtype_tim;
>         cnxk_logtype_tm;
> @@ -347,6 +348,21 @@ INTERNAL {
>         roc_tim_lf_enable;
>         roc_tim_lf_free;
>         roc_se_ctx_swap;
> -
> +       roc_ree_af_reg_read;
> +       roc_ree_af_reg_write;
> +       roc_ree_config_lf;
> +       roc_ree_dev_fini;
> +       roc_ree_dev_init;
> +       roc_ree_err_intr_register;
> +       roc_ree_err_intr_unregister;
> +       roc_ree_iq_disable;
> +       roc_ree_iq_enable;
> +       roc_ree_msix_offsets_get;
> +       roc_ree_qp_get_base;
> +       roc_ree_queues_attach;
> +       roc_ree_queues_detach;
> +       roc_ree_rule_db_get;
> +       roc_ree_rule_db_len_get;
> +       roc_ree_rule_db_prog;


We don't update .map files in a separate patch. Please update this to
the respective patch.
In short, this 4/5 patch can be squashed to respective patches.
Rest looks good to me. We can merge the next version if there are no
other comments.


>         local: *;
>  };
> --
> 2.28.0
>
Liron Himi Dec. 6, 2021, 6:54 a.m. UTC | #2
Hi,

This patch is not just for map update.
what about all other changes?

Liron Himi

 

Park Azorim, Kyriat Arie, Petah Tikva, 49527, Israel
Mobile: +972.52.3329169

-----Original Message-----
From: Jerin Jacob <jerinjacobk@gmail.com> 
Sent: Monday, 6 December 2021 07:08
To: Liron Himi <lironh@marvell.com>
Cc: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; dpdk-dev <dev@dpdk.org>
Subject: [EXT] Re: [PATCH v3 4/5] common/cnxk: link REE support to ROC files

External Email

----------------------------------------------------------------------
On Tue, Nov 30, 2021 at 1:30 AM <lironh@marvell.com> wrote:
>
> From: Liron Himi <lironh@marvell.com>
>
> add references to REE files from ROC files
>
> Signed-off-by: Liron Himi <lironh@marvell.com>
> ---
>         cnxk_logtype_nix;
>         cnxk_logtype_npa;
>         cnxk_logtype_npc;
> +       cnxk_logtype_ree;
>         cnxk_logtype_sso;
>         cnxk_logtype_tim;
>         cnxk_logtype_tm;
> @@ -347,6 +348,21 @@ INTERNAL {
>         roc_tim_lf_enable;
>         roc_tim_lf_free;
>         roc_se_ctx_swap;
> -
> +       roc_ree_af_reg_read;
> +       roc_ree_af_reg_write;
> +       roc_ree_config_lf;
> +       roc_ree_dev_fini;
> +       roc_ree_dev_init;
> +       roc_ree_err_intr_register;
> +       roc_ree_err_intr_unregister;
> +       roc_ree_iq_disable;
> +       roc_ree_iq_enable;
> +       roc_ree_msix_offsets_get;
> +       roc_ree_qp_get_base;
> +       roc_ree_queues_attach;
> +       roc_ree_queues_detach;
> +       roc_ree_rule_db_get;
> +       roc_ree_rule_db_len_get;
> +       roc_ree_rule_db_prog;


We don't update .map files in a separate patch. Please update this to the respective patch.
In short, this 4/5 patch can be squashed to respective patches.
Rest looks good to me. We can merge the next version if there are no other comments.


>         local: *;
>  };
> --
> 2.28.0
>
Jerin Jacob Dec. 6, 2021, 8:08 a.m. UTC | #3
On Mon, Dec 6, 2021 at 12:24 PM Liron Himi <lironh@marvell.com> wrote:
>
> Hi,
>
> This patch is not just for map update.
> what about all other changes?

1) roc_ree.c is added in this patch to build. It should be moved to
the first patch where thing started building
+        'roc_ree.c',

2) All other minor changes in this patch can be squashed to respective patches.



>
> Liron Himi
>
>
>
> Park Azorim, Kyriat Arie, Petah Tikva, 49527, Israel
> Mobile: +972.52.3329169
>
> -----Original Message-----
> From: Jerin Jacob <jerinjacobk@gmail.com>
> Sent: Monday, 6 December 2021 07:08
> To: Liron Himi <lironh@marvell.com>
> Cc: Jerin Jacob Kollanukkaran <jerinj@marvell.com>; dpdk-dev <dev@dpdk.org>
> Subject: [EXT] Re: [PATCH v3 4/5] common/cnxk: link REE support to ROC files
>
> External Email
>
> ----------------------------------------------------------------------
> On Tue, Nov 30, 2021 at 1:30 AM <lironh@marvell.com> wrote:
> >
> > From: Liron Himi <lironh@marvell.com>
> >
> > add references to REE files from ROC files
> >
> > Signed-off-by: Liron Himi <lironh@marvell.com>
> > ---
> >         cnxk_logtype_nix;
> >         cnxk_logtype_npa;
> >         cnxk_logtype_npc;
> > +       cnxk_logtype_ree;
> >         cnxk_logtype_sso;
> >         cnxk_logtype_tim;
> >         cnxk_logtype_tm;
> > @@ -347,6 +348,21 @@ INTERNAL {
> >         roc_tim_lf_enable;
> >         roc_tim_lf_free;
> >         roc_se_ctx_swap;
> > -
> > +       roc_ree_af_reg_read;
> > +       roc_ree_af_reg_write;
> > +       roc_ree_config_lf;
> > +       roc_ree_dev_fini;
> > +       roc_ree_dev_init;
> > +       roc_ree_err_intr_register;
> > +       roc_ree_err_intr_unregister;
> > +       roc_ree_iq_disable;
> > +       roc_ree_iq_enable;
> > +       roc_ree_msix_offsets_get;
> > +       roc_ree_qp_get_base;
> > +       roc_ree_queues_attach;
> > +       roc_ree_queues_detach;
> > +       roc_ree_rule_db_get;
> > +       roc_ree_rule_db_len_get;
> > +       roc_ree_rule_db_prog;
>
>
> We don't update .map files in a separate patch. Please update this to the respective patch.
> In short, this 4/5 patch can be squashed to respective patches.
> Rest looks good to me. We can merge the next version if there are no other comments.
>
>
> >         local: *;
> >  };
> > --
> > 2.28.0
> >
diff mbox series

Patch

diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 4928f7e549..7e27b3cc0a 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -61,6 +61,7 @@  sources = files(
         'roc_tim.c',
         'roc_tim_irq.c',
         'roc_utils.c',
+        'roc_ree.c',
 )
 
 # Security common code
diff --git a/drivers/common/cnxk/roc_api.h b/drivers/common/cnxk/roc_api.h
index e7aaa07563..1b46c21f7f 100644
--- a/drivers/common/cnxk/roc_api.h
+++ b/drivers/common/cnxk/roc_api.h
@@ -37,6 +37,7 @@ 
 #include "hw/nix.h"
 #include "hw/npa.h"
 #include "hw/npc.h"
+#include "hw/ree.h"
 #include "hw/rvu.h"
 #include "hw/sdp.h"
 #include "hw/sso.h"
@@ -90,6 +91,9 @@ 
 /* DPI */
 #include "roc_dpi.h"
 
+/* REE */
+#include "roc_ree.h"
+
 /* HASH computation */
 #include "roc_hash.h"
 
diff --git a/drivers/common/cnxk/roc_constants.h b/drivers/common/cnxk/roc_constants.h
index ac7335061c..5f78823642 100644
--- a/drivers/common/cnxk/roc_constants.h
+++ b/drivers/common/cnxk/roc_constants.h
@@ -37,6 +37,8 @@ 
 #define PCI_DEVID_CNXK_BPHY	      0xA089
 #define PCI_DEVID_CNXK_RVU_NIX_INL_PF 0xA0F0
 #define PCI_DEVID_CNXK_RVU_NIX_INL_VF 0xA0F1
+#define PCI_DEVID_CNXK_RVU_REE_PF     0xA0f4
+#define PCI_DEVID_CNXK_RVU_REE_VF     0xA0f5
 
 #define PCI_DEVID_CN9K_CGX  0xA059
 #define PCI_DEVID_CN10K_RPM 0xA060
diff --git a/drivers/common/cnxk/roc_platform.c b/drivers/common/cnxk/roc_platform.c
index 74dbdeceb9..ebb6225f4d 100644
--- a/drivers/common/cnxk/roc_platform.c
+++ b/drivers/common/cnxk/roc_platform.c
@@ -65,3 +65,4 @@  RTE_LOG_REGISTER(cnxk_logtype_npc, pmd.net.cnxk.flow, NOTICE);
 RTE_LOG_REGISTER(cnxk_logtype_sso, pmd.event.cnxk, NOTICE);
 RTE_LOG_REGISTER(cnxk_logtype_tim, pmd.event.cnxk.timer, NOTICE);
 RTE_LOG_REGISTER(cnxk_logtype_tm, pmd.net.cnxk.tm, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(cnxk_logtype_ree, NOTICE);
diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h
index 61d4781209..85aa6dcebc 100644
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -197,6 +197,7 @@  extern int cnxk_logtype_npc;
 extern int cnxk_logtype_sso;
 extern int cnxk_logtype_tim;
 extern int cnxk_logtype_tm;
+extern int cnxk_logtype_ree;
 
 #define plt_err(fmt, args...)                                                  \
 	RTE_LOG(ERR, PMD, "%s():%u " fmt "\n", __func__, __LINE__, ##args)
@@ -222,6 +223,7 @@  extern int cnxk_logtype_tm;
 #define plt_sso_dbg(fmt, ...)	plt_dbg(sso, fmt, ##__VA_ARGS__)
 #define plt_tim_dbg(fmt, ...)	plt_dbg(tim, fmt, ##__VA_ARGS__)
 #define plt_tm_dbg(fmt, ...)	plt_dbg(tm, fmt, ##__VA_ARGS__)
+#define plt_ree_dbg(fmt, ...)	plt_dbg(ree, fmt, ##__VA_ARGS__)
 
 /* Datapath logs */
 #define plt_dp_err(fmt, args...)                                               \
diff --git a/drivers/common/cnxk/roc_priv.h b/drivers/common/cnxk/roc_priv.h
index 782b90cf8d..122d411fe7 100644
--- a/drivers/common/cnxk/roc_priv.h
+++ b/drivers/common/cnxk/roc_priv.h
@@ -44,4 +44,7 @@ 
 /* DPI */
 #include "roc_dpi_priv.h"
 
+/* REE */
+#include "roc_ree_priv.h"
+
 #endif /* _ROC_PRIV_H_ */
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 07c6720f0c..5a03b91784 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -11,6 +11,7 @@  INTERNAL {
 	cnxk_logtype_nix;
 	cnxk_logtype_npa;
 	cnxk_logtype_npc;
+	cnxk_logtype_ree;
 	cnxk_logtype_sso;
 	cnxk_logtype_tim;
 	cnxk_logtype_tm;
@@ -347,6 +348,21 @@  INTERNAL {
 	roc_tim_lf_enable;
 	roc_tim_lf_free;
 	roc_se_ctx_swap;
-
+	roc_ree_af_reg_read;
+	roc_ree_af_reg_write;
+	roc_ree_config_lf;
+	roc_ree_dev_fini;
+	roc_ree_dev_init;
+	roc_ree_err_intr_register;
+	roc_ree_err_intr_unregister;
+	roc_ree_iq_disable;
+	roc_ree_iq_enable;
+	roc_ree_msix_offsets_get;
+	roc_ree_qp_get_base;
+	roc_ree_queues_attach;
+	roc_ree_queues_detach;
+	roc_ree_rule_db_get;
+	roc_ree_rule_db_len_get;
+	roc_ree_rule_db_prog;
 	local: *;
 };