Re: [PATCH v1 net-next 02/14] octeontx2-af: Add response for RSS flow key cfg message

2018-12-01 Thread David Miller 
From: Jerin Jacob 
Date: Sat,  1 Dec 2018 14:43:51 +0530

> +#define FLOW_KEY_TYPE_PORT   BIT(0)
> +#define FLOW_KEY_TYPE_IPV4   BIT(1)
> +#define FLOW_KEY_TYPE_IPV6   BIT(2)
> +#define FLOW_KEY_TYPE_TCPBIT(3)
> +#define FLOW_KEY_TYPE_UDPBIT(4)
> +#define FLOW_KEY_TYPE_SCTP   BIT(5)

This is asking for serious global namespace collisions, as we have
various FLOW_* definitions coming from include/uapi/linux/pkt_cls.h
for example.

Please put some appropriate driver prefix to these macro names.

Thanks.

[PATCH v1 net-next 02/14] octeontx2-af: Add response for RSS flow key cfg message

2018-12-01 Thread Jerin Jacob 
From: Jerin Jacob 

Added response for nix_rss_flowkey_cfg message to return
selected RSS algorithm index.

The FLOW_KEY_TYPE* definition is part of the mbox message and
it will be used by the other consumers of AF driver hence moving to mbox.h.

Signed-off-by: Jerin Jacob 
---
 drivers/net/ethernet/marvell/octeontx2/af/common.h |  8 
 drivers/net/ethernet/marvell/octeontx2/af/mbox.h   | 14 +-
 drivers/net/ethernet/marvell/octeontx2/af/rvu.h|  2 +-
 .../net/ethernet/marvell/octeontx2/af/rvu_nix.c|  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/common.h 
b/drivers/net/ethernet/marvell/octeontx2/af/common.h
index 9bddb032dd7e..e0a47d364982 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/common.h
@@ -193,14 +193,6 @@ enum nix_scheduler {
 #define DEFAULT_RSS_CONTEXT_GROUP  0
 #define MAX_RSS_INDIR_TBL_SIZE 256 /* 1 << Max adder bits */
 
-/* NIX flow tag, key type flags */
-#define FLOW_KEY_TYPE_PORT BIT(0)
-#define FLOW_KEY_TYPE_IPV4 BIT(1)
-#define FLOW_KEY_TYPE_IPV6 BIT(2)
-#define FLOW_KEY_TYPE_TCP  BIT(3)
-#define FLOW_KEY_TYPE_UDP  BIT(4)
-#define FLOW_KEY_TYPE_SCTP BIT(5)
-
 /* NIX flow tag algorithm indices, max is 31 */
 enum {
FLOW_KEY_ALG_PORT,
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h 
b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
index 292c13a901df..4cce31fb13ab 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
@@ -193,7 +193,8 @@ M(NIX_TXSCHQ_CFG,   0x8006, nix_txschq_cfg, 
nix_txschq_config, msg_rsp)  \
 M(NIX_STATS_RST,   0x8007, nix_stats_rst, msg_req, msg_rsp)\
 M(NIX_VTAG_CFG,0x8008, nix_vtag_cfg, nix_vtag_config, msg_rsp) 
\
 M(NIX_RSS_FLOWKEY_CFG,  0x8009, nix_rss_flowkey_cfg,   \
-nix_rss_flowkey_cfg, msg_rsp)  \
+nix_rss_flowkey_cfg,   \
+nix_rss_flowkey_cfg_rsp)   \
 M(NIX_SET_MAC_ADDR,0x800a, nix_set_mac_addr, nix_set_mac_addr, msg_rsp) \
 M(NIX_SET_RX_MODE, 0x800b, nix_set_rx_mode, nix_rx_mode, msg_rsp)  \
 M(NIX_SET_HW_FRS,  0x800c, nix_set_hw_frs, nix_frs_cfg, msg_rsp)   \
@@ -561,9 +562,20 @@ struct nix_rss_flowkey_cfg {
struct mbox_msghdr hdr;
int mcam_index;  /* MCAM entry index to modify */
u32 flowkey_cfg; /* Flowkey types selected */
+#define FLOW_KEY_TYPE_PORT BIT(0)
+#define FLOW_KEY_TYPE_IPV4 BIT(1)
+#define FLOW_KEY_TYPE_IPV6 BIT(2)
+#define FLOW_KEY_TYPE_TCP  BIT(3)
+#define FLOW_KEY_TYPE_UDP  BIT(4)
+#define FLOW_KEY_TYPE_SCTP BIT(5)
u8  group;   /* RSS context or group */
 };
 
+struct nix_rss_flowkey_cfg_rsp {
+   struct mbox_msghdr hdr;
+   u8  alg_idx; /* Selected algo index */
+};
+
 struct nix_set_mac_addr {
struct mbox_msghdr hdr;
u8 mac_addr[ETH_ALEN]; /* MAC address to be set for this pcifunc */
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h 
b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index ae8e2e206c87..48dbbaa9dd4d 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -398,7 +398,7 @@ int rvu_mbox_handler_nix_rxvlan_alloc(struct rvu *rvu, 
struct msg_req *req,
  struct msg_rsp *rsp);
 int rvu_mbox_handler_nix_rss_flowkey_cfg(struct rvu *rvu,
 struct nix_rss_flowkey_cfg *req,
-struct msg_rsp *rsp);
+struct nix_rss_flowkey_cfg_rsp *rsp);
 int rvu_mbox_handler_nix_set_mac_addr(struct rvu *rvu,
  struct nix_set_mac_addr *req,
  struct msg_rsp *rsp);
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c 
b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 183331448cf0..76fec9928ab7 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -1626,7 +1626,7 @@ static int get_flowkey_alg_idx(u32 flow_cfg)
 
 int rvu_mbox_handler_nix_rss_flowkey_cfg(struct rvu *rvu,
 struct nix_rss_flowkey_cfg *req,
-struct msg_rsp *rsp)
+struct nix_rss_flowkey_cfg_rsp *rsp)
 {
struct rvu_hwinfo *hw = rvu->hw;
u16 pcifunc = req->hdr.pcifunc;
@@ -1641,7 +1641,7 @@ int rvu_mbox_handler_nix_rss_flowkey_cfg(struct rvu *rvu,
return NIX_AF_ERR_AF_LF_INVALID;
 
alg_idx = get_flowkey_alg_idx(req->flowkey_cfg);
-
+   rsp->alg_idx = alg_idx;