Commit 5353599a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: refactor enetc_setup_tc_taprio() to have a switch/case for cmd 



Make enetc_setup_tc_taprio() more amenable to future extensions, like
reporting statistics.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c1adb65

drivers/net/ethernet/freescale/enetc/enetc.c

+2 −1
Original line number Diff line number Diff line
@@ -2624,7 +2624,7 @@ static void enetc_debug_tx_ring_prios(struct enetc_ndev_priv *priv) 
			   priv->tx_ring[i]->prio);

}



static void enetc_reset_tc_mqprio(struct net_device *ndev)

void enetc_reset_tc_mqprio(struct net_device *ndev)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	struct enetc_hw *hw = &priv->si->hw;
@@ -2649,6 +2649,7 @@ static void enetc_reset_tc_mqprio(struct net_device *ndev) 


	enetc_change_preemptible_tcs(priv, 0);

}

EXPORT_SYMBOL_GPL(enetc_reset_tc_mqprio);



int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data)

{

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ struct net_device_stats *enetc_get_stats(struct net_device *ndev); 
void enetc_set_features(struct net_device *ndev, netdev_features_t features);

int enetc_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd);

int enetc_setup_tc_mqprio(struct net_device *ndev, void *type_data);

void enetc_reset_tc_mqprio(struct net_device *ndev);

int enetc_setup_bpf(struct net_device *ndev, struct netdev_bpf *bpf);

int enetc_xdp_xmit(struct net_device *ndev, int num_frames,

		   struct xdp_frame **frames, u32 flags);

drivers/net/ethernet/freescale/enetc/enetc_qos.c

+51 −28
Original line number Diff line number Diff line
@@ -43,10 +43,9 @@ void enetc_sched_speed_set(struct enetc_ndev_priv *priv, int speed) 
	enetc_port_wr(hw, ENETC_PMR, (tmp & ~ENETC_PMR_PSPEED_MASK) | pspeed);

}



static int enetc_setup_taprio(struct net_device *ndev,

static int enetc_setup_taprio(struct enetc_ndev_priv *priv,

			      struct tc_taprio_qopt_offload *admin_conf)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	struct enetc_hw *hw = &priv->si->hw;

	struct enetc_cbd cbd = {.cmd = 0};

	struct tgs_gcl_conf *gcl_config;
@@ -60,19 +59,13 @@ static int enetc_setup_taprio(struct net_device *ndev, 
	int err;

	int i;



	/* TSD and Qbv are mutually exclusive in hardware */

	for (i = 0; i < priv->num_tx_rings; i++)

		if (priv->tx_ring[i]->tsd_enable)

			return -EBUSY;



	if (admin_conf->num_entries > enetc_get_max_gcl_len(hw))

		return -EINVAL;

	gcl_len = admin_conf->num_entries;



	tge = enetc_rd(hw, ENETC_PTGCR);

	if (admin_conf->cmd == TAPRIO_CMD_DESTROY) {

		enetc_wr(hw, ENETC_PTGCR, tge & ~ENETC_PTGCR_TGE);

		enetc_reset_ptcmsdur(hw);



		priv->active_offloads &= ~ENETC_F_QBV;



		return 0;

	}



	if (admin_conf->cycle_time > U32_MAX ||

	    admin_conf->cycle_time_extension > U32_MAX)
@@ -82,6 +75,7 @@ static int enetc_setup_taprio(struct net_device *ndev, 
	 * control BD descriptor.

	 */

	gcl_config = &cbd.gcl_conf;

	gcl_len = admin_conf->num_entries;



	data_size = struct_size(gcl_data, entry, gcl_len);

	tmp = enetc_cbd_alloc_data_mem(priv->si, &cbd, data_size,
@@ -115,6 +109,7 @@ static int enetc_setup_taprio(struct net_device *ndev, 
	cbd.cls = BDCR_CMD_PORT_GCL;

	cbd.status_flags = 0;



	tge = enetc_rd(hw, ENETC_PTGCR);

	enetc_wr(hw, ENETC_PTGCR, tge | ENETC_PTGCR_TGE);



	err = enetc_send_cmd(priv->si, &cbd);
@@ -132,29 +127,57 @@ static int enetc_setup_taprio(struct net_device *ndev, 
	return 0;

}



int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)

static void enetc_reset_taprio(struct enetc_ndev_priv *priv)

{

	struct enetc_hw *hw = &priv->si->hw;

	u32 val;



	val = enetc_rd(hw, ENETC_PTGCR);

	enetc_wr(hw, ENETC_PTGCR, val & ~ENETC_PTGCR_TGE);

	enetc_reset_ptcmsdur(hw);



	priv->active_offloads &= ~ENETC_F_QBV;

}



static void enetc_taprio_destroy(struct net_device *ndev)

{

	struct tc_taprio_qopt_offload *taprio = type_data;

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	int err, i;



	if (taprio->cmd != TAPRIO_CMD_REPLACE &&

	    taprio->cmd != TAPRIO_CMD_DESTROY)

		return -EOPNOTSUPP;

	enetc_reset_taprio(priv);

	enetc_reset_tc_mqprio(ndev);

}



	/* TSD and Qbv are mutually exclusive in hardware */

	for (i = 0; i < priv->num_tx_rings; i++)

		if (priv->tx_ring[i]->tsd_enable)

			return -EBUSY;

static int enetc_taprio_replace(struct net_device *ndev,

				struct tc_taprio_qopt_offload *offload)

{

	struct enetc_ndev_priv *priv = netdev_priv(ndev);

	int err;



	err = enetc_setup_tc_mqprio(ndev, &taprio->mqprio);

	err = enetc_setup_tc_mqprio(ndev, &offload->mqprio);

	if (err)

		return err;



	err = enetc_setup_taprio(ndev, taprio);

	if (err) {

		taprio->mqprio.qopt.num_tc = 0;

		enetc_setup_tc_mqprio(ndev, &taprio->mqprio);

	err = enetc_setup_taprio(priv, offload);

	if (err)

		enetc_reset_tc_mqprio(ndev);



	return err;

}



int enetc_setup_tc_taprio(struct net_device *ndev, void *type_data)

{

	struct tc_taprio_qopt_offload *offload = type_data;

	int err = 0;



	switch (offload->cmd) {

	case TAPRIO_CMD_REPLACE:

		err = enetc_taprio_replace(ndev, offload);

		break;

	case TAPRIO_CMD_DESTROY:

		enetc_taprio_destroy(ndev);

		break;

	default:

		err = -EOPNOTSUPP;

	}



	return err;