Commit 23705adb authored by Vamsi Attunuru's avatar Vamsi Attunuru Committed by David S. Miller
Browse files

octeontx2-af: Enable mkex profile 



The following set of NPC registers allow the driver to configure NPC
to generate different key value schemes to compare against packet
payload in MCAM search.

NPC_AF_INTF(0..1)_KEX_CFG
NPC_AF_KEX_LDATA(0..1)_FLAGS_CFG
NPC_AF_INTF(0..1)_LID(0..7)_LT(0..15)_LD(0..1)_CFG
NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG

Currently, the AF driver populates these registers to
configure the default values to address the most common
use cases such as key generation for channel number + DMAC.

The secure firmware stores different configuration
value of these registers to enable different NPC use case
along with the name for the lookup.

Patch loads profile binary from secure firmware over
the exiting CGX mailbox interface and apply the profile.

AF driver shall fall back to the default configuration
in case of any errors.

The AF consumer driver can know the selected profile
on response to NPC_GET_KEX_CFG mailbox by introducing
mkex_pfl_name in the struct npc_get_kex_cfg_rsp.

Signed-off-by: default avatarVamsi Attunuru <vamsi.attunuru@marvell.com>
Signed-off-by: default avatarJerin Jacob <jerinj@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da5d32e1

drivers/net/ethernet/marvell/octeontx2/af/cgx.c

+54 −0
Original line number Diff line number Diff line
@@ -498,6 +498,60 @@ static inline bool cgx_event_is_linkevent(u64 event) 
		return false;

}



static inline int cgx_fwi_get_mkex_prfl_sz(u64 *prfl_sz,

					   struct cgx *cgx)

{

	u64 req = 0;

	u64 resp;

	int err;



	req = FIELD_SET(CMDREG_ID, CGX_CMD_GET_MKEX_PRFL_SIZE, req);

	err = cgx_fwi_cmd_generic(req, &resp, cgx, 0);

	if (!err)

		*prfl_sz = FIELD_GET(RESP_MKEX_PRFL_SIZE, resp);



	return err;

}



static inline int cgx_fwi_get_mkex_prfl_addr(u64 *prfl_addr,

					     struct cgx *cgx)

{

	u64 req = 0;

	u64 resp;

	int err;



	req = FIELD_SET(CMDREG_ID, CGX_CMD_GET_MKEX_PRFL_ADDR, req);

	err = cgx_fwi_cmd_generic(req, &resp, cgx, 0);

	if (!err)

		*prfl_addr = FIELD_GET(RESP_MKEX_PRFL_ADDR, resp);



	return err;

}



int cgx_get_mkex_prfl_info(u64 *addr, u64 *size)

{

	struct cgx *cgx_dev;

	int err;



	if (!addr || !size)

		return -EINVAL;



	cgx_dev = list_first_entry(&cgx_list, struct cgx, cgx_list);

	if (!cgx_dev)

		return -ENXIO;



	err = cgx_fwi_get_mkex_prfl_sz(size, cgx_dev);

	if (err)

		return -EIO;



	err = cgx_fwi_get_mkex_prfl_addr(addr, cgx_dev);

	if (err)

		return -EIO;



	return 0;

}

EXPORT_SYMBOL(cgx_get_mkex_prfl_info);



static irqreturn_t cgx_fwi_event_handler(int irq, void *data)

{

	struct lmac *lmac = data;

drivers/net/ethernet/marvell/octeontx2/af/cgx.h

+1 −0
Original line number Diff line number Diff line
@@ -111,4 +111,5 @@ int cgx_lmac_internal_loopback(void *cgxd, int lmac_id, bool enable); 
int cgx_get_link_info(void *cgxd, int lmac_id,

		      struct cgx_link_user_info *linfo);

int cgx_lmac_linkup_start(void *cgxd);

int cgx_get_mkex_prfl_info(u64 *addr, u64 *size);

#endif /* CGX_H */

drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h

+12 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ enum cgx_cmd_id { 
	CGX_CMD_LINK_STATE_CHANGE,

	CGX_CMD_MODE_CHANGE,		/* hot plug support */

	CGX_CMD_INTF_SHUTDOWN,

	CGX_CMD_GET_MKEX_PRFL_SIZE,

	CGX_CMD_GET_MKEX_PRFL_ADDR

};



/* async event ids */
@@ -137,6 +139,16 @@ enum cgx_cmd_own { 
 */

#define RESP_MAC_ADDR		GENMASK_ULL(56, 9)



/* Response to cmd ID as CGX_CMD_GET_MKEX_PRFL_SIZE with cmd status as

 * CGX_STAT_SUCCESS

 */

#define RESP_MKEX_PRFL_SIZE		GENMASK_ULL(63, 9)



/* Response to cmd ID as CGX_CMD_GET_MKEX_PRFL_ADDR with cmd status as

 * CGX_STAT_SUCCESS

 */

#define RESP_MKEX_PRFL_ADDR		GENMASK_ULL(63, 9)



/* Response to cmd ID - CGX_CMD_LINK_BRING_UP/DOWN, event ID CGX_EVT_LINK_CHANGE

 * status can be either CGX_STAT_FAIL or CGX_STAT_SUCCESS

 *

drivers/net/ethernet/marvell/octeontx2/af/mbox.h

+2 −0
Original line number Diff line number Diff line
@@ -788,6 +788,8 @@ struct npc_get_kex_cfg_rsp { 
	u64 intf_lid_lt_ld[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT][NPC_MAX_LD];

	/* NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG */

	u64 intf_ld_flags[NPC_MAX_INTF][NPC_MAX_LD][NPC_MAX_LFL];

#define MKEX_NAME_LEN 128

	u8 mkex_pfl_name[MKEX_NAME_LEN];

};



#endif /* MBOX_H */

drivers/net/ethernet/marvell/octeontx2/af/npc.h

+18 −0
Original line number Diff line number Diff line
@@ -265,4 +265,22 @@ struct nix_rx_action { 
#define VTAG0_LID_MASK		GENMASK_ULL(10, 8)

#define VTAG0_RELPTR_MASK	GENMASK_ULL(7, 0)



struct npc_mcam_kex {

	/* MKEX Profle Header */

	u64 mkex_sign; /* "mcam-kex-profile" (8 bytes/ASCII characters) */

	u8 name[MKEX_NAME_LEN];   /* MKEX Profile name */

	u64 cpu_model;   /* Format as profiled by CPU hardware */

	u64 kpu_version; /* KPU firmware/profile version */

	u64 reserved; /* Reserved for extension */



	/* MKEX Profle Data */

	u64 keyx_cfg[NPC_MAX_INTF]; /* NPC_AF_INTF(0..1)_KEX_CFG */

	/* NPC_AF_KEX_LDATA(0..1)_FLAGS_CFG */

	u64 kex_ld_flags[NPC_MAX_LD];

	/* NPC_AF_INTF(0..1)_LID(0..7)_LT(0..15)_LD(0..1)_CFG */

	u64 intf_lid_lt_ld[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT][NPC_MAX_LD];

	/* NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG */

	u64 intf_ld_flags[NPC_MAX_INTF][NPC_MAX_LD][NPC_MAX_LFL];

} __packed;



#endif /* NPC_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE