Commit f4d35a2c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch... 

Merge branch 'net-airoha-preliminary-series-to-support-multiple-net_devices-connected-to-the-same-gdm-port'

Lorenzo Bianconi says:

====================
net: airoha: Preliminary series to support multiple net_devices connected to the same GDM port

EN7581 or AN7583 SoCs support connecting multiple external SerDes (e.g.
Ethernet or USB SerDes) to GDM3 or GDM4 ports via a hw arbiter that
manages the traffic in a TDM manner.
This series introduces some preliminary changes necessary to introduce
support for multiple net_devices connected to the same Frame Engine (FE)
GDM port (GDM3 or GDM4).
====================

Link: https://patch.msgid.link/20260412-airoha-multi-serdes-preliminary-patch-v1-0-08d5b670ca8f@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 88e8577a ae32f800

drivers/net/ethernet/airoha/airoha_eth.c

+43 −42
Original line number Diff line number Diff line
@@ -2138,10 +2138,11 @@ airoha_ethtool_get_rmon_stats(struct net_device *dev, 
	} while (u64_stats_fetch_retry(&port->stats.syncp, start));

}



static int airoha_qdma_set_chan_tx_sched(struct airoha_gdm_port *port,

static int airoha_qdma_set_chan_tx_sched(struct net_device *dev,

					 int channel, enum tx_sched_mode mode,

					 const u16 *weights, u8 n_weights)

{

	struct airoha_gdm_port *port = netdev_priv(dev);

	int i;



	for (i = 0; i < AIROHA_NUM_TX_RING; i++)
@@ -2173,17 +2174,15 @@ static int airoha_qdma_set_chan_tx_sched(struct airoha_gdm_port *port, 
	return 0;

}



static int airoha_qdma_set_tx_prio_sched(struct airoha_gdm_port *port,

					 int channel)

static int airoha_qdma_set_tx_prio_sched(struct net_device *dev, int channel)

{

	static const u16 w[AIROHA_NUM_QOS_QUEUES] = {};



	return airoha_qdma_set_chan_tx_sched(port, channel, TC_SCH_SP, w,

	return airoha_qdma_set_chan_tx_sched(dev, channel, TC_SCH_SP, w,

					     ARRAY_SIZE(w));

}



static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port,

					int channel,

static int airoha_qdma_set_tx_ets_sched(struct net_device *dev, int channel,

					struct tc_ets_qopt_offload *opt)

{

	struct tc_ets_qopt_offload_replace_params *p = &opt->replace_params;
@@ -2224,20 +2223,21 @@ static int airoha_qdma_set_tx_ets_sched(struct airoha_gdm_port *port, 
	else if (nstrict < AIROHA_NUM_QOS_QUEUES - 1)

		mode = nstrict + 1;



	return airoha_qdma_set_chan_tx_sched(port, channel, mode, w,

	return airoha_qdma_set_chan_tx_sched(dev, channel, mode, w,

					     ARRAY_SIZE(w));

}



static int airoha_qdma_get_tx_ets_stats(struct airoha_gdm_port *port,

					int channel,

static int airoha_qdma_get_tx_ets_stats(struct net_device *dev, int channel,

					struct tc_ets_qopt_offload *opt)

{

	struct airoha_gdm_port *port = netdev_priv(dev);

	u64 cpu_tx_packets = airoha_qdma_rr(port->qdma,

					    REG_CNTR_VAL(channel << 1));

	u64 fwd_tx_packets = airoha_qdma_rr(port->qdma,

					    REG_CNTR_VAL((channel << 1) + 1));

	u64 tx_packets = (cpu_tx_packets - port->cpu_tx_packets) +

			 (fwd_tx_packets - port->fwd_tx_packets);



	_bstats_update(opt->stats.bstats, 0, tx_packets);



	port->cpu_tx_packets = cpu_tx_packets;
@@ -2246,7 +2246,7 @@ static int airoha_qdma_get_tx_ets_stats(struct airoha_gdm_port *port, 
	return 0;

}



static int airoha_tc_setup_qdisc_ets(struct airoha_gdm_port *port,

static int airoha_tc_setup_qdisc_ets(struct net_device *dev,

				     struct tc_ets_qopt_offload *opt)

{

	int channel;
@@ -2259,12 +2259,12 @@ static int airoha_tc_setup_qdisc_ets(struct airoha_gdm_port *port, 


	switch (opt->command) {

	case TC_ETS_REPLACE:

		return airoha_qdma_set_tx_ets_sched(port, channel, opt);

		return airoha_qdma_set_tx_ets_sched(dev, channel, opt);

	case TC_ETS_DESTROY:

		/* PRIO is default qdisc scheduler */

		return airoha_qdma_set_tx_prio_sched(port, channel);

		return airoha_qdma_set_tx_prio_sched(dev, channel);

	case TC_ETS_STATS:

		return airoha_qdma_get_tx_ets_stats(port, channel, opt);

		return airoha_qdma_get_tx_ets_stats(dev, channel, opt);

	default:

		return -EOPNOTSUPP;

	}
@@ -2492,10 +2492,11 @@ static int airoha_qdma_set_trtcm_token_bucket(struct airoha_qdma *qdma, 
					   mode, val);

}



static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port,

static int airoha_qdma_set_tx_rate_limit(struct net_device *dev,

					 int channel, u32 rate,

					 u32 bucket_size)

{

	struct airoha_gdm_port *port = netdev_priv(dev);

	int i, err;



	for (i = 0; i <= TRTCM_PEAK_MODE; i++) {
@@ -2515,21 +2516,20 @@ static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port, 
	return 0;

}



static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port,

static int airoha_tc_htb_alloc_leaf_queue(struct net_device *dev,

					  struct tc_htb_qopt_offload *opt)

{

	u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;

	u32 rate = div_u64(opt->rate, 1000) << 3; /* kbps */

	struct net_device *dev = port->dev;

	int num_tx_queues = dev->real_num_tx_queues;

	int err;

	int err, num_tx_queues = dev->real_num_tx_queues;

	struct airoha_gdm_port *port = netdev_priv(dev);



	if (opt->parent_classid != TC_HTB_CLASSID_ROOT) {

		NL_SET_ERR_MSG_MOD(opt->extack, "invalid parent classid");

		return -EINVAL;

	}



	err = airoha_qdma_set_tx_rate_limit(port, channel, rate, opt->quantum);

	err = airoha_qdma_set_tx_rate_limit(dev, channel, rate, opt->quantum);

	if (err) {

		NL_SET_ERR_MSG_MOD(opt->extack,

				   "failed configuring htb offload");
@@ -2541,7 +2541,7 @@ static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port, 


	err = netif_set_real_num_tx_queues(dev, num_tx_queues + 1);

	if (err) {

		airoha_qdma_set_tx_rate_limit(port, channel, 0, opt->quantum);

		airoha_qdma_set_tx_rate_limit(dev, channel, 0, opt->quantum);

		NL_SET_ERR_MSG_MOD(opt->extack,

				   "failed setting real_num_tx_queues");

		return err;
@@ -2687,7 +2687,7 @@ static int airoha_dev_setup_tc_block_cb(enum tc_setup_type type, 
	}

}



static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port,

static int airoha_dev_setup_tc_block(struct net_device *dev,

				     struct flow_block_offload *f)

{

	flow_setup_cb_t *cb = airoha_dev_setup_tc_block_cb;
@@ -2700,12 +2700,12 @@ static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port, 
	f->driver_block_list = &block_cb_list;

	switch (f->command) {

	case FLOW_BLOCK_BIND:

		block_cb = flow_block_cb_lookup(f->block, cb, port->dev);

		block_cb = flow_block_cb_lookup(f->block, cb, dev);

		if (block_cb) {

			flow_block_cb_incref(block_cb);

			return 0;

		}

		block_cb = flow_block_cb_alloc(cb, port->dev, port->dev, NULL);

		block_cb = flow_block_cb_alloc(cb, dev, dev, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);
@@ -2714,7 +2714,7 @@ static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port, 
		list_add_tail(&block_cb->driver_list, &block_cb_list);

		return 0;

	case FLOW_BLOCK_UNBIND:

		block_cb = flow_block_cb_lookup(f->block, cb, port->dev);

		block_cb = flow_block_cb_lookup(f->block, cb, dev);

		if (!block_cb)

			return -ENOENT;
@@ -2728,44 +2728,47 @@ static int airoha_dev_setup_tc_block(struct airoha_gdm_port *port, 
	}

}



static void airoha_tc_remove_htb_queue(struct airoha_gdm_port *port, int queue)

static void airoha_tc_remove_htb_queue(struct net_device *dev, int queue)

{

	struct net_device *dev = port->dev;

	struct airoha_gdm_port *port = netdev_priv(dev);



	netif_set_real_num_tx_queues(dev, dev->real_num_tx_queues - 1);

	airoha_qdma_set_tx_rate_limit(port, queue + 1, 0, 0);

	airoha_qdma_set_tx_rate_limit(dev, queue + 1, 0, 0);

	clear_bit(queue, port->qos_sq_bmap);

}



static int airoha_tc_htb_delete_leaf_queue(struct airoha_gdm_port *port,

static int airoha_tc_htb_delete_leaf_queue(struct net_device *dev,

					   struct tc_htb_qopt_offload *opt)

{

	u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;

	struct airoha_gdm_port *port = netdev_priv(dev);



	if (!test_bit(channel, port->qos_sq_bmap)) {

		NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id");

		return -EINVAL;

	}



	airoha_tc_remove_htb_queue(port, channel);

	airoha_tc_remove_htb_queue(dev, channel);



	return 0;

}



static int airoha_tc_htb_destroy(struct airoha_gdm_port *port)

static int airoha_tc_htb_destroy(struct net_device *dev)

{

	struct airoha_gdm_port *port = netdev_priv(dev);

	int q;



	for_each_set_bit(q, port->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS)

		airoha_tc_remove_htb_queue(port, q);

		airoha_tc_remove_htb_queue(dev, q);



	return 0;

}



static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port,

static int airoha_tc_get_htb_get_leaf_queue(struct net_device *dev,

					    struct tc_htb_qopt_offload *opt)

{

	u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;

	struct airoha_gdm_port *port = netdev_priv(dev);



	if (!test_bit(channel, port->qos_sq_bmap)) {

		NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id");
@@ -2777,23 +2780,23 @@ static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port, 
	return 0;

}



static int airoha_tc_setup_qdisc_htb(struct airoha_gdm_port *port,

static int airoha_tc_setup_qdisc_htb(struct net_device *dev,

				     struct tc_htb_qopt_offload *opt)

{

	switch (opt->command) {

	case TC_HTB_CREATE:

		break;

	case TC_HTB_DESTROY:

		return airoha_tc_htb_destroy(port);

		return airoha_tc_htb_destroy(dev);

	case TC_HTB_NODE_MODIFY:

	case TC_HTB_LEAF_ALLOC_QUEUE:

		return airoha_tc_htb_alloc_leaf_queue(port, opt);

		return airoha_tc_htb_alloc_leaf_queue(dev, opt);

	case TC_HTB_LEAF_DEL:

	case TC_HTB_LEAF_DEL_LAST:

	case TC_HTB_LEAF_DEL_LAST_FORCE:

		return airoha_tc_htb_delete_leaf_queue(port, opt);

		return airoha_tc_htb_delete_leaf_queue(dev, opt);

	case TC_HTB_LEAF_QUERY_QUEUE:

		return airoha_tc_get_htb_get_leaf_queue(port, opt);

		return airoha_tc_get_htb_get_leaf_queue(dev, opt);

	default:

		return -EOPNOTSUPP;

	}
@@ -2804,16 +2807,14 @@ static int airoha_tc_setup_qdisc_htb(struct airoha_gdm_port *port, 
static int airoha_dev_tc_setup(struct net_device *dev, enum tc_setup_type type,

			       void *type_data)

{

	struct airoha_gdm_port *port = netdev_priv(dev);



	switch (type) {

	case TC_SETUP_QDISC_ETS:

		return airoha_tc_setup_qdisc_ets(port, type_data);

		return airoha_tc_setup_qdisc_ets(dev, type_data);

	case TC_SETUP_QDISC_HTB:

		return airoha_tc_setup_qdisc_htb(port, type_data);

		return airoha_tc_setup_qdisc_htb(dev, type_data);

	case TC_SETUP_BLOCK:

	case TC_SETUP_FT:

		return airoha_dev_setup_tc_block(port, type_data);

		return airoha_dev_setup_tc_block(dev, type_data);

	default:

		return -EOPNOTSUPP;

	}