Fix capturing emulation data for dell-dock #6985
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hughsie
reviewed
Mar 27, 2024
| @@ -3031,8 +3031,10 @@ fu_engine_prepare(FuEngine *self, | |||
| !fu_device_has_flag(device, FWUPD_DEVICE_FLAG_EMULATED)) { | |||
| if (!fu_engine_backends_save_phase(self, error)) | |||
| return FALSE; | |||
| if (!fu_engine_backends_clear_phase(self, error)) | |||
| return FALSE; | |||
| if (fu_device_get_composite_id(device) == NULL) { | |||
There was a problem hiding this comment.
I guess I'm missing the why -- how do you think it should work differently from a 40,000ft view for composite updates?
There was a problem hiding this comment.
The problem for composite updates is that you can't clear the USB events for a given device in between stages because a bunch of devices may use that USB device. With 52790d8 reverted, you end up with:
In the client:
Failed to query dock info: write over HID-I2C failed: failed after 5 retries: failed to SetReport: no matching event for ControlTransfer:Direction=0x01,RequestType=0x01,Recipient=0x01,Request=0x09,Value=0x0200,Idx=0x0000,Data=QMYAAAAAGgDsAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEYAQEABwAFBwQAAAEiAAABVwAAYAABADYBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,Length=0xc0
In the daemon:
12:13:26.826 FuEngine failed to cleanup failed composite action: failed to composite_cleanup using dell_dock: write over HID-I2C failed: failed after 5 retries: failed to SetReport: no matching event for ControlTransfer:Direction=0x01,RequestType=0x01,Recipient=0x01,Request=0x09,Value=0x0200,Idx=0x0000,Data=QMYAAAAAAwDsAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,Length=0xc0
There was a problem hiding this comment.
I guess another way to look at it is that there is mismatch in the engine for the concept of "install phase" for composite device. A given device goes through all the install phases, it's not a full engine state.
fu_engine_install_releases: Iterates over releases/devices. Callsfu_engine_install_releasefu_engine_install_release: Goes over one release/device. Callsfu_engine_install_blobfu_engine_install_blob: Goes over one device w/ a blob. Callsfu_engine_backends_save_phasea bunch of times for each install phase.
superm1
force-pushed
the
superm1/composite-emulation
branch
from
6440ffc
to
a0bc0bc
Compare
4 tasks
Clearing events for all USB devices on each device add causes the data to get lost for a composite device. Split up the clear phase to a separate step that is only called when doing an actual update.
superm1
force-pushed
the
superm1/composite-emulation
branch
from
a0bc0bc
to
dddc824
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using a proxy and composite devices leads to some mismatches with how emulation data is captured. These commits help it.
I captured this using an old WD19TB I found.
Here is the emulation file I captured. Assuming all is good @hughsie can you please add it to the matching LVFS upload and then build the device-test using it so we can have coverage in our tests?
wd19tb.zip
Type of pull request: