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.

Sign up for GitHub

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

Jump to bottom

poplar fixes #526

Merged
merged 2 commits into from
Sep 30, 2021
Merged

poplar fixes #526

merged 2 commits into from
Sep 30, 2021

Conversation

igoropaniuk
Copy link
Contributor

@igoropaniuk igoropaniuk commented Sep 29, 2021 •
edited

Poplar fixes

@igoropaniuk igoropaniuk changed the title poplar.mk: provide proper mmcblk for rootfs poplar fixes Sep 29, 2021
@igoropaniuk igoropaniuk mentioned this pull request Sep 29, 2021
Merged
@jbech-linaro
Copy link
Contributor

Acked-by: Joakim Bech <joakim.bech@linaro.org>

@jforissier
Copy link
Contributor

jforissier commented Sep 30, 2021 •
edited 

In the current version of linux kernel eMMC is enumerated as mmcblk0
instead of mmcblk1 as before,

Can you please tell exactly which version of the kernel changed this? I think it is v5.14 (or more exactly some v5.14-rcX but that level of detail isn't required), since our optee branch was just rebased from v5.13 to v5.14.

With that:
Acked-by: Jerome Forissier <jerome@forissier.org>

@igoropaniuk
Copy link
Contributor Author

@jforissier TBH I'm not sure where exactly it was changed, as I didn't do testing of Poplar for previous OP-TEE release, so
it could be any linux version since OP-TEE 3.12.0 release date.

I've quickly checked dw_mmc-hi3798cv200.c driver and Poplar device tree/hi3798 SoC dt include, and I didn't see any changes related to this that could affect probe order.

That was definitely something more generic, but I didn't manage to find it yet

@jforissier
Copy link
Contributor

@igoropaniuk OK so let's leave the commit description as is. Thanks!

@igoropaniuk
poplar.mk: provide proper mmcblk for rootfs
37f6824 
In the current version of linux kernel eMMC is enumerated as mmcblk0
instead of mmcblk1 as before, which causes hang while trying to mount
root partition:

[    1.631806] mmc0: new HS200 MMC card at address 0001
[    1.641686] mmcblk0: mmc0:0001 8WPD3R 7.28 GiB
...
[    2.791837] Waiting for root device /dev/mmcblk1p3...

Acked-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
@igoropaniuk
poplar: drop ion driver configs
7cad2d6 
Drop ION driver configs from poplar.conf, as since
linaro-swg/linux.git branch optee [1] was rebased onto kernel
v5.12, where ION allocator was removed.

Link: [1] https://github.com/linaro-swg/linux/tree/optee-v5.12-20210628
Acked-by: Joakim Bech <joakim.bech@linaro.org>
Acked-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
@igoropaniuk
Copy link
Contributor Author

tags applied and pushed
thanks!

@jforissier jforissier merged commit c573039 into OP-TEE:master Sep 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@igoropaniuk @jbech-linaro @jforissier