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

Merge "usb: check for port partner Thunderbolt capability" into main

Browse source
This commit is contained in:
RD Babiera 2023-10-05 23:09:55 +00:00 • committed by Android (Google) Code Review
commit 435c89be86
2 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

45
usb/usb/Usb.cpp
View file

@ -868,6 +868,29 @@ AltModeData::DisplayPortAltModeData constructAltModeData(string hpd, string pin_
return dpData; return dpData;
} }
Status queryPartnerSvids(std::vector<string> *svids) {
DIR *dp;
dp = opendir(kDisplayPortUsbPath);
if (dp != NULL) {
struct dirent *ep;
// Iterate through directories for Alt Mode SVIDs
while ((ep = readdir(dp))) {
if (ep->d_type == DT_DIR) {
string svid;
string portPartnerPath = string(kDisplayPortUsbPath) + string(ep->d_name) + "/svid";
if (ReadFileToString(portPartnerPath, &svid)) {
(*svids).push_back(Trim(svid));
}
}
}
closedir(dp);
} else {
return Status::ERROR;
}
return Status::SUCCESS;
}
/* DisplayPort Helper Functions End */ /* DisplayPort Helper Functions End */
// Only care about first port which must support DisplayPortAltMode // Only care about first port which must support DisplayPortAltMode
@ -877,18 +900,32 @@ Status queryDisplayPortStatus(android::hardware::usb::Usb *usb,
string path; string path;
AltModeData::DisplayPortAltModeData dpData; AltModeData::DisplayPortAltModeData dpData;
/*
* We check if the DisplayPort Alt Mode sysfs nodes exist. If they don't, then it means that the
* device has not entered Alt Mode with the port partner because of a source/sink role
* incompatibility, pin assignment incompatibility, etc. So, we then check to see if the partner
* supports Thunderbolt and DisplayPort SVIDs. If it supports DisplayPort, then we assume that
* it must be a source device and Thunderbolt should operate similarly; we don't populate the
* DisplayPortAltModeStatus. If it only supports Thunderbolt, then we cannot determine if it is
* sink or source capable, and need to notify the user.
*/
if (usb->getDisplayPortUsbPathHelper(&path) == Status::ERROR) { if (usb->getDisplayPortUsbPathHelper(&path) == Status::ERROR) {
(*currentPortStatus)[0].supportedAltModes.push_back(dpData); std::vector<string> svids;
return Status::SUCCESS; if (queryPartnerSvids(&svids) == Status::SUCCESS) {
if (std::count(svids.begin(), svids.end(), SVID_THUNDERBOLT) &&
!std::count(svids.begin(), svids.end(), SVID_DISPLAYPORT)) {
dpData.cableStatus = DisplayPortAltModeStatus::NOT_CAPABLE;
} }
}
} else {
usb->readDisplayPortAttribute("hpd", path, &hpd); usb->readDisplayPortAttribute("hpd", path, &hpd);
usb->readDisplayPortAttribute("pin_assignment", path, &pinAssign); usb->readDisplayPortAttribute("pin_assignment", path, &pinAssign);
usb->readDisplayPortAttribute("vdo", path, &vdo); usb->readDisplayPortAttribute("vdo", path, &vdo);
usb->readDisplayPortAttribute("link_status", path, &linkStatus); usb->readDisplayPortAttribute("link_status", path, &linkStatus);
// Set DisplayPortAltModeInfo
dpData = constructAltModeData(hpd, pinAssign, linkStatus, vdo); dpData = constructAltModeData(hpd, pinAssign, linkStatus, vdo);
}
(*currentPortStatus)[0].supportedAltModes.push_back(dpData); (*currentPortStatus)[0].supportedAltModes.push_back(dpData);
return Status::SUCCESS; return Status::SUCCESS;

3
usb/usb/Usb.h
View file

@ -70,6 +70,9 @@ constexpr char kGadgetName[] = "11210000.dwc3";
#define DISPLAYPORT_POLL_WAIT_MS 100 #define DISPLAYPORT_POLL_WAIT_MS 100
#define SVID_DISPLAYPORT "ff01"
#define SVID_THUNDERBOLT "8087"
struct Usb : public BnUsb { struct Usb : public BnUsb {
Usb(); Usb();