Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RB3 Gen2: switch to linux-firmware #761

Merged
merged 4 commits into from
Feb 21, 2025

Conversation

lumag
Copy link
Collaborator

@lumag lumag commented Feb 19, 2025

Switch RB3 Gen2 support to the firmware from linux-firmware.

Copy link

github-actions bot commented Feb 19, 2025

Test Results

 1 files  ±0   2 suites  ±0   36s ⏱️ ±0s
15 tests ±0  15 ✅ ±0  0 💤 ±0  0 ❌ ±0 
19 runs  ±0  19 ✅ ±0  0 💤 ±0  0 ❌ ±0 

Results for commit 591eeb0. ± Comparison against base commit 5c84a20.

♻️ This comment has been updated with latest results.

Copy link

Test jobs for commit 035697a

@ndechesne
Copy link
Contributor

Can you please confirm if all firmware files that you are replacing are the same ? e.g. what's the net effect of applying this patch? Please include that information in the commit message.

RB3G2 is actively being worked on, so I suspect we will release new firmware for it, through QCOM artifactory. So we will need to keep linux-firmware up-to-date quickly, and we might need to overlay some firmware in meta-qcom from time to time..

@lumag
Copy link
Collaborator Author

lumag commented Feb 20, 2025

Can you please confirm if all firmware files that you are replacing are the same ? e.g. what's the net effect of applying this patch? Please include that information in the commit message.

I have reworked the PR to make it more obvious, what is actually happening. The firmware-qcom-rb3gen2 already installs only WiFi firmware, ADSP, CDSP and Adreno firmware have been pulled from linux-firmware since November 2024.

RB3G2 is actively being worked on, so I suspect we will release new firmware for it, through QCOM artifactory. So we will need to keep linux-firmware up-to-date quickly, and we might need to overlay some firmware in meta-qcom from time to time..

In such a case I think it's easier to submit the firmware directly into linux-firmware and make the use of it by selecting class-devupstream version of linux-firmare:

PREFERRED_VERSION_linux-firmware = "1:20250211+git%"
SRCREV:pn-linux-firmware:class-devupstream = "commit-id" # Or ${AUTOREV}
WHENCE_CHKSUM:class-devupstream:pn-linux-firmware = "new-checksum"

For the stable branches it would be possible to reinstantiate the firmware-com-rb3gen2 recipe and make the distro use PREFERRED_PROVIDER or PREFERRED_VERSION in order to select the correct package.

@lumag lumag requested a review from ricardosalveti February 20, 2025 09:40
The package linux-firmware-qcom-qcm6490-wifi also provides a symlink
qcom/qcs6490/wpss.mbn. To follow the pattern established by
linux-firmware-qcom-qcm6490-audio and -compute packages the package
should RPROVIDE the qcs6490 name. Without RPROVIDES it is possible for
the image recipe to attempt installing both package names, resulting in
a conflict between the files provided by the linux-firmware and by the
firmware-qcom-rb3gen2 recipes.

The patch has been submitted to the OE-Core, but until it is merged
provide a local fixup.

Signed-off-by: Dmitry Baryshkov <[email protected]>
As the linux-firmware recipe now provides the WiFi firmware too, the
same version as installed by the firmware-qcom-rb3gen2. Drop the
firmware-qcom-rb3gen2 recipe.

Signed-off-by: Dmitry Baryshkov <[email protected]>
With the firmware-qcom-rb3gen2 being gone, there is no need to use
board file alternative in the linux-firmware package. Drop the
alternative.

Signed-off-by: Dmitry Baryshkov <[email protected]>
The QCS6490 and QCM6490 platforms are using the same firmware, with the
-qcm6490- being the main package name and -qcs6490- name being specified
by RPROVIDES.

Make the RB3 Gen 2 packagegroup use -qcm6490- firmware packages.

Signed-off-by: Dmitry Baryshkov <[email protected]>
Copy link

Test jobs for commit 591eeb0

@ricardosalveti
Copy link
Contributor

For the stable branches it would be possible to reinstantiate the firmware-com-rb3gen2 recipe and make the distro use PREFERRED_PROVIDER or PREFERRED_VERSION in order to select the correct package.

Even yocto stable releases quite often brings updates to linux-firmware, so backporting in oe-core could be an option.

@ndechesne ndechesne merged commit e1ecba4 into qualcomm-linux:master Feb 21, 2025
15 checks passed
@lumag lumag deleted the upd-rb3gen2 branch February 21, 2025 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants