Commit 56da64bc authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: mscc: ocelot: Handle SWITCHDEV_PORT_ATTR_SET 



Following patches will change the way we communicate setting a port's
attribute and use notifiers to perform those tasks.

Ocelot does not currently have an atomic notifier registered for
switchdev events, so we need to register one in order to deal with
atomic context SWITCHDEV_PORT_ATTR_SET events.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7464251b

drivers/net/ethernet/mscc/ocelot.c

+27 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,28 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { 
};

EXPORT_SYMBOL(ocelot_netdevice_nb);



static int ocelot_switchdev_event(struct notifier_block *unused,

				  unsigned long event, void *ptr)

{

	struct net_device *dev = switchdev_notifier_info_to_dev(ptr);

	int err;



	switch (event) {

	case SWITCHDEV_PORT_ATTR_SET:

		err = switchdev_handle_port_attr_set(dev, ptr,

						     ocelot_netdevice_dev_check,

						     ocelot_port_attr_set);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;

}



struct notifier_block ocelot_switchdev_nb __read_mostly = {

	.notifier_call = ocelot_switchdev_event,

};

EXPORT_SYMBOL(ocelot_switchdev_nb);



static int ocelot_switchdev_blocking_event(struct notifier_block *unused,

					   unsigned long event, void *ptr)

{
@@ -1600,6 +1622,11 @@ static int ocelot_switchdev_blocking_event(struct notifier_block *unused, 
						    ocelot_netdevice_dev_check,

						    ocelot_port_obj_del);

		return notifier_from_errno(err);

	case SWITCHDEV_PORT_ATTR_SET:

		err = switchdev_handle_port_attr_set(dev, ptr,

						     ocelot_netdevice_dev_check,

						     ocelot_port_attr_set);

		return notifier_from_errno(err);

	}



	return NOTIFY_DONE;

drivers/net/ethernet/mscc/ocelot.h

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, 
		      struct phy_device *phy);



extern struct notifier_block ocelot_netdevice_nb;

extern struct notifier_block ocelot_switchdev_nb;

extern struct notifier_block ocelot_switchdev_blocking_nb;



#endif

drivers/net/ethernet/mscc/ocelot_board.c

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev) 
	}



	register_netdevice_notifier(&ocelot_netdevice_nb);

	register_switchdev_notifier(&ocelot_switchdev_nb);

	register_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);



	dev_info(&pdev->dev, "Ocelot switch probed\n");
@@ -345,6 +346,7 @@ static int mscc_ocelot_remove(struct platform_device *pdev) 


	ocelot_deinit(ocelot);

	unregister_switchdev_blocking_notifier(&ocelot_switchdev_blocking_nb);

	unregister_switchdev_notifier(&ocelot_switchdev_nb);

	unregister_netdevice_notifier(&ocelot_netdevice_nb);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE