ps4-linux-6.15.y - mmc: Fix SDIO WiFi + Bluetooth for Marvell 88w8897 #11
Conversation
This file contains hidden or 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
Fixes card detection and functionality for the Marvell 88w8897 Chip
(PlayStation internal codename Torus 2.0).
The affected cards are present in the console models :-
CUH-1216{A,B},
CUH-1215{A,B},
CUH-1003{A},
... and maybe more.
Files changed:
- include/linux/mmc/sdio_ids.h:
Marvell 8897 F0 (function 0) ID in include/linux/mmc/sdio_ids.h.
To be polled by SDIO/SDHCI driver during card func initialization.
- drivers/mmc/core/quirks.h
Added MMC SDR104 mode with 150 MHz quirk for MARVELL_8897_F0 in drivers/mmc/core/quirks.h.
- drivers/mmc/host/sdhci-pci-core.c
Added SDHCI host controller quirk for correct clock tuning on affected
systems.
Adding .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
in drivers/mmc/host/sdhci-pci-core.c .
Added a check for SD host controller version (Aeolia or Belize only) before applying
the host quirk.
- drivers/mmc/core/sdio_ops.c
Added skeleton comment to have 3 retries on each CMD52 or 53 in mmc_wait_for_cmd function.
Is not needed now, but for future reference in case some card fails at
card function init.
Signed-off-by: feeRnt <81442162+feeRnt@users.noreply.github.com>
|
Let me know if the comments are excessive. |
The comments are fine. We should better leave them in for someone who might work on it in the future. |
|
LGTM Will look at it next week as well. Thanks for the PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes: Card detection and functionality for the Marvell 88w8897 Chip
(PlayStation internal codename Torus 2.0).
The affected cards are present in the console models :-
CUH-1216{A,B},
CUH-1215{A,B},
CUH-1003{A},
... and maybe more.
Files changed:
- include/linux/mmc/sdio_ids.h
Marvell 8897 F0 (function 0) ID in include/linux/mmc/sdio_ids.h. To be polled by SDIO/SDHCI driver during card func initialization.
- drivers/mmc/core/quirks.h
Added MMC SDR104 mode with 150 MHz quirk for MARVELL_8897_F0 in drivers/mmc/core/quirks.h.
- drivers/mmc/host/sdhci-pci-core.c
Added SDHCI host controller quirk for correct clock tuning on affected systems.
Adding .quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN, in drivers/mmc/host/sdhci-pci-core.c .
Added a check for SD host controller version (Aeolia or Belize only) before applying the host quirk.
- drivers/mmc/core/sdio_ops.c
Added skeleton comment to have 3 retries on each CMD52 or 53 in mmc_wait_for_cmd function.
Is not needed now, but for future reference in case some card fails at
card function init.