tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/SdMmcPciHcDxe: Allow overriding base clock frequency 

Some SdMmc host controllers are run by clocks with different
frequency than it is reflected in Capabilities Register 1.
It is allowed by SDHCI specification ver. 4.2 - if BaseClkFreq
field value of the Capability Register 1 is zero, the clock
frequency must be obtained via another method.

Because the bitfield is only 8 bits wide, a maximum value
that could be obtained from hardware is 255MHz.
In case the actual frequency exceeds 255MHz, the 8-bit BaseClkFreq
member of SD_MMC_HC_SLOT_CAP structure occurs to be not sufficient
to be used for setting the clock speed in SdMmcHcClockSupply
function.

This patch adds new UINT32 array ('BaseClkFreq[]') to
SD_MMC_HC_PRIVATE_DATA structure for specifying
the input clock speed for each slot of the host controller.
All routines that are used for clock configuration are
updated accordingly.

This patch also adds new IN OUT BaseClockFreq field
in the Capability callback of the SdMmcOverride,
protocol which allows to update BaseClkFreq value.

The patch reuses original commit from edk2-platforms:
20f6f144d3a8 ("Marvell/Drivers: XenonDxe: Allow overriding base clock
frequency")

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
This commit is contained in:
Marcin Wojtas 2018-11-10 07:01:27 +08:00 committed by Hao Wu
parent b7b803a6d5
commit 7f3b0bad4b
7 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
View File

@ -707,7 +707,7 @@ EmmcSwitchClockFreq (
// //
// Convert the clock freq unit from MHz to KHz. // Convert the clock freq unit from MHz to KHz.
// //
Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, Private->Capability[Slot]); Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, Private->BaseClkFreq[Slot]);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
@ -1007,7 +1007,7 @@ EmmcSetBusMode (
return Status; return Status;
} }
ASSERT (Private->Capability[Slot].BaseClkFreq != 0); ASSERT (Private->BaseClkFreq[Slot] != 0);
// //
// Check if the Host Controller support 8bits bus width. // Check if the Host Controller support 8bits bus width.
// //

4
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
View File

@ -864,7 +864,7 @@ SdCardSetBusMode (
return Status; return Status;
} }
Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability); Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, Private->BaseClkFreq[Slot]);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
@ -1064,7 +1064,7 @@ SdCardIdentification (
goto Error; goto Error;
} }
SdMmcHcInitClockFreq (PciIo, Slot, Private->Capability[Slot]); SdMmcHcInitClockFreq (PciIo, Slot, Private->BaseClkFreq[Slot]);
gBS->Stall (1000); gBS->Stall (1000);

13
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.c
View File

@ -625,11 +625,16 @@ SdMmcPciHcDriverBindingStart (
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
continue; continue;
} }
Private->BaseClkFreq[Slot] = Private->Capability[Slot].BaseClkFreq;
if (mOverride != NULL && mOverride->Capability != NULL) { if (mOverride != NULL && mOverride->Capability != NULL) {
Status = mOverride->Capability ( Status = mOverride->Capability (
Controller, Controller,
Slot, Slot,
&Private->Capability[Slot]); &Private->Capability[Slot],
&Private->BaseClkFreq[Slot]
);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_WARN, "%a: Failed to override capability - %r\n", DEBUG ((DEBUG_WARN, "%a: Failed to override capability - %r\n",
__FUNCTION__, Status)); __FUNCTION__, Status));
@ -637,6 +642,12 @@ SdMmcPciHcDriverBindingStart (
} }
} }
DumpCapabilityReg (Slot, &Private->Capability[Slot]); DumpCapabilityReg (Slot, &Private->Capability[Slot]);
DEBUG ((
DEBUG_INFO,
"Slot[%d] Base Clock Frequency: %dMHz\n",
Slot,
Private->BaseClkFreq[Slot]
));
Support64BitDma &= Private->Capability[Slot].SysBus64; Support64BitDma &= Private->Capability[Slot].SysBus64;

6
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHcDxe.h
View File

@ -118,6 +118,12 @@ typedef struct {
UINT64 MaxCurrent[SD_MMC_HC_MAX_SLOT]; UINT64 MaxCurrent[SD_MMC_HC_MAX_SLOT];
UINT32 ControllerVersion; UINT32 ControllerVersion;
//
// Some controllers may require to override base clock frequency
// value stored in Capabilities Register 1.
//
UINT32 BaseClkFreq[SD_MMC_HC_MAX_SLOT];
} SD_MMC_HC_PRIVATE_DATA; } SD_MMC_HC_PRIVATE_DATA;
#define SD_MMC_HC_TRB_SIG SIGNATURE_32 ('T', 'R', 'B', 'T') #define SD_MMC_HC_TRB_SIG SIGNATURE_32 ('T', 'R', 'B', 'T')

23
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
View File

@ -721,7 +721,7 @@ SdMmcHcStopClock (
@param[in] PciIo The PCI IO protocol instance. @param[in] PciIo The PCI IO protocol instance.
@param[in] Slot The slot number of the SD card to send the command to. @param[in] Slot The slot number of the SD card to send the command to.
@param[in] ClockFreq The max clock frequency to be set. The unit is KHz. @param[in] ClockFreq The max clock frequency to be set. The unit is KHz.
@param[in] Capability The capability of the slot. @param[in] BaseClkFreq The base clock frequency of host controller in MHz.
@retval EFI_SUCCESS The clock is supplied successfully. @retval EFI_SUCCESS The clock is supplied successfully.
@retval Others The clock isn't supplied successfully. @retval Others The clock isn't supplied successfully.
@ -732,11 +732,10 @@ SdMmcHcClockSupply (
IN EFI_PCI_IO_PROTOCOL *PciIo, IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINT8 Slot, IN UINT8 Slot,
IN UINT64 ClockFreq, IN UINT64 ClockFreq,
IN SD_MMC_HC_SLOT_CAP Capability IN UINT32 BaseClkFreq
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINT32 BaseClkFreq;
UINT32 SettingFreq; UINT32 SettingFreq;
UINT32 Divisor; UINT32 Divisor;
UINT32 Remainder; UINT32 Remainder;
@ -746,9 +745,8 @@ SdMmcHcClockSupply (
// //
// Calculate a divisor for SD clock frequency // Calculate a divisor for SD clock frequency
// //
ASSERT (Capability.BaseClkFreq != 0); ASSERT (BaseClkFreq != 0);
BaseClkFreq = Capability.BaseClkFreq;
if (ClockFreq == 0) { if (ClockFreq == 0) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -940,7 +938,7 @@ SdMmcHcSetBusWidth (
@param[in] PciIo The PCI IO protocol instance. @param[in] PciIo The PCI IO protocol instance.
@param[in] Slot The slot number of the SD card to send the command to. @param[in] Slot The slot number of the SD card to send the command to.
@param[in] Capability The capability of the slot. @param[in] BaseClkFreq The base clock frequency of host controller in MHz.
@retval EFI_SUCCESS The clock is supplied successfully. @retval EFI_SUCCESS The clock is supplied successfully.
@retval Others The clock isn't supplied successfully. @retval Others The clock isn't supplied successfully.
@ -950,16 +948,19 @@ EFI_STATUS
SdMmcHcInitClockFreq ( SdMmcHcInitClockFreq (
IN EFI_PCI_IO_PROTOCOL *PciIo, IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINT8 Slot, IN UINT8 Slot,
IN SD_MMC_HC_SLOT_CAP Capability IN UINT32 BaseClkFreq
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINT32 InitFreq; UINT32 InitFreq;
// //
// Calculate a divisor for SD clock frequency // According to SDHCI specification ver. 4.2, BaseClkFreq field value of
// the Capability Register 1 can be zero, which means a need for obtaining
// the clock frequency via another method. Fail in case it is not updated
// by SW at this point.
// //
if (Capability.BaseClkFreq == 0) { if (BaseClkFreq == 0) {
// //
// Don't support get Base Clock Frequency information via another method // Don't support get Base Clock Frequency information via another method
// //
@ -969,7 +970,7 @@ SdMmcHcInitClockFreq (
// Supply 400KHz clock frequency at initialization phase. // Supply 400KHz clock frequency at initialization phase.
// //
InitFreq = 400; InitFreq = 400;
Status = SdMmcHcClockSupply (PciIo, Slot, InitFreq, Capability); Status = SdMmcHcClockSupply (PciIo, Slot, InitFreq, BaseClkFreq);
return Status; return Status;
} }
@ -1103,7 +1104,7 @@ SdMmcHcInitHost (
PciIo = Private->PciIo; PciIo = Private->PciIo;
Capability = Private->Capability[Slot]; Capability = Private->Capability[Slot];
Status = SdMmcHcInitClockFreq (PciIo, Slot, Capability); Status = SdMmcHcInitClockFreq (PciIo, Slot, Private->BaseClkFreq[Slot]);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }

8
MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
View File

@ -423,7 +423,7 @@ SdMmcHcStopClock (
@param[in] PciIo The PCI IO protocol instance. @param[in] PciIo The PCI IO protocol instance.
@param[in] Slot The slot number of the SD card to send the command to. @param[in] Slot The slot number of the SD card to send the command to.
@param[in] ClockFreq The max clock frequency to be set. The unit is KHz. @param[in] ClockFreq The max clock frequency to be set. The unit is KHz.
@param[in] Capability The capability of the slot. @param[in] BaseClkFreq The base clock frequency of host controller in MHz.
@retval EFI_SUCCESS The clock is supplied successfully. @retval EFI_SUCCESS The clock is supplied successfully.
@retval Others The clock isn't supplied successfully. @retval Others The clock isn't supplied successfully.
@ -434,7 +434,7 @@ SdMmcHcClockSupply (
IN EFI_PCI_IO_PROTOCOL *PciIo, IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINT8 Slot, IN UINT8 Slot,
IN UINT64 ClockFreq, IN UINT64 ClockFreq,
IN SD_MMC_HC_SLOT_CAP Capability IN UINT32 BaseClkFreq
); );
/** /**
@ -482,7 +482,7 @@ SdMmcHcSetBusWidth (
@param[in] PciIo The PCI IO protocol instance. @param[in] PciIo The PCI IO protocol instance.
@param[in] Slot The slot number of the SD card to send the command to. @param[in] Slot The slot number of the SD card to send the command to.
@param[in] Capability The capability of the slot. @param[in] BaseClkFreq The base clock frequency of host controller in MHz.
@retval EFI_SUCCESS The clock is supplied successfully. @retval EFI_SUCCESS The clock is supplied successfully.
@retval Others The clock isn't supplied successfully. @retval Others The clock isn't supplied successfully.
@ -492,7 +492,7 @@ EFI_STATUS
SdMmcHcInitClockFreq ( SdMmcHcInitClockFreq (
IN EFI_PCI_IO_PROTOCOL *PciIo, IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINT8 Slot, IN UINT8 Slot,
IN SD_MMC_HC_SLOT_CAP Capability IN UINT32 BaseClkFreq
); );
/** /**

7
MdeModulePkg/Include/Protocol/SdMmcOverride.h
View File

@ -22,7 +22,7 @@
#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \ #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
{ 0xeaf9e3c1, 0xc9cd, 0x46db, { 0xa5, 0xe5, 0x5a, 0x12, 0x4c, 0x83, 0x23, 0x23 } } { 0xeaf9e3c1, 0xc9cd, 0x46db, { 0xa5, 0xe5, 0x5a, 0x12, 0x4c, 0x83, 0x23, 0x23 } }
#define EDKII_SD_MMC_OVERRIDE_PROTOCOL_VERSION 0x1 #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_VERSION 0x2
typedef struct _EDKII_SD_MMC_OVERRIDE EDKII_SD_MMC_OVERRIDE; typedef struct _EDKII_SD_MMC_OVERRIDE EDKII_SD_MMC_OVERRIDE;
@ -58,6 +58,8 @@ typedef enum {
@param[in] ControllerHandle The EFI_HANDLE of the controller. @param[in] ControllerHandle The EFI_HANDLE of the controller.
@param[in] Slot The 0 based slot index. @param[in] Slot The 0 based slot index.
@param[in,out] SdMmcHcSlotCapability The SDHCI capability structure. @param[in,out] SdMmcHcSlotCapability The SDHCI capability structure.
@param[in,out] BaseClkFreq The base clock frequency value that
optionally can be updated.
@retval EFI_SUCCESS The override function completed successfully. @retval EFI_SUCCESS The override function completed successfully.
@retval EFI_NOT_FOUND The specified controller or slot does not exist. @retval EFI_NOT_FOUND The specified controller or slot does not exist.
@ -69,7 +71,8 @@ EFI_STATUS
(EFIAPI * EDKII_SD_MMC_CAPABILITY) ( (EFIAPI * EDKII_SD_MMC_CAPABILITY) (
IN EFI_HANDLE ControllerHandle, IN EFI_HANDLE ControllerHandle,
IN UINT8 Slot, IN UINT8 Slot,
IN OUT VOID *SdMmcHcSlotCapability IN OUT VOID *SdMmcHcSlotCapability,
IN OUT UINT32 *BaseClkFreq
); );
/** /**