--- zzzz-none-000/linux-5.4.213/drivers/usb/core/hub.c 2022-09-15 10:04:56.000000000 +0000 +++ alder-5690pro-762/linux-5.4.213/drivers/usb/core/hub.c 2024-08-14 09:02:08.000000000 +0000 @@ -36,6 +36,12 @@ #include "hub.h" #include "otg_whitelist.h" +#ifdef CONFIG_AVM_POWERMETER +/* == 20160301 AVM/VGJ - CHANGESET: AVM Power Meter == */ +#include +#include +#endif /*--- #ifdef CONFIG_AVM_POWERMETER ---*/ + #define USB_VENDOR_GENESYS_LOGIC 0x05e3 #define USB_VENDOR_SMSC 0x0424 #define USB_PRODUCT_USB5534B 0x5534 @@ -111,6 +117,42 @@ #define HUB_DEBOUNCE_STEP 25 #define HUB_DEBOUNCE_STABLE 100 +#if defined(CONFIG_AVM_ENHANCED) +/* 20171027 AVM/VGJ USB KPI */ + +#define AVM_RECONNECT_ERROR_MS_THRESHOLD 2500 + +unsigned long disconnect_time[2]; +unsigned int disconnect_device_id[2]; + +int reconnect_count; +module_param(reconnect_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(reconnect_count, "Count of reconnects"); + +int enum_error_count; +module_param(enum_error_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(enum_error_count, "Count of enumeration errors"); + +int overcurrent_error_count; +module_param(overcurrent_error_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(overcurrent_error_count, "Count of overcurrent errors"); + +#if defined(CONFIG_AVM_USB_PM) +int suspend_count; +module_param(suspend_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(suspend_count, "Count of suspends"); + +int reset_resume_count; +module_param(reset_resume_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(reset_resume_count, "Count of resets during resume"); + +int resume_error_count; +module_param(resume_error_count, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(resume_error_count, "Count of failed resumes"); +#endif + +#endif + static void hub_release(struct kref *kref); static int usb_reset_and_verify_device(struct usb_device *udev); static int hub_port_disable(struct usb_hub *hub, int port1, int set_state); @@ -1817,7 +1859,9 @@ * - If user has indicated to prevent autosuspend by passing * usbcore.autosuspend = -1 then keep autosuspend disabled. */ -#ifdef CONFIG_PM + +#if defined(CONFIG_PM) && !defined(CONFIG_AVM_ENHANCED) + /* AVM USB stability: no immediate hub suspend */ if (hdev->dev.power.autosuspend_delay >= 0) pm_runtime_set_autosuspend_delay(&hdev->dev, 0); #endif @@ -2207,6 +2251,34 @@ dev_info(&udev->dev, "USB disconnect, device number %d\n", udev->devnum); +#if defined(CONFIG_AVM_POWERMETER) && defined(CONFIG_USB_DWC3_HOST) + /* == 20160301 AVM/VGJ - CHANGESET: AVM Power Meter for DWC3 USB Controller == */ + if (udev->level == 1) { + unsigned int nextmA = 0; + unsigned int avm_powerdevice; + + // Buses 1 and 2 belong to one port and buses 3 and 4 to the other + avm_powerdevice = (udev->bus->busnum < 3) ? powerdevice_usb_host : powerdevice_usb_host2; + dev_info(&udev->dev, "Bus#%u disconnect: AVM Powermeter changed to %u mA\n", + udev->bus->busnum, nextmA); + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } +#endif // CONFIG_AVM_POWERMETER + +#if defined(CONFIG_AVM_ENHANCED) + /* 20171012 AVM/VGJ store disconnect timestamp to check possible reconnects */ + /* Only check reconnects of devices directly connected to root-hub */ + if (udev->level == 1) { + int port_index; + unsigned int device_id; + + port_index = (udev->bus->busnum < 3) ? 0 : 1; + disconnect_time[port_index] = jiffies; + device_id = (udev->descriptor.idVendor << 16) | udev->descriptor.idProduct; + disconnect_device_id[port_index] = device_id; + } +#endif + /* * Ensure that the pm runtime code knows that the USB device * is in the process of being disconnected. @@ -2215,6 +2287,14 @@ usb_lock_device(udev); +#ifdef CONFIG_AVM_USB_PM + /* == 20180220 AVM/VGJ - Blacklist device, if disconnected recently after suspend == */ + if ((udev->dev.power.runtime_status == RPM_SUSPENDED) && ((jiffies - udev->dev.power.accounting_timestamp) < msecs_to_jiffies(1000))) { + suspend_error_count++; + avm_usb_pm_add_to_blacklist(udev); + } +#endif + hub_disconnect_children(udev); /* deallocate hcd/hardware state ... nuking all pending urbs and @@ -2541,6 +2621,52 @@ /* Tell the world! */ announce_device(udev); +#if defined(CONFIG_AVM_POWERMETER) && defined(CONFIG_USB_DWC3_HOST) + /* == 20160301 AVM/VGJ - CHANGESET: AVM Power Meter for DWC3 USB Controller == */ + if (udev->level == 1) { + unsigned int nextmA = (udev->speed == USB_SPEED_SUPER) ? 150 : 100; + unsigned int avm_powerdevice; + + // Buses 1 and 2 belong to one port and buses 3 and 4 to the other + avm_powerdevice = (udev->bus->busnum < 3) ? powerdevice_usb_host : powerdevice_usb_host2; + dev_info(&udev->dev, "Bus#%u disconnect: AVM Powermeter changed to %u mA\n", + udev->bus->busnum, nextmA); + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } +#endif // CONFIG_AVM_POWERMETER + +#if defined(CONFIG_AVM_ENHANCED) + /* 20171012 AVM/VGJ If connect comes too fast after disconnect -> reconnect error */ + /* 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; + + port_index = (udev->bus->busnum < 3) ? 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)) { + dev_err(&udev->dev, "Spontaneous reconnect\n"); + reconnect_count++; + } + } + } +#endif + +#if defined(CONFIG_AVM_USB_PM) + /* == 20171115 AVM/VGJ Prevent suspension of blacklisted devices == */ + if (avm_usb_pm_is_blacklisted(udev)) { + pm_runtime_set_autosuspend_delay(&udev->dev, -1); + dev_warn(&udev->dev, "USB device %04x:%04x:%04x is blacklisted for suspension\n", + le16_to_cpu(udev->descriptor.idVendor), + le16_to_cpu(udev->descriptor.idProduct), + le16_to_cpu(udev->descriptor.bcdDevice)); + } +#endif + if (udev->serial) add_device_randomness(udev->serial, strlen(udev->serial)); if (udev->product) @@ -3064,10 +3190,23 @@ /* pass */; } /* Is the device still present? */ - else if (status || port_is_suspended(hub, portstatus) || - !port_is_power_on(hub, portstatus)) { +#if defined(CONFIG_AVM_ENHANCED) + /* AVM/VGJ 20180420 Do not treat port_is_suspended as No Device Error */ + else if (status || !port_is_power_on(hub, portstatus)) { +#else + else if (status || port_is_suspended(hub, portstatus) + || !port_is_power_on(hub, portstatus)) { +#endif if (status >= 0) status = -ENODEV; +#if defined(CONFIG_AVM_ENHANCED) + /* AVM/VGJ 20180420 follow up port_is_suspended with reset resume */ + } else if (port_is_suspended(hub, portstatus)) { + dev_dbg(hub->intfdev, + "port %d status %04x.%04x still suspended\n", + port1, portchange, portstatus); + udev->reset_resume = 1; +#endif } else if (!(portstatus & USB_PORT_STAT_CONNECTION)) { if (retries--) { usleep_range(200, 300); @@ -3342,12 +3481,34 @@ if (!PMSG_IS_AUTO(msg)) status = 0; } else { +#if defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "usb %ssuspend, wakeup %d\n", +#else dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n", +#endif (PMSG_IS_AUTO(msg) ? "auto-" : ""), udev->do_remote_wakeup); if (really_suspend) { udev->port_is_suspended = 1; +#if defined(CONFIG_AVM_USB_PM) + suspend_count++; +#endif + +#if defined(CONFIG_AVM_POWERMETER) && defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - CHANGESET: AVM Power Meter change for suspended device == */ + if (udev->level == 1) { + unsigned int nextmA = 50; + unsigned int avm_powerdevice; + + avm_powerdevice = (udev->bus->busnum < 3) ? powerdevice_usb_host : powerdevice_usb_host2; + dev_info(&udev->dev, "Bus#%u suspend: AVM Powermeter changed to %u mA\n", + udev->bus->busnum, nextmA); + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } +#endif // CONFIG_AVM_POWERMETER + /* device has up to 10 msec to fully suspend */ msleep(10); } @@ -3381,7 +3542,12 @@ u16 devstatus = 0; /* caller owns the udev device lock */ +#if defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "%s\n", +#else dev_dbg(&udev->dev, "%s\n", +#endif udev->reset_resume ? "finish reset-resume" : "finish resume"); /* usb ch9 identifies four variants of SUSPENDED, based on what @@ -3428,8 +3594,19 @@ } } +#if defined(CONFIG_AVM_USB_PM) + if (udev->reset_resume) { + reset_resume_count++; + } +#endif + if (status) { +#if defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "gone after usb resume? status %d\n", +#else dev_dbg(&udev->dev, "gone after usb resume? status %d\n", +#endif status); /* * There are a few quirky devices which violate the standard @@ -3574,7 +3751,12 @@ dev_dbg(&port_dev->dev, "can't resume, status %d\n", status); } else { /* drive resume for USB_RESUME_TIMEOUT msec */ +#if defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "usb %sresume\n", +#else dev_dbg(&udev->dev, "usb %sresume\n", +#endif (PMSG_IS_AUTO(msg) ? "auto-" : "")); msleep(USB_RESUME_TIMEOUT); @@ -3598,6 +3780,32 @@ USB_PORT_FEAT_C_SUSPEND); } +#if defined(CONFIG_AVM_POWERMETER) && defined(CONFIG_AVM_USB_PM) + /* == 20170929 AVM/VGJ - CHANGESET: AVM Power Meter change for resumed device == */ + 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; + } + } + + avm_powerdevice = (udev->bus->busnum < 3) ? powerdevice_usb_host : powerdevice_usb_host2; + dev_info(&udev->dev, "Bus#%u resume: AVM Powermeter changed to %u mA\n", + udev->bus->busnum, nextmA); + PowerManagmentRessourceInfo(avm_powerdevice, nextmA); + } +#endif // CONFIG_AVM_POWERMETER + /* TRSMRCY = 10 msec */ msleep(10); } @@ -3611,7 +3819,16 @@ if (status == 0) status = finish_port_resume(udev); if (status < 0) { + +#if defined(CONFIG_AVM_USB_PM) + avm_usb_pm_add_to_blacklist(udev); + resume_error_count++; + /* == 20170929 AVM/VGJ - Show also without CONFIG_USB_DEBUG == */ + dev_info(&udev->dev, "can't resume, status %d\n", status); +#else dev_dbg(&udev->dev, "can't resume, status %d\n", status); +#endif + hub_port_logical_disconnect(hub, port1); } else { /* Try to enable USB2 hardware LPM */ @@ -5230,6 +5447,10 @@ if (status != -ENOTCONN && status != -ENODEV) dev_err(&port_dev->dev, "unable to enumerate USB device\n"); +#if defined(CONFIG_AVM_ENHANCED) + /* 20171027 AVM/VGJ increment enumeration error */ + enum_error_count++; +#endif } done: @@ -5389,8 +5610,15 @@ msleep(100); /* Cool down */ hub_power_on(hub, true); hub_port_status(hub, port1, &status, &unused); - if (status & USB_PORT_STAT_OVERCURRENT) + if (status & USB_PORT_STAT_OVERCURRENT) { dev_err(&port_dev->dev, "over-current condition\n"); +#if defined(CONFIG_AVM_ENHANCED) + /* 20171027 AVM/VGJ increment overcurrent error */ + /* Only count overcurrent events for root-hub */ + if (hdev->level == 0) + overcurrent_error_count++; +#endif + } } if (portchange & USB_PORT_STAT_C_RESET) {