--- zzzz-none-000/linux-4.19.183/drivers/usb/core/hub.c 2021-03-24 10:07:39.000000000 +0000 +++ bcm63-7530ax-756/linux-4.19.183/drivers/usb/core/hub.c 2023-06-28 08:54:20.000000000 +0000 @@ -35,6 +35,11 @@ #include "hub.h" #include "otg_whitelist.h" +#ifdef CONFIG_AVM_POWERMETER +#include +#include +#endif /*--- #ifdef CONFIG_AVM_POWERMETER ---*/ + #define USB_VENDOR_GENESYS_LOGIC 0x05e3 #define USB_VENDOR_SMSC 0x0424 #define USB_PRODUCT_USB5534B 0x5534 @@ -44,6 +49,43 @@ #define USB_TP_TRANSMISSION_DELAY 40 /* ns */ #define USB_TP_TRANSMISSION_DELAY_MAX 65535 /* ns */ +/* 20160801 AVM/VGJ USB KPI */ +#if defined(CONFIG_AVM_KERNEL) + +#define AVM_RECONNECT_ERROR_MS_THRESHOLD 2500 + +static unsigned long disconnect_time[2]; +static unsigned int disconnect_device_id[2]; + +static int reconnect_count; +module_param(reconnect_count, int, 0644); +MODULE_PARM_DESC(reconnect_count, "Count of reconnects"); + +static int enum_error_count; +module_param(enum_error_count, int, 0644); +MODULE_PARM_DESC(enum_error_count, "Count of enumeration errors"); + +// Overcurrent detection not yet supported in Broadcom Hardware +static int overcurrent_error_count = -1; +module_param(overcurrent_error_count, int, 0644); +MODULE_PARM_DESC(overcurrent_error_count, "Count of overcurrent errors"); + +#if defined(CONFIG_AVM_USB_SUSPEND) +static int suspend_count; +module_param(suspend_count, int, 0644); +MODULE_PARM_DESC(suspend_count, "Count of suspends"); + +static int reset_resume_count; +module_param(reset_resume_count, int, 0644); +MODULE_PARM_DESC(reset_resume_count, "Count of resets during resume"); + +static int resume_error_count; +module_param(resume_error_count, int, 0644); +MODULE_PARM_DESC(resume_error_count, "Count of failed resumes"); +#endif + +#endif + /* Protect struct usb_device->state and ->children members * Note: Both are also protected by ->dev.sem, except that ->state can * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */ @@ -2170,10 +2212,57 @@ */ pm_runtime_barrier(&udev->dev); +#if defined(CONFIG_AVM_POWERMETER) + { + unsigned nextmA = 0; + unsigned avm_powerdevice = 0; + + if (udev->level == 1) { + if (udev->parent->maxchild > 1) { + avm_powerdevice = (udev->portnum & 1)? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Port#%u config: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + } else { + avm_powerdevice = (udev->bus->busnum & 1)? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Bus#%u disconnect: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA); + } + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } +#endif // CONFIG_AVM_POWERMETER + +/* 20160801 AVM/VGJ store disconnect timestamp to check possible reconnects */ +#if defined(CONFIG_AVM_KERNEL) + // Only check reconnects of devices directly connected to root-hub + if (udev->level == 1) { + int port_index; + unsigned int device_id; + + if (udev->parent->maxchild > 1) { + port_index = udev->portnum & 1 ? 0 : 1; + } else { + port_index = udev->bus->busnum & 1 ? 0 : 1; + } + disconnect_time[port_index] = jiffies; + device_id = (udev->descriptor.idVendor << 16) | udev->descriptor.idProduct; + disconnect_device_id[port_index] = device_id; + } +#endif + usb_lock_device(udev); hub_disconnect_children(udev); +#if defined(CONFIG_AVM_USB_SUSPEND) + /* == 20180410 AVM/VGJ - Blacklist device, if disconnected recently after suspend (fixed) == */ + if (udev->port_is_suspended && ((jiffies - udev->avm_usb_suspend_timestamp) < msecs_to_jiffies(1000))) { + suspend_error_count++; + avm_usb_suspend_add_to_blacklist(udev); + } + + /* == 20180328 AVM/VGJ - Deletes suspend timer and disables suspend == */ + avm_usb_suspend_stop(udev); +#endif + /* deallocate hcd/hardware state ... nuking all pending urbs and * cleaning up all state associated with the current configuration * so that the hardware is now fully quiesced. @@ -2498,6 +2587,49 @@ /* Tell the world! */ announce_device(udev); +#if defined(CONFIG_AVM_POWERMETER) + { + unsigned nextmA = (udev->speed == USB_SPEED_SUPER)? 150: 100; + unsigned avm_powerdevice = 0; + + if (udev->level == 1) { + if (udev->parent->maxchild > 1) { + avm_powerdevice = (udev->portnum & 1)? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Port#%u config: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + } else { + avm_powerdevice = (udev->bus->busnum & 1)? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Bus#%u connect: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA); + } + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } +#endif // CONFIG_AVM_POWERMETER + +/* 20160801 AVM/VGJ If connect comes too fast after disconnect -> reconnect error */ +#if defined(CONFIG_AVM_KERNEL) + // Only check reconnects of devices directly connected to root-hub + if (udev->level == 1) { + unsigned long jiffies_diff; + unsigned int device_id; + int port_index; + + if (udev->parent->maxchild > 1) { + port_index = udev->portnum & 1 ? 0 : 1; + } else { + port_index = udev->bus->busnum & 1 ? 0 : 1; + } + // Check device_id to make sure that the stored time belongs to the same device + device_id = (udev->descriptor.idVendor << 16) | udev->descriptor.idProduct; + if (device_id == disconnect_device_id[port_index]) { + jiffies_diff = jiffies - disconnect_time[port_index]; + if (jiffies_diff < msecs_to_jiffies(AVM_RECONNECT_ERROR_MS_THRESHOLD)) { + pr_err("Spontaneous reconnect\n"); + reconnect_count++; + } + } + } +#endif + if (udev->serial) add_device_randomness(udev->serial, strlen(udev->serial)); if (udev->product) @@ -2985,7 +3117,8 @@ __release(&port_dev->status_lock); } -#ifdef CONFIG_PM +#if defined(CONFIG_PM) || defined(CONFIG_AVM_USB_SUSPEND) +//#ifdef CONFIG_PM /* Check if a port is suspended(USB2.0 port) or in U3 state(USB3.0 port) */ static int port_is_suspended(struct usb_hub *hub, unsigned portstatus) @@ -3021,10 +3154,18 @@ /* pass */; } /* Is the device still present? */ - else if (status || port_is_suspended(hub, portstatus) || + else if (status || + /* AVM/WKR 20210723 Do not treat port_is_suspended as No Device Error */ + (!IS_ENABLED(CONFIG_AVM_KERNEL) && port_is_suspended(hub, portstatus)) || !port_is_power_on(hub, portstatus)) { if (status >= 0) status = -ENODEV; + /* AVM/WKR 20210723 follow up port_is_suspended with reset resume */ + } else if (IS_ENABLED(CONFIG_AVM_KERNEL) && (port_is_suspended(hub, portstatus))) { + dev_dbg(hub->intfdev, + "port %d status %04x.%04x still suspended\n", + port1, portchange, portstatus); + udev->reset_resume = 1; } else if (!(portstatus & USB_PORT_STAT_CONNECTION)) { if (retries--) { usleep_range(200, 300); @@ -3298,12 +3439,36 @@ if (!PMSG_IS_AUTO(msg)) status = 0; } else { - dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n", + /* == 20180328 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "usb %ssuspend, wakeup %d\n", (PMSG_IS_AUTO(msg) ? "auto-" : ""), udev->do_remote_wakeup); if (really_suspend) { udev->port_is_suspended = 1; +#if defined(CONFIG_AVM_POWERMETER) + { + unsigned int nextmA = 50; + unsigned int avm_powerdevice = 0; + + if (udev->level == 1) { + if (udev->parent->maxchild > 1) { + avm_powerdevice = (udev->portnum & 1) ? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Port#%u suspend: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + } else { + avm_powerdevice = (udev->bus->busnum & 1) ? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Bus#%u suspend: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA); + } + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } +#endif // CONFIG_AVM_POWERMETER + +#if defined(CONFIG_AVM_USB_SUSPEND) + udev->avm_usb_suspend_timestamp = jiffies; + suspend_count++; +#endif + /* device has up to 10 msec to fully suspend */ msleep(10); } @@ -3337,7 +3502,8 @@ u16 devstatus = 0; /* caller owns the udev device lock */ - dev_dbg(&udev->dev, "%s\n", + /* == 20180328 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "%s\n", udev->reset_resume ? "finish reset-resume" : "finish resume"); /* usb ch9 identifies four variants of SUSPENDED, based on what @@ -3384,6 +3550,12 @@ } } +#if defined(CONFIG_AVM_USB_SUSPEND) + if (udev->reset_resume) { + reset_resume_count++; + } +#endif + if (status) { dev_dbg(&udev->dev, "gone after usb resume? status %d\n", status); @@ -3530,7 +3702,8 @@ dev_dbg(&port_dev->dev, "can't resume, status %d\n", status); } else { /* drive resume for USB_RESUME_TIMEOUT msec */ - dev_dbg(&udev->dev, "usb %sresume\n", + /* == 20180328 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "usb %sresume\n", (PMSG_IS_AUTO(msg) ? "auto-" : "")); msleep(USB_RESUME_TIMEOUT); @@ -3556,6 +3729,37 @@ usb_clear_port_feature(hub->hdev, port1, USB_PORT_FEAT_C_SUSPEND); } + +#if defined(CONFIG_AVM_POWERMETER) + { + if (udev->level == 1) { + unsigned int nextmA; + unsigned int avm_powerdevice; + + if (udev->speed == USB_SPEED_SUPER) { + nextmA = (udev->config->desc.bMaxPower * 8); + if (nextmA <= 150) { + nextmA = 150; + } + } else { + nextmA = (udev->config->desc.bMaxPower * 2); + /* A device should display at least 100 mA in AVM_POWERMETER */ + if (nextmA < 100) { + nextmA = 100; + } + } + + if (udev->parent->maxchild > 1) { + avm_powerdevice = (udev->portnum & 1) ? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Port#%u resume: AVM Powermeter changed to %u mA\n", udev->portnum, nextmA); + } else { + avm_powerdevice = ((udev->bus->busnum & 1) == 1) ? powerdevice_usb_host : powerdevice_usb_host2; + pr_info("Bus#%u resume: AVM Powermeter changed to %u mA\n", udev->bus->busnum, nextmA); + } + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } + } +#endif // CONFIG_AVM_POWERMETER } if (udev->persist_enabled) @@ -3567,7 +3771,12 @@ if (status == 0) status = finish_port_resume(udev); if (status < 0) { - dev_dbg(&udev->dev, "can't resume, status %d\n", status); +#if defined(CONFIG_AVM_USB_SUSPEND) + avm_usb_suspend_add_to_blacklist(udev); + resume_error_count++; +#endif + /* == 20180328 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "can't resume, status %d\n", status); hub_port_logical_disconnect(hub, port1); } else { /* Try to enable USB2 hardware LPM */ @@ -3599,6 +3808,9 @@ return status; } +#endif /* CONFIG_PM */ + +#if defined(CONFIG_PM) /* Returns 1 if there was a remote wakeup and a connect status change. */ static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port, u16 portstatus, u16 portchange) @@ -4288,6 +4500,8 @@ void usb_unlocked_enable_lpm(struct usb_device *udev) { } EXPORT_SYMBOL_GPL(usb_unlocked_enable_lpm); +#if !defined(CONFIG_AVM_USB_SUSPEND) + int usb_disable_ltm(struct usb_device *udev) { return 0; @@ -4297,6 +4511,8 @@ void usb_enable_ltm(struct usb_device *udev) { } EXPORT_SYMBOL_GPL(usb_enable_ltm); +#endif + static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port, u16 portstatus, u16 portchange) { @@ -5130,9 +5346,14 @@ if (hub->hdev->parent || !hcd->driver->port_handed_over || !(hcd->driver->port_handed_over)(hcd, port1)) { - if (status != -ENOTCONN && status != -ENODEV) + if (status != -ENOTCONN && status != -ENODEV) { dev_err(&port_dev->dev, "unable to enumerate USB device\n"); +/* 20170316 AVM/VGJ increment enumeration error */ +#if defined(CONFIG_AVM_KERNEL) + enum_error_count++; +#endif + } } done: