Commit 6f7c7e22 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeontx2-fixes' 



Hariprasad Kelam says:

====================
octeontx2: miscellaneous fixes

This series of patches fixes various issues related to NPC MCAM entry
management, debugfs, devlink, CGX LMAC mapping, RSS config etc

Change-log:
v2:
Fixed below review comments
	- corrected Fixed tag syntax with 12 digits SHA1
          and providing space between SHA1 and subject line
	- remove code improvement patch
	- make commit description more clear
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 804741ac 8c16cb03

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

+0 −2
Original line number Diff line number Diff line
@@ -13499,8 +13499,6 @@ static struct npc_mcam_kex npc_mkex_default = { 
			[NPC_LT_LC_IP] = {

				/* SIP+DIP: 8 bytes, KW2[63:0] */

				KEX_LD_CFG(0x07, 0xc, 0x1, 0x0, 0x10),

				/* TOS: 1 byte, KW1[63:56] */

				KEX_LD_CFG(0x0, 0x1, 0x1, 0x0, 0xf),

			},

			/* Layer C: IPv6 */

			[NPC_LT_LC_IP6] = {

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

+4 −2
Original line number Diff line number Diff line
@@ -2462,8 +2462,10 @@ static void rvu_unregister_interrupts(struct rvu *rvu) 
		    INTR_MASK(rvu->hw->total_pfs) & ~1ULL);



	for (irq = 0; irq < rvu->num_vec; irq++) {

		if (rvu->irq_allocated[irq])

		if (rvu->irq_allocated[irq]) {

			free_irq(pci_irq_vector(rvu->pdev, irq), rvu);

			rvu->irq_allocated[irq] = false;

		}

	}



	pci_free_irq_vectors(rvu->pdev);
@@ -2975,8 +2977,8 @@ static void rvu_remove(struct pci_dev *pdev) 
	struct rvu *rvu = pci_get_drvdata(pdev);



	rvu_dbg_exit(rvu);

	rvu_unregister_interrupts(rvu);

	rvu_unregister_dl(rvu);

	rvu_unregister_interrupts(rvu);

	rvu_flr_wq_destroy(rvu);

	rvu_cgx_exit(rvu);

	rvu_fwdata_exit(rvu);

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

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ void npc_read_mcam_entry(struct rvu *rvu, struct npc_mcam *mcam, 
			 u8 *intf, u8 *ena);

bool is_mac_feature_supported(struct rvu *rvu, int pf, int feature);

u32  rvu_cgx_get_fifolen(struct rvu *rvu);

void *rvu_first_cgx_pdata(struct rvu *rvu);



/* CPT APIs */

int rvu_cpt_lf_teardown(struct rvu *rvu, u16 pcifunc, int lf, int slot);

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

+16 −2
Original line number Diff line number Diff line
@@ -89,6 +89,21 @@ void *rvu_cgx_pdata(u8 cgx_id, struct rvu *rvu) 
	return rvu->cgx_idmap[cgx_id];

}



/* Return first enabled CGX instance if none are enabled then return NULL */

void *rvu_first_cgx_pdata(struct rvu *rvu)

{

	int first_enabled_cgx = 0;

	void *cgxd = NULL;



	for (; first_enabled_cgx < rvu->cgx_cnt_max; first_enabled_cgx++) {

		cgxd = rvu_cgx_pdata(first_enabled_cgx, rvu);

		if (cgxd)

			break;

	}



	return cgxd;

}



/* Based on P2X connectivity find mapped NIX block for a PF */

static void rvu_map_cgx_nix_block(struct rvu *rvu, int pf,

				  int cgx_id, int lmac_id)
@@ -711,10 +726,9 @@ int rvu_mbox_handler_cgx_features_get(struct rvu *rvu, 
u32 rvu_cgx_get_fifolen(struct rvu *rvu)

{

	struct mac_ops *mac_ops;

	int rvu_def_cgx_id = 0;

	u32 fifo_len;



	mac_ops = get_mac_ops(rvu_cgx_pdata(rvu_def_cgx_id, rvu));

	mac_ops = get_mac_ops(rvu_first_cgx_pdata(rvu));

	fifo_len = mac_ops ? mac_ops->fifo_len : 0;



	return fifo_len;

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

+34 −21
Original line number Diff line number Diff line
@@ -234,12 +234,14 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, 
					  char __user *buffer,

					  size_t count, loff_t *ppos)

{

	int index, off = 0, flag = 0, go_back = 0, off_prev;

	int index, off = 0, flag = 0, go_back = 0, len = 0;

	struct rvu *rvu = filp->private_data;

	int lf, pf, vf, pcifunc;

	struct rvu_block block;

	int bytes_not_copied;

	int lf_str_size = 12;

	int buf_size = 2048;

	char *lfs;

	char *buf;



	/* don't allow partial reads */
@@ -249,12 +251,18 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, 
	buf = kzalloc(buf_size, GFP_KERNEL);

	if (!buf)

		return -ENOSPC;

	off +=	scnprintf(&buf[off], buf_size - 1 - off, "\npcifunc\t\t");



	lfs = kzalloc(lf_str_size, GFP_KERNEL);

	if (!lfs)

		return -ENOMEM;

	off +=	scnprintf(&buf[off], buf_size - 1 - off, "%-*s", lf_str_size,

			  "pcifunc");

	for (index = 0; index < BLK_COUNT; index++)

		if (strlen(rvu->hw->block[index].name))

		if (strlen(rvu->hw->block[index].name)) {

			off += scnprintf(&buf[off], buf_size - 1 - off,

					  "%*s\t", (index - 1) * 2,

					 "%-*s", lf_str_size,

					 rvu->hw->block[index].name);

		}

	off += scnprintf(&buf[off], buf_size - 1 - off, "\n");

	for (pf = 0; pf < rvu->hw->total_pfs; pf++) {

		for (vf = 0; vf <= rvu->hw->total_vfs; vf++) {
@@ -263,14 +271,15 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, 
				continue;



			if (vf) {

				sprintf(lfs, "PF%d:VF%d", pf, vf - 1);

				go_back = scnprintf(&buf[off],

						    buf_size - 1 - off,

						    "PF%d:VF%d\t\t", pf,

						    vf - 1);

						    "%-*s", lf_str_size, lfs);

			} else {

				sprintf(lfs, "PF%d", pf);

				go_back = scnprintf(&buf[off],

						    buf_size - 1 - off,

						    "PF%d\t\t", pf);

						    "%-*s", lf_str_size, lfs);

			}



			off += go_back;
@@ -278,20 +287,22 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, 
				block = rvu->hw->block[index];

				if (!strlen(block.name))

					continue;

				off_prev = off;

				len = 0;

				lfs[len] = '\0';

				for (lf = 0; lf < block.lf.max; lf++) {

					if (block.fn_map[lf] != pcifunc)

						continue;

					flag = 1;

					off += scnprintf(&buf[off], buf_size - 1

							- off, "%3d,", lf);

					len += sprintf(&lfs[len], "%d,", lf);

				}

				if (flag && off_prev != off)

					off--;

				else

					go_back++;



				if (flag)

					len--;

				lfs[len] = '\0';

				off += scnprintf(&buf[off], buf_size - 1 - off,

						"\t");

						 "%-*s", lf_str_size, lfs);

				if (!strlen(lfs))

					go_back += lf_str_size;

			}

			if (!flag)

				off -= go_back;
@@ -303,6 +314,7 @@ static ssize_t rvu_dbg_rsrc_attach_status(struct file *filp, 
	}



	bytes_not_copied = copy_to_user(buffer, buf, off);

	kfree(lfs);

	kfree(buf);



	if (bytes_not_copied)
@@ -319,7 +331,6 @@ static int rvu_dbg_rvu_pf_cgx_map_display(struct seq_file *filp, void *unused) 
	struct rvu *rvu = filp->private;

	struct pci_dev *pdev = NULL;

	struct mac_ops *mac_ops;

	int rvu_def_cgx_id = 0;

	char cgx[10], lmac[10];

	struct rvu_pfvf *pfvf;

	int pf, domain, blkid;
@@ -327,7 +338,10 @@ static int rvu_dbg_rvu_pf_cgx_map_display(struct seq_file *filp, void *unused) 
	u16 pcifunc;



	domain = 2;

	mac_ops = get_mac_ops(rvu_cgx_pdata(rvu_def_cgx_id, rvu));

	mac_ops = get_mac_ops(rvu_first_cgx_pdata(rvu));

	/* There can be no CGX devices at all */

	if (!mac_ops)

		return 0;

	seq_printf(filp, "PCI dev\t\tRVU PF Func\tNIX block\t%s\tLMAC\n",

		   mac_ops->name);

	for (pf = 0; pf < rvu->hw->total_pfs; pf++) {
@@ -1818,7 +1832,6 @@ static void rvu_dbg_cgx_init(struct rvu *rvu) 
{

	struct mac_ops *mac_ops;

	unsigned long lmac_bmap;

	int rvu_def_cgx_id = 0;

	int i, lmac_id;

	char dname[20];

	void *cgx;
@@ -1826,7 +1839,7 @@ static void rvu_dbg_cgx_init(struct rvu *rvu) 
	if (!cgx_get_cgxcnt_max())

		return;



	mac_ops = get_mac_ops(rvu_cgx_pdata(rvu_def_cgx_id, rvu));

	mac_ops = get_mac_ops(rvu_first_cgx_pdata(rvu));

	if (!mac_ops)

		return;