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

Merge branch 'octeontx2-af-misc-mac-block-changes' 



Hariprasad Kelam says:

====================
octeontx2-af: misc MAC block changes

This series of patches adds recent changes added in MAC (CGX/RPM) block.

Patch1: Adds new LMAC mode supported by CN10KB silicon

Patch2: In a scenario where system boots with no cgx devices, currently
        AF driver treats this as error as a result no interfaces will work.
        This patch relaxes this check, such that non cgx mapped netdev
        devices will work.

Patch3: This patch adds required lmac validation in MAC block APIs.

Patch4: Prints error message incase, no netdev is mapped with given
        cgx,lmac pair.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c639a708 17d1368f

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

+8 −3
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ static const char *cgx_lmactype_string[LMAC_MODE_MAX] = { 
	[LMAC_MODE_50G_R] = "50G_R",

	[LMAC_MODE_100G_R] = "100G_R",

	[LMAC_MODE_USXGMII] = "USXGMII",

	[LMAC_MODE_USGMII] = "USGMII",

};



/* CGX PHY management internal APIs */
@@ -231,6 +232,9 @@ int cgx_lmac_addr_set(u8 cgx_id, u8 lmac_id, u8 *mac_addr) 
	int index, id;

	u64 cfg;



	if (!lmac)

		return -ENODEV;



	/* access mac_ops to know csr_offset */

	mac_ops = cgx_dev->mac_ops;
@@ -549,15 +553,16 @@ void cgx_lmac_promisc_config(int cgx_id, int lmac_id, bool enable) 
{

	struct cgx *cgx = cgx_get_pdata(cgx_id);

	struct lmac *lmac = lmac_pdata(lmac_id, cgx);

	u16 max_dmac = lmac->mac_to_index_bmap.max;

	struct mac_ops *mac_ops;

	u16 max_dmac;

	int index, i;

	u64 cfg = 0;

	int id;



	if (!cgx)

	if (!cgx || !lmac)

		return;



	max_dmac = lmac->mac_to_index_bmap.max;

	id = get_sequence_id_of_lmac(cgx, lmac_id);



	mac_ops = cgx->mac_ops;
@@ -730,7 +735,7 @@ int cgx_get_fec_stats(void *cgxd, int lmac_id, struct cgx_fec_stats_rsp *rsp) 
	int corr_reg, uncorr_reg;

	struct cgx *cgx = cgxd;



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

	if (!is_lmac_valid(cgx, lmac_id))

		return -ENODEV;



	if (cgx->lmac_idmap[lmac_id]->link_info.fec == OTX2_FEC_NONE)

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

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ enum LMAC_TYPE { 
	LMAC_MODE_50G_R		= 8,

	LMAC_MODE_100G_R	= 9,

	LMAC_MODE_USXGMII	= 10,

	LMAC_MODE_USGMII	= 11,

	LMAC_MODE_MAX,

};

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

+6 −1
Original line number Diff line number Diff line
@@ -236,6 +236,11 @@ static void cgx_notify_pfs(struct cgx_link_event *event, struct rvu *rvu) 


	linfo = &event->link_uinfo;

	pfmap = cgxlmac_to_pfmap(rvu, event->cgx_id, event->lmac_id);

	if (!pfmap) {

		dev_err(rvu->dev, "CGX port%d:%d not mapped with PF\n",

			event->cgx_id, event->lmac_id);

		return;

	}



	do {

		pfid = find_first_bit(&pfmap,
@@ -345,7 +350,7 @@ int rvu_cgx_init(struct rvu *rvu) 
	rvu->cgx_cnt_max = cgx_get_cgxcnt_max();

	if (!rvu->cgx_cnt_max) {

		dev_info(rvu->dev, "No CGX devices found!\n");

		return -ENODEV;

		return 0;

	}



	rvu->cgx_idmap = devm_kzalloc(rvu->dev, rvu->cgx_cnt_max *