| Message ID | 20190210234007.16173-6-f.fainelli@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: Remove switchdev_ops | expand |
Mon, Feb 11, 2019 at 12:40:03AM CET, f.fainelli@gmail.com wrote: >Following patches will change the way we communicate getting or setting >a port's attribute and use a blocking notifier to perform those tasks. > >Prepare ocelot to support receiving notifier events targeting >SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing >ocelot_port_attr_{set,get} calls. > >Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> >--- > drivers/net/ethernet/mscc/ocelot.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > >diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c >index 195306d05bcd..850a49033a30 100644 >--- a/drivers/net/ethernet/mscc/ocelot.c >+++ b/drivers/net/ethernet/mscc/ocelot.c >@@ -1582,6 +1582,24 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { > }; > EXPORT_SYMBOL(ocelot_netdevice_nb); > >+static int >+ocelot_switchdev_port_attr_event(unsigned long event, >+ struct net_device *netdev, >+ struct switchdev_notifier_port_attr_info *port_attr_info) >+{ >+ int err = -EOPNOTSUPP; >+ >+ switch (event) { >+ case SWITCHDEV_PORT_ATTR_SET: >+ err = ocelot_port_attr_set(netdev, port_attr_info->attr, >+ port_attr_info->trans); >+ break; >+ } >+ >+ port_attr_info->handled = true; >+ return notifier_from_errno(err); >+} >+ > static int ocelot_switchdev_blocking_event(struct notifier_block *unused, > unsigned long event, void *ptr) > { >@@ -1600,6 +1618,9 @@ 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: >+ case SWITCHDEV_PORT_ATTR_GET: /* fallthrough */ I think that the "fallthrough" comment should be for "ATTR_SET" case. Anyway: Acked-by: Jiri Pirko <jiri@mellanox.com> >+ return ocelot_switchdev_port_attr_event(event, dev, ptr); > } > > return NOTIFY_DONE; >-- >2.19.1 >
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 195306d05bcd..850a49033a30 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -1582,6 +1582,24 @@ struct notifier_block ocelot_netdevice_nb __read_mostly = { }; EXPORT_SYMBOL(ocelot_netdevice_nb); +static int +ocelot_switchdev_port_attr_event(unsigned long event, + struct net_device *netdev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int err = -EOPNOTSUPP; + + switch (event) { + case SWITCHDEV_PORT_ATTR_SET: + err = ocelot_port_attr_set(netdev, port_attr_info->attr, + port_attr_info->trans); + break; + } + + port_attr_info->handled = true; + return notifier_from_errno(err); +} + static int ocelot_switchdev_blocking_event(struct notifier_block *unused, unsigned long event, void *ptr) { @@ -1600,6 +1618,9 @@ 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: + case SWITCHDEV_PORT_ATTR_GET: /* fallthrough */ + return ocelot_switchdev_port_attr_event(event, dev, ptr); } return NOTIFY_DONE;
Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare ocelot to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET/SET and simply translate that into the existing ocelot_port_attr_{set,get} calls. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/ethernet/mscc/ocelot.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)