i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: handle "high capacity' (>2GB) devices similarly to SDHC

Browse Source 
A similar change was made to address sectors instead of bytes.
The detection method is different in the initialization sequence.

Change-Id: I38af6e21b720d4437594431964a5244fb0d80848
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10933
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
PulkoMandy
2026-05-07 07:22:21 +00:00
committed by Adrien Destugues
parent 0753e9eb5e
commit 1e9473f97e
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/drivers/mmc.h
+1
View File
@@ -20,6 +20,7 @@ struct IOOperation;
typedef enum card_type { typedef enum card_type {
CARD_TYPE_UNKNOWN, CARD_TYPE_UNKNOWN,
CARD_TYPE_MMC, CARD_TYPE_MMC,
CARD_TYPE_MMC_EXTENDED_CAPACITY,
CARD_TYPE_SD, CARD_TYPE_SD,
CARD_TYPE_SDHC, CARD_TYPE_SDHC,
CARD_TYPE_UHS1, CARD_TYPE_UHS1,
src/add-ons/kernel/bus_managers/mmc/mmc_bus.cpp
+10 -10
View File
@@ -224,27 +224,27 @@ MMCBus::_WorkerThread(void* cookie)
TRACE("Card does not implement CMD8, may be a V1 SD or MMC card\n"); TRACE("Card does not implement CMD8, may be a V1 SD or MMC card\n");
// Do not check for SDHC support in this case // Do not check for SDHC support in this case
hcs = 0; hcs = 0;
uint32_t mmcOcr;
TRACE("Trying MMC CMD1 initialization...\n"); TRACE("Trying MMC CMD1 initialization...\n");
do { do {
status = bus->ExecuteCommand(0, MMC_SEND_OP_COND, 0xFF8000, &mmcOcr); status = bus->ExecuteCommand(0, MMC_SEND_OP_COND, 0xFF8000, &ocr);
// full voltage window, byte addressable, should look into this. // full voltage window, byte addressable, should look into this.
if (status != B_OK) { if (status != B_OK) {
TRACE("MMC CMD1 failed\n"); TRACE("MMC CMD1 failed\n");
break; break;
} }
if ((mmcOcr & (1 << 31)) == 0) { if ((ocr & (1 << 31)) == 0) {
TRACE("MMC card is busy\n"); TRACE("MMC card is busy\n");
snooze(100000); snooze(100000);
} }
} while ((mmcOcr & (1 << 31)) == 0); } while ((ocr & (1 << 31)) == 0);
if (status == B_OK && (mmcOcr & (1 << 31)) != 0) { if (status == B_OK && (ocr & (1 << 31)) != 0) {
TRACE("Detected MMC card after CMD1\n"); TRACE("Detected MMC card after CMD1\n");
cardType = CARD_TYPE_MMC; if ((ocr & (1 << 30)) != 0)
// Reuse the probed OCR value for logging and later handling cardType = CARD_TYPE_MMC_EXTENDED_CAPACITY;
ocr = mmcOcr; else
cardType = CARD_TYPE_MMC;
} }
} else if (response != probe) { } else if (response != probe) {
ERROR("Card does not support voltage range (expected %x, " ERROR("Card does not support voltage range (expected %x, "
@@ -257,7 +257,7 @@ MMCBus::_WorkerThread(void* cookie)
// Probe OCR, waiting for card to become ready // Probe OCR, waiting for card to become ready
// We keep repeating ACMD41 until the card replies that it is // We keep repeating ACMD41 until the card replies that it is
// initialized. For MMC we already probed using CMD1 above. // initialized. For MMC we already probed using CMD1 above.
if (cardType != CARD_TYPE_MMC) { if ((cardType != CARD_TYPE_MMC) && (cardType != CARD_TYPE_MMC_EXTENDED_CAPACITY)) {
do { do {
uint32_t cardStatus; uint32_t cardStatus;
while (bus->ExecuteCommand(0, SD_APP_CMD, 0, &cardStatus) == B_BUSY) { while (bus->ExecuteCommand(0, SD_APP_CMD, 0, &cardStatus) == B_BUSY) {
@@ -314,7 +314,7 @@ MMCBus::_WorkerThread(void* cookie)
bool cardFound = false; bool cardFound = false;
// This being an if statement as opposed to a while statement restricts // This being an if statement as opposed to a while statement restricts
// it to one device per bus. // it to one device per bus.
if (cardType == CARD_TYPE_MMC) { if ((cardType == CARD_TYPE_MMC) || (cardType == CARD_TYPE_MMC_EXTENDED_CAPACITY)) {
if (bus->ExecuteCommand(0, ALL_SEND_CID, 0, cid) == B_OK) { if (bus->ExecuteCommand(0, ALL_SEND_CID, 0, cid) == B_OK) {
// We currently support only a single card, so use a fixed RCA. // We currently support only a single card, so use a fixed RCA.
rca = 1; rca = 1;
src/add-ons/kernel/drivers/disk/mmc/mmc_disk.cpp
+4 -2
View File
@@ -101,7 +101,10 @@ mmc_disk_supports_device(device_node* parent)
TRACE("SD card found, parent: %p\n", parent); TRACE("SD card found, parent: %p\n", parent);
else if (deviceType == CARD_TYPE_SDHC) else if (deviceType == CARD_TYPE_SDHC)
TRACE("SDHC card found, parent: %p\n", parent); TRACE("SDHC card found, parent: %p\n", parent);
else else if (deviceType == CARD_TYPE_SDIO) {
// Ignore silently, since it is not mass storage and should be handled by other drivers
return 0.0;
} else
return 0.0; return 0.0;
return 0.8; return 0.8;
@@ -237,7 +240,6 @@ mmc_disk_init_driver(device_node* node, void** cookie)
// SD and MMC cards use byte offsets for IO commands, later ones (SDHC, // SD and MMC cards use byte offsets for IO commands, later ones (SDHC,
// SDXC, ...) use sectors. // SDXC, ...) use sectors.
// TODO eMMC uses sectors as well if defined in the OCR register bits 30:29
if (deviceType == CARD_TYPE_SD || deviceType == CARD_TYPE_MMC) if (deviceType == CARD_TYPE_SD || deviceType == CARD_TYPE_MMC)
info->flags = 0; info->flags = 0;
else else