mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-10 07:01:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://source.denx.de/u-boot/custodians/u-boot-usb

Browse Source 
- Fix some issues with usb gadget ethernet.  A small set of updates for
  docs, etc, is still pending
This commit is contained in:
Tom Rini 2023-08-05 12:24:33 -04:00
commit fd13001d13
2 changed files with 75 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/Kconfig
View File

@ -986,6 +986,7 @@ config CMD_BCB
config CMD_BIND config CMD_BIND
bool "bind/unbind - Bind or unbind a device to/from a driver" bool "bind/unbind - Bind or unbind a device to/from a driver"
depends on DM depends on DM
default y if USB_ETHER
help help
Bind or unbind a device to/from a driver from the command line. Bind or unbind a device to/from a driver from the command line.
This is useful in situations where a device may be handled by several This is useful in situations where a device may be handled by several

171
drivers/usb/gadget/ether.c
View File

@ -2273,56 +2273,16 @@ 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 eth_dev *dev = &priv->ethdev;
struct usb_gadget *gadget; struct usb_gadget *gadget;
unsigned long ts; unsigned long ts;
int ret;
unsigned long timeout = USB_CONNECT_TIMEOUT; 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; dev->network_started = 0;
packet_received = 0; packet_received = 0;
@ -2347,12 +2307,13 @@ static int _usb_eth_init(struct ether_priv *priv)
rx_submit(dev, dev->rx_req, 0); rx_submit(dev, dev->rx_req, 0);
return 0; return 0;
fail: fail:
_usb_eth_halt(priv); usb_eth_stop(udev);
return -1; 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; int retval;
void *rndis_pkt = NULL; void *rndis_pkt = NULL;
struct eth_dev *dev = &priv->ethdev; struct eth_dev *dev = &priv->ethdev;
@ -2419,15 +2380,9 @@ drop:
return -ENOMEM; return -ENOMEM;
} }
static int _usb_eth_recv(struct ether_priv *priv) static void usb_eth_stop(struct udevice *udev)
{
usb_gadget_handle_interrupts(0);
return 0;
}
static void _usb_eth_halt(struct ether_priv *priv)
{ {
struct ether_priv *priv = dev_get_priv(udev);
struct eth_dev *dev = &priv->ethdev; struct eth_dev *dev = &priv->ethdev;
/* If the gadget not registered, simple return */ /* If the gadget not registered, simple return */
@ -2454,36 +2409,14 @@ static void _usb_eth_halt(struct ether_priv *priv)
usb_gadget_handle_interrupts(0); usb_gadget_handle_interrupts(0);
dev->network_started = 0; dev->network_started = 0;
} }
usb_gadget_unregister_driver(&priv->eth_driver);
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) static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
{ {
struct ether_priv *priv = dev_get_priv(dev); struct ether_priv *priv = dev_get_priv(dev);
struct eth_dev *ethdev = &priv->ethdev; struct eth_dev *ethdev = &priv->ethdev;
int ret;
ret = _usb_eth_recv(priv); usb_gadget_handle_interrupts(0);
if (ret) {
pr_err("error packet receive\n");
return ret;
}
if (packet_received) { if (packet_received) {
if (ethdev->rx_req) { if (ethdev->rx_req) {
@ -2509,27 +2442,6 @@ static int usb_eth_free_pkt(struct udevice *dev, uchar *packet,
return rx_submit(ethdev, ethdev->rx_req, 0); 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);
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 = { static const struct eth_ops usb_eth_ops = {
.start = usb_eth_start, .start = usb_eth_start,
.send = usb_eth_send, .send = usb_eth_send,
@ -2555,6 +2467,69 @@ int usb_ether_init(void)
return ret; return ret;
} }
return usb_gadget_initialize(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);
/* 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");
return -EINVAL;
}
if (!is_eth_addr_valid(host_addr)) {
pr_err("Need valid 'usbnet_hostaddr' to be set");
return -EINVAL;
}
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;
return usb_gadget_register_driver(&priv->eth_driver);
}
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;
}
static int usb_eth_unbind(struct udevice *dev)
{
usb_gadget_release(0);
return 0; return 0;
} }
@ -2562,6 +2537,8 @@ U_BOOT_DRIVER(eth_usb) = {
.name = "usb_ether", .name = "usb_ether",
.id = UCLASS_ETH, .id = UCLASS_ETH,
.probe = usb_eth_probe, .probe = usb_eth_probe,
.remove = usb_eth_remove,
.unbind = usb_eth_unbind,
.ops = &usb_eth_ops, .ops = &usb_eth_ops,
.priv_auto = sizeof(struct ether_priv), .priv_auto = sizeof(struct ether_priv),
.plat_auto = sizeof(struct eth_pdata), .plat_auto = sizeof(struct eth_pdata),