Commit 8bcf5ced authored by Subbaraya Sundeep's avatar Subbaraya Sundeep Committed by Jakub Kicinski
Browse files

octeontx2-pf: Calculate LBK link instead of hardcoding 



CGX links are followed by LBK links but number of
CGX and LBK links varies between platforms. Hence
get the number of links present in hardware from
AF and use it to calculate LBK link number.

Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarRakesh Babu <rsaladi2@marvell.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a84cdcea

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c

+6 −2
Original line number Diff line number Diff line
@@ -531,8 +531,10 @@ static int otx2_get_link(struct otx2_nic *pfvf) 
		link = 4 * ((map >> 8) & 0xF) + ((map >> 4) & 0xF);

	}

	/* LBK channel */

	if (pfvf->hw.tx_chan_base < SDP_CHAN_BASE)

		link = 12;

	if (pfvf->hw.tx_chan_base < SDP_CHAN_BASE) {

		map = pfvf->hw.tx_chan_base & 0x7FF;

		link = pfvf->hw.cgx_links | ((map >> 8) & 0xF);

	}



	return link;

}
@@ -1503,6 +1505,8 @@ void mbox_handler_nix_lf_alloc(struct otx2_nic *pfvf, 
	pfvf->hw.tx_chan_base = rsp->tx_chan_base;

	pfvf->hw.lso_tsov4_idx = rsp->lso_tsov4_idx;

	pfvf->hw.lso_tsov6_idx = rsp->lso_tsov6_idx;

	pfvf->hw.cgx_links = rsp->cgx_links;

	pfvf->hw.lbk_links = rsp->lbk_links;

}

EXPORT_SYMBOL(mbox_handler_nix_lf_alloc);

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ struct otx2_hw { 
	struct otx2_drv_stats	drv_stats;

	u64			cgx_rx_stats[CGX_RX_STATS_COUNT];

	u64			cgx_tx_stats[CGX_TX_STATS_COUNT];

	u8			cgx_links;  /* No. of CGX links present in HW */

	u8			lbk_links;  /* No. of LBK links present in HW */

};



struct otx2_vf_config {