From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org, leif.lindholm@linaro.org,
michael.d.kinney@intel.com
Cc: liming.gao@intel.com, star.zeng@intel.com, feng.tian@intel.com,
eric.dong@intel.com, Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [RFC PATCH 2/2] MdeModulePkg/SdMmcPciHcDxe: allow HC capabilities to be overridden
Date: Fri, 10 Nov 2017 13:58:47 +0000 [thread overview]
Message-ID: <20171110135847.361-3-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20171110135847.361-1-ard.biesheuvel@linaro.org>
Invoke the newly introduced SD/MMC override protocol to override
the capabilities register after reading it from the device registers,
and to call the pre/post host init and reset hooks at the appropriate
times.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c | 111 +++++++++++++++++++-
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h | 6 ++
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf | 2 +
3 files changed, 114 insertions(+), 5 deletions(-)
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
index 0be8828abfcc..d328e9f867c4 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
@@ -60,7 +60,8 @@ SD_MMC_HC_PRIVATE_DATA gSdMmcPciHcTemplate = {
{ // MaxCurrent
0,
},
- 0 // ControllerVersion
+ 0, // ControllerVersion
+ NULL // Override
};
SD_DEVICE_PATH mSdDpTemplate = {
@@ -213,6 +214,88 @@ Done:
return;
}
+STATIC
+EFI_STATUS
+SdMmcPciHcResetHost (
+ IN SD_MMC_HC_PRIVATE_DATA *Private,
+ IN UINT8 Slot
+ )
+{
+ EFI_STATUS Status;
+
+ if (Private->Override != NULL &&
+ Private->Override->InvokeHook != NULL) {
+ Status = Private->Override->InvokeHook (
+ Private->ControllerHandle,
+ Slot,
+ SD_MMC_OVERRIDE_RESET_PRE_HOOK);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "%a: SD/MMC pre reset hook failed - %r\n",
+ __FUNCTION__, Status));
+ return Status;
+ }
+ }
+
+ Status = SdMmcHcReset (Private->PciIo, Slot);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ if (Private->Override != NULL &&
+ Private->Override->InvokeHook != NULL) {
+ Status = Private->Override->InvokeHook (
+ Private->ControllerHandle,
+ Slot,
+ SD_MMC_OVERRIDE_RESET_POST_HOOK);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "%a: SD/MMC post reset hook failed - %r\n",
+ __FUNCTION__, Status));
+ }
+ }
+ return Status;
+}
+
+STATIC
+EFI_STATUS
+SdMmcPciHcInitHost (
+ IN SD_MMC_HC_PRIVATE_DATA *Private,
+ IN UINT8 Slot
+ )
+{
+ EFI_STATUS Status;
+
+ if (Private->Override != NULL &&
+ Private->Override->InvokeHook != NULL) {
+ Status = Private->Override->InvokeHook (
+ Private->ControllerHandle,
+ Slot,
+ SD_MMC_OVERRIDE_INIT_HOST_PRE_HOOK);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "%a: SD/MMC pre init hook failed - %r\n",
+ __FUNCTION__, Status));
+ return Status;
+ }
+ }
+
+ Status = SdMmcHcInitHost (Private->PciIo, Slot, Private->Capability[Slot]);
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ if (Private->Override != NULL &&
+ Private->Override->InvokeHook != NULL) {
+ Status = Private->Override->InvokeHook (
+ Private->ControllerHandle,
+ Slot,
+ SD_MMC_OVERRIDE_INIT_HOST_POST_HOOK);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "%a: SD/MMC post init hook failed - %r\n",
+ __FUNCTION__, Status));
+ }
+ }
+ return Status;
+}
+
/**
Sd removable device enumeration callback function when the timer event is signaled.
@@ -281,14 +364,14 @@ SdMmcPciHcEnumerateDevice (
//
// Reset the specified slot of the SD/MMC Pci Host Controller
//
- Status = SdMmcHcReset (Private->PciIo, Slot);
+ Status = SdMmcPciHcResetHost (Private, Slot);
if (EFI_ERROR (Status)) {
continue;
}
//
// Reinitialize slot and restart identification process for the new attached device
//
- Status = SdMmcHcInitHost (Private->PciIo, Slot, Private->Capability[Slot]);
+ Status = SdMmcPciHcInitHost (Private, Slot);
if (EFI_ERROR (Status)) {
continue;
}
@@ -601,6 +684,12 @@ SdMmcPciHcDriverBindingStart (
goto Done;
}
+ Status = gBS->HandleProtocol (Controller, &gEdkiiSdMmcOverrideProtocolGuid,
+ (VOID **)&Private->Override);
+ if (!EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_INFO, "%a: using SD/MMC override protocol\n", __FUNCTION__));
+ }
+
Support64BitDma = TRUE;
for (Slot = FirstBar; Slot < (FirstBar + SlotNum); Slot++) {
Private->Slot[Slot].Enable = TRUE;
@@ -609,6 +698,18 @@ SdMmcPciHcDriverBindingStart (
if (EFI_ERROR (Status)) {
continue;
}
+ if (Private->Override != NULL &&
+ Private->Override->OverrideCapability != NULL) {
+ Status = Private->Override->OverrideCapability (
+ Controller,
+ Slot,
+ &Private->Capability[Slot]);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "%a: Failed to override capability - %r\n",
+ __FUNCTION__, Status));
+ continue;
+ }
+ }
DumpCapabilityReg (Slot, &Private->Capability[Slot]);
Support64BitDma &= Private->Capability[Slot].SysBus64;
@@ -627,7 +728,7 @@ SdMmcPciHcDriverBindingStart (
//
// Reset the specified slot of the SD/MMC Pci Host Controller
//
- Status = SdMmcHcReset (PciIo, Slot);
+ Status = SdMmcPciHcResetHost (Private, Slot);
if (EFI_ERROR (Status)) {
continue;
}
@@ -642,7 +743,7 @@ SdMmcPciHcDriverBindingStart (
continue;
}
- Status = SdMmcHcInitHost (PciIo, Slot, Private->Capability[Slot]);
+ Status = SdMmcPciHcInitHost (Private, Slot);
if (EFI_ERROR (Status)) {
continue;
}
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
index 6a2a27969936..b51e0529f885 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
@@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/DriverBinding.h>
#include <Protocol/ComponentName.h>
#include <Protocol/ComponentName2.h>
+#include <Protocol/SdMmcOverride.h>
#include <Protocol/SdMmcPassThru.h>
#include "SdMmcPciHci.h"
@@ -115,6 +116,11 @@ typedef struct {
UINT64 MaxCurrent[SD_MMC_HC_MAX_SLOT];
UINT32 ControllerVersion;
+
+ //
+ // Optional protocol to deal with non-standard SDHCI implementations
+ //
+ SD_MMC_OVERRIDE *Override;
} SD_MMC_HC_PRIVATE_DATA;
#define SD_MMC_HC_TRB_SIG SIGNATURE_32 ('T', 'R', 'B', 'T')
diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
index e26e6a098c17..154ce45d8223 100644
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.inf
@@ -48,6 +48,7 @@ [Sources]
[Packages]
MdePkg/MdePkg.dec
+ MdeModulePkg/MdeModulePkg.dec
[LibraryClasses]
DevicePathLib
@@ -61,6 +62,7 @@ [LibraryClasses]
DebugLib
[Protocols]
+ gEdkiiSdMmcOverrideProtocolGuid ## SOMETIMES_CONSUMES
gEfiDevicePathProtocolGuid ## TO_START
gEfiPciIoProtocolGuid ## TO_START
gEfiSdMmcPassThruProtocolGuid ## BY_START
--
2.11.0
next prev parent reply other threads:[~2017-11-10 13:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 13:58 [RFC PATCH 0/2] quirks handling for SDHCI controllers Ard Biesheuvel
2017-11-10 13:58 ` [RFC PATCH 1/2] MdeModulePkg: introduce SD/MMC override protocol Ard Biesheuvel
2017-11-10 13:58 ` Ard Biesheuvel [this message]
2017-11-13 3:31 ` [RFC PATCH 0/2] quirks handling for SDHCI controllers Zeng, Star
2017-11-13 3:37 ` Wu, Hao A
2017-11-23 10:10 ` Ard Biesheuvel
2017-11-23 12:55 ` Wu, Hao A
2017-11-23 12:56 ` Ard Biesheuvel
2017-11-30 2:10 ` Wu, Hao A
2017-11-30 2:14 ` Wu, Hao A
2017-11-30 2:15 ` Zeng, Star
2017-11-30 2:16 ` Wu, Hao A
2017-11-30 6:45 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171110135847.361-3-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox