From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by mx.groups.io with SMTP id smtpd.web10.17197.1594638996700905604 for ; Mon, 13 Jul 2020 04:16:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=b4ioNuqD; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.208.65, mailfrom: pete@akeo.ie) Received: by mail-ed1-f65.google.com with SMTP id by13so13156139edb.11 for ; Mon, 13 Jul 2020 04:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gxiZlUi4Z5+n1UL2JAOJmat35pnJI4xW7gZDaTdZh6s=; b=b4ioNuqDewN6PUIVcTg0qjJwsMSFkXBK4fllGorf3fh3hWHj+JsOSwOJVtpUXDvLyK q2hXFUuN5ushN4Ekmf+scNouL9nZ6LQhTi6S3bQaKJa9U14FBovBlvKIGAjpudUOmnTY movJm/xAR4ZxkB7GeOhMrdHATKPw+8zagw781QS13x1B1Y6YJ31dcMLFMjQ63PF7Esmj tHzoH3gUc2FFNrMriDhxM4qLl6n0qfKBjq/99HpF3gDxEsl1eSm+ZvmtTobfF0FF7dLk IPrZOD0R9zA34IesJ3DdXy/JpEHbg3SdVplMy5B2STLm+N1qbp6cfdBBxstllNkwU/My dAeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gxiZlUi4Z5+n1UL2JAOJmat35pnJI4xW7gZDaTdZh6s=; b=AP3nDV5IKV0z4r+zxMD2qL6ov+yZoCDjo/mS2OlRN5KRtmEWLYhYDUhTLC3x8C0z/7 ZRfJ2xMv4l/5DWh9HOGEqmDJyfT9vn0+ofrWFD/70OmfbgiKZ9HdzW2cb9m1qEQxrV2H eliV7ZKya1bj2p559z/0UqaKj6+1hqUEC5DhWHwQZiuc10WAUrflxVEezkp/COJQY6rD TPz1nDcsPspDaYnB6+Sy9HK21/N2iXQ/r/3bJlpn/pOGahJVg4qIR1twvnYUuvtpyx5V 4ueSIdD9A59IMipijcd7/lqdVPQVuFVV2fJ0OCOd3YN7aHLpEcrMupmeQjTFNm37az9i BtBA== X-Gm-Message-State: AOAM5324PnwGLWwFpBarW70/iDhelIrUV3iE7s1FYlu2TrBZmIbyMRei 0g0qSnvhiaJB8bEPR6cfQhAsHSP6VIt14g== X-Google-Smtp-Source: ABdhPJzOFxgppr1byUWDAZrcD81M9lNUivOeffOIpFXZ5DnoR53m84cDP4cUDDblHvIWroeDHifBPQ== X-Received: by 2002:aa7:c31a:: with SMTP id l26mr86711169edq.61.1594638994797; Mon, 13 Jul 2020 04:16:34 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([84.203.73.23]) by smtp.gmail.com with ESMTPSA id d26sm10933095edz.93.2020.07.13.04.16.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2020 04:16:34 -0700 (PDT) From: "Pete Batard" To: devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, awarkentin@vmware.com, Andrei Warkentin Subject: [edk2-platforms][PATCH v3 1/1] Platform/RaspberryPi/Drivers: Add SD/(e)MMC card detection Date: Mon, 13 Jul 2020 12:16:20 +0100 Message-Id: <20200713111620.3596-2-pete@akeo.ie> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200713111620.3596-1-pete@akeo.ie> References: <20200713111620.3596-1-pete@akeo.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The Raspberry Pi 3 and Pi 4 platforms (with latest EEPROM) can boot straight from USB, without the need for an SD card being present. However, the IsCardPresent () calls from the ArasanMmcHost and SdHost drivers are currently hardwired to return TRUE, which results in straight to USB boot failing due to the SD drivers looping on errors while trying to poke at a non-existent card... Ideally, we would use the Card Detect signal from the uSD slot, to report on the presence or absence of a card, but the Raspberry Pi Foundation did not wire those signals in the Pi 2 and subsequent models, leaving us with only potentially interfering SD commands as means to perform card detection. As a result of this, we are left with no other choice but limit detection to occurring only once, prior to formal SD card init, and then return the detected value for subsequent calls. This, however, is more than good enough for the intended purpose, which is to allow straight to USB boot. The sequence is a simplified variant of the identification code in MmcDxe. Tested on Raspberry Pi 2B, 3B and CM3 (for both SD controllers) and Pi 4 (for Arasan, as that's the only controller available today) Addresses pftf/RPi3#13, pftf/RPi3#14, pftf/RPi4#37. Co-authored-by: Andrei Warkentin Signed-off-by: Pete Batard --- Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c | 86 ++++++++++++++++++-- Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c | 75 +++++++++++++++-- Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h | 6 ++ 3 files changed, 150 insertions(+), 17 deletions(-) diff --git a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c index 6d706af6f276..d2a8ffddbb66 100644 --- a/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c +++ b/Platform/RaspberryPi/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c @@ -11,7 +11,8 @@ #define DEBUG_MMCHOST_SD DEBUG_VERBOSE -BOOLEAN PreviousIsCardPresent = FALSE; +BOOLEAN CardIsPresent = FALSE; +CARD_DETECT_STATE CardDetectState = CardDetectRequired; UINT32 LastExecutedCommand = (UINT32) -1; STATIC RASPBERRY_PI_FIRMWARE_PROTOCOL *mFwProtocol; @@ -239,14 +240,6 @@ CalculateClockFrequencyDivisor ( return EFI_SUCCESS; } -BOOLEAN -MMCIsCardPresent ( - IN EFI_MMC_HOST_PROTOCOL *This -) -{ - return TRUE; -} - BOOLEAN MMCIsReadOnly ( IN EFI_MMC_HOST_PROTOCOL *This @@ -418,6 +411,10 @@ MMCNotifyState ( DEBUG ((DEBUG_MMCHOST_SD, "ArasanMMCHost: MMCNotifyState(State: %d)\n", State)); + // Stall all operations except init until card detection has occurred. + if (State != MmcHwInitializationState && CardDetectState != CardDetectCompleted) + return EFI_NOT_READY; + switch (State) { case MmcHwInitializationState: { @@ -489,6 +486,77 @@ MMCNotifyState ( return EFI_SUCCESS; } +BOOLEAN +MMCIsCardPresent ( + IN EFI_MMC_HOST_PROTOCOL *This +) +{ + EFI_STATUS Status; + + // + // If we are already in progress (we may get concurrent calls) + // or completed the detection, just return the current value. + // + if (CardDetectState != CardDetectRequired) + return CardIsPresent; + + CardDetectState = CardDetectInProgress; + CardIsPresent = FALSE; + + // + // The two following commands should succeed even if no card is present. + // + Status = MMCNotifyState (This, MmcHwInitializationState); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "MMCIsCardPresent: Error MmcHwInitializationState, Status=%r.\n", Status)); + // If we failed init, go back to requiring card detection + CardDetectState = CardDetectRequired; + return FALSE; + } + + Status = MMCSendCommand (This, MMC_CMD0, 0); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "MMCIsCardPresent: CMD0 Error, Status=%r.\n", Status)); + goto out; + } + + // + // CMD8 should tell us if an SD card is present. + // + Status = MMCSendCommand (This, MMC_CMD8, CMD8_SD_ARG); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "MMCIsCardPresent: Maybe SD card detected.\n")); + CardIsPresent = TRUE; + goto out; + } + + // + // MMC/eMMC won't accept CMD8, but we can try CMD1. + // + Status = MMCSendCommand (This, MMC_CMD1, EMMC_CMD1_CAPACITY_GREATER_THAN_2GB); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "MMCIsCardPresent: Maybe MMC card detected.\n")); + CardIsPresent = TRUE; + goto out; + } + + // + // SDIO? + // + Status = MMCSendCommand (This, MMC_CMD5, 0); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "MMCIsCardPresent: Maybe SDIO card detected.\n")); + CardIsPresent = TRUE; + goto out; + } + + DEBUG ((DEBUG_INFO, "MMCIsCardPresent: Not detected, Status=%r.\n", Status)); + +out: + CardDetectState = CardDetectCompleted; + return CardIsPresent; +} + EFI_STATUS MMCReceiveResponse ( IN EFI_MMC_HOST_PROTOCOL *This, diff --git a/Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c b/Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c index 2f31c5eb8c46..aac8b34c4bf4 100644 --- a/Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c +++ b/Platform/RaspberryPi/Drivers/SdHostDxe/SdHostDxe.c @@ -64,6 +64,8 @@ STATIC CONST CHAR8 *mFsmState[] = { "identmode", "datamode", "readdata", "genpulses", "writewait2", "?", "startpowdown" }; #endif /* NDEBUG */ +STATIC BOOLEAN CardIsPresent = FALSE; +STATIC CARD_DETECT_STATE CardDetectState = CardDetectRequired; STATIC UINT32 mLastGoodCmd = MMC_GET_INDX (MMC_CMD0); STATIC inline BOOLEAN @@ -264,14 +266,6 @@ SdHostSetClockFrequency ( return Status; } -STATIC BOOLEAN -SdIsCardPresent ( - IN EFI_MMC_HOST_PROTOCOL *This - ) -{ - return TRUE; -} - STATIC BOOLEAN SdIsReadOnly ( IN EFI_MMC_HOST_PROTOCOL *This @@ -639,6 +633,10 @@ SdNotifyState ( { DEBUG ((DEBUG_MMCHOST_SD, "SdHost: SdNotifyState(State: %d) ", State)); + // Stall all operations except init until card detection has occurred. + if (State != MmcHwInitializationState && CardDetectState != CardDetectCompleted) + return EFI_NOT_READY; + switch (State) { case MmcHwInitializationState: DEBUG ((DEBUG_MMCHOST_SD, "MmcHwInitializationState\n", State)); @@ -718,6 +716,67 @@ SdNotifyState ( return EFI_SUCCESS; } +STATIC BOOLEAN +SdIsCardPresent ( + IN EFI_MMC_HOST_PROTOCOL *This + ) +{ + EFI_STATUS Status; + + // + // If we are already in progress (we may get concurrent calls) + // or completed the detection, just return the current value. + // + if (CardDetectState != CardDetectRequired) + return CardIsPresent; + + CardDetectState = CardDetectInProgress; + CardIsPresent = FALSE; + + // + // The two following commands should succeed even if no card is present. + // + Status = SdNotifyState (This, MmcHwInitializationState); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "SdIsCardPresent: Error MmcHwInitializationState, Status=%r.\n", Status)); + // If we failed init, go back to requiring card detection + CardDetectState = CardDetectRequired; + return FALSE; + } + + Status = SdSendCommand (This, MMC_CMD0, 0); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "SdIsCardPresent: CMD0 Error, Status=%r.\n", Status)); + goto out; + } + + // + // CMD8 should tell us if an SD card is present. + // + Status = SdSendCommand (This, MMC_CMD8, CMD8_SD_ARG); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "SdIsCardPresent: Maybe SD card detected.\n")); + CardIsPresent = TRUE; + goto out; + } + + // + // MMC/eMMC won't accept CMD8, but we can try CMD1. + // + Status = SdSendCommand (This, MMC_CMD1, EMMC_CMD1_CAPACITY_GREATER_THAN_2GB); + if (!EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "SdIsCardPresent: Maybe MMC card detected.\n")); + CardIsPresent = TRUE; + goto out; + } + + DEBUG ((DEBUG_INFO, "SdIsCardPresent: Not detected, Status=%r.\n", Status)); + +out: + CardDetectState = CardDetectCompleted; + return CardIsPresent; +} + BOOLEAN SdIsMultiBlock ( IN EFI_MMC_HOST_PROTOCOL *This diff --git a/Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h b/Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h index c558e00bf500..78514a31bc4e 100644 --- a/Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h +++ b/Platform/RaspberryPi/Include/Protocol/RpiMmcHost.h @@ -82,6 +82,12 @@ typedef enum _MMC_STATE { MmcDisconnectState, } MMC_STATE; +typedef enum _CARD_DETECT_STATE { + CardDetectRequired = 0, + CardDetectInProgress, + CardDetectCompleted +} CARD_DETECT_STATE; + #define EMMCBACKWARD (0) #define EMMCHS26 (1 << 0) // High-Speed @26MHz at rated device voltages #define EMMCHS52 (1 << 1) // High-Speed @52MHz at rated device voltages -- 2.21.0.windows.1