Commit 94d942c5 authored by Geetha sowjanya's avatar Geetha sowjanya Committed by David S. Miller
Browse files

octeontx2-af: Config pkind for CGX mapped PFs 



For each CGX LMAC that is mapped to a RVU PF, allocate
a pkind and config the same in CGX. For a received packet
at CGX LMAC interface this pkind is used by NPC block
to start parsing of packet.

Signed-off-by: default avatarGeetha sowjanya <gakula@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23923ea4

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

+12 −0
Original line number Diff line number Diff line
@@ -186,6 +186,18 @@ u64 cgx_lmac_addr_get(u8 cgx_id, u8 lmac_id) 
}

EXPORT_SYMBOL(cgx_lmac_addr_get);



int cgx_set_pkind(void *cgxd, u8 lmac_id, int pkind)

{

	struct cgx *cgx = cgxd;



	if (!cgx || lmac_id >= cgx->lmac_count)

		return -ENODEV;



	cgx_write(cgx, lmac_id, CGXX_CMRX_RX_ID_MAP, (pkind & 0x3F));

	return 0;

}

EXPORT_SYMBOL(cgx_set_pkind);



static inline u8 cgx_get_lmac_type(struct cgx *cgx, int lmac_id)

{

	u64 cfg;

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

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ extern struct pci_driver cgx_driver; 
int cgx_get_cgx_cnt(void);

int cgx_get_lmac_cnt(void *cgxd);

void *cgx_get_pdata(int cgx_id);

int cgx_set_pkind(void *cgxd, u8 lmac_id, int pkind);

int cgx_lmac_evh_register(struct cgx_event_cb *cb, void *cgxd, int lmac_id);

int cgx_get_tx_stats(void *cgxd, int lmac_id, int idx, u64 *tx_stat);

int cgx_get_rx_stats(void *cgxd, int lmac_id, int idx, u64 *rx_stat);

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

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,12 @@ enum nix_scheduler { 
	NIX_TXSCH_LVL_CNT = 0x5,

};



#define NIX_INTF_TYPE_CGX		0

#define NIX_INTF_TYPE_LBK		1



#define MAX_LMAC_PKIND			12

#define NIX_LINK_CGX_LMAC(a, b)		(0 + 4 * (a) + (b))



/* NIX LSO format indices.

 * As of now TSO is the only one using, so statically assigning indices.

 */

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

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ struct rvu_pfvf { 
	u16		ssow;

	u16		cptlfs;

	u16		timlfs;

	u8		cgx_lmac;



	/* Block LF's MSIX vector info */

	struct rsrc_bmap msix;      /* Bitmap for MSIX vector alloc */
@@ -230,6 +231,7 @@ static inline void rvu_get_cgx_lmac_id(u8 map, u8 *cgx_id, u8 *lmac_id) 


int rvu_cgx_probe(struct rvu *rvu);

void rvu_cgx_wq_destroy(struct rvu *rvu);

void *rvu_cgx_pdata(u8 cgx_id, struct rvu *rvu);

int rvu_cgx_config_rxtx(struct rvu *rvu, u16 pcifunc, bool start);

int rvu_mbox_handler_CGX_START_RXTX(struct rvu *rvu, struct msg_req *req,

				    struct msg_rsp *rsp);
@@ -302,4 +304,6 @@ int rvu_mbox_handler_NIX_STATS_RST(struct rvu *rvu, struct msg_req *req, 
/* NPC APIs */

int rvu_npc_init(struct rvu *rvu);

void rvu_npc_freemem(struct rvu *rvu);

int rvu_npc_get_pkind(struct rvu *rvu, u16 pf);

void rvu_npc_set_pkind(struct rvu *rvu, int pkind, struct rvu_pfvf *pfvf);

#endif /* RVU_H */

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

+5 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static inline u8 cgxlmac_id_to_bmap(u8 cgx_id, u8 lmac_id) 
	return ((cgx_id & 0xF) << 4) | (lmac_id & 0xF);

}



static void *rvu_cgx_pdata(u8 cgx_id, struct rvu *rvu)

void *rvu_cgx_pdata(u8 cgx_id, struct rvu *rvu)

{

	if (cgx_id >= rvu->cgx_cnt)

		return NULL;
@@ -60,10 +60,11 @@ static void *rvu_cgx_pdata(u8 cgx_id, struct rvu *rvu) 


static int rvu_map_cgx_lmac_pf(struct rvu *rvu)

{

	struct npc_pkind *pkind = &rvu->hw->pkind;

	int cgx_cnt = rvu->cgx_cnt;

	int cgx, lmac_cnt, lmac;

	int pf = PF_CGXMAP_BASE;

	int size;

	int size, free_pkind;



	if (!cgx_cnt)

		return 0;
@@ -96,6 +97,8 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) 
		for (lmac = 0; lmac < lmac_cnt; lmac++, pf++) {

			rvu->pf2cgxlmac_map[pf] = cgxlmac_id_to_bmap(cgx, lmac);

			rvu->cgxlmac2pf_map[CGX_OFFSET(cgx) + lmac] = 1 << pf;

			free_pkind = rvu_alloc_rsrc(&pkind->rsrc);

			pkind->pfchan_map[free_pkind] = ((pf) & 0x3F) << 16;

			rvu->cgx_mapped_pfs++;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE