Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a4fa841 authored by Linu Cherian's avatar Linu Cherian Committed by David S. Miller
Browse files

octeontx2-af: Set RVU PFs to CGX LMACs mapping 



Each of the enabled CGX LMAC is considered a physical
interface and RVU PFs are mapped to these. VFs of these
SRIOV PFs will be virtual interfaces and share CGX LMAC
along with PF.

This mapping info will be used later on for Rx/Tx pkt steering.

Signed-off-by: default avatarLinu Cherian <lcherian@marvell.com>
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 8e22f040

drivers/net/ethernet/marvell/octeontx2/af/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ obj-$(CONFIG_OCTEONTX2_MBOX) += octeontx2_mbox.o 
obj-$(CONFIG_OCTEONTX2_AF) += octeontx2_af.o



octeontx2_mbox-y := mbox.o

octeontx2_af-y := cgx.o rvu.o
 
octeontx2_af-y := cgx.o rvu.o rvu_cgx.o

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

+59 −0
Original line number Diff line number Diff line
@@ -28,8 +28,12 @@ struct cgx { 
	void __iomem		*reg_base;

	struct pci_dev		*pdev;

	u8			cgx_id;

	u8			lmac_count;

	struct list_head	cgx_list;

};



static LIST_HEAD(cgx_list);



/* Supported devices */

static const struct pci_device_id cgx_id_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_CGX) },
@@ -38,6 +42,53 @@ static const struct pci_device_id cgx_id_table[] = { 


MODULE_DEVICE_TABLE(pci, cgx_id_table);



static u64 cgx_read(struct cgx *cgx, u64 lmac, u64 offset)

{

	return readq(cgx->reg_base + (lmac << 18) + offset);

}



int cgx_get_cgx_cnt(void)

{

	struct cgx *cgx_dev;

	int count = 0;



	list_for_each_entry(cgx_dev, &cgx_list, cgx_list)

		count++;



	return count;

}

EXPORT_SYMBOL(cgx_get_cgx_cnt);



int cgx_get_lmac_cnt(void *cgxd)

{

	struct cgx *cgx = cgxd;



	if (!cgx)

		return -ENODEV;



	return cgx->lmac_count;

}

EXPORT_SYMBOL(cgx_get_lmac_cnt);



void *cgx_get_pdata(int cgx_id)

{

	struct cgx *cgx_dev;



	list_for_each_entry(cgx_dev, &cgx_list, cgx_list) {

		if (cgx_dev->cgx_id == cgx_id)

			return cgx_dev;

	}

	return NULL;

}

EXPORT_SYMBOL(cgx_get_pdata);



static void cgx_lmac_init(struct cgx *cgx)

{

	cgx->lmac_count = cgx_read(cgx, 0, CGXX_CMRX_RX_LMACS) & 0x7;

	if (cgx->lmac_count > MAX_LMAC_PER_CGX)

		cgx->lmac_count = MAX_LMAC_PER_CGX;

}



static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct device *dev = &pdev->dev;
@@ -72,9 +123,14 @@ static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto err_release_regions;

	}



	list_add(&cgx->cgx_list, &cgx_list);

	cgx->cgx_id = cgx_get_cgx_cnt() - 1;

	cgx_lmac_init(cgx);



	return 0;



err_release_regions:

	list_del(&cgx->cgx_list);

	pci_release_regions(pdev);

err_disable_device:

	pci_disable_device(pdev);
@@ -84,6 +140,9 @@ static int cgx_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


static void cgx_remove(struct pci_dev *pdev)

{

	struct cgx *cgx = pci_get_drvdata(pdev);



	list_del(&cgx->cgx_list);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_set_drvdata(pdev, NULL);

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

+13 −2
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ 
/* PCI BAR nos */

#define PCI_CFG_REG_BAR_NUM		0



#define MAX_CGX				3

#define MAX_LMAC_PER_CGX		4

#define CGX_OFFSET(x)			((x) * MAX_LMAC_PER_CGX)



/* Registers */

#define CGXX_CMRX_RX_ID_MAP		0x060

#define CGXX_CMRX_RX_LMACS		0x128



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);

#endif /* CGX_H */

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

+4 −0
Original line number Diff line number Diff line
@@ -1558,6 +1558,10 @@ static int rvu_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	if (err)

		goto err_hwsetup;



	err = rvu_cgx_probe(rvu);

	if (err)

		goto err_mbox;



	err = rvu_register_interrupts(rvu);

	if (err)

		goto err_mbox;

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

+12 −0
Original line number Diff line number Diff line
@@ -100,6 +100,16 @@ struct rvu { 
	char			*irq_name;

	bool			*irq_allocated;

	dma_addr_t		msix_base_iova;



	/* CGX */

#define PF_CGXMAP_BASE		1 /* PF 0 is reserved for RVU PF */

	u8			cgx_mapped_pfs;

	u8			cgx_cnt; /* available cgx ports */

	u8			*pf2cgxlmac_map; /* pf to cgx_lmac map */

	u16			*cgxlmac2pf_map; /* bitmap of mapped pfs for

						  * every cgx lmac port

						  */

	void			**cgx_idmap; /* cgx id to cgx data map table */

};



static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u64 val)
@@ -138,4 +148,6 @@ int rvu_get_lf(struct rvu *rvu, struct rvu_block *block, u16 pcifunc, u16 slot); 
int rvu_get_blkaddr(struct rvu *rvu, int blktype, u16 pcifunc);

int rvu_poll_reg(struct rvu *rvu, u64 block, u64 offset, u64 mask, bool zero);



/* CGX APIs */

int rvu_cgx_probe(struct rvu *rvu);

#endif /* RVU_H */