Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a39b8888 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_OBJ_ADD/_DEL 



Following patches will change the way of distributing port object
changes from a switchdev operation to a switchdev notifier. The
switchdev code currently recursively descends through layers of lower
devices, eventually calling the op on a front-panel port device. The
notifier will instead be sent referencing the bridge port device, which
may be a stacking device that's one of front-panel ports uppers, or a
completely unrelated device.

ethsw currently doesn't support any uppers other than bridge.
SWITCHDEV_OBJ_ID_HOST_MDB and _PORT_MDB objects are always notified on
the bridge port device. Thus the only case that a stacked device could
be validly referenced by port object notifications are bridge
notifications for VLAN objects added to the bridge itself. But the
driver explicitly rejects such notifications in port_vlans_add(). It is
therefore safe to assume that the only interesting case is that the
notification is on a front-panel port netdevice.

To handle SWITCHDEV_PORT_OBJ_ADD and _DEL, subscribe to the blocking
notifier chain. Dispatch to swdev_port_obj_add() resp. _del() to
maintain the behavior that the switchdev operation based code currently
has.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb896805

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+56 −0
Original line number Original line Diff line number Diff line
@@ -1088,10 +1088,51 @@ static int port_switchdev_event(struct notifier_block *unused, 
	return NOTIFY_BAD;

	return NOTIFY_BAD;

}

}





static int

ethsw_switchdev_port_obj_event(unsigned long event, struct net_device *netdev,

			struct switchdev_notifier_port_obj_info *port_obj_info)

{

	int err = -EOPNOTSUPP;



	switch (event) {

	case SWITCHDEV_PORT_OBJ_ADD:

		err = swdev_port_obj_add(netdev, port_obj_info->obj,

					 port_obj_info->trans);

		break;

	case SWITCHDEV_PORT_OBJ_DEL:

		err = swdev_port_obj_del(netdev, port_obj_info->obj);

		break;

	}



	port_obj_info->handled = true;

	return notifier_from_errno(err);

}



static int port_switchdev_blocking_event(struct notifier_block *unused,

					 unsigned long event, void *ptr)

{

	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);



	if (!ethsw_port_dev_check(dev))

		return NOTIFY_DONE;



	switch (event) {

	case SWITCHDEV_PORT_OBJ_ADD: /* fall through */

	case SWITCHDEV_PORT_OBJ_DEL:

		return ethsw_switchdev_port_obj_event(event, dev, ptr);

	}



	return NOTIFY_DONE;

}



static struct notifier_block port_switchdev_nb = {

static struct notifier_block port_switchdev_nb = {

	.notifier_call = port_switchdev_event,

	.notifier_call = port_switchdev_event,

};

};





static struct notifier_block port_switchdev_blocking_nb = {

	.notifier_call = port_switchdev_blocking_event,

};



static int ethsw_register_notifier(struct device *dev)

static int ethsw_register_notifier(struct device *dev)

{

{

	int err;

	int err;
@@ -1108,8 +1149,16 @@ static int ethsw_register_notifier(struct device *dev) 
		goto err_switchdev_nb;

		goto err_switchdev_nb;

	}

	}





	err = register_switchdev_blocking_notifier(&port_switchdev_blocking_nb);

	if (err) {

		dev_err(dev, "Failed to register switchdev blocking notifier\n");

		goto err_switchdev_blocking_nb;

	}



	return 0;

	return 0;





err_switchdev_blocking_nb:

	unregister_switchdev_notifier(&port_switchdev_nb);

err_switchdev_nb:

err_switchdev_nb:

	unregister_netdevice_notifier(&port_nb);

	unregister_netdevice_notifier(&port_nb);

	return err;

	return err;
@@ -1296,8 +1345,15 @@ static int ethsw_port_init(struct ethsw_port_priv *port_priv, u16 port) 




static void ethsw_unregister_notifier(struct device *dev)

static void ethsw_unregister_notifier(struct device *dev)

{

{

	struct notifier_block *nb;

	int err;

	int err;





	nb = &port_switchdev_blocking_nb;

	err = unregister_switchdev_blocking_notifier(nb);

	if (err)

		dev_err(dev,

			"Failed to unregister switchdev blocking notifier (%d)\n", err);



	err = unregister_switchdev_notifier(&port_switchdev_nb);

	err = unregister_switchdev_notifier(&port_switchdev_nb);

	if (err)

	if (err)

		dev_err(dev,

		dev_err(dev,