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

sd: fix frequency and timing selection logic #72705

Merged
merged 7 commits into from
May 16, 2024
Merged

sd: fix frequency and timing selection logic #72705

merged 7 commits into from
May 16, 2024

Conversation

danieldegrasse
Copy link
Collaborator

@danieldegrasse danieldegrasse commented May 13, 2024 •
edited

SDMMC framework frequency and timing selection logic has several
longstanding issues, including:

  • requiring that SD hosts support the maximum frequency possible for a
    given UHS mode in order to apply that timing
  • selecting SDHC_TIMING_SDR25 for high speed mode, when SDHC_TIMING_HS
    would be correct

Rework the frequency and timing selection logic within the SD framework
to resolve these issues.

Fixes #52589
Fixes #67943

This PR also includes a similar rework for the frequency selection logic in the SDIO framework, as the same issue exists there

@danieldegrasse
include: zephyr: sd: sd_spec: use frequency macros
d1f0d02 
Use frequency macros to define SD frequencies, this should increase
readability of the file and reduce errors.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
include: zephyr: sd: sd_spec: add UNSUPPORTED frequency for HS mode
0c3c941 
Add UNSUPPORTED frequency macro for HS mode frequencies, used when a
card does not support any high speed mode frequencies

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
sd: sdmmc: add DEFAULT and HIGH_SPEED bus speeds
712798d 
Add DEFAULT and HIGH_SPEED bus speeds to SD spec definition, for non UHS
cards.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
sd: sdmmc: rework frequency and timing selection logic
30407dd 
SDMMC framework frequency and timing selection logic has several
longstanding issues, including:
- requiring that SD hosts support the maximum frequency possible for a
  given UHS mode in order to apply that timing
- selecting SDHC_TIMING_SDR25 for high speed mode, when SDHC_TIMING_HS
  would be correct

Rework the frequency and timing selection logic within the SD framework
to resolve these issues.

Fixes zephyrproject-rtos#52589
Fixes zephyrproject-rtos#67943

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
sd: sdio: rework frequency and timing selection logic
9f68093 
Reword frequency and timing selection logic for SDIO framework so that
the maximum supported timing mode between the card and host will be
selected, even if the maximum frequency supported by the host is not
equal to the maximum frequency for that mode.

Also, resolve an issue where a host and card combo only supporting HS
mode or worse would still use legacy timing mode, because the CCCR flags
were not being checked when checking if HS bus speed could be used.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
tests: subsys: sd: report bus frequency, report timing correctly
c089db5 
Report bus frequency, and use correct names for the timing modes when SD
cards do not support UHS modes.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse
drivers: sdhc: rcar_mmc: remove frequency correction code
609e638 
RCAR MMC driver previously had to report inaccurate maximum supported
frequency to SD subsystem so that the subsystem would select SDR104 mode
timing. Remove this logic, as it should no longer be needed.

Signed-off-by: Daniel DeGrasse <daniel.degrasse@nxp.com>
@danieldegrasse danieldegrasse changed the title sd: sdmmc: rework frequency and timing selection logic sd: sdmmc: frequency and timing selection logic May 13, 2024
xakep-amatop
xakep-amatop approved these changes May 14, 2024
View reviewed changes
Copy link
Contributor

@xakep-amatop xakep-amatop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes have been checked on a real board; everything works as expected.

@danieldegrasse danieldegrasse changed the title sd: sdmmc: frequency and timing selection logic sd: fix frequency and timing selection logic May 14, 2024
@danieldegrasse
Copy link
Collaborator Author

Changes have been checked on a real board; everything works as expected.

Thanks for verifying this- I also checked these changes on an RT1170 (imx_usdhc.c) and LPC55S69 (mcux_sdif.c), and both worked as expected.

@danieldegrasse
Copy link
Collaborator Author

Reassigning, as I can't review my own PR

@aescolar aescolar merged commit 3b718bf into zephyrproject-rtos:main May 16, 2024
21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xakep-amatop xakep-amatop xakep-amatop approved these changes

@dleach02 dleach02 dleach02 approved these changes

@decsny decsny decsny approved these changes

@aaillet aaillet Awaiting requested review from aaillet

@jfischer-no jfischer-no Awaiting requested review from jfischer-no

@lorc lorc Awaiting requested review from lorc

Assignees

@decsny decsny

Labels
area: Disk Access platform: Renesas R-Car Renesas R-Car
Projects
None yet
Milestone
No milestone
6 participants
@danieldegrasse @xakep-amatop @dleach02 @decsny @zephyrbot @aescolar