Evolution-X-Tensor/device_google_zumapro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: adjust heuristics for flaky connection warning

Browse source 
The state count requirement is very specific to the case where the
signal integrity is the culprit of flaky connection. However,
there could be other cases such as bad receptacles causing data pins
to disconnect randomly.
Remove the state count requirement to cover more cases.

Bug: 296119135
Test: manually trigger the warnings
Change-Id: Ic2ae376ad6062d9930614381503f44e4a5ac760f
(cherry picked from commit 5e14ba01be9acc31d3df0f506b4287eea0bf9583)
This commit is contained in:
Roy Luo 2023-12-26 20:45:34 +00:00
parent ce1aaad6e2
commit aa0edc38fb
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
usb/usb/UsbDataSessionMonitor.cpp
View file

@ -52,11 +52,6 @@ namespace usb {
#define WARNING_SURFACE_DELAY_SEC 5
#define ENUM_FAIL_DEFAULT_COUNT_THRESHOLD 3
#define DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD 5
/*
* Typically a smooth and successful enumeration in device mode would go through 5 states at
* maximum: not attached -> default -> default -> addressed -> configured
*/
#define DEVICE_STATE_TRANSITION_PER_ENUMERATION 5
constexpr char kUdcConfigfsPath[] = "/config/usb_gadget/g1/UDC";
constexpr char kNotAttachedState[] = "not attached\n";
@ -250,7 +245,6 @@ void UsbDataSessionMonitor::evaluateComplianceWarning() {
if (elapsedTimeSec >= WARNING_SURFACE_DELAY_SEC) {
if (mDataRole == PortDataRole::DEVICE && mUdcBind) {
int stateCount = mDeviceState.states.size();
int configuredCount = std::count(mDeviceState.states.begin(),
mDeviceState.states.end(), kConfiguredState);
int defaultCount =
@ -259,12 +253,8 @@ void UsbDataSessionMonitor::evaluateComplianceWarning() {
if (configuredCount == 0 && defaultCount > ENUM_FAIL_DEFAULT_COUNT_THRESHOLD)
newWarningSet.insert(ComplianceWarning::ENUMERATION_FAIL);
if (configuredCount > DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD &&
stateCount > configuredCount * DEVICE_STATE_TRANSITION_PER_ENUMERATION) {
ALOGI("Detected flaky connection: state count %d, configured count %d",
stateCount, configuredCount);
if (configuredCount > DEVICE_FLAKY_CONNECTION_CONFIGURED_COUNT_THRESHOLD)
newWarningSet.insert(ComplianceWarning::FLAKY_CONNECTION);
}
} else if (mDataRole == PortDataRole::HOST) {
int host1StateCount = mHost1State.states.size();
int host1ConfiguredCount =