Commit 2e3e94c2 authored by Hariprasad Kelam's avatar Hariprasad Kelam Committed by David S. Miller
Browse files

octeontx2-af: Reset MAC features in FLR 



AF driver configures MAC features like internal loopback and PFC upon
receiving the request from PF and its VF netdev. But these
features are not getting reset in FLR.  This patch fixes the issue by
resetting the same.

Fixes: 23999b30 ("octeontx2-af: Enable or disable CGX internal loopback")
Fixes: 1121f6b0 ("octeontx2-af: Priority flow control configuration support")
Signed-off-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Signed-off-by: default avatarSunil Goutham <sgoutham@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79ebb537

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

+23 −3
Original line number Diff line number Diff line
@@ -537,14 +537,15 @@ static u32 cgx_get_lmac_fifo_len(void *cgxd, int lmac_id) 
int cgx_lmac_internal_loopback(void *cgxd, int lmac_id, bool enable)

{

	struct cgx *cgx = cgxd;

	u8 lmac_type;

	struct lmac *lmac;

	u64 cfg;



	if (!is_lmac_valid(cgx, lmac_id))

		return -ENODEV;



	lmac_type = cgx->mac_ops->get_lmac_type(cgx, lmac_id);

	if (lmac_type == LMAC_MODE_SGMII || lmac_type == LMAC_MODE_QSGMII) {

	lmac = lmac_pdata(lmac_id, cgx);

	if (lmac->lmac_type == LMAC_MODE_SGMII ||

	    lmac->lmac_type == LMAC_MODE_QSGMII) {

		cfg = cgx_read(cgx, lmac_id, CGXX_GMP_PCS_MRX_CTL);

		if (enable)

			cfg |= CGXX_GMP_PCS_MRX_CTL_LBK;
@@ -1563,6 +1564,23 @@ int cgx_lmac_linkup_start(void *cgxd) 
	return 0;

}



int cgx_lmac_reset(void *cgxd, int lmac_id, u8 pf_req_flr)

{

	struct cgx *cgx = cgxd;

	u64 cfg;



	if (!is_lmac_valid(cgx, lmac_id))

		return -ENODEV;



	/* Resetting PFC related CSRs */

	cfg = 0xff;

	cgx_write(cgxd, lmac_id, CGXX_CMRX_RX_LOGL_XON, cfg);



	if (pf_req_flr)

		cgx_lmac_internal_loopback(cgxd, lmac_id, false);

	return 0;

}



static int cgx_configure_interrupt(struct cgx *cgx, struct lmac *lmac,

				   int cnt, bool req_free)

{
@@ -1682,6 +1700,7 @@ static int cgx_lmac_init(struct cgx *cgx) 
		cgx->lmac_idmap[lmac->lmac_id] = lmac;

		set_bit(lmac->lmac_id, &cgx->lmac_bmap);

		cgx->mac_ops->mac_pause_frm_config(cgx, lmac->lmac_id, true);

		lmac->lmac_type = cgx->mac_ops->get_lmac_type(cgx, lmac->lmac_id);

	}



	return cgx_lmac_verify_fwi_version(cgx);
@@ -1778,6 +1797,7 @@ static struct mac_ops cgx_mac_ops = { 
	.mac_tx_enable =		cgx_lmac_tx_enable,

	.pfc_config =                   cgx_lmac_pfc_config,

	.mac_get_pfc_frm_cfg   =        cgx_lmac_get_pfc_frm_cfg,

	.mac_reset   =			cgx_lmac_reset,

};



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

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define CGXX_CMRX_INT_ENA_W1S		0x058

#define CGXX_CMRX_RX_ID_MAP		0x060

#define CGXX_CMRX_RX_STAT0		0x070

#define CGXX_CMRX_RX_LOGL_XON		0x100

#define CGXX_CMRX_RX_LMACS		0x128

#define CGXX_CMRX_RX_DMAC_CTL0		(0x1F8 + mac_ops->csr_offset)

#define CGX_DMAC_CTL0_CAM_ENABLE	BIT_ULL(3)
@@ -181,4 +182,5 @@ int cgx_lmac_get_pfc_frm_cfg(void *cgxd, int lmac_id, u8 *tx_pause, 
			     u8 *rx_pause);

int verify_lmac_fc_cfg(void *cgxd, int lmac_id, u8 tx_pause, u8 rx_pause,

		       int pfvf_idx);

int cgx_lmac_reset(void *cgxd, int lmac_id, u8 pf_req_flr);

#endif /* CGX_H */

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

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 * @cgx:		parent cgx port

 * @mcast_filters_count:  Number of multicast filters installed

 * @lmac_id:		lmac port id

 * @lmac_type:	        lmac type like SGMII/XAUI

 * @cmd_pend:		flag set before new command is started

 *			flag cleared after command response is received

 * @name:		lmac port name
@@ -43,6 +44,7 @@ struct lmac { 
	struct cgx *cgx;

	u8 mcast_filters_count;

	u8 lmac_id;

	u8 lmac_type;

	bool cmd_pend;

	char *name;

};
@@ -125,6 +127,7 @@ struct mac_ops { 


	int                     (*mac_get_pfc_frm_cfg)(void *cgxd, int lmac_id,

						       u8 *tx_pause, u8 *rx_pause);

	int			(*mac_reset)(void *cgxd, int lmac_id, u8 pf_req_flr);



	/* FEC stats */

	int			(*get_fec_stats)(void *cgxd, int lmac_id,

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

+27 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ static struct mac_ops rpm_mac_ops = { 
	.mac_tx_enable =		rpm_lmac_tx_enable,

	.pfc_config =                   rpm_lmac_pfc_config,

	.mac_get_pfc_frm_cfg   =        rpm_lmac_get_pfc_frm_cfg,

	.mac_reset   =			rpm_lmac_reset,

};



static struct mac_ops		rpm2_mac_ops   = {
@@ -68,6 +69,7 @@ static struct mac_ops rpm2_mac_ops = { 
	.mac_tx_enable =		rpm_lmac_tx_enable,

	.pfc_config =                   rpm_lmac_pfc_config,

	.mac_get_pfc_frm_cfg   =        rpm_lmac_get_pfc_frm_cfg,

	.mac_reset   =			rpm_lmac_reset,

};



bool is_dev_rpm2(void *rpmd)
@@ -537,14 +539,15 @@ u32 rpm2_get_lmac_fifo_len(void *rpmd, int lmac_id) 
int rpm_lmac_internal_loopback(void *rpmd, int lmac_id, bool enable)

{

	rpm_t *rpm = rpmd;

	u8 lmac_type;

	struct lmac *lmac;

	u64 cfg;



	if (!is_lmac_valid(rpm, lmac_id))

		return -ENODEV;

	lmac_type = rpm->mac_ops->get_lmac_type(rpm, lmac_id);



	if (lmac_type == LMAC_MODE_QSGMII || lmac_type == LMAC_MODE_SGMII) {

	lmac = lmac_pdata(lmac_id, rpm);

	if (lmac->lmac_type == LMAC_MODE_QSGMII ||

	    lmac->lmac_type == LMAC_MODE_SGMII) {

		dev_err(&rpm->pdev->dev, "loopback not supported for LPC mode\n");

		return 0;

	}
@@ -713,3 +716,24 @@ int rpm_get_fec_stats(void *rpmd, int lmac_id, struct cgx_fec_stats_rsp *rsp) 


	return 0;

}



int rpm_lmac_reset(void *rpmd, int lmac_id, u8 pf_req_flr)

{

	u64 rx_logl_xon, cfg;

	rpm_t *rpm = rpmd;



	if (!is_lmac_valid(rpm, lmac_id))

		return -ENODEV;



	/* Resetting PFC related CSRs */

	rx_logl_xon = is_dev_rpm2(rpm) ? RPM2_CMRX_RX_LOGL_XON :

					 RPMX_CMRX_RX_LOGL_XON;

	cfg = 0xff;



	rpm_write(rpm, lmac_id, rx_logl_xon, cfg);



	if (pf_req_flr)

		rpm_lmac_internal_loopback(rpm, lmac_id, false);



	return 0;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#define RPMX_MTI_MAC100X_CL01_PAUSE_QUANTA              0x80A8

#define RPMX_MTI_MAC100X_CL89_PAUSE_QUANTA		0x8108

#define RPM_DEFAULT_PAUSE_TIME                          0x7FF

#define RPMX_CMRX_RX_LOGL_XON				0x4100



#define RPMX_MTI_MAC100X_XIF_MODE		        0x8100

#define RPMX_ONESTEP_ENABLE				BIT_ULL(5)
@@ -132,4 +133,5 @@ int rpm_lmac_get_pfc_frm_cfg(void *rpmd, int lmac_id, u8 *tx_pause, 
int rpm2_get_nr_lmacs(void *rpmd);

bool is_dev_rpm2(void *rpmd);

int rpm_get_fec_stats(void *cgxd, int lmac_id, struct cgx_fec_stats_rsp *rsp);

int rpm_lmac_reset(void *rpmd, int lmac_id, u8 pf_req_flr);

#endif /* RPM_H */