Commit 4950b699 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ocelot-vcap-cleanups' 

Vladimir Oltean says:

====================
Ocelot VCAP cleanups

This is a series of minor code cleanups brought to the Ocelot switch
driver logic for VCAP filters.

- don't use list_for_each_safe() in ocelot_vcap_filter_add_to_block
- don't use magic numbers for OCELOT_POLICER_DISCARD
====================

Link: https://lore.kernel.org/r/20220503120150.837233-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents fa728505 91d350d6

drivers/net/ethernet/mscc/ocelot_police.c

+15 −11
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
/* Default policer order */

#define POL_ORDER 0x1d3 /* Ocelot policer order: Serial (QoS -> Port -> VCAP) */



int qos_policer_conf_set(struct ocelot *ocelot, int port, u32 pol_ix,

int qos_policer_conf_set(struct ocelot *ocelot, u32 pol_ix,

			 struct qos_policer_conf *conf)

{

	u32 cf = 0, cir_ena = 0, frm_mode = POL_MODE_LINERATE;
@@ -102,26 +102,30 @@ int qos_policer_conf_set(struct ocelot *ocelot, int port, u32 pol_ix, 


	/* Check limits */

	if (pir > GENMASK(15, 0)) {

		dev_err(ocelot->dev, "Invalid pir for port %d: %u (max %lu)\n",

			port, pir, GENMASK(15, 0));

		dev_err(ocelot->dev,

			"Invalid pir for policer %u: %u (max %lu)\n",

			pol_ix, pir, GENMASK(15, 0));

		return -EINVAL;

	}



	if (cir > GENMASK(15, 0)) {

		dev_err(ocelot->dev, "Invalid cir for port %d: %u (max %lu)\n",

			port, cir, GENMASK(15, 0));

		dev_err(ocelot->dev,

			"Invalid cir for policer %u: %u (max %lu)\n",

			pol_ix, cir, GENMASK(15, 0));

		return -EINVAL;

	}



	if (pbs > pbs_max) {

		dev_err(ocelot->dev, "Invalid pbs for port %d: %u (max %u)\n",

			port, pbs, pbs_max);

		dev_err(ocelot->dev,

			"Invalid pbs for policer %u: %u (max %u)\n",

			pol_ix, pbs, pbs_max);

		return -EINVAL;

	}



	if (cbs > cbs_max) {

		dev_err(ocelot->dev, "Invalid cbs for port %d: %u (max %u)\n",

			port, cbs, cbs_max);

		dev_err(ocelot->dev,

			"Invalid cbs for policer %u: %u (max %u)\n",

			pol_ix, cbs, cbs_max);

		return -EINVAL;

	}
@@ -211,7 +215,7 @@ int ocelot_port_policer_add(struct ocelot *ocelot, int port, 
	dev_dbg(ocelot->dev, "%s: port %u pir %u kbps, pbs %u bytes\n",

		__func__, port, pp.pir, pp.pbs);



	err = qos_policer_conf_set(ocelot, port, POL_IX_PORT + port, &pp);

	err = qos_policer_conf_set(ocelot, POL_IX_PORT + port, &pp);

	if (err)

		return err;
@@ -235,7 +239,7 @@ int ocelot_port_policer_del(struct ocelot *ocelot, int port) 


	pp.mode = MSCC_QOS_RATE_MODE_DISABLED;



	err = qos_policer_conf_set(ocelot, port, POL_IX_PORT + port, &pp);

	err = qos_policer_conf_set(ocelot, POL_IX_PORT + port, &pp);

	if (err)

		return err;

drivers/net/ethernet/mscc/ocelot_police.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct qos_policer_conf { 
	u8   ipg; /* Size of IPG when MSCC_QOS_RATE_MODE_LINE is chosen */

};



int qos_policer_conf_set(struct ocelot *ocelot, int port, u32 pol_ix,

int qos_policer_conf_set(struct ocelot *ocelot, u32 pol_ix,

			 struct qos_policer_conf *conf);



int ocelot_policer_validate(const struct flow_action *action,

drivers/net/ethernet/mscc/ocelot_vcap.c

+15 −23
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ int ocelot_vcap_policer_add(struct ocelot *ocelot, u32 pol_ix, 
	if (!tmp)

		return -ENOMEM;



	ret = qos_policer_conf_set(ocelot, 0, pol_ix, &pp);

	ret = qos_policer_conf_set(ocelot, pol_ix, &pp);

	if (ret) {

		kfree(tmp);

		return ret;
@@ -945,7 +945,7 @@ int ocelot_vcap_policer_del(struct ocelot *ocelot, u32 pol_ix) 


	if (z) {

		pp.mode = MSCC_QOS_RATE_MODE_DISABLED;

		return qos_policer_conf_set(ocelot, 0, pol_ix, &pp);

		return qos_policer_conf_set(ocelot, pol_ix, &pp);

	}



	return 0;
@@ -993,8 +993,8 @@ static int ocelot_vcap_filter_add_to_block(struct ocelot *ocelot, 
					   struct ocelot_vcap_filter *filter,

					   struct netlink_ext_ack *extack)

{

	struct list_head *pos = &block->rules;

	struct ocelot_vcap_filter *tmp;

	struct list_head *pos, *n;

	int ret;



	ret = ocelot_vcap_filter_add_aux_resources(ocelot, filter, extack);
@@ -1003,17 +1003,13 @@ static int ocelot_vcap_filter_add_to_block(struct ocelot *ocelot, 


	block->count++;



	if (list_empty(&block->rules)) {

		list_add(&filter->list, &block->rules);

		return 0;

	}



	list_for_each_safe(pos, n, &block->rules) {

		tmp = list_entry(pos, struct ocelot_vcap_filter, list);

		if (filter->prio < tmp->prio)

	list_for_each_entry(tmp, &block->rules, list) {

		if (filter->prio < tmp->prio) {

			pos = &tmp->list;

			break;

		}

	list_add(&filter->list, pos->prev);

	}

	list_add_tail(&filter->list, pos);



	return 0;

}
@@ -1398,22 +1394,18 @@ static void ocelot_vcap_detect_constants(struct ocelot *ocelot, 


int ocelot_vcap_init(struct ocelot *ocelot)

{

	int i;

	struct qos_policer_conf cpu_drop = {

		.mode = MSCC_QOS_RATE_MODE_DATA,

	};

	int ret, i;



	/* Create a policer that will drop the frames for the cpu.

	 * This policer will be used as action in the acl rules to drop

	 * frames.

	 */

	ocelot_write_gix(ocelot, 0x299, ANA_POL_MODE_CFG,

			 OCELOT_POLICER_DISCARD);

	ocelot_write_gix(ocelot, 0x1, ANA_POL_PIR_CFG,

			 OCELOT_POLICER_DISCARD);

	ocelot_write_gix(ocelot, 0x3fffff, ANA_POL_PIR_STATE,

			 OCELOT_POLICER_DISCARD);

	ocelot_write_gix(ocelot, 0x0, ANA_POL_CIR_CFG,

			 OCELOT_POLICER_DISCARD);

	ocelot_write_gix(ocelot, 0x3fffff, ANA_POL_CIR_STATE,

			 OCELOT_POLICER_DISCARD);

	ret = qos_policer_conf_set(ocelot, OCELOT_POLICER_DISCARD, &cpu_drop);

	if (ret)

		return ret;



	for (i = 0; i < OCELOT_NUM_VCAP_BLOCKS; i++) {

		struct ocelot_vcap_block *block = &ocelot->block[i];