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

Merge branch 'Accomodate-DSA-front-end-into-Ocelot' 

Vladimir Oltean says:

====================
Accomodate DSA front-end into Ocelot

After the nice "change-my-mind" discussion about Ocelot, Felix and
LS1028A (which can be read here: https://lkml.org/lkml/2019/6/21/630),
we have decided to take the route of reworking the Ocelot implementation
in a way that is DSA-compatible.

This is a large series, but hopefully is easy enough to digest, since it
contains mostly code refactoring. What needs to be changed:
- The struct net_device, phy_device needs to be isolated from Ocelot
  private structures (struct ocelot, struct ocelot_port). These will
  live as 1-to-1 equivalents to struct dsa_switch and struct dsa_port.
- The function prototypes need to be compatible with DSA (of course,
  struct dsa_switch will become struct ocelot).
- The CPU port needs to be assigned via a higher-level API, not
  hardcoded in the driver.

What is going to be interesting is that the new DSA front-end of Ocelot
will need to have features in lockstep with the DSA core itself. At the
moment, some more advanced tc offloading features of Ocelot (tc-flower,
etc) are not available in the DSA front-end due to lack of API in the
DSA core. It also means that Ocelot practically re-implements large
parts of DSA (although it is not a DSA switch per se) - see the FDB API
for example.

The code has been only compile-tested on Ocelot, since I don't have
access to any VSC7514 hardware. It was proven to work on NXP LS1028A,
which instantiates a DSA derivative of Ocelot. So I would like to ask
Alex Belloni if you could confirm this series causes no regression on
the Ocelot MIPS SoC.

The goal is to get this rework upstream as quickly as possible,
precisely because it is a large volume of code that risks gaining merge
conflicts if we keep it for too long.

This is but the first chunk of the LS1028A Felix DSA driver upstreaming.
For those who are interested, the concept can be seen on my private
Github repo, the user of this reworked Ocelot driver living under
drivers/net/dsa/vitesse/:
https://github.com/vladimiroltean/ls1028ardb-linux


====================

Acked-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c82488df c9d2203b

drivers/net/ethernet/mscc/ocelot.c

+571 −377

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/mscc/ocelot.h

+24 −9
Original line number Diff line number Diff line
@@ -427,6 +427,13 @@ struct ocelot_multicast { 
	u16 ports;

};



enum ocelot_tag_prefix {

	OCELOT_TAG_PREFIX_DISABLED	= 0,

	OCELOT_TAG_PREFIX_NONE,

	OCELOT_TAG_PREFIX_SHORT,

	OCELOT_TAG_PREFIX_LONG,

};



struct ocelot_port;



struct ocelot_stat_layout {
@@ -455,6 +462,7 @@ struct ocelot { 


	u8 num_phys_ports;

	u8 num_cpu_ports;

	u8 cpu;

	struct ocelot_port **ports;



	u32 *lags;
@@ -479,11 +487,9 @@ struct ocelot { 
};



struct ocelot_port {

	struct net_device *dev;

	struct ocelot *ocelot;

	struct phy_device *phy;



	void __iomem *regs;

	u8 chip_port;



	/* Ingress default VLAN (pvid) */

	u16 pvid;
@@ -491,18 +497,23 @@ struct ocelot_port { 
	/* Egress default VLAN (vid) */

	u16 vid;



	u8 vlan_aware;

	u8 ptp_cmd;

	struct list_head skbs;

	u8 ts_id;

};



	u64 *stats;

struct ocelot_port_private {

	struct ocelot_port port;

	struct net_device *dev;

	struct phy_device *phy;

	u8 chip_port;



	u8 vlan_aware;



	phy_interface_t phy_mode;

	struct phy *serdes;



	struct ocelot_port_tc tc;



	u8 ptp_cmd;

	struct list_head skbs;

	u8 ts_id;

};



struct ocelot_skb {
@@ -549,6 +560,10 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, 
		      void __iomem *regs,

		      struct phy_device *phy);



void ocelot_set_cpu_port(struct ocelot *ocelot, int cpu,

			 enum ocelot_tag_prefix injection,

			 enum ocelot_tag_prefix extraction);



extern struct notifier_block ocelot_netdevice_nb;

extern struct notifier_block ocelot_switchdev_nb;

extern struct notifier_block ocelot_switchdev_blocking_nb;

drivers/net/ethernet/mscc/ocelot_ace.h

+2 −2
Original line number Diff line number Diff line
@@ -224,9 +224,9 @@ int ocelot_ace_rule_stats_update(struct ocelot_ace_rule *rule); 
int ocelot_ace_init(struct ocelot *ocelot);

void ocelot_ace_deinit(void);



int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port,

int ocelot_setup_tc_block_flower_bind(struct ocelot_port_private *priv,

				      struct flow_block_offload *f);

void ocelot_setup_tc_block_flower_unbind(struct ocelot_port *port,

void ocelot_setup_tc_block_flower_unbind(struct ocelot_port_private *priv,

					 struct flow_block_offload *f);



#endif /* _MSCC_OCELOT_ACE_H_ */

drivers/net/ethernet/mscc/ocelot_board.c

+18 −6
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) 


	do {

		struct skb_shared_hwtstamps *shhwtstamps;

		struct ocelot_port_private *priv;

		struct ocelot_port *ocelot_port;

		u64 tod_in_ns, full_ts_in_ns;

		struct frame_info info = {};

		struct net_device *dev;
@@ -114,7 +116,10 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) 


		ocelot_parse_ifh(ifh, &info);



		dev = ocelot->ports[info.port]->dev;

		ocelot_port = ocelot->ports[info.port];

		priv = container_of(ocelot_port, struct ocelot_port_private,

				    port);

		dev = priv->dev;



		skb = netdev_alloc_skb(dev, info.len);
@@ -359,10 +364,13 @@ static int mscc_ocelot_probe(struct platform_device *pdev) 
	ocelot->ports = devm_kcalloc(&pdev->dev, ocelot->num_phys_ports,

				     sizeof(struct ocelot_port *), GFP_KERNEL);



	INIT_LIST_HEAD(&ocelot->multicast);

	ocelot_init(ocelot);

	ocelot_set_cpu_port(ocelot, ocelot->num_phys_ports,

			    OCELOT_TAG_PREFIX_NONE, OCELOT_TAG_PREFIX_NONE);



	for_each_available_child_of_node(ports, portnp) {

		struct ocelot_port_private *priv;

		struct ocelot_port *ocelot_port;

		struct device_node *phy_node;

		phy_interface_t phy_mode;

		struct phy_device *phy;
@@ -398,13 +406,17 @@ static int mscc_ocelot_probe(struct platform_device *pdev) 
			goto out_put_ports;

		}



		ocelot_port = ocelot->ports[port];

		priv = container_of(ocelot_port, struct ocelot_port_private,

				    port);



		err = of_get_phy_mode(portnp, &phy_mode);

		if (err && err != -ENODEV)

			goto out_put_ports;



		ocelot->ports[port]->phy_mode = phy_mode;

		priv->phy_mode = phy_mode;



		switch (ocelot->ports[port]->phy_mode) {

		switch (priv->phy_mode) {

		case PHY_INTERFACE_MODE_NA:

			continue;

		case PHY_INTERFACE_MODE_SGMII:
@@ -413,7 +425,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev) 
			/* Ensure clock signals and speed is set on all

			 * QSGMII links

			 */

			ocelot_port_writel(ocelot->ports[port],

			ocelot_port_writel(ocelot_port,

					   DEV_CLOCK_CFG_LINK_SPEED

					   (OCELOT_SPEED_1000),

					   DEV_CLOCK_CFG);
@@ -441,7 +453,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev) 
			goto out_put_ports;

		}



		ocelot->ports[port]->serdes = serdes;

		priv->serdes = serdes;

	}



	register_netdevice_notifier(&ocelot_netdevice_nb);

drivers/net/ethernet/mscc/ocelot_flower.c

+16 −16
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


struct ocelot_port_block {

	struct ocelot_acl_block *block;

	struct ocelot_port *port;

	struct ocelot_port_private *priv;

};



static int ocelot_flower_parse_action(struct flow_cls_offload *f,
@@ -177,8 +177,8 @@ struct ocelot_ace_rule *ocelot_ace_rule_create(struct flow_cls_offload *f, 
	if (!rule)

		return NULL;



	rule->port = block->port;

	rule->chip_port = block->port->chip_port;

	rule->port = &block->priv->port;

	rule->chip_port = block->priv->chip_port;

	return rule;

}
@@ -202,7 +202,7 @@ static int ocelot_flower_replace(struct flow_cls_offload *f, 
	if (ret)

		return ret;



	port_block->port->tc.offload_cnt++;

	port_block->priv->tc.offload_cnt++;

	return 0;

}
@@ -213,14 +213,14 @@ static int ocelot_flower_destroy(struct flow_cls_offload *f, 
	int ret;



	rule.prio = f->common.prio;

	rule.port = port_block->port;

	rule.port = &port_block->priv->port;

	rule.id = f->cookie;



	ret = ocelot_ace_rule_offload_del(&rule);

	if (ret)

		return ret;



	port_block->port->tc.offload_cnt--;

	port_block->priv->tc.offload_cnt--;

	return 0;

}
@@ -231,7 +231,7 @@ static int ocelot_flower_stats_update(struct flow_cls_offload *f, 
	int ret;



	rule.prio = f->common.prio;

	rule.port = port_block->port;

	rule.port = &port_block->priv->port;

	rule.id = f->cookie;

	ret = ocelot_ace_rule_stats_update(&rule);

	if (ret)
@@ -261,7 +261,7 @@ static int ocelot_setup_tc_block_cb_flower(enum tc_setup_type type, 
{

	struct ocelot_port_block *port_block = cb_priv;



	if (!tc_cls_can_offload_and_chain0(port_block->port->dev, type_data))

	if (!tc_cls_can_offload_and_chain0(port_block->priv->dev, type_data))

		return -EOPNOTSUPP;



	switch (type) {
@@ -275,7 +275,7 @@ static int ocelot_setup_tc_block_cb_flower(enum tc_setup_type type, 
}



static struct ocelot_port_block*

ocelot_port_block_create(struct ocelot_port *port)

ocelot_port_block_create(struct ocelot_port_private *priv)

{

	struct ocelot_port_block *port_block;
@@ -283,7 +283,7 @@ ocelot_port_block_create(struct ocelot_port *port) 
	if (!port_block)

		return NULL;



	port_block->port = port;

	port_block->priv = priv;



	return port_block;

}
@@ -300,7 +300,7 @@ static void ocelot_tc_block_unbind(void *cb_priv) 
	ocelot_port_block_destroy(port_block);

}



int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port,

int ocelot_setup_tc_block_flower_bind(struct ocelot_port_private *priv,

				      struct flow_block_offload *f)

{

	struct ocelot_port_block *port_block;
@@ -311,14 +311,14 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port, 
		return -EOPNOTSUPP;



	block_cb = flow_block_cb_lookup(f->block,

					ocelot_setup_tc_block_cb_flower, port);

					ocelot_setup_tc_block_cb_flower, priv);

	if (!block_cb) {

		port_block = ocelot_port_block_create(port);

		port_block = ocelot_port_block_create(priv);

		if (!port_block)

			return -ENOMEM;



		block_cb = flow_block_cb_alloc(ocelot_setup_tc_block_cb_flower,

					       port, port_block,

					       priv, port_block,

					       ocelot_tc_block_unbind);

		if (IS_ERR(block_cb)) {

			ret = PTR_ERR(block_cb);
@@ -339,13 +339,13 @@ err_cb_register: 
	return ret;

}



void ocelot_setup_tc_block_flower_unbind(struct ocelot_port *port,

void ocelot_setup_tc_block_flower_unbind(struct ocelot_port_private *priv,

					 struct flow_block_offload *f)

{

	struct flow_block_cb *block_cb;



	block_cb = flow_block_cb_lookup(f->block,

					ocelot_setup_tc_block_cb_flower, port);

					ocelot_setup_tc_block_cb_flower, priv);

	if (!block_cb)

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE