cmd: bind: Add unbind command with driver filter
PATCH 1/4 cmd: bind: Add unbind command with driver filter
Extend the driver core to perform lookup by both OF node and driver bound to the node. Use this to look up specific device instances to unbind from nodes in the unbind command. One example where this is needed is USB peripheral controller, which may have multiple gadget drivers bound to it. The unbind command has to select that specific gadget driver instance to unbind from the controller, not unbind the controller driver itself from the controller.
USB ethernet gadget usage looks as follows with this change. Notice the extra 'usb_ether' addition in the 'unbind' command at the end. "
bind /soc/usb-otg@49000000 usb_ether
setenv ethact usb_ether
setenv loadaddr 0xc2000000
setenv ipaddr 10.0.0.2
setenv serverip 10.0.0.1
setenv netmask 255.255.255.0
tftpboot 0xc2000000 10.0.0.1:test.file
unbind /soc/usb-otg@49000000 usb_ether
"
---
Cc: Kevin Hilman <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Simon Glass <[email protected]>
--- cmd/bind.c | 10 +++++----- drivers/core/device.c | 20 +++++++++++++++----- include/dm/device.h | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 10 deletions(-)
cmd/bind.c +5 -5
@@ -162,7 +162,7 @@ static int bind_by_node_path(const char *path, const char *drv_name)return 0 ; } -static int unbind_by_node_path (const char *path) +static int unbind_by_node_path (const char *path,const char *drv_name) {struct udevice *dev;int ret;
@@ -174,7 +174,7 @@ static int unbind_by_node_path(const char *path)return -EINVAL ; } - ret =device_find_global_by_ofnode (ofnode, &dev); + ret =device_find_global_by_ofnode_driver (ofnode, drv_name, &dev);if (!dev || ret) {printf ("Cannot find a device with path %s\n" , path);
@@ -214,9 +214,9 @@ static int do_bind_unbind(struct cmd_tbl *cmdtp, int flag, int argc,return CMD_RET_USAGE ; ret =bind_by_node_path (argv[1 ], argv[2 ]); }else if (by_node && !bind) { -if (argc !=2 ) +if (argc !=2 && argc !=3 )return CMD_RET_USAGE ; - ret =unbind_by_node_path (argv[1 ]); + ret =unbind_by_node_path (argv[1 ], argv[2 ]); }else if (!by_node && bind) {int index = (argc >2 ) ?dectoul (argv[2 ],NULL ) :0 ;
@@ -251,7 +251,7 @@ U_BOOT_CMD(U_BOOT_CMD ( unbind,4 ,0 , do_bind_unbind,"Unbind a device from a driver" , -"<node path>\n" +"<node path> [<driver>]\n" "unbind <class> <index>\n" "unbind <class> <index> <driver>\n" );
drivers/core/device.c +15 -5
@@ -877,15 +877,17 @@ int device_get_child_by_of_offset(const struct udevice *parent, int node, }static struct udevice *_device_find_global_by_ofnode (struct udevice *parent, -ofnode ofnode) +ofnode ofnode, +const char *drv) {struct udevice *dev, *found; -if (ofnode_equal (dev_ofnode (parent), ofnode)) +if (ofnode_equal (dev_ofnode (parent), ofnode) && + (!drv || (drv && !strcmp (parent->driver->name, drv))))return parent; device_foreach_child(dev, parent) { - found =_device_find_global_by_ofnode (dev, ofnode); + found =_device_find_global_by_ofnode (dev, ofnode, drv);if (found)return found; }
@@ -895,7 +897,15 @@ static struct udevice *_device_find_global_by_ofnode(struct udevice *parent,int device_find_global_by_ofnode (ofnode ofnode,struct udevice **devp) { - *devp =_device_find_global_by_ofnode (gd->dm_root, ofnode); + *devp =_device_find_global_by_ofnode (gd->dm_root, ofnode,NULL ); + +return *devp ?0 : -ENOENT ; +} + +int device_find_global_by_ofnode_driver (ofnode ofnode,const char *drv, +struct udevice **devp) +{ + *devp =_device_find_global_by_ofnode (gd->dm_root, ofnode, drv);return *devp ?0 : -ENOENT ; }
@@ -904,7 +914,7 @@ int device_get_global_by_ofnode(ofnode ofnode, struct udevice **devp) {struct udevice *dev; - dev =_device_find_global_by_ofnode (gd->dm_root, ofnode); + dev =_device_find_global_by_ofnode (gd->dm_root, ofnode,NULL );return device_get_device_tail (dev, dev ?0 : -ENOENT , devp); }
include/dm/device.h +17 -0
@@ -748,6 +748,23 @@ int device_get_child_by_of_offset(const struct udevice *parent, int of_offset,int device_find_global_by_ofnode (ofnode node,struct udevice **devp); +/** +* device_find_global_by_ofnode_driver() - Get a device based on ofnode and driver +* +* Locates a device by its device tree ofnode and driver currently bound to +* it, searching globally throughout the all driver model devices. +* +* The device is NOT probed +* +* @node: Device tree ofnode to find +* @drv: Driver name bound to device +* @devp: Returns pointer to device if found, otherwise this is set to NULL +* Return: 0 if OK, -ve on error +*/ + +int device_find_global_by_ofnode_driver (ofnode node,const char *drv, +struct udevice **devp); +/** * device_get_global_by_ofnode() - Get a device based on ofnode *
Signature · 1 line
2.39.2
PATCH 2/4 usb: gadget: ether: Inline functions used once
These functions here are only ever called once since drop of non-DM networking code. Inline them. No functional change.
---
Cc: Kevin Hilman <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Simon Glass <[email protected]>
--- drivers/usb/gadget/ether.c | 48 +++++++------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-)
drivers/usb/gadget/ether.c +9 -39
@@ -2273,10 +2273,11 @@ fail: }/*-------------------------------------------------------------------------*/ -static void _usb_eth_halt (struct ether_priv *priv); +static void usb_eth_stop (struct udevice *dev); -static int _usb_eth_init (struct ether_priv *priv) +static int usb_eth_start (struct udevice *udev) { +struct ether_priv *priv =dev_get_priv (udev);struct eth_dev *dev = &priv->ethdev;struct usb_gadget *gadget;unsigned long ts;
@@ -2347,12 +2348,13 @@ static int _usb_eth_init(struct ether_priv *priv)rx_submit (dev, dev->rx_req,0 );return 0 ; fail: -_usb_eth_halt (priv); +usb_eth_stop (udev);return -1 ; } -static int _usb_eth_send (struct ether_priv *priv,void *packet,int length) +static int usb_eth_send (struct udevice *udev,void *packet,int length) { +struct ether_priv *priv =dev_get_priv (udev);int retval;void *rndis_pkt =NULL ;struct eth_dev *dev = &priv->ethdev;
@@ -2419,15 +2421,9 @@ drop:return -ENOMEM ; } -static int _usb_eth_recv (struct ether_priv *priv) -{ -usb_gadget_handle_interrupts (0 ); - -return 0 ; -} - -static void _usb_eth_halt (struct ether_priv *priv) +static void usb_eth_stop (struct udevice *udev) { +struct ether_priv *priv =dev_get_priv (udev);struct eth_dev *dev = &priv->ethdev;/* If the gadget not registered, simple return */
@@ -2459,31 +2455,12 @@ static void _usb_eth_halt(struct ether_priv *priv)usb_gadget_release (0 ); } -static int usb_eth_start (struct udevice *dev) -{ -struct ether_priv *priv =dev_get_priv (dev); - -return _usb_eth_init (priv); -} - -static int usb_eth_send (struct udevice *dev,void *packet,int length) -{ -struct ether_priv *priv =dev_get_priv (dev); - -return _usb_eth_send (priv, packet, length); -} -static int usb_eth_recv (struct udevice *dev,int flags,uchar **packetp) {struct ether_priv *priv =dev_get_priv (dev);struct eth_dev *ethdev = &priv->ethdev; -int ret; - ret =_usb_eth_recv (priv); -if (ret) { -pr_err ("error packet receive\n" ); -return ret; - } +usb_gadget_handle_interrupts (0 );if (packet_received) {if (ethdev->rx_req) {
@@ -2509,13 +2486,6 @@ static int usb_eth_free_pkt(struct udevice *dev, uchar *packet,return rx_submit (ethdev, ethdev->rx_req,0 ); } -static void usb_eth_stop (struct udevice *dev) -{ -struct ether_priv *priv =dev_get_priv (dev); - -_usb_eth_halt (priv); -} -static int usb_eth_probe (struct udevice *dev) {struct ether_priv *priv =dev_get_priv (dev);
Signature · 1 line
2.39.2
PATCH 3/4 usb: gadget: ether: Move probe function above driver structure
In reply to Marek VasutMove the driver probe function above the driver structure, so it can be placed alongside other related functions, like upcoming remove function. No functional change.
---
Cc: Kevin Hilman <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Simon Glass <[email protected]>
--- drivers/usb/gadget/ether.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/usb/gadget/ether.c +14 -14
@@ -2486,20 +2486,6 @@ static int usb_eth_free_pkt(struct udevice *dev, uchar *packet,return rx_submit (ethdev, ethdev->rx_req,0 ); } -static int usb_eth_probe (struct udevice *dev) -{ -struct ether_priv *priv =dev_get_priv (dev); -struct eth_pdata *pdata =dev_get_plat (dev); - - priv->netdev = dev; - l_priv = priv; - -get_ether_addr (CONFIG_USBNET_DEV_ADDR , pdata->enetaddr); -eth_env_set_enetaddr ("usbnet_devaddr" , pdata->enetaddr); - -return 0 ; -} -static const struct eth_ops usb_eth_ops = { .start = usb_eth_start, .send = usb_eth_send,
@@ -2528,6 +2514,20 @@ int usb_ether_init(void)return 0 ; } +static int usb_eth_probe (struct udevice *dev) +{ +struct ether_priv *priv =dev_get_priv (dev); +struct eth_pdata *pdata =dev_get_plat (dev); + + priv->netdev = dev; + l_priv = priv; + +get_ether_addr (CONFIG_USBNET_DEV_ADDR , pdata->enetaddr); +eth_env_set_enetaddr ("usbnet_devaddr" , pdata->enetaddr); + +return 0 ; +} +U_BOOT_DRIVER (eth_usb) = { .name ="usb_ether" , .id =UCLASS_ETH ,
Signature · 1 line
2.39.2
PATCH 4/4 usb: gadget: ether: Handle gadget driver registration in probe and remove
In reply to Marek VasutMove the ethernet gadget driver registration and removal from ethernet bind and unbind callbacks into driver DM probe and remove callbacks. This way, when the driver is bound, which is triggered deliberately using 'bind' command, the USB ethernet gadget driver is instantiated and bound to the matching UDC. In reverse, when the driver is unbound, which is again triggered deliberately using 'unbind' command, the USB ethernet gadget driver instance is removed.
Effectively, this now behaves like running either 'ums' or 'dfu' or any other commands utilizing USB gadget functionality.
This also drops use of usb_gadget_initialize()/usb_gadget_release(), which are helper functions implemented in the UDC uclass to bind and unbind UDC drivers to controllers from U-Boot command line. Those have no place in drivers.
---
NOTE: This must be thoroughly tested.
---
Cc: Kevin Hilman <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Marek Vasut <[email protected]>
Cc: Simon Glass <[email protected]>
--- drivers/usb/gadget/ether.c | 95 ++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 44 deletions(-)
drivers/usb/gadget/ether.c +51 -44
@@ -2281,49 +2281,8 @@ static int usb_eth_start(struct udevice *udev)struct eth_dev *dev = &priv->ethdev;struct usb_gadget *gadget;unsigned long ts; -int ret;unsigned long timeout =USB_CONNECT_TIMEOUT ; - ret =usb_gadget_initialize (0 ); -if (ret) -return ret; - -/* Configure default mac-addresses for the USB ethernet device */ -#ifdef CONFIG_USBNET_DEV_ADDR -strlcpy (dev_addr,CONFIG_USBNET_DEV_ADDR ,sizeof (dev_addr)); -#endif -#ifdef CONFIG_USBNET_HOST_ADDR -strlcpy (host_addr,CONFIG_USBNET_HOST_ADDR ,sizeof (host_addr)); -#endif -/* Check if the user overruled the MAC addresses */ -if (env_get ("usbnet_devaddr" )) -strlcpy (dev_addr,env_get ("usbnet_devaddr" ), -sizeof (dev_addr)); - -if (env_get ("usbnet_hostaddr" )) -strlcpy (host_addr,env_get ("usbnet_hostaddr" ), -sizeof (host_addr)); - -if (!is_eth_addr_valid (dev_addr)) { -pr_err ("Need valid 'usbnet_devaddr' to be set" ); - goto fail; - } -if (!is_eth_addr_valid (host_addr)) { -pr_err ("Need valid 'usbnet_hostaddr' to be set" ); - goto fail; - } - - priv->eth_driver.speed =DEVSPEED ; - priv->eth_driver.bind = eth_bind; - priv->eth_driver.unbind = eth_unbind; - priv->eth_driver.setup = eth_setup; - priv->eth_driver.reset = eth_disconnect; - priv->eth_driver.disconnect = eth_disconnect; - priv->eth_driver.suspend = eth_suspend; - priv->eth_driver.resume = eth_resume; -if (usb_gadget_register_driver (&priv->eth_driver) <0 ) - goto fail; - dev->network_started =0 ; packet_received =0 ;
@@ -2450,9 +2409,6 @@ static void usb_eth_stop(struct udevice *udev)usb_gadget_handle_interrupts (0 ); dev->network_started =0 ; } - -usb_gadget_unregister_driver (&priv->eth_driver); -usb_gadget_release (0 ); }static int usb_eth_recv (struct udevice *dev,int flags,uchar **packetp)
@@ -2518,6 +2474,7 @@ static int usb_eth_probe(struct udevice *dev) {struct ether_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_plat (dev); +int ret; priv->netdev = dev; l_priv = priv;
@@ -2525,6 +2482,55 @@ static int usb_eth_probe(struct udevice *dev)get_ether_addr (CONFIG_USBNET_DEV_ADDR , pdata->enetaddr);eth_env_set_enetaddr ("usbnet_devaddr" , pdata->enetaddr); +/* Configure default mac-addresses for the USB ethernet device */ +#ifdef CONFIG_USBNET_DEV_ADDR +strlcpy (dev_addr,CONFIG_USBNET_DEV_ADDR ,sizeof (dev_addr)); +#endif +#ifdef CONFIG_USBNET_HOST_ADDR +strlcpy (host_addr,CONFIG_USBNET_HOST_ADDR ,sizeof (host_addr)); +#endif +/* Check if the user overruled the MAC addresses */ +if (env_get ("usbnet_devaddr" )) +strlcpy (dev_addr,env_get ("usbnet_devaddr" ), +sizeof (dev_addr)); + +if (env_get ("usbnet_hostaddr" )) +strlcpy (host_addr,env_get ("usbnet_hostaddr" ), +sizeof (host_addr)); + +if (!is_eth_addr_valid (dev_addr)) { +pr_err ("Need valid 'usbnet_devaddr' to be set" ); + goto fail; + } +if (!is_eth_addr_valid (host_addr)) { +pr_err ("Need valid 'usbnet_hostaddr' to be set" ); + goto fail; + } + + priv->eth_driver.speed =DEVSPEED ; + priv->eth_driver.bind = eth_bind; + priv->eth_driver.unbind = eth_unbind; + priv->eth_driver.setup = eth_setup; + priv->eth_driver.reset = eth_disconnect; + priv->eth_driver.disconnect = eth_disconnect; + priv->eth_driver.suspend = eth_suspend; + priv->eth_driver.resume = eth_resume; + ret =usb_gadget_register_driver (&priv->eth_driver); +if (ret <0 ) + goto fail; + +return 0 ; +fail: +usb_gadget_release (0 ); +return ret; +} + +static int usb_eth_remove (struct udevice *dev) +{ +struct ether_priv *priv =dev_get_priv (dev); + +usb_gadget_unregister_driver (&priv->eth_driver); +return 0 ; }
@@ -2532,6 +2538,7 @@ U_BOOT_DRIVER(eth_usb) = { .name = "usb_ether", .id = UCLASS_ETH, .probe = usb_eth_probe, + .remove = usb_eth_remove, .ops = &usb_eth_ops, .priv_auto = sizeof(struct ether_priv), .plat_auto = sizeof(struct eth_pdata),
Signature · 1 line
2.39.2