Commit graph

44 commits

Author SHA1 Message Date
RD Babiera
04d1e94d10 usb: reattempt to enter displayport alt mode if driver entry process fails
In the kernel, it is possible for the DisplayPort Alt Mode
driver to queue an Enter Mode message to the tcpm and have
that message be interupted by a Power Role or Vconn swap,
which results in the Port Partner never entering Alt Mode.

Add a debounce that checks to make sure that the port partner
enters Alt Mode when DisplayPort Alt Mode is active on the
port. On trigger, reattempt to send Enter Mode through the
tcpm up to 2 times.

Test: Manual test on device - put device into Preferred
      Source role, test to see if Alt Mode reentry triggers
      when original entry is interrupted by PR Swap from
      monitor.
Bug: 308383356
Change-Id: I96563c9900a01e428850e4873371bcdb0225aa07
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-11-15 22:08:36 +00:00
Roy Luo
398ceca7a9 usb: update incompatible charger warning reason
Report COMPLIANCE_WARNING_INPUT_POWER_LIMITED instead of
COMPLIANCE_WARNING_OTHER to flag incompatible chargers. The underlying
logic that generates the warning remains the same, what's changed is
the enum that's being used.
The purpose of the change is to have a warning type that better
represents what actually happens and free up COMPLIANCE_WARNING_OTHER
that was intended to act as a fallback reason code.
The flag enable_input_power_limited_warning controls whether to switch
to the new enum, while the flag enable_usb_data_compliance_warning
controls the new enums that are added as FlaggedApi in the framework.
Both flags need to be on to enable the change.

Bug: 308700954
Test: manual tests with local flag override
Change-Id: I6595706d1b83d533fc2d3e29086773270e045ede
2023-11-09 19:11:32 +00:00
Jacky Liu
a3772510e6 Update i2c pathes with new static i2c bus numbers
Bug: 305242309
Test: Boot to home
Change-Id: I87687b2e3a479a166257ad958ddd07af7967f416
2023-10-23 14:17:22 +08:00
RD Babiera
5cc2bfebf4 Merge "usb: enable/disable displayport alt mode through enableUsbData" into main 2023-10-13 21:23:38 +00:00
RD Babiera
9233142080 Merge "usb: check for port partner Thunderbolt capability" into main 2023-10-05 23:09:55 +00:00
Roy Luo
ccb35c81ff Usb: capture and upload Suez metric VendorUsbDataSessionEvent
Upload metrics for the last data session that just ends upon
data role changes. The change is purely metric collection and
does not change any business logic.

Bug: 297224564
Test: Trigger metric upload for both host and device mode and
      verify it by statsd_testdrive
Change-Id: I823ae8712b7914cfc7f6c6379acb3749d13c0974
2023-10-04 20:01:38 +00:00
Roy Luo
03fd3d9a37 Merge "usb: upgrade stats AIDL to v2" into main 2023-10-03 20:49:36 +00:00
Roy Luo
5aa4f0519f usb: upgrade stats AIDL to v2
Upgrade stats AIDL to v2 following pixelstats lib.

Bug: 297224564
Test: Build
Change-Id: Ia9837a8ea568c788a1a6044ff37c05172c019c2d
2023-10-02 18:53:56 +00:00
RD Babiera
873766c6f0 usb: check for port partner Thunderbolt capability
Query the port partner's SVIDs when the DisplayPort driver sysfs
is not recognized so that the USB HAL can identify whether or not
the port partner supports Thunderbolt.

Test: manual verification on device - test to see that cableStatus
is set to NOT_CAPABLE on hub that supports Thunderbolt but not
DisplayPort Alt Mode. Then verify that device not capable of being
a DisplayPort sink but does support Thunderbolt does not trigger
this status.
Bug: 288150501
Change-Id: Iaba60ecc5510acecee1e1d3241611906c738a263
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-09-21 18:28:50 +00:00
Treehugger Robot
2c8f57245a Merge "Usb.cpp: Fix typos when unable to disable USB data" into udc-qpr-dev am: 16d00110ec am: 05f20fefad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24799970

Change-Id: Ifd028d32242e88a8c9e327f303bdbd2c75df8dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 11:31:00 +00:00
Treehugger Robot
16d00110ec Merge "Usb.cpp: Fix typos when unable to disable USB data" into udc-qpr-dev 2023-09-21 09:55:00 +00:00
RD Babiera
05cedc1314 usb: enable/disable displayport alt mode through enableUsbData
Adds functionality for enabling and disabling DisplayPort Alt Mode
on the port through enableUsbData in the USB HAL to comply with USB
restrictions for heightened security mode.

Test: manual test on device - use enableUsbData dumpsys command to
      turn off DisplayPort and then turn it back on while connected to a
      partner sink.
Bug: 297208252
Change-Id: I9f071bce802b728f2229abc08efb2204e4c2505a
Signed-off-by: RD Babiera <rdbabiera@google.com>
2023-09-20 19:52:07 +00:00
Amit Sunil Dhamne
5454adc8dc Merge "UsbGadget: Update SDP enum timeout when gadget is pulled up" into udc-qpr-dev am: 5d78a3f43b am: e4486f9834
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/24805490

Change-Id: I51613d9969e34619e433479e7fe2eae42ec5a88b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 18:38:16 +00:00
Amit Sunil Dhamne
e683802386 UsbGadget: Update SDP enum timeout when gadget is pulled up
Indicate to the kernel that the usb gadget is pulled up
by writing to `update_sdp_enum_timeout` sysfs node. Write
to this node will inform the kernel that it can lower the SDP
timeout alarm value which is used to detect an SDP port
vs a DCP.

(ported from c5c5b127a7ed0db559d286284fe77b656bef6945)

Bug:275687235
Test: Check `update_sdp_enum_timeout` is written into after usb
     gadget is pulled up. Verify that the alarm timeout lowers.
Change-Id: Id3ae7e7a20b236cec6604414a7f81860e868bdd0
Signed-off-by: Amit Sunil Dhamne <amitsd@google.com>
2023-09-19 13:45:30 -07:00
Kuen-Han Tsai
3ce6a5fe2e Usb.cpp: Fix typos when unable to disable USB data
If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
Change-Id: I5d2c24154bd1d2c20810bcb4db0a3b2cc575fcfe
2023-09-19 17:03:16 +08:00
Jayant Chowdhary
969c01c3f2 Merge changes from topic "webcam-shusky" into udc-qpr-dev
* changes:
  usb gadget: Add config for UVC in init
  UsbGadget: Add support for UVC function
2023-09-07 19:38:53 +00:00
Avichal Rakesh
b75f286a74 UsbGadget: Add support for UVC function
UVC is a new USB function supported in Android. This CL adds UVC as a
valid function and gives it a new pid of 0x4ee[de]. UVC function is
guarded by the property `ro.usb.uvc.enabled`. When this property is set
to false, UVC won't be considered as a valid gadget function.

Bug: 242344221

Test: Manually tested that the UVC function is successfully configured

Merged-In: I5c2040a84ee8360b16c955403478d908fe109121
Change-Id: I5c2040a84ee8360b16c955403478d908fe109121
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2023-09-06 20:51:36 +00:00
Avichal Rakesh
5749b85397 UsbGadget: Add support for UVC function
UVC is a new USB function supported in Android. This CL adds UVC as a
valid function and gives it a new pid of 0x4ee[de]. UVC function is
guarded by the property `ro.usb.uvc.enabled`. When this property is set
to false, UVC won't be considered as a valid gadget function.

Bug: 242344221
Test: Manually tested that the UVC function is successfully configured
Change-Id: I5c2040a84ee8360b16c955403478d908fe109121
2023-09-06 13:33:49 -07:00
RD Babiera
c2c37bf3a8 usb: populate USB aidl hal AltModeData
Populates AltModeData within PortStatus with DisplayPort
Alt Mode statuses for pin assignment, hpd, link training
status, and port partner capability.

Test: manual test on device
Bug: 277466852
Change-Id: I52a56f7090ed6dbef6211f19d6350cecac58e4fa
Merged-In: I52a56f7090ed6dbef6211f19d6350cecac58e4fa
2023-09-02 00:07:22 +00:00
RD Babiera
cabe846a1f usb: populate USB aidl hal AltModeData
Populates AltModeData within PortStatus with DisplayPort
Alt Mode statuses for pin assignment, hpd, link training
status, and port partner capability.

Test: manual test on device
Bug: 277466852
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:24f5f802bd37040e62de4f111b4c4f73c2ae8db4)
Change-Id: I52a56f7090ed6dbef6211f19d6350cecac58e4fa
2023-09-01 23:51:27 +00:00
Roy Luo
a6462edbe3 Usb: Listen to USB sysfs attribute for device state
Poll the sysfs attributes that represents usb device state in
either of the following states: not attached, powered, default,
addressed, configured.
The information is useful in detecting non compliant USB cable,
which will be supported in later patch sets. This patch lays
the ground work to monitor the sysfs attributes in both device
and host modes.
The thread to poll uevent is re-used to poll sysfs because this
serialize type-C port events and usb device state changes, hence
prevent potential races.
Added a thin abstration layer and a map to keep epoll data so
that it's easier to dynamically add/delete files to epoll, which
is needed for usb devices in host mode.

Bug: 285199434
Test: trigger usb device state changes in device and host mode
Change-Id: Ie5389d051deb28dbb486c2f27319b3cc9e89312f
2023-08-08 23:14:37 +00:00
RD Babiera
78f6294e38 Usb: shutdown old displayport poll thread when multiple start up
Better enforces that only one DisplayPort poll thread should be
active at once. If a new call to setup is made from additional
bind uevents before a disconnect occurs, tells the old thread
to shutdown and awaits signaling before a new worker thread spins
up.

Test: manual testing on device
Bug: 286593610
Change-Id: I1707970c500915fd4abb161d0b3a424bbb2bddca
2023-06-15 23:26:09 +00:00
Badhri Jagan Sridharan
574d046bd7 Usb: Check for displayport when booting
When booting check whether displayport driver has been probed and
signal hpd events as needed. Pin config and orientation needs to
be queried before signalling hpd.

Bug: 282223693
Change-Id: Iddb0921b363e49c41c0f6f635887b4daf4d19561
2023-06-15 23:23:01 +00:00
Badhri Jagan Sridharan
378b155ab6 Merge "Usb: Signal irq_hpd to drm stack" into udc-d1-dev 2023-05-25 19:46:52 +00:00
Badhri Jagan Sridharan
412f31194c Usb: Signal irq_hpd to drm stack
Monitor typec stack for irq_hpd events and signal irq_hpd when the
irq_hpd counter value read is not the same as the previously cached
value.

Bug: 278307874
Change-Id: Id4a72afcf85550cabbc2f9469bb0ccb92cd02ad2
2023-05-25 04:36:06 +00:00
Badhri Jagan Sridharan
47e1400c8f Usb: Populate UsbDataStatus only when not populated
Do not override UsbDataStatus when already populated.
Compliance warnings such as missing Rp do not populate
UsbDataStatus and the port partner is detected.
Populate UsbDataStatus only when not populated.

Bug: 279251052
Change-Id: Ibe71bdd5c521ba90c124d89bd56af90087c0df18
2023-05-16 05:51:50 +00:00
Badhri Jagan Sridharan
e707356f6a Usb: Set connected status when connected to non compliant port partners
Set mode, power role and data role when connected to non compliant
port partners.

Bug: 268584498
Change-Id: I6c3e7df09a61e26f3b976a86bd65cb646edd653d
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
(cherry picked from commit 7c2d62aafc219af11252dabf49d84d84b7ccfa57)
2023-05-16 03:58:34 +00:00
RD Babiera
005049d207 Usb non-compliant port partner implementation
Adds vendor code for non-compliant charger feature. Currently
updates service version.

Minor port of  commit 96ccf93453583642a15dd96b1e4d6bf0645fc10b

Test: atest VtsAidlUsbTargetTest
Bug: 236322506
Change-Id: Ie1a48b1acaaae9a53f3b9bfebcfee7a2f4814810
(cherry picked from commit 96ccf93453583642a15dd96b1e4d6bf0645fc10b)
2023-05-16 03:58:30 +00:00
RD Babiera
4e29924d3d usb: Fix HAL build warnings related to DisplayPort
Adds proper error handling go-to points to remove warnings arising
from uninitialized variables, and removes unused
queryDisplayPortStatus() method.

Test: manual test on device, verify compiler warnings
Bug: 278951278
Change-Id: I54f7b710a0805b32c894d741e473d64814200134
2023-04-24 21:45:17 +00:00
RD Babiera
cc50d99508 usb: provide usb reference to DisplayPort shutdown thread
Passes usb object reference to thread creation of
mDisplayPortShutdownHelper so that it can properly call DisplayPort
shutdown method instead of calling on NULL reference.

Test: manual test on device
Bug: 278395605
Change-Id: Ie4dabb5e3ae9065f57cc0fbf2593fbe399097472
2023-04-17 22:43:31 +00:00
Treehugger Robot
5aa6158425 [conflict] Merge "usb: add all i2c number" into udc-d1-dev am: 6f1e1dca4a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22122384

Change-Id: I0a4b28d87efdfeb7629d0c3a36fde232f45cc3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 04:24:17 +00:00
Chien Kun Niu
5bda84b517 usb: add all i2c number
Add all I2c number to change the permission

Bug: 273391794
Test: limit 1.3A work
Change-Id: Iefb44f37c5b42ae5579e928477efc927d270b724
2023-04-07 15:26:49 +08:00
RD Babiera
de0fc9d220 Port dp changes to drm sysfs
Write pin assignment, hpd, and orientation from type-c class to
drmdp platform device attributes using epoll when displayport
driver binds to device, and determine whether or not to shut down
epoll on displayport driver change uevents.

Test: manual testing with form factor device
Bug: 260915739
Change-Id: Iec9fc76166481a4611bb2fc023aea044b497f2c0
2023-04-03 22:16:17 +00:00
Chien Kun Niu
7946bd55e7 Merge changes If0925a61,I9d6624cb,I7cc7070d,I2c1091aa into udc-dev
* changes:
  Fix up open bugs from gs201 AIDL migration
  Add resetCb
  Migrate IUsbGadget implementation to AIDL
  usb: limit the current to 1.3A when connect to accessory
2023-03-02 06:59:25 +00:00
Ricky Niu
704316d8ba Fix up open bugs from gs201 AIDL migration
1. Remove unused group "wakelock".
2. Correct the right return value on setCurrentUsbFunctions.

Bug: 266694076
Test: Boot to home and function work
Change-Id: If0925a61e481e4deca560dc8dfc1be80a76c148f
(cherry picked from commit 5c7e338667a7f21c27f5789c16a4781dcbbe8755)
2023-02-22 06:50:55 +00:00
Ricky Niu
400c1a9ca3 Add resetCb
Add the resetCb to complete asynchronous

Bug: 267252826
Test: Boot to home and function work
Change-Id: I9d6624cbe15c86c63e28f8f176d7c560aed8446f
(cherry picked from commit f14cbd637085145feff255b192a8031375fcdaa4)
2023-02-22 06:50:51 +00:00
Ricky Niu
1915b65459 Migrate IUsbGadget implementation to AIDL
This change migrates IUsbGadget implementation to AIDL.

Bug: 218791946
Test: USB function switch success and AIDL service is running.
Change-Id: I7cc7070d875c26bc42f99aef84d5e5a41606223f
Signed-off-by: Ricky Niu <rickyniu@google.com>
(cherry picked from aosp commit d6d0b7d2ca5066988ee90889dccd00c06d64b694)
2023-02-22 06:50:43 +00:00
Ricky Niu
4d736354f3 usb: limit the current to 1.3A when connect to accessory
For imporve USB stability, limit the current to 1.3A,
when connect to accessory.

Bug: 206635552
Signed-off-by: Ricky Niu <rickyniu@google.com>
Change-Id: I2c1091aa7111e6242cc949923fbc86f27e54e976
(cherry picked from commit e6cacbcff21d315763943469038c9ca8822a7f37)
2023-02-22 06:42:06 +00:00
Xiang Wang
d43341a801 Move thermal utils to hardware/interfaces
Bug: b/269370789
Test: m
Change-Id: Id813adc99746b171693f983230f9193431f25693
Merged-In: Id813adc99746b171693f983230f9193431f25693
2023-02-22 01:25:40 +00:00
Xiang Wang
4964215149 Update USB HAL clients to use Thermal stable AIDL
Bug: b/264594715
Test: boot test
Change-Id: I28bd0e7fab1812c7c5f02d2b0337648f23e7f6a1
2023-02-13 14:51:27 -08:00
Ray Chi
fbfb40d58c Modify dwc3 irq affinity to get better performance
Bug: 264946043
Test: build pass and dwc3 irq is located in expected cpu
Change-Id: Ia9ad880c64ae3122ab059a0cac9e7c6efe5950bb
2023-01-12 09:47:32 +00:00
Badhri Jagan Sridharan
26f4504f16 Enable USB HAL
Fix up i2c address for typec and enable USB HAL.

Bug: 241871290
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I87ce763e350bfaec05dbe83ee040eda7d252e7a2
2022-08-27 02:42:21 +00:00
Aaron Ding
66befd88e3 Create device Ripcurrent on Zuma platform
s/cloudripper/ripcurrent
s/gs201/zuma
s/pantah/ripcurrent

Bug: 229340586
Change-Id: Ic5dffbbfadbb1eb8479587b95222801426bba35e
Signed-off-by: Aaron Ding <aaronding@google.com>
2022-04-19 12:55:56 +08:00
Aaron Ding
d88f9a90bd Branch zuma from gs201
Branch zuma from gs201 sha1 9009acf5c217f553b45ea82aa0702607229f0347

cp/pantah/ripcurrent
cp/gs201/zuma

Bug: 229340586
Change-Id: Ia312c20dae892ead9bf06728b4ef5c0c260ad045
Signed-off-by: Aaron Ding <aaronding@google.com>
2022-04-19 12:45:55 +08:00