* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-05 13:25 ` [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol Marcin Wojtas
@ 2018-10-05 15:12 ` Philippe Mathieu-Daudé
2018-10-05 15:17 ` Marcin Wojtas
2018-10-08 12:41 ` Ard Biesheuvel
2018-11-01 7:04 ` Wu, Hao A
2 siblings, 1 reply; 47+ messages in thread
From: Philippe Mathieu-Daudé @ 2018-10-05 15:12 UTC (permalink / raw)
To: Marcin Wojtas, edk2-devel
Cc: feng.tian, tm, hao.a.wu, nadavh, liming.gao, michael.d.kinney
Hi Marcin, Tomasz.
On 05/10/2018 15:25, Marcin Wojtas wrote:
> From: Tomasz Michalec <tm@semihalf.com>
>
> Some SD Host Controlers use different values in Host Control 2 Register
My two cents, in various places "Controler" is miswritten, this should
be "Controller".
> to select UHS Mode. This patch adds a new UhsSignaling type routine to
> the NotifyPhase of the SdMmcOverride protocol.
>
> UHS signaling configuration is moved to a common, default routine
> (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> cover this functionality.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> 5 files changed, 243 insertions(+), 68 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> index e389d52..a03160d 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> #define SD_MMC_HC_CTRL_VER 0xFE
>
> //
> +// SD Host Controler bits to HOST_CTRL2 register
> +//
> +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_HS200 0x0003
> +#define SD_MMC_HC_CTRL_HS400 0x0005
> +
> +//
> +// Timing modes for uhs
> +//
> +typedef enum {
> + SdMmcUhsSdr12,
> + SdMmcUhsSdr25,
> + SdMmcUhsSdr50,
> + SdMmcUhsSdr104,
> + SdMmcUhsDdr50,
> + SdMmcMmcDdr52,
> + SdMmcMmcSdr50,
> + SdMmcMmcSdr25,
> + SdMmcMmcSdr12,
> + SdMmcMmcHs200,
> + SdMmcMmcHs400,
> +} SD_MMC_UHS_TIMING;
> +
> +//
> // The transfer modes supported by SD Host Controller
> // Simplified Spec 3.0 Table 1-2
> //
> @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> IN UINT8 Slot
> );
>
> +/**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + );
> +
> #endif
> diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> index 178945f..25db98a 100644
> --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> @@ -17,6 +17,7 @@
> #ifndef __SD_MMC_OVERRIDE_H__
> #define __SD_MMC_OVERRIDE_H__
>
> +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> #include <Protocol/SdMmcPassThru.h>
>
> #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> @@ -31,6 +32,7 @@ typedef enum {
> EdkiiSdMmcResetPost,
> EdkiiSdMmcInitHostPre,
> EdkiiSdMmcInitHostPost,
> + EdkiiSdMmcUhsSignaling,
> } EDKII_SD_MMC_PHASE_TYPE;
>
> /**
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> index c5fd214..05bd4a0 100755
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT8 HostCtrl1;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> if (EFI_ERROR (Status)) {
> @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> return Status;
> }
>
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> - //
> if (IsDdr) {
> - HostCtrl2 = BIT2;
> + Timing = SdMmcMmcDdr52;
> } else if (ClockFreq == 52) {
> - HostCtrl2 = BIT0;
> + Timing = SdMmcMmcSdr50;
> + } else if (ClockFreq == 26) {
> + Timing = SdMmcMmcSdr25;
> } else {
> - HostCtrl2 = 0;
> + Timing = SdMmcMmcSdr12;
> }
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> HsTiming = 1;
> @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> - UINT16 ClockCtrl;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT16 ClockCtrl;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> if ((BusWidth != 4) && (BusWidth != 8)) {
> return EFI_INVALID_PARAMETER;
> @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> - //
> - HostCtrl2 = BIT0 | BIT1;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs200;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
> //
> // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> IN UINT32 ClockFreq
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> if (EFI_ERROR (Status)) {
> @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> - //
> - HostCtrl2 = BIT0 | BIT2;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs400;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> HsTiming = 3;
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> index 8c93933..5645a71 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> @@ -784,8 +784,8 @@ SdCardSetBusMode (
> UINT8 BusWidth;
> UINT8 AccessMode;
> UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> UINT8 SwitchResp[64];
> + SD_MMC_UHS_TIMING Timing;
> SD_MMC_HC_PRIVATE_DATA *Private;
>
> Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> @@ -817,18 +817,23 @@ SdCardSetBusMode (
> if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> ClockFreq = 208;
> AccessMode = 3;
> + Timing = SdMmcUhsSdr104;
> } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> ClockFreq = 100;
> AccessMode = 2;
> + Timing = SdMmcUhsSdr50;
> } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> ClockFreq = 50;
> AccessMode = 4;
> + Timing = SdMmcUhsDdr50;
> } else if ((SwitchResp[13] & BIT1) != 0) {
> ClockFreq = 50;
> AccessMode = 1;
> + Timing = SdMmcUhsSdr25;
> } else {
> ClockFreq = 25;
> AccessMode = 0;
> + Timing = SdMmcUhsSdr12;
> }
>
> Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> @@ -854,15 +859,27 @@ SdCardSetBusMode (
> }
> }
>
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - HostCtrl2 = AccessMode;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> index 02eb4ad..38d6202 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> }
>
> /**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + )
> +{
> + EFI_STATUS Status;
> + UINT8 HostCtrl2;
> +
> + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> +
> + switch (Timing) {
> + case SdMmcUhsSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> + break;
> + case SdMmcUhsSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> + break;
> + case SdMmcUhsSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> + break;
> + case SdMmcUhsSdr104:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> + break;
> + case SdMmcUhsDdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> + break;
> + case SdMmcMmcDdr52:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> + break;
> + case SdMmcMmcSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> + break;
> + case SdMmcMmcSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> + break;
> + case SdMmcMmcSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> + break;
> + case SdMmcMmcHs200:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> + break;
> + case SdMmcMmcHs400:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> + break;
> + default:
> + HostCtrl2 = 0;
> + break;
> + }
> + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> +
> + return Status;
> +}
> +
> +/**
> Turn on/off LED.
>
> @param[in] PciIo The PCI IO protocol instance.
>
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-05 15:12 ` Philippe Mathieu-Daudé
@ 2018-10-05 15:17 ` Marcin Wojtas
0 siblings, 0 replies; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-05 15:17 UTC (permalink / raw)
To: philmd
Cc: edk2-devel-01, Tian, Feng, Tomasz Michalec, hao.a.wu, nadavh,
Gao, Liming, Kinney, Michael D
pt., 5 paź 2018 o 17:12 Philippe Mathieu-Daudé <philmd@redhat.com> napisał(a):
>
> Hi Marcin, Tomasz.
>
> On 05/10/2018 15:25, Marcin Wojtas wrote:
> > From: Tomasz Michalec <tm@semihalf.com>
> >
> > Some SD Host Controlers use different values in Host Control 2 Register
>
> My two cents, in various places "Controler" is miswritten, this should
> be "Controller".
Thanks, missed that. It will be corrected in the next revision.
Best regards,
Marcin
>
> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> > the NotifyPhase of the SdMmcOverride protocol.
> >
> > UHS signaling configuration is moved to a common, default routine
> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> > cover this functionality.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > ---
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > index e389d52..a03160d 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> > #define SD_MMC_HC_CTRL_VER 0xFE
> >
> > //
> > +// SD Host Controler bits to HOST_CTRL2 register
> > +//
> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> > +
> > +//
> > +// Timing modes for uhs
> > +//
> > +typedef enum {
> > + SdMmcUhsSdr12,
> > + SdMmcUhsSdr25,
> > + SdMmcUhsSdr50,
> > + SdMmcUhsSdr104,
> > + SdMmcUhsDdr50,
> > + SdMmcMmcDdr52,
> > + SdMmcMmcSdr50,
> > + SdMmcMmcSdr25,
> > + SdMmcMmcSdr12,
> > + SdMmcMmcHs200,
> > + SdMmcMmcHs400,
> > +} SD_MMC_UHS_TIMING;
> > +
> > +//
> > // The transfer modes supported by SD Host Controller
> > // Simplified Spec 3.0 Table 1-2
> > //
> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> > IN UINT8 Slot
> > );
> >
> > +/**
> > + Set SD Host Controler control 2 registry according to selected speed.
> > +
> > + @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] Timing The timing to select.
> > +
> > + @retval EFI_SUCCESS The timing is set successfully.
> > + @retval Others The timing isn't set successfully.
> > +**/
> > +EFI_STATUS
> > +SdMmcHcUhsSignaling (
> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > + IN UINT8 Slot,
> > + IN SD_MMC_UHS_TIMING Timing
> > + );
> > +
> > #endif
> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > index 178945f..25db98a 100644
> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > @@ -17,6 +17,7 @@
> > #ifndef __SD_MMC_OVERRIDE_H__
> > #define __SD_MMC_OVERRIDE_H__
> >
> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> > #include <Protocol/SdMmcPassThru.h>
> >
> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> > @@ -31,6 +32,7 @@ typedef enum {
> > EdkiiSdMmcResetPost,
> > EdkiiSdMmcInitHostPre,
> > EdkiiSdMmcInitHostPost,
> > + EdkiiSdMmcUhsSignaling,
> > } EDKII_SD_MMC_PHASE_TYPE;
> >
> > /**
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > index c5fd214..05bd4a0 100755
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> > IN UINT8 BusWidth
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl1;
> > - UINT8 HostCtrl2;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + UINT8 HostCtrl1;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> > if (EFI_ERROR (Status)) {
> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> > return Status;
> > }
> >
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> > - //
> > if (IsDdr) {
> > - HostCtrl2 = BIT2;
> > + Timing = SdMmcMmcDdr52;
> > } else if (ClockFreq == 52) {
> > - HostCtrl2 = BIT0;
> > + Timing = SdMmcMmcSdr50;
> > + } else if (ClockFreq == 26) {
> > + Timing = SdMmcMmcSdr25;
> > } else {
> > - HostCtrl2 = 0;
> > + Timing = SdMmcMmcSdr12;
> > }
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > HsTiming = 1;
> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> > IN UINT8 BusWidth
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl2;
> > - UINT16 ClockCtrl;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + UINT16 ClockCtrl;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > if ((BusWidth != 4) && (BusWidth != 8)) {
> > return EFI_INVALID_PARAMETER;
> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> > if (EFI_ERROR (Status)) {
> > return Status;
> > }
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> > - //
> > - HostCtrl2 = BIT0 | BIT1;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + Timing = SdMmcMmcHs200;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> > //
> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> > IN UINT32 ClockFreq
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl2;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> > if (EFI_ERROR (Status)) {
> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> > if (EFI_ERROR (Status)) {
> > return Status;
> > }
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> > - //
> > - HostCtrl2 = BIT0 | BIT2;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + Timing = SdMmcMmcHs400;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > HsTiming = 3;
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > index 8c93933..5645a71 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
> > UINT8 BusWidth;
> > UINT8 AccessMode;
> > UINT8 HostCtrl1;
> > - UINT8 HostCtrl2;
> > UINT8 SwitchResp[64];
> > + SD_MMC_UHS_TIMING Timing;
> > SD_MMC_HC_PRIVATE_DATA *Private;
> >
> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> > ClockFreq = 208;
> > AccessMode = 3;
> > + Timing = SdMmcUhsSdr104;
> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> > ClockFreq = 100;
> > AccessMode = 2;
> > + Timing = SdMmcUhsSdr50;
> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> > ClockFreq = 50;
> > AccessMode = 4;
> > + Timing = SdMmcUhsDdr50;
> > } else if ((SwitchResp[13] & BIT1) != 0) {
> > ClockFreq = 50;
> > AccessMode = 1;
> > + Timing = SdMmcUhsSdr25;
> > } else {
> > ClockFreq = 25;
> > AccessMode = 0;
> > + Timing = SdMmcUhsSdr12;
> > }
> >
> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
> > }
> > }
> >
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - HostCtrl2 = AccessMode;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > index 02eb4ad..38d6202 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> > }
> >
> > /**
> > + Set SD Host Controler control 2 registry according to selected speed.
> > +
> > + @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] Timing The timing to select.
> > +
> > + @retval EFI_SUCCESS The timing is set successfully.
> > + @retval Others The timing isn't set successfully.
> > +**/
> > +EFI_STATUS
> > +SdMmcHcUhsSignaling (
> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > + IN UINT8 Slot,
> > + IN SD_MMC_UHS_TIMING Timing
> > + )
> > +{
> > + EFI_STATUS Status;
> > + UINT8 HostCtrl2;
> > +
> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > +
> > + switch (Timing) {
> > + case SdMmcUhsSdr12:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> > + break;
> > + case SdMmcUhsSdr25:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> > + break;
> > + case SdMmcUhsSdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> > + break;
> > + case SdMmcUhsSdr104:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> > + break;
> > + case SdMmcUhsDdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> > + break;
> > + case SdMmcMmcDdr52:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> > + break;
> > + case SdMmcMmcSdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> > + break;
> > + case SdMmcMmcSdr25:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> > + break;
> > + case SdMmcMmcSdr12:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> > + break;
> > + case SdMmcMmcHs200:
> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> > + break;
> > + case SdMmcMmcHs400:
> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> > + break;
> > + default:
> > + HostCtrl2 = 0;
> > + break;
> > + }
> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > +
> > + return Status;
> > +}
> > +
> > +/**
> > Turn on/off LED.
> >
> > @param[in] PciIo The PCI IO protocol instance.
> >
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-05 13:25 ` [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol Marcin Wojtas
2018-10-05 15:12 ` Philippe Mathieu-Daudé
@ 2018-10-08 12:41 ` Ard Biesheuvel
2018-10-08 12:59 ` Marcin Wojtas
2018-11-01 7:04 ` Wu, Hao A
2 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-08 12:41 UTC (permalink / raw)
To: Marcin Wojtas, Zeng, Star, Eric Dong, Ruiyu Ni
Cc: edk2-devel@lists.01.org, Tian, Feng, Kinney, Michael D,
Gao, Liming, Leif Lindholm, Wu, Hao A, Nadav Haklai,
Jan Dąbroś, Tomasz Michalec
(add MdeModulePkg maintainers)
On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> From: Tomasz Michalec <tm@semihalf.com>
>
> Some SD Host Controlers use different values in Host Control 2 Register
> to select UHS Mode. This patch adds a new UhsSignaling type routine to
> the NotifyPhase of the SdMmcOverride protocol.
>
> UHS signaling configuration is moved to a common, default routine
> (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> cover this functionality.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> 5 files changed, 243 insertions(+), 68 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> index e389d52..a03160d 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> #define SD_MMC_HC_CTRL_VER 0xFE
>
> //
> +// SD Host Controler bits to HOST_CTRL2 register
> +//
> +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_HS200 0x0003
> +#define SD_MMC_HC_CTRL_HS400 0x0005
> +
> +//
> +// Timing modes for uhs
> +//
> +typedef enum {
> + SdMmcUhsSdr12,
> + SdMmcUhsSdr25,
> + SdMmcUhsSdr50,
> + SdMmcUhsSdr104,
> + SdMmcUhsDdr50,
> + SdMmcMmcDdr52,
> + SdMmcMmcSdr50,
> + SdMmcMmcSdr25,
> + SdMmcMmcSdr12,
> + SdMmcMmcHs200,
> + SdMmcMmcHs400,
> +} SD_MMC_UHS_TIMING;
> +
Here, we end up with two sets of symbolic constants for the same
thing, and I suppose this enum will be duplicated in your
SdMmcOverride implementation?
> +//
> // The transfer modes supported by SD Host Controller
> // Simplified Spec 3.0 Table 1-2
> //
> @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> IN UINT8 Slot
> );
>
> +/**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + );
> +
> #endif
> diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> index 178945f..25db98a 100644
> --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> @@ -17,6 +17,7 @@
> #ifndef __SD_MMC_OVERRIDE_H__
> #define __SD_MMC_OVERRIDE_H__
>
> +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> #include <Protocol/SdMmcPassThru.h>
>
> #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> @@ -31,6 +32,7 @@ typedef enum {
> EdkiiSdMmcResetPost,
> EdkiiSdMmcInitHostPre,
> EdkiiSdMmcInitHostPost,
> + EdkiiSdMmcUhsSignaling,
> } EDKII_SD_MMC_PHASE_TYPE;
>
> /**
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> index c5fd214..05bd4a0 100755
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT8 HostCtrl1;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> if (EFI_ERROR (Status)) {
> @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> return Status;
> }
>
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> - //
> if (IsDdr) {
> - HostCtrl2 = BIT2;
> + Timing = SdMmcMmcDdr52;
> } else if (ClockFreq == 52) {
> - HostCtrl2 = BIT0;
> + Timing = SdMmcMmcSdr50;
> + } else if (ClockFreq == 26) {
> + Timing = SdMmcMmcSdr25;
> } else {
> - HostCtrl2 = 0;
> + Timing = SdMmcMmcSdr12;
> }
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> HsTiming = 1;
> @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> - UINT16 ClockCtrl;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT16 ClockCtrl;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> if ((BusWidth != 4) && (BusWidth != 8)) {
> return EFI_INVALID_PARAMETER;
> @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> - //
> - HostCtrl2 = BIT0 | BIT1;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs200;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
> //
> // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> IN UINT32 ClockFreq
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> if (EFI_ERROR (Status)) {
> @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> - //
> - HostCtrl2 = BIT0 | BIT2;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs400;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> HsTiming = 3;
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> index 8c93933..5645a71 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> @@ -784,8 +784,8 @@ SdCardSetBusMode (
> UINT8 BusWidth;
> UINT8 AccessMode;
> UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> UINT8 SwitchResp[64];
> + SD_MMC_UHS_TIMING Timing;
> SD_MMC_HC_PRIVATE_DATA *Private;
>
> Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> @@ -817,18 +817,23 @@ SdCardSetBusMode (
> if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> ClockFreq = 208;
> AccessMode = 3;
> + Timing = SdMmcUhsSdr104;
> } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> ClockFreq = 100;
> AccessMode = 2;
> + Timing = SdMmcUhsSdr50;
> } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> ClockFreq = 50;
> AccessMode = 4;
> + Timing = SdMmcUhsDdr50;
> } else if ((SwitchResp[13] & BIT1) != 0) {
> ClockFreq = 50;
> AccessMode = 1;
> + Timing = SdMmcUhsSdr25;
> } else {
> ClockFreq = 25;
> AccessMode = 0;
> + Timing = SdMmcUhsSdr12;
> }
>
> Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> @@ -854,15 +859,27 @@ SdCardSetBusMode (
> }
> }
>
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - HostCtrl2 = AccessMode;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> index 02eb4ad..38d6202 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> }
>
> /**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + )
> +{
> + EFI_STATUS Status;
> + UINT8 HostCtrl2;
> +
> + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> +
> + switch (Timing) {
> + case SdMmcUhsSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> + break;
> + case SdMmcUhsSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> + break;
> + case SdMmcUhsSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> + break;
> + case SdMmcUhsSdr104:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> + break;
> + case SdMmcUhsDdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> + break;
> + case SdMmcMmcDdr52:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> + break;
> + case SdMmcMmcSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> + break;
> + case SdMmcMmcSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> + break;
> + case SdMmcMmcSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> + break;
> + case SdMmcMmcHs200:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> + break;
> + case SdMmcMmcHs400:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> + break;
> + default:
> + HostCtrl2 = 0;
> + break;
> + }
> + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> +
> + return Status;
> +}
> +
This function looks identical to the override that your are proposing
in your platform code. Why is that? Are the values of those defines
different?
> +/**
> Turn on/off LED.
>
> @param[in] PciIo The PCI IO protocol instance.
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 12:41 ` Ard Biesheuvel
@ 2018-10-08 12:59 ` Marcin Wojtas
2018-10-08 13:07 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-08 12:59 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Zeng, Star, eric.dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, hao.a.wu, nadavh,
jsd@semihalf.com, Tomasz Michalec
Hi Ard,
pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> (add MdeModulePkg maintainers)
>
> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> > From: Tomasz Michalec <tm@semihalf.com>
> >
> > Some SD Host Controlers use different values in Host Control 2 Register
> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> > the NotifyPhase of the SdMmcOverride protocol.
> >
> > UHS signaling configuration is moved to a common, default routine
> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> > cover this functionality.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > ---
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > index e389d52..a03160d 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> > #define SD_MMC_HC_CTRL_VER 0xFE
> >
> > //
> > +// SD Host Controler bits to HOST_CTRL2 register
> > +//
> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> > +
> > +//
> > +// Timing modes for uhs
> > +//
> > +typedef enum {
> > + SdMmcUhsSdr12,
> > + SdMmcUhsSdr25,
> > + SdMmcUhsSdr50,
> > + SdMmcUhsSdr104,
> > + SdMmcUhsDdr50,
> > + SdMmcMmcDdr52,
> > + SdMmcMmcSdr50,
> > + SdMmcMmcSdr25,
> > + SdMmcMmcSdr12,
> > + SdMmcMmcHs200,
> > + SdMmcMmcHs400,
> > +} SD_MMC_UHS_TIMING;
> > +
>
> Here, we end up with two sets of symbolic constants for the same
> thing, and I suppose this enum will be duplicated in your
> SdMmcOverride implementation?
>
Why duplicated? Macros are for generic UHS_MODE_SEL field values for
SD and MMC in HostControl2Register.
SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
only in UhsSignaling routine (actually the next patch, with
SwitchClockFreqPost, use it...).
In my SdMmcOverride implementation this enum is not duplicated,
because this file (SdMmcPciHci.h) is included via
Protocol/SdMmcOverride.h.
>
>
> > +//
> > // The transfer modes supported by SD Host Controller
> > // Simplified Spec 3.0 Table 1-2
> > //
> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> > IN UINT8 Slot
> > );
> >
> > +/**
> > + Set SD Host Controler control 2 registry according to selected speed.
> > +
> > + @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] Timing The timing to select.
> > +
> > + @retval EFI_SUCCESS The timing is set successfully.
> > + @retval Others The timing isn't set successfully.
> > +**/
> > +EFI_STATUS
> > +SdMmcHcUhsSignaling (
> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > + IN UINT8 Slot,
> > + IN SD_MMC_UHS_TIMING Timing
> > + );
> > +
> > #endif
> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > index 178945f..25db98a 100644
> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > @@ -17,6 +17,7 @@
> > #ifndef __SD_MMC_OVERRIDE_H__
> > #define __SD_MMC_OVERRIDE_H__
> >
> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> > #include <Protocol/SdMmcPassThru.h>
> >
> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> > @@ -31,6 +32,7 @@ typedef enum {
> > EdkiiSdMmcResetPost,
> > EdkiiSdMmcInitHostPre,
> > EdkiiSdMmcInitHostPost,
> > + EdkiiSdMmcUhsSignaling,
> > } EDKII_SD_MMC_PHASE_TYPE;
> >
> > /**
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > index c5fd214..05bd4a0 100755
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> > IN UINT8 BusWidth
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl1;
> > - UINT8 HostCtrl2;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + UINT8 HostCtrl1;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> > if (EFI_ERROR (Status)) {
> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> > return Status;
> > }
> >
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> > - //
> > if (IsDdr) {
> > - HostCtrl2 = BIT2;
> > + Timing = SdMmcMmcDdr52;
> > } else if (ClockFreq == 52) {
> > - HostCtrl2 = BIT0;
> > + Timing = SdMmcMmcSdr50;
> > + } else if (ClockFreq == 26) {
> > + Timing = SdMmcMmcSdr25;
> > } else {
> > - HostCtrl2 = 0;
> > + Timing = SdMmcMmcSdr12;
> > }
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > HsTiming = 1;
> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> > IN UINT8 BusWidth
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl2;
> > - UINT16 ClockCtrl;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + UINT16 ClockCtrl;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > if ((BusWidth != 4) && (BusWidth != 8)) {
> > return EFI_INVALID_PARAMETER;
> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> > if (EFI_ERROR (Status)) {
> > return Status;
> > }
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> > - //
> > - HostCtrl2 = BIT0 | BIT1;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + Timing = SdMmcMmcHs200;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> > //
> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> > IN UINT32 ClockFreq
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl2;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> > if (EFI_ERROR (Status)) {
> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> > if (EFI_ERROR (Status)) {
> > return Status;
> > }
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> > - //
> > - HostCtrl2 = BIT0 | BIT2;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + Timing = SdMmcMmcHs400;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > HsTiming = 3;
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > index 8c93933..5645a71 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
> > UINT8 BusWidth;
> > UINT8 AccessMode;
> > UINT8 HostCtrl1;
> > - UINT8 HostCtrl2;
> > UINT8 SwitchResp[64];
> > + SD_MMC_UHS_TIMING Timing;
> > SD_MMC_HC_PRIVATE_DATA *Private;
> >
> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> > ClockFreq = 208;
> > AccessMode = 3;
> > + Timing = SdMmcUhsSdr104;
> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> > ClockFreq = 100;
> > AccessMode = 2;
> > + Timing = SdMmcUhsSdr50;
> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> > ClockFreq = 50;
> > AccessMode = 4;
> > + Timing = SdMmcUhsDdr50;
> > } else if ((SwitchResp[13] & BIT1) != 0) {
> > ClockFreq = 50;
> > AccessMode = 1;
> > + Timing = SdMmcUhsSdr25;
> > } else {
> > ClockFreq = 25;
> > AccessMode = 0;
> > + Timing = SdMmcUhsSdr12;
> > }
> >
> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
> > }
> > }
> >
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - HostCtrl2 = AccessMode;
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
> >
> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > index 02eb4ad..38d6202 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> > }
> >
> > /**
> > + Set SD Host Controler control 2 registry according to selected speed.
> > +
> > + @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] Timing The timing to select.
> > +
> > + @retval EFI_SUCCESS The timing is set successfully.
> > + @retval Others The timing isn't set successfully.
> > +**/
> > +EFI_STATUS
> > +SdMmcHcUhsSignaling (
> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > + IN UINT8 Slot,
> > + IN SD_MMC_UHS_TIMING Timing
> > + )
> > +{
> > + EFI_STATUS Status;
> > + UINT8 HostCtrl2;
> > +
> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > +
> > + switch (Timing) {
> > + case SdMmcUhsSdr12:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> > + break;
> > + case SdMmcUhsSdr25:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> > + break;
> > + case SdMmcUhsSdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> > + break;
> > + case SdMmcUhsSdr104:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> > + break;
> > + case SdMmcUhsDdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> > + break;
> > + case SdMmcMmcDdr52:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> > + break;
> > + case SdMmcMmcSdr50:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> > + break;
> > + case SdMmcMmcSdr25:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> > + break;
> > + case SdMmcMmcSdr12:
> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> > + break;
> > + case SdMmcMmcHs200:
> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> > + break;
> > + case SdMmcMmcHs400:
> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> > + break;
> > + default:
> > + HostCtrl2 = 0;
> > + break;
> > + }
> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> > +
> > + return Status;
> > +}
> > +
>
> This function looks identical to the override that your are proposing
> in your platform code. Why is that? Are the values of those defines
> different?
>
This is exactly the reason. For Xenon, MMC_HS400 and MMC_HS200 values
of UHS_MODE_SEL field in HostControl2Register are custom. Actually,
non-generic UHS_MODE_SEL values are pretty common, from what I can see
in the Linux code. The new callback allows overriding it. Looking
forward to your feedback.
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 12:59 ` Marcin Wojtas
@ 2018-10-08 13:07 ` Ard Biesheuvel
2018-10-08 13:17 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-08 13:07 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Zeng, Star, Eric Dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, Wu, Hao A,
Nadav Haklai, jsd@semihalf.com, Tomasz Michalec
On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
> Hi Ard,
>
> pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>>
>> (add MdeModulePkg maintainers)
>>
>> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
>> > From: Tomasz Michalec <tm@semihalf.com>
>> >
>> > Some SD Host Controlers use different values in Host Control 2 Register
>> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
>> > the NotifyPhase of the SdMmcOverride protocol.
>> >
>> > UHS signaling configuration is moved to a common, default routine
>> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
>> > cover this functionality.
>> >
>> > Contributed-under: TianoCore Contribution Agreement 1.1
>> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> > ---
>> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
>> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
>> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
>> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
>> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
>> > 5 files changed, 243 insertions(+), 68 deletions(-)
>> >
>> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> > index e389d52..a03160d 100644
>> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> > #define SD_MMC_HC_CTRL_VER 0xFE
>> >
>> > //
>> > +// SD Host Controler bits to HOST_CTRL2 register
>> > +//
>> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
>> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
>> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
>> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
>> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
>> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
>> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
>> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
>> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
>> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
>> > +#define SD_MMC_HC_CTRL_HS200 0x0003
>> > +#define SD_MMC_HC_CTRL_HS400 0x0005
>> > +
>> > +//
>> > +// Timing modes for uhs
>> > +//
>> > +typedef enum {
>> > + SdMmcUhsSdr12,
>> > + SdMmcUhsSdr25,
>> > + SdMmcUhsSdr50,
>> > + SdMmcUhsSdr104,
>> > + SdMmcUhsDdr50,
>> > + SdMmcMmcDdr52,
>> > + SdMmcMmcSdr50,
>> > + SdMmcMmcSdr25,
>> > + SdMmcMmcSdr12,
>> > + SdMmcMmcHs200,
>> > + SdMmcMmcHs400,
>> > +} SD_MMC_UHS_TIMING;
>> > +
>>
>> Here, we end up with two sets of symbolic constants for the same
>> thing, and I suppose this enum will be duplicated in your
>> SdMmcOverride implementation?
>>
>
> Why duplicated? Macros are for generic UHS_MODE_SEL field values for
> SD and MMC in HostControl2Register.
>
> SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
> only in UhsSignaling routine (actually the next patch, with
> SwitchClockFreqPost, use it...).
>
> In my SdMmcOverride implementation this enum is not duplicated,
> because this file (SdMmcPciHci.h) is included via
> Protocol/SdMmcOverride.h.
>
Ah ok. Please don't expose internal headers of the SD/MMC driver via
Protocol/SdMmcOverride.h
I think it should be fine to add the enum definition to
Protocol/SdMmcOverride.h instead.
But wouldn't it be much easier to have a hook for setting
HostControl2Register that decodes the value and modifies it according
to what the platform requires?
>>
>>
>> > +//
>> > // The transfer modes supported by SD Host Controller
>> > // Simplified Spec 3.0 Table 1-2
>> > //
>> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
>> > IN UINT8 Slot
>> > );
>> >
>> > +/**
>> > + Set SD Host Controler control 2 registry according to selected speed.
>> > +
>> > + @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] Timing The timing to select.
>> > +
>> > + @retval EFI_SUCCESS The timing is set successfully.
>> > + @retval Others The timing isn't set successfully.
>> > +**/
>> > +EFI_STATUS
>> > +SdMmcHcUhsSignaling (
>> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
>> > + IN UINT8 Slot,
>> > + IN SD_MMC_UHS_TIMING Timing
>> > + );
>> > +
>> > #endif
>> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> > index 178945f..25db98a 100644
>> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> > @@ -17,6 +17,7 @@
>> > #ifndef __SD_MMC_OVERRIDE_H__
>> > #define __SD_MMC_OVERRIDE_H__
>> >
>> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
>> > #include <Protocol/SdMmcPassThru.h>
>> >
>> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
>> > @@ -31,6 +32,7 @@ typedef enum {
>> > EdkiiSdMmcResetPost,
>> > EdkiiSdMmcInitHostPre,
>> > EdkiiSdMmcInitHostPost,
>> > + EdkiiSdMmcUhsSignaling,
>> > } EDKII_SD_MMC_PHASE_TYPE;
>> >
>> > /**
>> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> > index c5fd214..05bd4a0 100755
>> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
>> > IN UINT8 BusWidth
>> > )
>> > {
>> > - EFI_STATUS Status;
>> > - UINT8 HsTiming;
>> > - UINT8 HostCtrl1;
>> > - UINT8 HostCtrl2;
>> > + EFI_STATUS Status;
>> > + UINT8 HsTiming;
>> > + UINT8 HostCtrl1;
>> > + SD_MMC_UHS_TIMING Timing;
>> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> > +
>> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >
>> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
>> > if (EFI_ERROR (Status)) {
>> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
>> > return Status;
>> > }
>> >
>> > - //
>> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> > - //
>> > - HostCtrl2 = (UINT8)~0x7;
>> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > - }
>> > - //
>> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
>> > - //
>> > if (IsDdr) {
>> > - HostCtrl2 = BIT2;
>> > + Timing = SdMmcMmcDdr52;
>> > } else if (ClockFreq == 52) {
>> > - HostCtrl2 = BIT0;
>> > + Timing = SdMmcMmcSdr50;
>> > + } else if (ClockFreq == 26) {
>> > + Timing = SdMmcMmcSdr25;
>> > } else {
>> > - HostCtrl2 = 0;
>> > + Timing = SdMmcMmcSdr12;
>> > }
>> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > +
>> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> > + Status = mOverride->NotifyPhase (
>> > + Private->ControllerHandle,
>> > + Slot,
>> > + EdkiiSdMmcUhsSignaling,
>> > + &Timing
>> > + );
>> > + if (EFI_ERROR (Status)) {
>> > + DEBUG ((
>> > + DEBUG_ERROR,
>> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> > + __FUNCTION__,
>> > + Status
>> > + ));
>> > + return Status;
>> > + }
>> > + } else {
>> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> > + if (EFI_ERROR (Status)) {
>> > + return Status;
>> > + }
>> > }
>> >
>> > HsTiming = 1;
>> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
>> > IN UINT8 BusWidth
>> > )
>> > {
>> > - EFI_STATUS Status;
>> > - UINT8 HsTiming;
>> > - UINT8 HostCtrl2;
>> > - UINT16 ClockCtrl;
>> > + EFI_STATUS Status;
>> > + UINT8 HsTiming;
>> > + UINT16 ClockCtrl;
>> > + SD_MMC_UHS_TIMING Timing;
>> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> > +
>> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >
>> > if ((BusWidth != 4) && (BusWidth != 8)) {
>> > return EFI_INVALID_PARAMETER;
>> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
>> > if (EFI_ERROR (Status)) {
>> > return Status;
>> > }
>> > - //
>> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> > - //
>> > - HostCtrl2 = (UINT8)~0x7;
>> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > - }
>> > - //
>> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
>> > - //
>> > - HostCtrl2 = BIT0 | BIT1;
>> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > +
>> > + Timing = SdMmcMmcHs200;
>> > +
>> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> > + Status = mOverride->NotifyPhase (
>> > + Private->ControllerHandle,
>> > + Slot,
>> > + EdkiiSdMmcUhsSignaling,
>> > + &Timing
>> > + );
>> > + if (EFI_ERROR (Status)) {
>> > + DEBUG ((
>> > + DEBUG_ERROR,
>> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> > + __FUNCTION__,
>> > + Status
>> > + ));
>> > + return Status;
>> > + }
>> > + } else {
>> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> > + if (EFI_ERROR (Status)) {
>> > + return Status;
>> > + }
>> > }
>> > //
>> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
>> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
>> > IN UINT32 ClockFreq
>> > )
>> > {
>> > - EFI_STATUS Status;
>> > - UINT8 HsTiming;
>> > - UINT8 HostCtrl2;
>> > + EFI_STATUS Status;
>> > + UINT8 HsTiming;
>> > + SD_MMC_UHS_TIMING Timing;
>> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> > +
>> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >
>> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
>> > if (EFI_ERROR (Status)) {
>> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
>> > if (EFI_ERROR (Status)) {
>> > return Status;
>> > }
>> > - //
>> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> > - //
>> > - HostCtrl2 = (UINT8)~0x7;
>> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > - }
>> > - //
>> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
>> > - //
>> > - HostCtrl2 = BIT0 | BIT2;
>> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > +
>> > + Timing = SdMmcMmcHs400;
>> > +
>> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> > + Status = mOverride->NotifyPhase (
>> > + Private->ControllerHandle,
>> > + Slot,
>> > + EdkiiSdMmcUhsSignaling,
>> > + &Timing
>> > + );
>> > + if (EFI_ERROR (Status)) {
>> > + DEBUG ((
>> > + DEBUG_ERROR,
>> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> > + __FUNCTION__,
>> > + Status
>> > + ));
>> > + return Status;
>> > + }
>> > + } else {
>> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> > + if (EFI_ERROR (Status)) {
>> > + return Status;
>> > + }
>> > }
>> >
>> > HsTiming = 3;
>> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> > index 8c93933..5645a71 100644
>> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
>> > UINT8 BusWidth;
>> > UINT8 AccessMode;
>> > UINT8 HostCtrl1;
>> > - UINT8 HostCtrl2;
>> > UINT8 SwitchResp[64];
>> > + SD_MMC_UHS_TIMING Timing;
>> > SD_MMC_HC_PRIVATE_DATA *Private;
>> >
>> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
>> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
>> > ClockFreq = 208;
>> > AccessMode = 3;
>> > + Timing = SdMmcUhsSdr104;
>> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
>> > ClockFreq = 100;
>> > AccessMode = 2;
>> > + Timing = SdMmcUhsSdr50;
>> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
>> > ClockFreq = 50;
>> > AccessMode = 4;
>> > + Timing = SdMmcUhsDdr50;
>> > } else if ((SwitchResp[13] & BIT1) != 0) {
>> > ClockFreq = 50;
>> > AccessMode = 1;
>> > + Timing = SdMmcUhsSdr25;
>> > } else {
>> > ClockFreq = 25;
>> > AccessMode = 0;
>> > + Timing = SdMmcUhsSdr12;
>> > }
>> >
>> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
>> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
>> > }
>> > }
>> >
>> > - HostCtrl2 = (UINT8)~0x7;
>> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > - }
>> > - HostCtrl2 = AccessMode;
>> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > - if (EFI_ERROR (Status)) {
>> > - return Status;
>> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> > + Status = mOverride->NotifyPhase (
>> > + Private->ControllerHandle,
>> > + Slot,
>> > + EdkiiSdMmcUhsSignaling,
>> > + &Timing
>> > + );
>> > + if (EFI_ERROR (Status)) {
>> > + DEBUG ((
>> > + DEBUG_ERROR,
>> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> > + __FUNCTION__,
>> > + Status
>> > + ));
>> > + return Status;
>> > + }
>> > + } else {
>> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> > + if (EFI_ERROR (Status)) {
>> > + return Status;
>> > + }
>> > }
>> >
>> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
>> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> > index 02eb4ad..38d6202 100644
>> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
>> > }
>> >
>> > /**
>> > + Set SD Host Controler control 2 registry according to selected speed.
>> > +
>> > + @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] Timing The timing to select.
>> > +
>> > + @retval EFI_SUCCESS The timing is set successfully.
>> > + @retval Others The timing isn't set successfully.
>> > +**/
>> > +EFI_STATUS
>> > +SdMmcHcUhsSignaling (
>> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
>> > + IN UINT8 Slot,
>> > + IN SD_MMC_UHS_TIMING Timing
>> > + )
>> > +{
>> > + EFI_STATUS Status;
>> > + UINT8 HostCtrl2;
>> > +
>> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
>> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > + if (EFI_ERROR (Status)) {
>> > + return Status;
>> > + }
>> > +
>> > + switch (Timing) {
>> > + case SdMmcUhsSdr12:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
>> > + break;
>> > + case SdMmcUhsSdr25:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
>> > + break;
>> > + case SdMmcUhsSdr50:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
>> > + break;
>> > + case SdMmcUhsSdr104:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
>> > + break;
>> > + case SdMmcUhsDdr50:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
>> > + break;
>> > + case SdMmcMmcDdr52:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
>> > + break;
>> > + case SdMmcMmcSdr50:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
>> > + break;
>> > + case SdMmcMmcSdr25:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
>> > + break;
>> > + case SdMmcMmcSdr12:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
>> > + break;
>> > + case SdMmcMmcHs200:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
>> > + break;
>> > + case SdMmcMmcHs400:
>> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
>> > + break;
>> > + default:
>> > + HostCtrl2 = 0;
>> > + break;
>> > + }
>> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> > +
>> > + return Status;
>> > +}
>> > +
>>
>> This function looks identical to the override that your are proposing
>> in your platform code. Why is that? Are the values of those defines
>> different?
>>
>
> This is exactly the reason. For Xenon, MMC_HS400 and MMC_HS200 values
> of UHS_MODE_SEL field in HostControl2Register are custom. Actually,
> non-generic UHS_MODE_SEL values are pretty common, from what I can see
> in the Linux code. The new callback allows overriding it. Looking
> forward to your feedback.
>
> Best regards,
> Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 13:07 ` Ard Biesheuvel
@ 2018-10-08 13:17 ` Marcin Wojtas
2018-10-08 13:27 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-08 13:17 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Zeng, Star, eric.dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, hao.a.wu, nadavh,
jsd@semihalf.com, Tomasz Michalec
pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
> > Hi Ard,
> >
> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >>
> >> (add MdeModulePkg maintainers)
> >>
> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> >> > From: Tomasz Michalec <tm@semihalf.com>
> >> >
> >> > Some SD Host Controlers use different values in Host Control 2 Register
> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> >> > the NotifyPhase of the SdMmcOverride protocol.
> >> >
> >> > UHS signaling configuration is moved to a common, default routine
> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> >> > cover this functionality.
> >> >
> >> > Contributed-under: TianoCore Contribution Agreement 1.1
> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >> > ---
> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >> >
> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> > index e389d52..a03160d 100644
> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >> > #define SD_MMC_HC_CTRL_VER 0xFE
> >> >
> >> > //
> >> > +// SD Host Controler bits to HOST_CTRL2 register
> >> > +//
> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> >> > +
> >> > +//
> >> > +// Timing modes for uhs
> >> > +//
> >> > +typedef enum {
> >> > + SdMmcUhsSdr12,
> >> > + SdMmcUhsSdr25,
> >> > + SdMmcUhsSdr50,
> >> > + SdMmcUhsSdr104,
> >> > + SdMmcUhsDdr50,
> >> > + SdMmcMmcDdr52,
> >> > + SdMmcMmcSdr50,
> >> > + SdMmcMmcSdr25,
> >> > + SdMmcMmcSdr12,
> >> > + SdMmcMmcHs200,
> >> > + SdMmcMmcHs400,
> >> > +} SD_MMC_UHS_TIMING;
> >> > +
> >>
> >> Here, we end up with two sets of symbolic constants for the same
> >> thing, and I suppose this enum will be duplicated in your
> >> SdMmcOverride implementation?
> >>
> >
> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
> > SD and MMC in HostControl2Register.
> >
> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
> > only in UhsSignaling routine (actually the next patch, with
> > SwitchClockFreqPost, use it...).
> >
> > In my SdMmcOverride implementation this enum is not duplicated,
> > because this file (SdMmcPciHci.h) is included via
> > Protocol/SdMmcOverride.h.
> >
>
> Ah ok. Please don't expose internal headers of the SD/MMC driver via
> Protocol/SdMmcOverride.h
>
OK.
> I think it should be fine to add the enum definition to
> Protocol/SdMmcOverride.h instead.
>
OK.
> But wouldn't it be much easier to have a hook for setting
> HostControl2Register that decodes the value and modifies it according
> to what the platform requires?
>
Can you please explain, how it will be different from UhsSignaling in
current shape (read required timing value and update UHS_MODE_SEL
field)?
Thanks,
Marcin
>
>
> >>
> >>
> >> > +//
> >> > // The transfer modes supported by SD Host Controller
> >> > // Simplified Spec 3.0 Table 1-2
> >> > //
> >> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> >> > IN UINT8 Slot
> >> > );
> >> >
> >> > +/**
> >> > + Set SD Host Controler control 2 registry according to selected speed.
> >> > +
> >> > + @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] Timing The timing to select.
> >> > +
> >> > + @retval EFI_SUCCESS The timing is set successfully.
> >> > + @retval Others The timing isn't set successfully.
> >> > +**/
> >> > +EFI_STATUS
> >> > +SdMmcHcUhsSignaling (
> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> >> > + IN UINT8 Slot,
> >> > + IN SD_MMC_UHS_TIMING Timing
> >> > + );
> >> > +
> >> > #endif
> >> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> > index 178945f..25db98a 100644
> >> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> > @@ -17,6 +17,7 @@
> >> > #ifndef __SD_MMC_OVERRIDE_H__
> >> > #define __SD_MMC_OVERRIDE_H__
> >> >
> >> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> >> > #include <Protocol/SdMmcPassThru.h>
> >> >
> >> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> >> > @@ -31,6 +32,7 @@ typedef enum {
> >> > EdkiiSdMmcResetPost,
> >> > EdkiiSdMmcInitHostPre,
> >> > EdkiiSdMmcInitHostPost,
> >> > + EdkiiSdMmcUhsSignaling,
> >> > } EDKII_SD_MMC_PHASE_TYPE;
> >> >
> >> > /**
> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> > index c5fd214..05bd4a0 100755
> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> >> > IN UINT8 BusWidth
> >> > )
> >> > {
> >> > - EFI_STATUS Status;
> >> > - UINT8 HsTiming;
> >> > - UINT8 HostCtrl1;
> >> > - UINT8 HostCtrl2;
> >> > + EFI_STATUS Status;
> >> > + UINT8 HsTiming;
> >> > + UINT8 HostCtrl1;
> >> > + SD_MMC_UHS_TIMING Timing;
> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> > +
> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >
> >> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> >> > if (EFI_ERROR (Status)) {
> >> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> >> > return Status;
> >> > }
> >> >
> >> > - //
> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> > - //
> >> > - HostCtrl2 = (UINT8)~0x7;
> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > - }
> >> > - //
> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> >> > - //
> >> > if (IsDdr) {
> >> > - HostCtrl2 = BIT2;
> >> > + Timing = SdMmcMmcDdr52;
> >> > } else if (ClockFreq == 52) {
> >> > - HostCtrl2 = BIT0;
> >> > + Timing = SdMmcMmcSdr50;
> >> > + } else if (ClockFreq == 26) {
> >> > + Timing = SdMmcMmcSdr25;
> >> > } else {
> >> > - HostCtrl2 = 0;
> >> > + Timing = SdMmcMmcSdr12;
> >> > }
> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > +
> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> > + Status = mOverride->NotifyPhase (
> >> > + Private->ControllerHandle,
> >> > + Slot,
> >> > + EdkiiSdMmcUhsSignaling,
> >> > + &Timing
> >> > + );
> >> > + if (EFI_ERROR (Status)) {
> >> > + DEBUG ((
> >> > + DEBUG_ERROR,
> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> > + __FUNCTION__,
> >> > + Status
> >> > + ));
> >> > + return Status;
> >> > + }
> >> > + } else {
> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> > + if (EFI_ERROR (Status)) {
> >> > + return Status;
> >> > + }
> >> > }
> >> >
> >> > HsTiming = 1;
> >> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> >> > IN UINT8 BusWidth
> >> > )
> >> > {
> >> > - EFI_STATUS Status;
> >> > - UINT8 HsTiming;
> >> > - UINT8 HostCtrl2;
> >> > - UINT16 ClockCtrl;
> >> > + EFI_STATUS Status;
> >> > + UINT8 HsTiming;
> >> > + UINT16 ClockCtrl;
> >> > + SD_MMC_UHS_TIMING Timing;
> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> > +
> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >
> >> > if ((BusWidth != 4) && (BusWidth != 8)) {
> >> > return EFI_INVALID_PARAMETER;
> >> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> >> > if (EFI_ERROR (Status)) {
> >> > return Status;
> >> > }
> >> > - //
> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> > - //
> >> > - HostCtrl2 = (UINT8)~0x7;
> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > - }
> >> > - //
> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> >> > - //
> >> > - HostCtrl2 = BIT0 | BIT1;
> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > +
> >> > + Timing = SdMmcMmcHs200;
> >> > +
> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> > + Status = mOverride->NotifyPhase (
> >> > + Private->ControllerHandle,
> >> > + Slot,
> >> > + EdkiiSdMmcUhsSignaling,
> >> > + &Timing
> >> > + );
> >> > + if (EFI_ERROR (Status)) {
> >> > + DEBUG ((
> >> > + DEBUG_ERROR,
> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> > + __FUNCTION__,
> >> > + Status
> >> > + ));
> >> > + return Status;
> >> > + }
> >> > + } else {
> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> > + if (EFI_ERROR (Status)) {
> >> > + return Status;
> >> > + }
> >> > }
> >> > //
> >> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> >> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> >> > IN UINT32 ClockFreq
> >> > )
> >> > {
> >> > - EFI_STATUS Status;
> >> > - UINT8 HsTiming;
> >> > - UINT8 HostCtrl2;
> >> > + EFI_STATUS Status;
> >> > + UINT8 HsTiming;
> >> > + SD_MMC_UHS_TIMING Timing;
> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> > +
> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >
> >> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> >> > if (EFI_ERROR (Status)) {
> >> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> >> > if (EFI_ERROR (Status)) {
> >> > return Status;
> >> > }
> >> > - //
> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> > - //
> >> > - HostCtrl2 = (UINT8)~0x7;
> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > - }
> >> > - //
> >> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> >> > - //
> >> > - HostCtrl2 = BIT0 | BIT2;
> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > +
> >> > + Timing = SdMmcMmcHs400;
> >> > +
> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> > + Status = mOverride->NotifyPhase (
> >> > + Private->ControllerHandle,
> >> > + Slot,
> >> > + EdkiiSdMmcUhsSignaling,
> >> > + &Timing
> >> > + );
> >> > + if (EFI_ERROR (Status)) {
> >> > + DEBUG ((
> >> > + DEBUG_ERROR,
> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> > + __FUNCTION__,
> >> > + Status
> >> > + ));
> >> > + return Status;
> >> > + }
> >> > + } else {
> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> > + if (EFI_ERROR (Status)) {
> >> > + return Status;
> >> > + }
> >> > }
> >> >
> >> > HsTiming = 3;
> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> > index 8c93933..5645a71 100644
> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
> >> > UINT8 BusWidth;
> >> > UINT8 AccessMode;
> >> > UINT8 HostCtrl1;
> >> > - UINT8 HostCtrl2;
> >> > UINT8 SwitchResp[64];
> >> > + SD_MMC_UHS_TIMING Timing;
> >> > SD_MMC_HC_PRIVATE_DATA *Private;
> >> >
> >> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
> >> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> >> > ClockFreq = 208;
> >> > AccessMode = 3;
> >> > + Timing = SdMmcUhsSdr104;
> >> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> >> > ClockFreq = 100;
> >> > AccessMode = 2;
> >> > + Timing = SdMmcUhsSdr50;
> >> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> >> > ClockFreq = 50;
> >> > AccessMode = 4;
> >> > + Timing = SdMmcUhsDdr50;
> >> > } else if ((SwitchResp[13] & BIT1) != 0) {
> >> > ClockFreq = 50;
> >> > AccessMode = 1;
> >> > + Timing = SdMmcUhsSdr25;
> >> > } else {
> >> > ClockFreq = 25;
> >> > AccessMode = 0;
> >> > + Timing = SdMmcUhsSdr12;
> >> > }
> >> >
> >> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> >> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
> >> > }
> >> > }
> >> >
> >> > - HostCtrl2 = (UINT8)~0x7;
> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > - }
> >> > - HostCtrl2 = AccessMode;
> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > - if (EFI_ERROR (Status)) {
> >> > - return Status;
> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> > + Status = mOverride->NotifyPhase (
> >> > + Private->ControllerHandle,
> >> > + Slot,
> >> > + EdkiiSdMmcUhsSignaling,
> >> > + &Timing
> >> > + );
> >> > + if (EFI_ERROR (Status)) {
> >> > + DEBUG ((
> >> > + DEBUG_ERROR,
> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> > + __FUNCTION__,
> >> > + Status
> >> > + ));
> >> > + return Status;
> >> > + }
> >> > + } else {
> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> > + if (EFI_ERROR (Status)) {
> >> > + return Status;
> >> > + }
> >> > }
> >> >
> >> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> > index 02eb4ad..38d6202 100644
> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> >> > }
> >> >
> >> > /**
> >> > + Set SD Host Controler control 2 registry according to selected speed.
> >> > +
> >> > + @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] Timing The timing to select.
> >> > +
> >> > + @retval EFI_SUCCESS The timing is set successfully.
> >> > + @retval Others The timing isn't set successfully.
> >> > +**/
> >> > +EFI_STATUS
> >> > +SdMmcHcUhsSignaling (
> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> >> > + IN UINT8 Slot,
> >> > + IN SD_MMC_UHS_TIMING Timing
> >> > + )
> >> > +{
> >> > + EFI_STATUS Status;
> >> > + UINT8 HostCtrl2;
> >> > +
> >> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> >> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > + if (EFI_ERROR (Status)) {
> >> > + return Status;
> >> > + }
> >> > +
> >> > + switch (Timing) {
> >> > + case SdMmcUhsSdr12:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> >> > + break;
> >> > + case SdMmcUhsSdr25:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> >> > + break;
> >> > + case SdMmcUhsSdr50:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> >> > + break;
> >> > + case SdMmcUhsSdr104:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> >> > + break;
> >> > + case SdMmcUhsDdr50:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> >> > + break;
> >> > + case SdMmcMmcDdr52:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> >> > + break;
> >> > + case SdMmcMmcSdr50:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> >> > + break;
> >> > + case SdMmcMmcSdr25:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> >> > + break;
> >> > + case SdMmcMmcSdr12:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> >> > + break;
> >> > + case SdMmcMmcHs200:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> >> > + break;
> >> > + case SdMmcMmcHs400:
> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> >> > + break;
> >> > + default:
> >> > + HostCtrl2 = 0;
> >> > + break;
> >> > + }
> >> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> > +
> >> > + return Status;
> >> > +}
> >> > +
> >>
> >> This function looks identical to the override that your are proposing
> >> in your platform code. Why is that? Are the values of those defines
> >> different?
> >>
> >
> > This is exactly the reason. For Xenon, MMC_HS400 and MMC_HS200 values
> > of UHS_MODE_SEL field in HostControl2Register are custom. Actually,
> > non-generic UHS_MODE_SEL values are pretty common, from what I can see
> > in the Linux code. The new callback allows overriding it. Looking
> > forward to your feedback.
> >
> > Best regards,
> > Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 13:17 ` Marcin Wojtas
@ 2018-10-08 13:27 ` Ard Biesheuvel
2018-10-08 13:37 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-08 13:27 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Zeng, Star, Eric Dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, Wu, Hao A,
Nadav Haklai, jsd@semihalf.com, Tomasz Michalec
On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
> pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>>
>> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
>> > Hi Ard,
>> >
>> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >>
>> >> (add MdeModulePkg maintainers)
>> >>
>> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> > From: Tomasz Michalec <tm@semihalf.com>
>> >> >
>> >> > Some SD Host Controlers use different values in Host Control 2 Register
>> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
>> >> > the NotifyPhase of the SdMmcOverride protocol.
>> >> >
>> >> > UHS signaling configuration is moved to a common, default routine
>> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
>> >> > cover this functionality.
>> >> >
>> >> > Contributed-under: TianoCore Contribution Agreement 1.1
>> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> >> > ---
>> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
>> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
>> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
>> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
>> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
>> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
>> >> >
>> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> > index e389d52..a03160d 100644
>> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> >> > #define SD_MMC_HC_CTRL_VER 0xFE
>> >> >
>> >> > //
>> >> > +// SD Host Controler bits to HOST_CTRL2 register
>> >> > +//
>> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
>> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
>> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
>> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
>> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
>> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
>> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
>> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
>> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
>> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
>> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
>> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
>> >> > +
>> >> > +//
>> >> > +// Timing modes for uhs
>> >> > +//
>> >> > +typedef enum {
>> >> > + SdMmcUhsSdr12,
>> >> > + SdMmcUhsSdr25,
>> >> > + SdMmcUhsSdr50,
>> >> > + SdMmcUhsSdr104,
>> >> > + SdMmcUhsDdr50,
>> >> > + SdMmcMmcDdr52,
>> >> > + SdMmcMmcSdr50,
>> >> > + SdMmcMmcSdr25,
>> >> > + SdMmcMmcSdr12,
>> >> > + SdMmcMmcHs200,
>> >> > + SdMmcMmcHs400,
>> >> > +} SD_MMC_UHS_TIMING;
>> >> > +
>> >>
>> >> Here, we end up with two sets of symbolic constants for the same
>> >> thing, and I suppose this enum will be duplicated in your
>> >> SdMmcOverride implementation?
>> >>
>> >
>> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
>> > SD and MMC in HostControl2Register.
>> >
>> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
>> > only in UhsSignaling routine (actually the next patch, with
>> > SwitchClockFreqPost, use it...).
>> >
>> > In my SdMmcOverride implementation this enum is not duplicated,
>> > because this file (SdMmcPciHci.h) is included via
>> > Protocol/SdMmcOverride.h.
>> >
>>
>> Ah ok. Please don't expose internal headers of the SD/MMC driver via
>> Protocol/SdMmcOverride.h
>>
>
> OK.
>
>> I think it should be fine to add the enum definition to
>> Protocol/SdMmcOverride.h instead.
>>
>
> OK.
>
>> But wouldn't it be much easier to have a hook for setting
>> HostControl2Register that decodes the value and modifies it according
>> to what the platform requires?
>>
>
> Can you please explain, how it will be different from UhsSignaling in
> current shape (read required timing value and update UHS_MODE_SEL
> field)?
>
Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
bits are set, you substitute them with the appropriate xenon values.
Also, how important is it to drive the SD/MMC at its max rated speed
at boot time? On Synquacer, I just disable HS200 in the capability
struct so I can forget about all this stuff
>>
>>
>> >>
>> >>
>> >> > +//
>> >> > // The transfer modes supported by SD Host Controller
>> >> > // Simplified Spec 3.0 Table 1-2
>> >> > //
>> >> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
>> >> > IN UINT8 Slot
>> >> > );
>> >> >
>> >> > +/**
>> >> > + Set SD Host Controler control 2 registry according to selected speed.
>> >> > +
>> >> > + @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] Timing The timing to select.
>> >> > +
>> >> > + @retval EFI_SUCCESS The timing is set successfully.
>> >> > + @retval Others The timing isn't set successfully.
>> >> > +**/
>> >> > +EFI_STATUS
>> >> > +SdMmcHcUhsSignaling (
>> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
>> >> > + IN UINT8 Slot,
>> >> > + IN SD_MMC_UHS_TIMING Timing
>> >> > + );
>> >> > +
>> >> > #endif
>> >> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> >> > index 178945f..25db98a 100644
>> >> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> >> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
>> >> > @@ -17,6 +17,7 @@
>> >> > #ifndef __SD_MMC_OVERRIDE_H__
>> >> > #define __SD_MMC_OVERRIDE_H__
>> >> >
>> >> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
>> >> > #include <Protocol/SdMmcPassThru.h>
>> >> >
>> >> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
>> >> > @@ -31,6 +32,7 @@ typedef enum {
>> >> > EdkiiSdMmcResetPost,
>> >> > EdkiiSdMmcInitHostPre,
>> >> > EdkiiSdMmcInitHostPost,
>> >> > + EdkiiSdMmcUhsSignaling,
>> >> > } EDKII_SD_MMC_PHASE_TYPE;
>> >> >
>> >> > /**
>> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> >> > index c5fd214..05bd4a0 100755
>> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
>> >> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
>> >> > IN UINT8 BusWidth
>> >> > )
>> >> > {
>> >> > - EFI_STATUS Status;
>> >> > - UINT8 HsTiming;
>> >> > - UINT8 HostCtrl1;
>> >> > - UINT8 HostCtrl2;
>> >> > + EFI_STATUS Status;
>> >> > + UINT8 HsTiming;
>> >> > + UINT8 HostCtrl1;
>> >> > + SD_MMC_UHS_TIMING Timing;
>> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> >> > +
>> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >> >
>> >> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
>> >> > if (EFI_ERROR (Status)) {
>> >> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
>> >> > return Status;
>> >> > }
>> >> >
>> >> > - //
>> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> >> > - //
>> >> > - HostCtrl2 = (UINT8)~0x7;
>> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > - }
>> >> > - //
>> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
>> >> > - //
>> >> > if (IsDdr) {
>> >> > - HostCtrl2 = BIT2;
>> >> > + Timing = SdMmcMmcDdr52;
>> >> > } else if (ClockFreq == 52) {
>> >> > - HostCtrl2 = BIT0;
>> >> > + Timing = SdMmcMmcSdr50;
>> >> > + } else if (ClockFreq == 26) {
>> >> > + Timing = SdMmcMmcSdr25;
>> >> > } else {
>> >> > - HostCtrl2 = 0;
>> >> > + Timing = SdMmcMmcSdr12;
>> >> > }
>> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > +
>> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> >> > + Status = mOverride->NotifyPhase (
>> >> > + Private->ControllerHandle,
>> >> > + Slot,
>> >> > + EdkiiSdMmcUhsSignaling,
>> >> > + &Timing
>> >> > + );
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + DEBUG ((
>> >> > + DEBUG_ERROR,
>> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> >> > + __FUNCTION__,
>> >> > + Status
>> >> > + ));
>> >> > + return Status;
>> >> > + }
>> >> > + } else {
>> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + return Status;
>> >> > + }
>> >> > }
>> >> >
>> >> > HsTiming = 1;
>> >> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
>> >> > IN UINT8 BusWidth
>> >> > )
>> >> > {
>> >> > - EFI_STATUS Status;
>> >> > - UINT8 HsTiming;
>> >> > - UINT8 HostCtrl2;
>> >> > - UINT16 ClockCtrl;
>> >> > + EFI_STATUS Status;
>> >> > + UINT8 HsTiming;
>> >> > + UINT16 ClockCtrl;
>> >> > + SD_MMC_UHS_TIMING Timing;
>> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> >> > +
>> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >> >
>> >> > if ((BusWidth != 4) && (BusWidth != 8)) {
>> >> > return EFI_INVALID_PARAMETER;
>> >> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
>> >> > if (EFI_ERROR (Status)) {
>> >> > return Status;
>> >> > }
>> >> > - //
>> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> >> > - //
>> >> > - HostCtrl2 = (UINT8)~0x7;
>> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > - }
>> >> > - //
>> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
>> >> > - //
>> >> > - HostCtrl2 = BIT0 | BIT1;
>> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > +
>> >> > + Timing = SdMmcMmcHs200;
>> >> > +
>> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> >> > + Status = mOverride->NotifyPhase (
>> >> > + Private->ControllerHandle,
>> >> > + Slot,
>> >> > + EdkiiSdMmcUhsSignaling,
>> >> > + &Timing
>> >> > + );
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + DEBUG ((
>> >> > + DEBUG_ERROR,
>> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> >> > + __FUNCTION__,
>> >> > + Status
>> >> > + ));
>> >> > + return Status;
>> >> > + }
>> >> > + } else {
>> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + return Status;
>> >> > + }
>> >> > }
>> >> > //
>> >> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
>> >> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
>> >> > IN UINT32 ClockFreq
>> >> > )
>> >> > {
>> >> > - EFI_STATUS Status;
>> >> > - UINT8 HsTiming;
>> >> > - UINT8 HostCtrl2;
>> >> > + EFI_STATUS Status;
>> >> > + UINT8 HsTiming;
>> >> > + SD_MMC_UHS_TIMING Timing;
>> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
>> >> > +
>> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >> >
>> >> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
>> >> > if (EFI_ERROR (Status)) {
>> >> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
>> >> > if (EFI_ERROR (Status)) {
>> >> > return Status;
>> >> > }
>> >> > - //
>> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
>> >> > - //
>> >> > - HostCtrl2 = (UINT8)~0x7;
>> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > - }
>> >> > - //
>> >> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
>> >> > - //
>> >> > - HostCtrl2 = BIT0 | BIT2;
>> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > +
>> >> > + Timing = SdMmcMmcHs400;
>> >> > +
>> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> >> > + Status = mOverride->NotifyPhase (
>> >> > + Private->ControllerHandle,
>> >> > + Slot,
>> >> > + EdkiiSdMmcUhsSignaling,
>> >> > + &Timing
>> >> > + );
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + DEBUG ((
>> >> > + DEBUG_ERROR,
>> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> >> > + __FUNCTION__,
>> >> > + Status
>> >> > + ));
>> >> > + return Status;
>> >> > + }
>> >> > + } else {
>> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + return Status;
>> >> > + }
>> >> > }
>> >> >
>> >> > HsTiming = 3;
>> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> >> > index 8c93933..5645a71 100644
>> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
>> >> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
>> >> > UINT8 BusWidth;
>> >> > UINT8 AccessMode;
>> >> > UINT8 HostCtrl1;
>> >> > - UINT8 HostCtrl2;
>> >> > UINT8 SwitchResp[64];
>> >> > + SD_MMC_UHS_TIMING Timing;
>> >> > SD_MMC_HC_PRIVATE_DATA *Private;
>> >> >
>> >> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>> >> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
>> >> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
>> >> > ClockFreq = 208;
>> >> > AccessMode = 3;
>> >> > + Timing = SdMmcUhsSdr104;
>> >> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
>> >> > ClockFreq = 100;
>> >> > AccessMode = 2;
>> >> > + Timing = SdMmcUhsSdr50;
>> >> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
>> >> > ClockFreq = 50;
>> >> > AccessMode = 4;
>> >> > + Timing = SdMmcUhsDdr50;
>> >> > } else if ((SwitchResp[13] & BIT1) != 0) {
>> >> > ClockFreq = 50;
>> >> > AccessMode = 1;
>> >> > + Timing = SdMmcUhsSdr25;
>> >> > } else {
>> >> > ClockFreq = 25;
>> >> > AccessMode = 0;
>> >> > + Timing = SdMmcUhsSdr12;
>> >> > }
>> >> >
>> >> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
>> >> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
>> >> > }
>> >> > }
>> >> >
>> >> > - HostCtrl2 = (UINT8)~0x7;
>> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > - }
>> >> > - HostCtrl2 = AccessMode;
>> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > - if (EFI_ERROR (Status)) {
>> >> > - return Status;
>> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
>> >> > + Status = mOverride->NotifyPhase (
>> >> > + Private->ControllerHandle,
>> >> > + Slot,
>> >> > + EdkiiSdMmcUhsSignaling,
>> >> > + &Timing
>> >> > + );
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + DEBUG ((
>> >> > + DEBUG_ERROR,
>> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
>> >> > + __FUNCTION__,
>> >> > + Status
>> >> > + ));
>> >> > + return Status;
>> >> > + }
>> >> > + } else {
>> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + return Status;
>> >> > + }
>> >> > }
>> >> >
>> >> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
>> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> >> > index 02eb4ad..38d6202 100644
>> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
>> >> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
>> >> > }
>> >> >
>> >> > /**
>> >> > + Set SD Host Controler control 2 registry according to selected speed.
>> >> > +
>> >> > + @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] Timing The timing to select.
>> >> > +
>> >> > + @retval EFI_SUCCESS The timing is set successfully.
>> >> > + @retval Others The timing isn't set successfully.
>> >> > +**/
>> >> > +EFI_STATUS
>> >> > +SdMmcHcUhsSignaling (
>> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
>> >> > + IN UINT8 Slot,
>> >> > + IN SD_MMC_UHS_TIMING Timing
>> >> > + )
>> >> > +{
>> >> > + EFI_STATUS Status;
>> >> > + UINT8 HostCtrl2;
>> >> > +
>> >> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
>> >> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > + if (EFI_ERROR (Status)) {
>> >> > + return Status;
>> >> > + }
>> >> > +
>> >> > + switch (Timing) {
>> >> > + case SdMmcUhsSdr12:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
>> >> > + break;
>> >> > + case SdMmcUhsSdr25:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
>> >> > + break;
>> >> > + case SdMmcUhsSdr50:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
>> >> > + break;
>> >> > + case SdMmcUhsSdr104:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
>> >> > + break;
>> >> > + case SdMmcUhsDdr50:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
>> >> > + break;
>> >> > + case SdMmcMmcDdr52:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
>> >> > + break;
>> >> > + case SdMmcMmcSdr50:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
>> >> > + break;
>> >> > + case SdMmcMmcSdr25:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
>> >> > + break;
>> >> > + case SdMmcMmcSdr12:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
>> >> > + break;
>> >> > + case SdMmcMmcHs200:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
>> >> > + break;
>> >> > + case SdMmcMmcHs400:
>> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
>> >> > + break;
>> >> > + default:
>> >> > + HostCtrl2 = 0;
>> >> > + break;
>> >> > + }
>> >> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
>> >> > +
>> >> > + return Status;
>> >> > +}
>> >> > +
>> >>
>> >> This function looks identical to the override that your are proposing
>> >> in your platform code. Why is that? Are the values of those defines
>> >> different?
>> >>
>> >
>> > This is exactly the reason. For Xenon, MMC_HS400 and MMC_HS200 values
>> > of UHS_MODE_SEL field in HostControl2Register are custom. Actually,
>> > non-generic UHS_MODE_SEL values are pretty common, from what I can see
>> > in the Linux code. The new callback allows overriding it. Looking
>> > forward to your feedback.
>> >
>> > Best regards,
>> > Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 13:27 ` Ard Biesheuvel
@ 2018-10-08 13:37 ` Marcin Wojtas
2018-10-08 13:43 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-08 13:37 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Zeng, Star, eric.dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, hao.a.wu, nadavh,
jsd@semihalf.com, Tomasz Michalec
pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >>
> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
> >> > Hi Ard,
> >> >
> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >> >>
> >> >> (add MdeModulePkg maintainers)
> >> >>
> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >> > From: Tomasz Michalec <tm@semihalf.com>
> >> >> >
> >> >> > Some SD Host Controlers use different values in Host Control 2 Register
> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> >> >> > the NotifyPhase of the SdMmcOverride protocol.
> >> >> >
> >> >> > UHS signaling configuration is moved to a common, default routine
> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> >> >> > cover this functionality.
> >> >> >
> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >> >> > ---
> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >> >> >
> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> > index e389d52..a03160d 100644
> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
> >> >> >
> >> >> > //
> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
> >> >> > +//
> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> >> >> > +
In case we move enums to SdMmcOverride.h, would it be desired, to move
there register fields values as well? Or should I rather use Xenon
macros for all of above locally?
> >> >> > +//
> >> >> > +// Timing modes for uhs
> >> >> > +//
> >> >> > +typedef enum {
> >> >> > + SdMmcUhsSdr12,
> >> >> > + SdMmcUhsSdr25,
> >> >> > + SdMmcUhsSdr50,
> >> >> > + SdMmcUhsSdr104,
> >> >> > + SdMmcUhsDdr50,
> >> >> > + SdMmcMmcDdr52,
> >> >> > + SdMmcMmcSdr50,
> >> >> > + SdMmcMmcSdr25,
> >> >> > + SdMmcMmcSdr12,
> >> >> > + SdMmcMmcHs200,
> >> >> > + SdMmcMmcHs400,
> >> >> > +} SD_MMC_UHS_TIMING;
> >> >> > +
> >> >>
> >> >> Here, we end up with two sets of symbolic constants for the same
> >> >> thing, and I suppose this enum will be duplicated in your
> >> >> SdMmcOverride implementation?
> >> >>
> >> >
> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
> >> > SD and MMC in HostControl2Register.
> >> >
> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
> >> > only in UhsSignaling routine (actually the next patch, with
> >> > SwitchClockFreqPost, use it...).
> >> >
> >> > In my SdMmcOverride implementation this enum is not duplicated,
> >> > because this file (SdMmcPciHci.h) is included via
> >> > Protocol/SdMmcOverride.h.
> >> >
> >>
> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
> >> Protocol/SdMmcOverride.h
> >>
> >
> > OK.
> >
> >> I think it should be fine to add the enum definition to
> >> Protocol/SdMmcOverride.h instead.
> >>
> >
> > OK.
> >
> >> But wouldn't it be much easier to have a hook for setting
> >> HostControl2Register that decodes the value and modifies it according
> >> to what the platform requires?
> >>
> >
> > Can you please explain, how it will be different from UhsSignaling in
> > current shape (read required timing value and update UHS_MODE_SEL
> > field)?
> >
>
> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
> bits are set, you substitute them with the appropriate xenon values.
Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
from the controller driver perspective, how would I know, which mode
is requested?
>
> Also, how important is it to drive the SD/MMC at its max rated speed
> at boot time? On Synquacer, I just disable HS200 in the capability
> struct so I can forget about all this stuff
Some customers want it - a real life scenario from one of them:
applications, Linux binaries and rootfs stores in the MMC. Each boot a
couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
time saving.
Best regards,
Marcin
>
>
> >>
> >>
> >> >>
> >> >>
> >> >> > +//
> >> >> > // The transfer modes supported by SD Host Controller
> >> >> > // Simplified Spec 3.0 Table 1-2
> >> >> > //
> >> >> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> >> >> > IN UINT8 Slot
> >> >> > );
> >> >> >
> >> >> > +/**
> >> >> > + Set SD Host Controler control 2 registry according to selected speed.
> >> >> > +
> >> >> > + @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] Timing The timing to select.
> >> >> > +
> >> >> > + @retval EFI_SUCCESS The timing is set successfully.
> >> >> > + @retval Others The timing isn't set successfully.
> >> >> > +**/
> >> >> > +EFI_STATUS
> >> >> > +SdMmcHcUhsSignaling (
> >> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> >> >> > + IN UINT8 Slot,
> >> >> > + IN SD_MMC_UHS_TIMING Timing
> >> >> > + );
> >> >> > +
> >> >> > #endif
> >> >> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> >> > index 178945f..25db98a 100644
> >> >> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> >> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> >> >> > @@ -17,6 +17,7 @@
> >> >> > #ifndef __SD_MMC_OVERRIDE_H__
> >> >> > #define __SD_MMC_OVERRIDE_H__
> >> >> >
> >> >> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> >> >> > #include <Protocol/SdMmcPassThru.h>
> >> >> >
> >> >> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> >> >> > @@ -31,6 +32,7 @@ typedef enum {
> >> >> > EdkiiSdMmcResetPost,
> >> >> > EdkiiSdMmcInitHostPre,
> >> >> > EdkiiSdMmcInitHostPost,
> >> >> > + EdkiiSdMmcUhsSignaling,
> >> >> > } EDKII_SD_MMC_PHASE_TYPE;
> >> >> >
> >> >> > /**
> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> >> > index c5fd214..05bd4a0 100755
> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> >> >> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> >> >> > IN UINT8 BusWidth
> >> >> > )
> >> >> > {
> >> >> > - EFI_STATUS Status;
> >> >> > - UINT8 HsTiming;
> >> >> > - UINT8 HostCtrl1;
> >> >> > - UINT8 HostCtrl2;
> >> >> > + EFI_STATUS Status;
> >> >> > + UINT8 HsTiming;
> >> >> > + UINT8 HostCtrl1;
> >> >> > + SD_MMC_UHS_TIMING Timing;
> >> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> >> > +
> >> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >> >
> >> >> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> >> >> > if (EFI_ERROR (Status)) {
> >> >> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> >> >> > return Status;
> >> >> > }
> >> >> >
> >> >> > - //
> >> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> >> > - //
> >> >> > - HostCtrl2 = (UINT8)~0x7;
> >> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > - }
> >> >> > - //
> >> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> >> >> > - //
> >> >> > if (IsDdr) {
> >> >> > - HostCtrl2 = BIT2;
> >> >> > + Timing = SdMmcMmcDdr52;
> >> >> > } else if (ClockFreq == 52) {
> >> >> > - HostCtrl2 = BIT0;
> >> >> > + Timing = SdMmcMmcSdr50;
> >> >> > + } else if (ClockFreq == 26) {
> >> >> > + Timing = SdMmcMmcSdr25;
> >> >> > } else {
> >> >> > - HostCtrl2 = 0;
> >> >> > + Timing = SdMmcMmcSdr12;
> >> >> > }
> >> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > +
> >> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> >> > + Status = mOverride->NotifyPhase (
> >> >> > + Private->ControllerHandle,
> >> >> > + Slot,
> >> >> > + EdkiiSdMmcUhsSignaling,
> >> >> > + &Timing
> >> >> > + );
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + DEBUG ((
> >> >> > + DEBUG_ERROR,
> >> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> >> > + __FUNCTION__,
> >> >> > + Status
> >> >> > + ));
> >> >> > + return Status;
> >> >> > + }
> >> >> > + } else {
> >> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + return Status;
> >> >> > + }
> >> >> > }
> >> >> >
> >> >> > HsTiming = 1;
> >> >> > @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> >> >> > IN UINT8 BusWidth
> >> >> > )
> >> >> > {
> >> >> > - EFI_STATUS Status;
> >> >> > - UINT8 HsTiming;
> >> >> > - UINT8 HostCtrl2;
> >> >> > - UINT16 ClockCtrl;
> >> >> > + EFI_STATUS Status;
> >> >> > + UINT8 HsTiming;
> >> >> > + UINT16 ClockCtrl;
> >> >> > + SD_MMC_UHS_TIMING Timing;
> >> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> >> > +
> >> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >> >
> >> >> > if ((BusWidth != 4) && (BusWidth != 8)) {
> >> >> > return EFI_INVALID_PARAMETER;
> >> >> > @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> >> >> > if (EFI_ERROR (Status)) {
> >> >> > return Status;
> >> >> > }
> >> >> > - //
> >> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> >> > - //
> >> >> > - HostCtrl2 = (UINT8)~0x7;
> >> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > - }
> >> >> > - //
> >> >> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> >> >> > - //
> >> >> > - HostCtrl2 = BIT0 | BIT1;
> >> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > +
> >> >> > + Timing = SdMmcMmcHs200;
> >> >> > +
> >> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> >> > + Status = mOverride->NotifyPhase (
> >> >> > + Private->ControllerHandle,
> >> >> > + Slot,
> >> >> > + EdkiiSdMmcUhsSignaling,
> >> >> > + &Timing
> >> >> > + );
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + DEBUG ((
> >> >> > + DEBUG_ERROR,
> >> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> >> > + __FUNCTION__,
> >> >> > + Status
> >> >> > + ));
> >> >> > + return Status;
> >> >> > + }
> >> >> > + } else {
> >> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + return Status;
> >> >> > + }
> >> >> > }
> >> >> > //
> >> >> > // Wait Internal Clock Stable in the Clock Control register to be 1 before set SD Clock Enable bit
> >> >> > @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> >> >> > IN UINT32 ClockFreq
> >> >> > )
> >> >> > {
> >> >> > - EFI_STATUS Status;
> >> >> > - UINT8 HsTiming;
> >> >> > - UINT8 HostCtrl2;
> >> >> > + EFI_STATUS Status;
> >> >> > + UINT8 HsTiming;
> >> >> > + SD_MMC_UHS_TIMING Timing;
> >> >> > + SD_MMC_HC_PRIVATE_DATA *Private;
> >> >> > +
> >> >> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >> >
> >> >> > Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> >> >> > if (EFI_ERROR (Status)) {
> >> >> > @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> >> >> > if (EFI_ERROR (Status)) {
> >> >> > return Status;
> >> >> > }
> >> >> > - //
> >> >> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> >> >> > - //
> >> >> > - HostCtrl2 = (UINT8)~0x7;
> >> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > - }
> >> >> > - //
> >> >> > - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> >> >> > - //
> >> >> > - HostCtrl2 = BIT0 | BIT2;
> >> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > +
> >> >> > + Timing = SdMmcMmcHs400;
> >> >> > +
> >> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> >> > + Status = mOverride->NotifyPhase (
> >> >> > + Private->ControllerHandle,
> >> >> > + Slot,
> >> >> > + EdkiiSdMmcUhsSignaling,
> >> >> > + &Timing
> >> >> > + );
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + DEBUG ((
> >> >> > + DEBUG_ERROR,
> >> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> >> > + __FUNCTION__,
> >> >> > + Status
> >> >> > + ));
> >> >> > + return Status;
> >> >> > + }
> >> >> > + } else {
> >> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + return Status;
> >> >> > + }
> >> >> > }
> >> >> >
> >> >> > HsTiming = 3;
> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> >> > index 8c93933..5645a71 100644
> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> >> >> > @@ -784,8 +784,8 @@ SdCardSetBusMode (
> >> >> > UINT8 BusWidth;
> >> >> > UINT8 AccessMode;
> >> >> > UINT8 HostCtrl1;
> >> >> > - UINT8 HostCtrl2;
> >> >> > UINT8 SwitchResp[64];
> >> >> > + SD_MMC_UHS_TIMING Timing;
> >> >> > SD_MMC_HC_PRIVATE_DATA *Private;
> >> >> >
> >> >> > Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >> >> > @@ -817,18 +817,23 @@ SdCardSetBusMode (
> >> >> > if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> >> >> > ClockFreq = 208;
> >> >> > AccessMode = 3;
> >> >> > + Timing = SdMmcUhsSdr104;
> >> >> > } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0)) {
> >> >> > ClockFreq = 100;
> >> >> > AccessMode = 2;
> >> >> > + Timing = SdMmcUhsSdr50;
> >> >> > } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) != 0)) {
> >> >> > ClockFreq = 50;
> >> >> > AccessMode = 4;
> >> >> > + Timing = SdMmcUhsDdr50;
> >> >> > } else if ((SwitchResp[13] & BIT1) != 0) {
> >> >> > ClockFreq = 50;
> >> >> > AccessMode = 1;
> >> >> > + Timing = SdMmcUhsSdr25;
> >> >> > } else {
> >> >> > ClockFreq = 25;
> >> >> > AccessMode = 0;
> >> >> > + Timing = SdMmcUhsSdr12;
> >> >> > }
> >> >> >
> >> >> > Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE, SwitchResp);
> >> >> > @@ -854,15 +859,27 @@ SdCardSetBusMode (
> >> >> > }
> >> >> > }
> >> >> >
> >> >> > - HostCtrl2 = (UINT8)~0x7;
> >> >> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > - }
> >> >> > - HostCtrl2 = AccessMode;
> >> >> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > - if (EFI_ERROR (Status)) {
> >> >> > - return Status;
> >> >> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> >> >> > + Status = mOverride->NotifyPhase (
> >> >> > + Private->ControllerHandle,
> >> >> > + Slot,
> >> >> > + EdkiiSdMmcUhsSignaling,
> >> >> > + &Timing
> >> >> > + );
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + DEBUG ((
> >> >> > + DEBUG_ERROR,
> >> >> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> >> >> > + __FUNCTION__,
> >> >> > + Status
> >> >> > + ));
> >> >> > + return Status;
> >> >> > + }
> >> >> > + } else {
> >> >> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + return Status;
> >> >> > + }
> >> >> > }
> >> >> >
> >> >> > Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> >> > index 02eb4ad..38d6202 100644
> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> >> >> > @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> >> >> > }
> >> >> >
> >> >> > /**
> >> >> > + Set SD Host Controler control 2 registry according to selected speed.
> >> >> > +
> >> >> > + @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] Timing The timing to select.
> >> >> > +
> >> >> > + @retval EFI_SUCCESS The timing is set successfully.
> >> >> > + @retval Others The timing isn't set successfully.
> >> >> > +**/
> >> >> > +EFI_STATUS
> >> >> > +SdMmcHcUhsSignaling (
> >> >> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> >> >> > + IN UINT8 Slot,
> >> >> > + IN SD_MMC_UHS_TIMING Timing
> >> >> > + )
> >> >> > +{
> >> >> > + EFI_STATUS Status;
> >> >> > + UINT8 HostCtrl2;
> >> >> > +
> >> >> > + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> >> >> > + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > + if (EFI_ERROR (Status)) {
> >> >> > + return Status;
> >> >> > + }
> >> >> > +
> >> >> > + switch (Timing) {
> >> >> > + case SdMmcUhsSdr12:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> >> >> > + break;
> >> >> > + case SdMmcUhsSdr25:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> >> >> > + break;
> >> >> > + case SdMmcUhsSdr50:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> >> >> > + break;
> >> >> > + case SdMmcUhsSdr104:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> >> >> > + break;
> >> >> > + case SdMmcUhsDdr50:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> >> >> > + break;
> >> >> > + case SdMmcMmcDdr52:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> >> >> > + break;
> >> >> > + case SdMmcMmcSdr50:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> >> >> > + break;
> >> >> > + case SdMmcMmcSdr25:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> >> >> > + break;
> >> >> > + case SdMmcMmcSdr12:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> >> >> > + break;
> >> >> > + case SdMmcMmcHs200:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> >> >> > + break;
> >> >> > + case SdMmcMmcHs400:
> >> >> > + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> >> >> > + break;
> >> >> > + default:
> >> >> > + HostCtrl2 = 0;
> >> >> > + break;
> >> >> > + }
> >> >> > + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof (HostCtrl2), &HostCtrl2);
> >> >> > +
> >> >> > + return Status;
> >> >> > +}
> >> >> > +
> >> >>
> >> >> This function looks identical to the override that your are proposing
> >> >> in your platform code. Why is that? Are the values of those defines
> >> >> different?
> >> >>
> >> >
> >> > This is exactly the reason. For Xenon, MMC_HS400 and MMC_HS200 values
> >> > of UHS_MODE_SEL field in HostControl2Register are custom. Actually,
> >> > non-generic UHS_MODE_SEL values are pretty common, from what I can see
> >> > in the Linux code. The new callback allows overriding it. Looking
> >> > forward to your feedback.
> >> >
> >> > Best regards,
> >> > Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 13:37 ` Marcin Wojtas
@ 2018-10-08 13:43 ` Ard Biesheuvel
2018-10-08 14:52 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-08 13:43 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Zeng, Star, Eric Dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, Wu, Hao A,
Nadav Haklai, jsd@semihalf.com, Tomasz Michalec
On 8 October 2018 at 15:37, Marcin Wojtas <mw@semihalf.com> wrote:
> pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>>
>> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
>> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >>
>> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> > Hi Ard,
>> >> >
>> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >> >>
>> >> >> (add MdeModulePkg maintainers)
>> >> >>
>> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> >> > From: Tomasz Michalec <tm@semihalf.com>
>> >> >> >
>> >> >> > Some SD Host Controlers use different values in Host Control 2 Register
>> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
>> >> >> > the NotifyPhase of the SdMmcOverride protocol.
>> >> >> >
>> >> >> > UHS signaling configuration is moved to a common, default routine
>> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
>> >> >> > cover this functionality.
>> >> >> >
>> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
>> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> >> >> > ---
>> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
>> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
>> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
>> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
>> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
>> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
>> >> >> >
>> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> > index e389d52..a03160d 100644
>> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
>> >> >> >
>> >> >> > //
>> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
>> >> >> > +//
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
>> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
>> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
>> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
>> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
>> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
>> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
>> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
>> >> >> > +
>
> In case we move enums to SdMmcOverride.h, would it be desired, to move
> there register fields values as well? Or should I rather use Xenon
> macros for all of above locally?
>
No, I think the macros should be kept locally.
>> >> >> > +//
>> >> >> > +// Timing modes for uhs
>> >> >> > +//
>> >> >> > +typedef enum {
>> >> >> > + SdMmcUhsSdr12,
>> >> >> > + SdMmcUhsSdr25,
>> >> >> > + SdMmcUhsSdr50,
>> >> >> > + SdMmcUhsSdr104,
>> >> >> > + SdMmcUhsDdr50,
>> >> >> > + SdMmcMmcDdr52,
>> >> >> > + SdMmcMmcSdr50,
>> >> >> > + SdMmcMmcSdr25,
>> >> >> > + SdMmcMmcSdr12,
>> >> >> > + SdMmcMmcHs200,
>> >> >> > + SdMmcMmcHs400,
>> >> >> > +} SD_MMC_UHS_TIMING;
>> >> >> > +
>> >> >>
>> >> >> Here, we end up with two sets of symbolic constants for the same
>> >> >> thing, and I suppose this enum will be duplicated in your
>> >> >> SdMmcOverride implementation?
>> >> >>
>> >> >
>> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
>> >> > SD and MMC in HostControl2Register.
>> >> >
>> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
>> >> > only in UhsSignaling routine (actually the next patch, with
>> >> > SwitchClockFreqPost, use it...).
>> >> >
>> >> > In my SdMmcOverride implementation this enum is not duplicated,
>> >> > because this file (SdMmcPciHci.h) is included via
>> >> > Protocol/SdMmcOverride.h.
>> >> >
>> >>
>> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
>> >> Protocol/SdMmcOverride.h
>> >>
>> >
>> > OK.
>> >
>> >> I think it should be fine to add the enum definition to
>> >> Protocol/SdMmcOverride.h instead.
>> >>
>> >
>> > OK.
>> >
>> >> But wouldn't it be much easier to have a hook for setting
>> >> HostControl2Register that decodes the value and modifies it according
>> >> to what the platform requires?
>> >>
>> >
>> > Can you please explain, how it will be different from UhsSignaling in
>> > current shape (read required timing value and update UHS_MODE_SEL
>> > field)?
>> >
>>
>> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
>> bits are set, you substitute them with the appropriate xenon values.
>
> Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
> from the controller driver perspective, how would I know, which mode
> is requested?
>
Good point.
>>
>> Also, how important is it to drive the SD/MMC at its max rated speed
>> at boot time? On Synquacer, I just disable HS200 in the capability
>> struct so I can forget about all this stuff
>
> Some customers want it - a real life scenario from one of them:
> applications, Linux binaries and rootfs stores in the MMC. Each boot a
> couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
> time saving.
>
Do you mean in the initrd? Because otherwise, Linux will use its own
driver and select its own mode.
And btw, does the spec permit using different HC2 values for HS200 / HS400 ?
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 13:43 ` Ard Biesheuvel
@ 2018-10-08 14:52 ` Marcin Wojtas
2018-10-08 15:10 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-08 14:52 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Zeng, Star, eric.dong, Ni, Ruiyu, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, hao.a.wu, nadavh,
jsd@semihalf.com, Tomasz Michalec
pon., 8 paź 2018 o 15:43 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On 8 October 2018 at 15:37, Marcin Wojtas <mw@semihalf.com> wrote:
> > pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >>
> >> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
> >> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >> >>
> >> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >> > Hi Ard,
> >> >> >
> >> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >> >> >>
> >> >> >> (add MdeModulePkg maintainers)
> >> >> >>
> >> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >> >> > From: Tomasz Michalec <tm@semihalf.com>
> >> >> >> >
> >> >> >> > Some SD Host Controlers use different values in Host Control 2 Register
> >> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> >> >> >> > the NotifyPhase of the SdMmcOverride protocol.
> >> >> >> >
> >> >> >> > UHS signaling configuration is moved to a common, default routine
> >> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> >> >> >> > cover this functionality.
> >> >> >> >
> >> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
> >> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >> >> >> > ---
> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> >> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> >> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >> >> >> >
> >> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> > index e389d52..a03160d 100644
> >> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
> >> >> >> >
> >> >> >> > //
> >> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
> >> >> >> > +//
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> >> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> >> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> >> >> >> > +
> >
> > In case we move enums to SdMmcOverride.h, would it be desired, to move
> > there register fields values as well? Or should I rather use Xenon
> > macros for all of above locally?
> >
>
> No, I think the macros should be kept locally.
>
> >> >> >> > +//
> >> >> >> > +// Timing modes for uhs
> >> >> >> > +//
> >> >> >> > +typedef enum {
> >> >> >> > + SdMmcUhsSdr12,
> >> >> >> > + SdMmcUhsSdr25,
> >> >> >> > + SdMmcUhsSdr50,
> >> >> >> > + SdMmcUhsSdr104,
> >> >> >> > + SdMmcUhsDdr50,
> >> >> >> > + SdMmcMmcDdr52,
> >> >> >> > + SdMmcMmcSdr50,
> >> >> >> > + SdMmcMmcSdr25,
> >> >> >> > + SdMmcMmcSdr12,
> >> >> >> > + SdMmcMmcHs200,
> >> >> >> > + SdMmcMmcHs400,
> >> >> >> > +} SD_MMC_UHS_TIMING;
> >> >> >> > +
> >> >> >>
> >> >> >> Here, we end up with two sets of symbolic constants for the same
> >> >> >> thing, and I suppose this enum will be duplicated in your
> >> >> >> SdMmcOverride implementation?
> >> >> >>
> >> >> >
> >> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
> >> >> > SD and MMC in HostControl2Register.
> >> >> >
> >> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
> >> >> > only in UhsSignaling routine (actually the next patch, with
> >> >> > SwitchClockFreqPost, use it...).
> >> >> >
> >> >> > In my SdMmcOverride implementation this enum is not duplicated,
> >> >> > because this file (SdMmcPciHci.h) is included via
> >> >> > Protocol/SdMmcOverride.h.
> >> >> >
> >> >>
> >> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
> >> >> Protocol/SdMmcOverride.h
> >> >>
> >> >
> >> > OK.
> >> >
> >> >> I think it should be fine to add the enum definition to
> >> >> Protocol/SdMmcOverride.h instead.
> >> >>
> >> >
> >> > OK.
> >> >
> >> >> But wouldn't it be much easier to have a hook for setting
> >> >> HostControl2Register that decodes the value and modifies it according
> >> >> to what the platform requires?
> >> >>
> >> >
> >> > Can you please explain, how it will be different from UhsSignaling in
> >> > current shape (read required timing value and update UHS_MODE_SEL
> >> > field)?
> >> >
> >>
> >> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
> >> bits are set, you substitute them with the appropriate xenon values.
> >
> > Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
> > from the controller driver perspective, how would I know, which mode
> > is requested?
> >
>
> Good point.
>
> >>
> >> Also, how important is it to drive the SD/MMC at its max rated speed
> >> at boot time? On Synquacer, I just disable HS200 in the capability
> >> struct so I can forget about all this stuff
> >
> > Some customers want it - a real life scenario from one of them:
> > applications, Linux binaries and rootfs stores in the MMC. Each boot a
> > couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
> > time saving.
> >
>
> Do you mean in the initrd? Because otherwise, Linux will use its own
> driver and select its own mode.
No, I mean loading >300MB images from eMMC to memory in the DXE phase,
before booting anything.
>
> And btw, does the spec permit using different HC2 values for HS200 / HS400 ?
According to SD Host Controller Specification v4.20, UHS_MODE_SEL
values 0x5 and 0x6 are "reserved". According to Linux code, HS400
value is treated as "non-standard" and HS200 should be same as for
SDR104 (0x3). Nothing is written about permiting different values, but
given Linux 'sdhci_set_uhs_signaling' and whole bunch of other quirks
used under drivers/mmc overriding standard behavior is very common.
Please let know your desired way of handling custom UhsSignaling.
Best regards,
MArcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 14:52 ` Marcin Wojtas
@ 2018-10-08 15:10 ` Ard Biesheuvel
2018-10-09 11:22 ` Wu, Hao A
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-08 15:10 UTC (permalink / raw)
To: Marcin Wojtas, Ni, Ruiyu, Wu, Hao A
Cc: Zeng, Star, Eric Dong, edk2-devel-01, Tian, Feng,
Kinney, Michael D, Gao, Liming, Leif Lindholm, Nadav Haklai,
jsd@semihalf.com, Tomasz Michalec
On 8 October 2018 at 16:52, Marcin Wojtas <mw@semihalf.com> wrote:
> pon., 8 paź 2018 o 15:43 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>>
>> On 8 October 2018 at 15:37, Marcin Wojtas <mw@semihalf.com> wrote:
>> > pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >>
>> >> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >> >>
>> >> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> >> > Hi Ard,
>> >> >> >
>> >> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>> >> >> >>
>> >> >> >> (add MdeModulePkg maintainers)
>> >> >> >>
>> >> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
>> >> >> >> > From: Tomasz Michalec <tm@semihalf.com>
>> >> >> >> >
>> >> >> >> > Some SD Host Controlers use different values in Host Control 2 Register
>> >> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
>> >> >> >> > the NotifyPhase of the SdMmcOverride protocol.
>> >> >> >> >
>> >> >> >> > UHS signaling configuration is moved to a common, default routine
>> >> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
>> >> >> >> > cover this functionality.
>> >> >> >> >
>> >> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
>> >> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
>> >> >> >> > ---
>> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
>> >> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
>> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153 ++++++++++++--------
>> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
>> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
>> >> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
>> >> >> >> >
>> >> >> >> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> >> > index e389d52..a03160d 100644
>> >> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
>> >> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
>> >> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
>> >> >> >> >
>> >> >> >> > //
>> >> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
>> >> >> >> > +//
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
>> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
>> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
>> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
>> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
>> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
>> >> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
>> >> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
>> >> >> >> > +
>> >
>> > In case we move enums to SdMmcOverride.h, would it be desired, to move
>> > there register fields values as well? Or should I rather use Xenon
>> > macros for all of above locally?
>> >
>>
>> No, I think the macros should be kept locally.
>>
>> >> >> >> > +//
>> >> >> >> > +// Timing modes for uhs
>> >> >> >> > +//
>> >> >> >> > +typedef enum {
>> >> >> >> > + SdMmcUhsSdr12,
>> >> >> >> > + SdMmcUhsSdr25,
>> >> >> >> > + SdMmcUhsSdr50,
>> >> >> >> > + SdMmcUhsSdr104,
>> >> >> >> > + SdMmcUhsDdr50,
>> >> >> >> > + SdMmcMmcDdr52,
>> >> >> >> > + SdMmcMmcSdr50,
>> >> >> >> > + SdMmcMmcSdr25,
>> >> >> >> > + SdMmcMmcSdr12,
>> >> >> >> > + SdMmcMmcHs200,
>> >> >> >> > + SdMmcMmcHs400,
>> >> >> >> > +} SD_MMC_UHS_TIMING;
>> >> >> >> > +
>> >> >> >>
>> >> >> >> Here, we end up with two sets of symbolic constants for the same
>> >> >> >> thing, and I suppose this enum will be duplicated in your
>> >> >> >> SdMmcOverride implementation?
>> >> >> >>
>> >> >> >
>> >> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field values for
>> >> >> > SD and MMC in HostControl2Register.
>> >> >> >
>> >> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be used not
>> >> >> > only in UhsSignaling routine (actually the next patch, with
>> >> >> > SwitchClockFreqPost, use it...).
>> >> >> >
>> >> >> > In my SdMmcOverride implementation this enum is not duplicated,
>> >> >> > because this file (SdMmcPciHci.h) is included via
>> >> >> > Protocol/SdMmcOverride.h.
>> >> >> >
>> >> >>
>> >> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
>> >> >> Protocol/SdMmcOverride.h
>> >> >>
>> >> >
>> >> > OK.
>> >> >
>> >> >> I think it should be fine to add the enum definition to
>> >> >> Protocol/SdMmcOverride.h instead.
>> >> >>
>> >> >
>> >> > OK.
>> >> >
>> >> >> But wouldn't it be much easier to have a hook for setting
>> >> >> HostControl2Register that decodes the value and modifies it according
>> >> >> to what the platform requires?
>> >> >>
>> >> >
>> >> > Can you please explain, how it will be different from UhsSignaling in
>> >> > current shape (read required timing value and update UHS_MODE_SEL
>> >> > field)?
>> >> >
>> >>
>> >> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
>> >> bits are set, you substitute them with the appropriate xenon values.
>> >
>> > Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
>> > from the controller driver perspective, how would I know, which mode
>> > is requested?
>> >
>>
>> Good point.
>>
>> >>
>> >> Also, how important is it to drive the SD/MMC at its max rated speed
>> >> at boot time? On Synquacer, I just disable HS200 in the capability
>> >> struct so I can forget about all this stuff
>> >
>> > Some customers want it - a real life scenario from one of them:
>> > applications, Linux binaries and rootfs stores in the MMC. Each boot a
>> > couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
>> > time saving.
>> >
>>
>> Do you mean in the initrd? Because otherwise, Linux will use its own
>> driver and select its own mode.
>
> No, I mean loading >300MB images from eMMC to memory in the DXE phase,
> before booting anything.
>
Yikes
>>
>> And btw, does the spec permit using different HC2 values for HS200 / HS400 ?
>
> According to SD Host Controller Specification v4.20, UHS_MODE_SEL
> values 0x5 and 0x6 are "reserved". According to Linux code, HS400
> value is treated as "non-standard" and HS200 should be same as for
> SDR104 (0x3). Nothing is written about permiting different values, but
> given Linux 'sdhci_set_uhs_signaling' and whole bunch of other quirks
> used under drivers/mmc overriding standard behavior is very common.
> Please let know your desired way of handling custom UhsSignaling.
>
I suppose this is defined by the eMMC spec.
Ruiyu, Hao, could you clarify? Are the host control 2 register values
for HS200/HS400 defined by the eMMC spec?
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-08 15:10 ` Ard Biesheuvel
@ 2018-10-09 11:22 ` Wu, Hao A
2018-10-09 11:32 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Wu, Hao A @ 2018-10-09 11:22 UTC (permalink / raw)
To: Ard Biesheuvel, Marcin Wojtas, Ni, Ruiyu
Cc: Tian, Feng, Tomasz Michalec, Dong, Eric, edk2-devel-01,
Gao, Liming, Nadav Haklai, Kinney, Michael D, Zeng, Star
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard
> Biesheuvel
> Sent: Monday, October 08, 2018 11:10 PM
> To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao, Liming;
> Nadav Haklai; Kinney, Michael D; Zeng, Star
> Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> UhsSignaling to SdMmcOverride protocol
>
> On 8 October 2018 at 16:52, Marcin Wojtas <mw@semihalf.com> wrote:
> > pon., 8 paź 2018 o 15:43 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> napisał(a):
> >>
> >> On 8 October 2018 at 15:37, Marcin Wojtas <mw@semihalf.com> wrote:
> >> > pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> napisał(a):
> >> >>
> >> >> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
> >> >> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> napisał(a):
> >> >> >>
> >> >> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com>
> wrote:
> >> >> >> > Hi Ard,
> >> >> >> >
> >> >> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> napisał(a):
> >> >> >> >>
> >> >> >> >> (add MdeModulePkg maintainers)
> >> >> >> >>
> >> >> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com>
> wrote:
> >> >> >> >> > From: Tomasz Michalec <tm@semihalf.com>
> >> >> >> >> >
> >> >> >> >> > Some SD Host Controlers use different values in Host Control 2
> Register
> >> >> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type
> routine to
> >> >> >> >> > the NotifyPhase of the SdMmcOverride protocol.
> >> >> >> >> >
> >> >> >> >> > UHS signaling configuration is moved to a common, default
> routine
> >> >> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride
> does not
> >> >> >> >> > cover this functionality.
> >> >> >> >> >
> >> >> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
> >> >> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> >> >> >> >> > ---
> >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50
> +++++++
> >> >> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> ++++++++++++--------
> >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37
> +++--
> >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69
> +++++++++
> >> >> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >> >> >> >> >
> >> >> >> >> > diff --git
> a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> >> > index e389d52..a03160d 100644
> >> >> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> >> >> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR
> REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >> >> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
> >> >> >> >> >
> >> >> >> >> > //
> >> >> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
> >> >> >> >> > +//
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> >> >> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> >> >> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> >> >> >> >> > +
> >> >
> >> > In case we move enums to SdMmcOverride.h, would it be desired, to
> move
> >> > there register fields values as well? Or should I rather use Xenon
> >> > macros for all of above locally?
> >> >
> >>
> >> No, I think the macros should be kept locally.
> >>
> >> >> >> >> > +//
> >> >> >> >> > +// Timing modes for uhs
> >> >> >> >> > +//
> >> >> >> >> > +typedef enum {
> >> >> >> >> > + SdMmcUhsSdr12,
> >> >> >> >> > + SdMmcUhsSdr25,
> >> >> >> >> > + SdMmcUhsSdr50,
> >> >> >> >> > + SdMmcUhsSdr104,
> >> >> >> >> > + SdMmcUhsDdr50,
> >> >> >> >> > + SdMmcMmcDdr52,
> >> >> >> >> > + SdMmcMmcSdr50,
> >> >> >> >> > + SdMmcMmcSdr25,
> >> >> >> >> > + SdMmcMmcSdr12,
> >> >> >> >> > + SdMmcMmcHs200,
> >> >> >> >> > + SdMmcMmcHs400,
> >> >> >> >> > +} SD_MMC_UHS_TIMING;
> >> >> >> >> > +
> >> >> >> >>
> >> >> >> >> Here, we end up with two sets of symbolic constants for the same
> >> >> >> >> thing, and I suppose this enum will be duplicated in your
> >> >> >> >> SdMmcOverride implementation?
> >> >> >> >>
> >> >> >> >
> >> >> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field
> values for
> >> >> >> > SD and MMC in HostControl2Register.
> >> >> >> >
> >> >> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be
> used not
> >> >> >> > only in UhsSignaling routine (actually the next patch, with
> >> >> >> > SwitchClockFreqPost, use it...).
> >> >> >> >
> >> >> >> > In my SdMmcOverride implementation this enum is not duplicated,
> >> >> >> > because this file (SdMmcPciHci.h) is included via
> >> >> >> > Protocol/SdMmcOverride.h.
> >> >> >> >
> >> >> >>
> >> >> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
> >> >> >> Protocol/SdMmcOverride.h
> >> >> >>
> >> >> >
> >> >> > OK.
> >> >> >
> >> >> >> I think it should be fine to add the enum definition to
> >> >> >> Protocol/SdMmcOverride.h instead.
> >> >> >>
> >> >> >
> >> >> > OK.
> >> >> >
> >> >> >> But wouldn't it be much easier to have a hook for setting
> >> >> >> HostControl2Register that decodes the value and modifies it according
> >> >> >> to what the platform requires?
> >> >> >>
> >> >> >
> >> >> > Can you please explain, how it will be different from UhsSignaling in
> >> >> > current shape (read required timing value and update UHS_MODE_SEL
> >> >> > field)?
> >> >> >
> >> >>
> >> >> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
> >> >> bits are set, you substitute them with the appropriate xenon values.
> >> >
> >> > Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
> >> > from the controller driver perspective, how would I know, which mode
> >> > is requested?
> >> >
> >>
> >> Good point.
> >>
> >> >>
> >> >> Also, how important is it to drive the SD/MMC at its max rated speed
> >> >> at boot time? On Synquacer, I just disable HS200 in the capability
> >> >> struct so I can forget about all this stuff
> >> >
> >> > Some customers want it - a real life scenario from one of them:
> >> > applications, Linux binaries and rootfs stores in the MMC. Each boot a
> >> > couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
> >> > time saving.
> >> >
> >>
> >> Do you mean in the initrd? Because otherwise, Linux will use its own
> >> driver and select its own mode.
> >
> > No, I mean loading >300MB images from eMMC to memory in the DXE phase,
> > before booting anything.
> >
>
> Yikes
>
> >>
> >> And btw, does the spec permit using different HC2 values for HS200 / HS400 ?
> >
> > According to SD Host Controller Specification v4.20, UHS_MODE_SEL
> > values 0x5 and 0x6 are "reserved". According to Linux code, HS400
> > value is treated as "non-standard" and HS200 should be same as for
> > SDR104 (0x3). Nothing is written about permiting different values, but
> > given Linux 'sdhci_set_uhs_signaling' and whole bunch of other quirks
> > used under drivers/mmc overriding standard behavior is very common.
> > Please let know your desired way of handling custom UhsSignaling.
> >
>
> I suppose this is defined by the eMMC spec.
>
> Ruiyu, Hao, could you clarify? Are the host control 2 register values
> for HS200/HS400 defined by the eMMC spec?
Hi Ard and Marcin,
As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does not
mention on how to set the "UHS Mode Select" field of the Host Control 2
Register when switching to HS200/HS400. (Actually, the EMMC spec does not
mention Host Control 2 Register at all)
When it comes to setting the bus mode for EMMC devices, the current
implementation of the SdMmcPciHcDxe driver does a mapping when setting the
Host Control 2 Register:
EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
matches
SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
matches
SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
matches
SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
matches
SD None
And there is no obvious counterpart for the EMMC HS400 mode in the SD
spec. The driver currently sets the "UHS Mode Select" field to a reserved
value 0x5.
Best Regards,
Hao Wu
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-09 11:22 ` Wu, Hao A
@ 2018-10-09 11:32 ` Marcin Wojtas
2018-10-09 11:45 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-09 11:32 UTC (permalink / raw)
To: hao.a.wu, Ard Biesheuvel
Cc: Ni, Ruiyu, Tian, Feng, Tomasz Michalec, eric.dong, edk2-devel-01,
Gao, Liming, nadavh, Kinney, Michael D, Zeng, Star
wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>
> > -----Original Message-----
> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard
> > Biesheuvel
> > Sent: Monday, October 08, 2018 11:10 PM
> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao, Liming;
> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> > UhsSignaling to SdMmcOverride protocol
> >
> > On 8 October 2018 at 16:52, Marcin Wojtas <mw@semihalf.com> wrote:
> > > pon., 8 paź 2018 o 15:43 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > napisał(a):
> > >>
> > >> On 8 October 2018 at 15:37, Marcin Wojtas <mw@semihalf.com> wrote:
> > >> > pon., 8 paź 2018 o 15:27 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > napisał(a):
> > >> >>
> > >> >> On 8 October 2018 at 15:17, Marcin Wojtas <mw@semihalf.com> wrote:
> > >> >> > pon., 8 paź 2018 o 15:07 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > napisał(a):
> > >> >> >>
> > >> >> >> On 8 October 2018 at 14:59, Marcin Wojtas <mw@semihalf.com>
> > wrote:
> > >> >> >> > Hi Ard,
> > >> >> >> >
> > >> >> >> > pon., 8 paź 2018 o 14:41 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > napisał(a):
> > >> >> >> >>
> > >> >> >> >> (add MdeModulePkg maintainers)
> > >> >> >> >>
> > >> >> >> >> On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com>
> > wrote:
> > >> >> >> >> > From: Tomasz Michalec <tm@semihalf.com>
> > >> >> >> >> >
> > >> >> >> >> > Some SD Host Controlers use different values in Host Control 2
> > Register
> > >> >> >> >> > to select UHS Mode. This patch adds a new UhsSignaling type
> > routine to
> > >> >> >> >> > the NotifyPhase of the SdMmcOverride protocol.
> > >> >> >> >> >
> > >> >> >> >> > UHS signaling configuration is moved to a common, default
> > routine
> > >> >> >> >> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride
> > does not
> > >> >> >> >> > cover this functionality.
> > >> >> >> >> >
> > >> >> >> >> > Contributed-under: TianoCore Contribution Agreement 1.1
> > >> >> >> >> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > >> >> >> >> > ---
> > >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50
> > +++++++
> > >> >> >> >> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> > ++++++++++++--------
> > >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37
> > +++--
> > >> >> >> >> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69
> > +++++++++
> > >> >> >> >> > 5 files changed, 243 insertions(+), 68 deletions(-)
> > >> >> >> >> >
> > >> >> >> >> > diff --git
> > a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > >> >> >> >> > index e389d52..a03160d 100644
> > >> >> >> >> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > >> >> >> >> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > >> >> >> >> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR
> > REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> > >> >> >> >> > #define SD_MMC_HC_CTRL_VER 0xFE
> > >> >> >> >> >
> > >> >> >> >> > //
> > >> >> >> >> > +// SD Host Controler bits to HOST_CTRL2 register
> > >> >> >> >> > +//
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > >> >> >> >> > +#define SD_MMC_HC_CTRL_HS400 0x0005
> > >> >> >> >> > +
> > >> >
> > >> > In case we move enums to SdMmcOverride.h, would it be desired, to
> > move
> > >> > there register fields values as well? Or should I rather use Xenon
> > >> > macros for all of above locally?
> > >> >
> > >>
> > >> No, I think the macros should be kept locally.
> > >>
> > >> >> >> >> > +//
> > >> >> >> >> > +// Timing modes for uhs
> > >> >> >> >> > +//
> > >> >> >> >> > +typedef enum {
> > >> >> >> >> > + SdMmcUhsSdr12,
> > >> >> >> >> > + SdMmcUhsSdr25,
> > >> >> >> >> > + SdMmcUhsSdr50,
> > >> >> >> >> > + SdMmcUhsSdr104,
> > >> >> >> >> > + SdMmcUhsDdr50,
> > >> >> >> >> > + SdMmcMmcDdr52,
> > >> >> >> >> > + SdMmcMmcSdr50,
> > >> >> >> >> > + SdMmcMmcSdr25,
> > >> >> >> >> > + SdMmcMmcSdr12,
> > >> >> >> >> > + SdMmcMmcHs200,
> > >> >> >> >> > + SdMmcMmcHs400,
> > >> >> >> >> > +} SD_MMC_UHS_TIMING;
> > >> >> >> >> > +
> > >> >> >> >>
> > >> >> >> >> Here, we end up with two sets of symbolic constants for the same
> > >> >> >> >> thing, and I suppose this enum will be duplicated in your
> > >> >> >> >> SdMmcOverride implementation?
> > >> >> >> >>
> > >> >> >> >
> > >> >> >> > Why duplicated? Macros are for generic UHS_MODE_SEL field
> > values for
> > >> >> >> > SD and MMC in HostControl2Register.
> > >> >> >> >
> > >> >> >> > SD_MMC_UHS_TIMING is just a timing mode indicator, it can be
> > used not
> > >> >> >> > only in UhsSignaling routine (actually the next patch, with
> > >> >> >> > SwitchClockFreqPost, use it...).
> > >> >> >> >
> > >> >> >> > In my SdMmcOverride implementation this enum is not duplicated,
> > >> >> >> > because this file (SdMmcPciHci.h) is included via
> > >> >> >> > Protocol/SdMmcOverride.h.
> > >> >> >> >
> > >> >> >>
> > >> >> >> Ah ok. Please don't expose internal headers of the SD/MMC driver via
> > >> >> >> Protocol/SdMmcOverride.h
> > >> >> >>
> > >> >> >
> > >> >> > OK.
> > >> >> >
> > >> >> >> I think it should be fine to add the enum definition to
> > >> >> >> Protocol/SdMmcOverride.h instead.
> > >> >> >>
> > >> >> >
> > >> >> > OK.
> > >> >> >
> > >> >> >> But wouldn't it be much easier to have a hook for setting
> > >> >> >> HostControl2Register that decodes the value and modifies it according
> > >> >> >> to what the platform requires?
> > >> >> >>
> > >> >> >
> > >> >> > Can you please explain, how it will be different from UhsSignaling in
> > >> >> > current shape (read required timing value and update UHS_MODE_SEL
> > >> >> > field)?
> > >> >> >
> > >> >>
> > >> >> Well, you decode the value, and if, e.g., the SD_MMC_HC_CTRL_HS200
> > >> >> bits are set, you substitute them with the appropriate xenon values.
> > >> >
> > >> > Because values can be same for SD and MMC (e.g. UHS_104 and HS200),
> > >> > from the controller driver perspective, how would I know, which mode
> > >> > is requested?
> > >> >
> > >>
> > >> Good point.
> > >>
> > >> >>
> > >> >> Also, how important is it to drive the SD/MMC at its max rated speed
> > >> >> at boot time? On Synquacer, I just disable HS200 in the capability
> > >> >> struct so I can forget about all this stuff
> > >> >
> > >> > Some customers want it - a real life scenario from one of them:
> > >> > applications, Linux binaries and rootfs stores in the MMC. Each boot a
> > >> > couple of hundreds of MB to be loaded. Thanks to HS200 we have huge
> > >> > time saving.
> > >> >
> > >>
> > >> Do you mean in the initrd? Because otherwise, Linux will use its own
> > >> driver and select its own mode.
> > >
> > > No, I mean loading >300MB images from eMMC to memory in the DXE phase,
> > > before booting anything.
> > >
> >
> > Yikes
> >
> > >>
> > >> And btw, does the spec permit using different HC2 values for HS200 / HS400 ?
> > >
> > > According to SD Host Controller Specification v4.20, UHS_MODE_SEL
> > > values 0x5 and 0x6 are "reserved". According to Linux code, HS400
> > > value is treated as "non-standard" and HS200 should be same as for
> > > SDR104 (0x3). Nothing is written about permiting different values, but
> > > given Linux 'sdhci_set_uhs_signaling' and whole bunch of other quirks
> > > used under drivers/mmc overriding standard behavior is very common.
> > > Please let know your desired way of handling custom UhsSignaling.
> > >
> >
> > I suppose this is defined by the eMMC spec.
> >
> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > for HS200/HS400 defined by the eMMC spec?
>
> Hi Ard and Marcin,
>
> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does not
> mention on how to set the "UHS Mode Select" field of the Host Control 2
> Register when switching to HS200/HS400. (Actually, the EMMC spec does not
> mention Host Control 2 Register at all)
>
> When it comes to setting the bus mode for EMMC devices, the current
> implementation of the SdMmcPciHcDxe driver does a mapping when setting the
> Host Control 2 Register:
>
> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> matches
> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
>
> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> matches
> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
>
> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> matches
> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
>
> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> matches
> SD None
>
> And there is no obvious counterpart for the EMMC HS400 mode in the SD
> spec. The driver currently sets the "UHS Mode Select" field to a reserved
> value 0x5.
>
Thank you Hao, above is on par with what the default UhsSignaling
routine does in this patch. IMO especially in case the EMMC standard
is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
some way of updating HostControl2 register, depending on the
implementation. What is your opinion Ard?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-09 11:32 ` Marcin Wojtas
@ 2018-10-09 11:45 ` Ard Biesheuvel
2018-10-09 11:51 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-09 11:45 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Wu, Hao A, Ni, Ruiyu, Tian, Feng, Tomasz Michalec, Eric Dong,
edk2-devel-01, Gao, Liming, Nadav Haklai, Kinney, Michael D,
Zeng, Star
On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>>
>> > -----Original Message-----
>> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard
>> > Biesheuvel
>> > Sent: Monday, October 08, 2018 11:10 PM
>> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
>> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao, Liming;
>> > Nadav Haklai; Kinney, Michael D; Zeng, Star
>> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
>> > UhsSignaling to SdMmcOverride protocol
>> >
...
>> >
>> > I suppose this is defined by the eMMC spec.
>> >
>> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
>> > for HS200/HS400 defined by the eMMC spec?
>>
>> Hi Ard and Marcin,
>>
>> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does not
>> mention on how to set the "UHS Mode Select" field of the Host Control 2
>> Register when switching to HS200/HS400. (Actually, the EMMC spec does not
>> mention Host Control 2 Register at all)
>>
>> When it comes to setting the bus mode for EMMC devices, the current
>> implementation of the SdMmcPciHcDxe driver does a mapping when setting the
>> Host Control 2 Register:
>>
>> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
>> matches
>> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
>>
>> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
>> matches
>> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
>>
>> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
>> matches
>> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
>>
>> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
>> matches
>> SD None
>>
>> And there is no obvious counterpart for the EMMC HS400 mode in the SD
>> spec. The driver currently sets the "UHS Mode Select" field to a reserved
>> value 0x5.
>>
>
> Thank you Hao, above is on par with what the default UhsSignaling
> routine does in this patch. IMO especially in case the EMMC standard
> is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> some way of updating HostControl2 register, depending on the
> implementation. What is your opinion Ard?
>
I would like to know where the current values in SdMmcPciHcDxe come
from if they are not defined in any spec.
How do we know which ones are the correct ones?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-09 11:45 ` Ard Biesheuvel
@ 2018-10-09 11:51 ` Marcin Wojtas
2018-10-11 15:43 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-09 11:51 UTC (permalink / raw)
To: Ard Biesheuvel, hao.a.wu
Cc: Ni, Ruiyu, Tian, Feng, Tomasz Michalec, eric.dong, edk2-devel-01,
Gao, Liming, nadavh, Kinney, Michael D, Zeng, Star
wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> >>
> >> > -----Original Message-----
> >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard
> >> > Biesheuvel
> >> > Sent: Monday, October 08, 2018 11:10 PM
> >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao, Liming;
> >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> >> > UhsSignaling to SdMmcOverride protocol
> >> >
> ...
> >> >
> >> > I suppose this is defined by the eMMC spec.
> >> >
> >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> >> > for HS200/HS400 defined by the eMMC spec?
> >>
> >> Hi Ard and Marcin,
> >>
> >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does not
> >> mention on how to set the "UHS Mode Select" field of the Host Control 2
> >> Register when switching to HS200/HS400. (Actually, the EMMC spec does not
> >> mention Host Control 2 Register at all)
> >>
> >> When it comes to setting the bus mode for EMMC devices, the current
> >> implementation of the SdMmcPciHcDxe driver does a mapping when setting the
> >> Host Control 2 Register:
> >>
> >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> >> matches
> >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> >>
> >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> >> matches
> >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> >>
> >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> >> matches
> >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> >>
> >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> >> matches
> >> SD None
> >>
> >> And there is no obvious counterpart for the EMMC HS400 mode in the SD
> >> spec. The driver currently sets the "UHS Mode Select" field to a reserved
> >> value 0x5.
> >>
> >
> > Thank you Hao, above is on par with what the default UhsSignaling
> > routine does in this patch. IMO especially in case the EMMC standard
> > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > some way of updating HostControl2 register, depending on the
> > implementation. What is your opinion Ard?
> >
>
> I would like to know where the current values in SdMmcPciHcDxe come
> from if they are not defined in any spec.
>
> How do we know which ones are the correct ones?
Hao, can you justify used values?
Thanks,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-09 11:51 ` Marcin Wojtas
@ 2018-10-11 15:43 ` Marcin Wojtas
2018-10-12 1:39 ` Wu, Hao A
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-11 15:43 UTC (permalink / raw)
To: hao.a.wu
Cc: Ni, Ruiyu, Ard Biesheuvel, Tian, Feng, Tomasz Michalec, eric.dong,
edk2-devel-01, Gao, Liming, nadavh, Kinney, Michael D, Zeng, Star
wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
>
> wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >
> > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > >>
> > >> > -----Original Message-----
> > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard
> > >> > Biesheuvel
> > >> > Sent: Monday, October 08, 2018 11:10 PM
> > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao, Liming;
> > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> > >> > UhsSignaling to SdMmcOverride protocol
> > >> >
> > ...
> > >> >
> > >> > I suppose this is defined by the eMMC spec.
> > >> >
> > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > >> > for HS200/HS400 defined by the eMMC spec?
> > >>
> > >> Hi Ard and Marcin,
> > >>
> > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does not
> > >> mention on how to set the "UHS Mode Select" field of the Host Control 2
> > >> Register when switching to HS200/HS400. (Actually, the EMMC spec does not
> > >> mention Host Control 2 Register at all)
> > >>
> > >> When it comes to setting the bus mode for EMMC devices, the current
> > >> implementation of the SdMmcPciHcDxe driver does a mapping when setting the
> > >> Host Control 2 Register:
> > >>
> > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> > >> matches
> > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> > >>
> > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> > >> matches
> > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> > >>
> > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> > >> matches
> > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> > >>
> > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> > >> matches
> > >> SD None
> > >>
> > >> And there is no obvious counterpart for the EMMC HS400 mode in the SD
> > >> spec. The driver currently sets the "UHS Mode Select" field to a reserved
> > >> value 0x5.
> > >>
> > >
> > > Thank you Hao, above is on par with what the default UhsSignaling
> > > routine does in this patch. IMO especially in case the EMMC standard
> > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > > some way of updating HostControl2 register, depending on the
> > > implementation. What is your opinion Ard?
> > >
> >
> > I would like to know where the current values in SdMmcPciHcDxe come
> > from if they are not defined in any spec.
> >
> > How do we know which ones are the correct ones?
>
> Hao, can you justify used values?
>
Hi Hao,
Can you please take a look at the UHS_MODE_SEL values source for eMMC?
Thanks,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-11 15:43 ` Marcin Wojtas
@ 2018-10-12 1:39 ` Wu, Hao A
2018-10-12 5:06 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Wu, Hao A @ 2018-10-12 1:39 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Ni, Ruiyu, Ard Biesheuvel, Tian, Feng, Tomasz Michalec,
Dong, Eric, edk2-devel-01, Gao, Liming, nadavh@marvell.com,
Kinney, Michael D, Zeng, Star
> -----Original Message-----
> From: Marcin Wojtas [mailto:mw@semihalf.com]
> Sent: Thursday, October 11, 2018 11:43 PM
> To: Wu, Hao A
> Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
> devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
> Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> UhsSignaling to SdMmcOverride protocol
>
> wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
> >
> > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> napisał(a):
> > >
> > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > > >>
> > > >> > -----Original Message-----
> > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> Behalf Of Ard
> > > >> > Biesheuvel
> > > >> > Sent: Monday, October 08, 2018 11:10 PM
> > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
> Liming;
> > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
> Add
> > > >> > UhsSignaling to SdMmcOverride protocol
> > > >> >
> > > ...
> > > >> >
> > > >> > I suppose this is defined by the eMMC spec.
> > > >> >
> > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > > >> > for HS200/HS400 defined by the eMMC spec?
> > > >>
> > > >> Hi Ard and Marcin,
> > > >>
> > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
> not
> > > >> mention on how to set the "UHS Mode Select" field of the Host
> Control 2
> > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
> does not
> > > >> mention Host Control 2 Register at all)
> > > >>
> > > >> When it comes to setting the bus mode for EMMC devices, the current
> > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
> setting the
> > > >> Host Control 2 Register:
> > > >>
> > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> > > >> matches
> > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> > > >>
> > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> > > >> matches
> > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> > > >>
> > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> > > >> matches
> > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> > > >>
> > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> > > >> matches
> > > >> SD None
> > > >>
> > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
> SD
> > > >> spec. The driver currently sets the "UHS Mode Select" field to a
> reserved
> > > >> value 0x5.
> > > >>
> > > >
> > > > Thank you Hao, above is on par with what the default UhsSignaling
> > > > routine does in this patch. IMO especially in case the EMMC standard
> > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > > > some way of updating HostControl2 register, depending on the
> > > > implementation. What is your opinion Ard?
> > > >
> > >
> > > I would like to know where the current values in SdMmcPciHcDxe come
> > > from if they are not defined in any spec.
> > >
> > > How do we know which ones are the correct ones?
> >
> > Hao, can you justify used values?
> >
>
> Hi Hao,
>
> Can you please take a look at the UHS_MODE_SEL values source for eMMC?
Hi Marcin,
Sorry for the delayed response.
For the current implementation of the SdMmcPciHcDxe driver, the selecting
of "UHS Mode Select" field value of the Host Control 2 Register is based
on a Max Clock Frequency & Data Rate (Single or Dual) matching
relationship between the:
A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
Specification Version 4.10
and
B. Table 4 of the EMMC Electrical Standard Spec 5.1
The matching details was included in my previous reply. The only missing
part is there seems no matching for the EMMC HS400 mode in the SD
specifications. For this case, we are currently using the same approach
with the Linux implementation, that is to set the "UHS Mode Select" to a
value of 0x5 (not standard).
Best Regards,
Hao Wu
>
> Thanks,
> Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-12 1:39 ` Wu, Hao A
@ 2018-10-12 5:06 ` Marcin Wojtas
2018-10-12 15:55 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-12 5:06 UTC (permalink / raw)
To: hao.a.wu, Ard Biesheuvel
Cc: Ni, Ruiyu, Tian, Feng, Tomasz Michalec, eric.dong, edk2-devel-01,
Gao, Liming, nadavh, Kinney, Michael D, Zeng, Star
pt., 12 paź 2018 o 03:41 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>
> > -----Original Message-----
> > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > Sent: Thursday, October 11, 2018 11:43 PM
> > To: Wu, Hao A
> > Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
> > devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> > UhsSignaling to SdMmcOverride protocol
> >
> > wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
> > >
> > > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > napisał(a):
> > > >
> > > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > > > >>
> > > > >> > -----Original Message-----
> > > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> > Behalf Of Ard
> > > > >> > Biesheuvel
> > > > >> > Sent: Monday, October 08, 2018 11:10 PM
> > > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
> > Liming;
> > > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
> > Add
> > > > >> > UhsSignaling to SdMmcOverride protocol
> > > > >> >
> > > > ...
> > > > >> >
> > > > >> > I suppose this is defined by the eMMC spec.
> > > > >> >
> > > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > > > >> > for HS200/HS400 defined by the eMMC spec?
> > > > >>
> > > > >> Hi Ard and Marcin,
> > > > >>
> > > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
> > not
> > > > >> mention on how to set the "UHS Mode Select" field of the Host
> > Control 2
> > > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
> > does not
> > > > >> mention Host Control 2 Register at all)
> > > > >>
> > > > >> When it comes to setting the bus mode for EMMC devices, the current
> > > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
> > setting the
> > > > >> Host Control 2 Register:
> > > > >>
> > > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> > > > >> matches
> > > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> > > > >>
> > > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> > > > >> matches
> > > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> > > > >>
> > > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> > > > >> matches
> > > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> > > > >>
> > > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> > > > >> matches
> > > > >> SD None
> > > > >>
> > > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
> > SD
> > > > >> spec. The driver currently sets the "UHS Mode Select" field to a
> > reserved
> > > > >> value 0x5.
> > > > >>
> > > > >
> > > > > Thank you Hao, above is on par with what the default UhsSignaling
> > > > > routine does in this patch. IMO especially in case the EMMC standard
> > > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > > > > some way of updating HostControl2 register, depending on the
> > > > > implementation. What is your opinion Ard?
> > > > >
> > > >
> > > > I would like to know where the current values in SdMmcPciHcDxe come
> > > > from if they are not defined in any spec.
> > > >
> > > > How do we know which ones are the correct ones?
> > >
> > > Hao, can you justify used values?
> > >
> >
> > Hi Hao,
> >
> > Can you please take a look at the UHS_MODE_SEL values source for eMMC?
>
> Hi Marcin,
>
> Sorry for the delayed response.
>
> For the current implementation of the SdMmcPciHcDxe driver, the selecting
> of "UHS Mode Select" field value of the Host Control 2 Register is based
> on a Max Clock Frequency & Data Rate (Single or Dual) matching
> relationship between the:
>
> A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
> Specification Version 4.10
>
> and
>
> B. Table 4 of the EMMC Electrical Standard Spec 5.1
>
> The matching details was included in my previous reply. The only missing
> part is there seems no matching for the EMMC HS400 mode in the SD
> specifications. For this case, we are currently using the same approach
> with the Linux implementation, that is to set the "UHS Mode Select" to a
> value of 0x5 (not standard).
>
Hao,
Thanks a lot for the clarification.
Ard,
Knowing the numbers details, what is your view of the UhsSignaling handling?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-12 5:06 ` Marcin Wojtas
@ 2018-10-12 15:55 ` Ard Biesheuvel
2018-10-12 16:04 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-12 15:55 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Wu, Hao A, Ni, Ruiyu, Tian, Feng, Tomasz Michalec, Eric Dong,
edk2-devel-01, Gao, Liming, Nadav Haklai, Kinney, Michael D,
Zeng, Star
On 12 October 2018 at 07:06, Marcin Wojtas <mw@semihalf.com> wrote:
> pt., 12 paź 2018 o 03:41 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>>
>> > -----Original Message-----
>> > From: Marcin Wojtas [mailto:mw@semihalf.com]
>> > Sent: Thursday, October 11, 2018 11:43 PM
>> > To: Wu, Hao A
>> > Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
>> > devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
>> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
>> > UhsSignaling to SdMmcOverride protocol
>> >
>> > wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
>> > >
>> > > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> > napisał(a):
>> > > >
>> > > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
>> > > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>> > > > >>
>> > > > >> > -----Original Message-----
>> > > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
>> > Behalf Of Ard
>> > > > >> > Biesheuvel
>> > > > >> > Sent: Monday, October 08, 2018 11:10 PM
>> > > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
>> > > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
>> > Liming;
>> > > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
>> > > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
>> > Add
>> > > > >> > UhsSignaling to SdMmcOverride protocol
>> > > > >> >
>> > > > ...
>> > > > >> >
>> > > > >> > I suppose this is defined by the eMMC spec.
>> > > > >> >
>> > > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
>> > > > >> > for HS200/HS400 defined by the eMMC spec?
>> > > > >>
>> > > > >> Hi Ard and Marcin,
>> > > > >>
>> > > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
>> > not
>> > > > >> mention on how to set the "UHS Mode Select" field of the Host
>> > Control 2
>> > > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
>> > does not
>> > > > >> mention Host Control 2 Register at all)
>> > > > >>
>> > > > >> When it comes to setting the bus mode for EMMC devices, the current
>> > > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
>> > setting the
>> > > > >> Host Control 2 Register:
>> > > > >>
>> > > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
>> > > > >> matches
>> > > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
>> > > > >>
>> > > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
>> > > > >> matches
>> > > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
>> > > > >>
>> > > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
>> > > > >> matches
>> > > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
>> > > > >>
>> > > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
>> > > > >> matches
>> > > > >> SD None
>> > > > >>
>> > > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
>> > SD
>> > > > >> spec. The driver currently sets the "UHS Mode Select" field to a
>> > reserved
>> > > > >> value 0x5.
>> > > > >>
>> > > > >
>> > > > > Thank you Hao, above is on par with what the default UhsSignaling
>> > > > > routine does in this patch. IMO especially in case the EMMC standard
>> > > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
>> > > > > some way of updating HostControl2 register, depending on the
>> > > > > implementation. What is your opinion Ard?
>> > > > >
>> > > >
>> > > > I would like to know where the current values in SdMmcPciHcDxe come
>> > > > from if they are not defined in any spec.
>> > > >
>> > > > How do we know which ones are the correct ones?
>> > >
>> > > Hao, can you justify used values?
>> > >
>> >
>> > Hi Hao,
>> >
>> > Can you please take a look at the UHS_MODE_SEL values source for eMMC?
>>
>> Hi Marcin,
>>
>> Sorry for the delayed response.
>>
>> For the current implementation of the SdMmcPciHcDxe driver, the selecting
>> of "UHS Mode Select" field value of the Host Control 2 Register is based
>> on a Max Clock Frequency & Data Rate (Single or Dual) matching
>> relationship between the:
>>
>> A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
>> Specification Version 4.10
>>
>> and
>>
>> B. Table 4 of the EMMC Electrical Standard Spec 5.1
>>
>> The matching details was included in my previous reply. The only missing
>> part is there seems no matching for the EMMC HS400 mode in the SD
>> specifications. For this case, we are currently using the same approach
>> with the Linux implementation, that is to set the "UHS Mode Select" to a
>> value of 0x5 (not standard).
>>
>
> Hao,
>
> Thanks a lot for the clarification.
>
> Ard,
>
> Knowing the numbers details, what is your view of the UhsSignaling handling?
>
I think it makes sense to be able to override the SD->MMC mapping for
HC2 attributes. But it seems to me that this mapping is rather ad-hoc
and so it should apply to all configuration that is inferred:
UhsSignalling does not quite cover it.
So I think the approach is correct, but we need a better name.
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-12 15:55 ` Ard Biesheuvel
@ 2018-10-12 16:04 ` Marcin Wojtas
2018-10-12 16:24 ` Ard Biesheuvel
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-12 16:04 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: hao.a.wu, Ni, Ruiyu, Tian, Feng, Tomasz Michalec, eric.dong,
edk2-devel-01, Gao, Liming, nadavh, Kinney, Michael D, Zeng, Star
pt., 12 paź 2018 o 17:55 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On 12 October 2018 at 07:06, Marcin Wojtas <mw@semihalf.com> wrote:
> > pt., 12 paź 2018 o 03:41 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> >>
> >> > -----Original Message-----
> >> > From: Marcin Wojtas [mailto:mw@semihalf.com]
> >> > Sent: Thursday, October 11, 2018 11:43 PM
> >> > To: Wu, Hao A
> >> > Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
> >> > devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
> >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> >> > UhsSignaling to SdMmcOverride protocol
> >> >
> >> > wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
> >> > >
> >> > > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> > napisał(a):
> >> > > >
> >> > > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> >> > > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> >> > > > >>
> >> > > > >> > -----Original Message-----
> >> > > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> >> > Behalf Of Ard
> >> > > > >> > Biesheuvel
> >> > > > >> > Sent: Monday, October 08, 2018 11:10 PM
> >> > > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> >> > > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
> >> > Liming;
> >> > > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> >> > > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
> >> > Add
> >> > > > >> > UhsSignaling to SdMmcOverride protocol
> >> > > > >> >
> >> > > > ...
> >> > > > >> >
> >> > > > >> > I suppose this is defined by the eMMC spec.
> >> > > > >> >
> >> > > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> >> > > > >> > for HS200/HS400 defined by the eMMC spec?
> >> > > > >>
> >> > > > >> Hi Ard and Marcin,
> >> > > > >>
> >> > > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
> >> > not
> >> > > > >> mention on how to set the "UHS Mode Select" field of the Host
> >> > Control 2
> >> > > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
> >> > does not
> >> > > > >> mention Host Control 2 Register at all)
> >> > > > >>
> >> > > > >> When it comes to setting the bus mode for EMMC devices, the current
> >> > > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
> >> > setting the
> >> > > > >> Host Control 2 Register:
> >> > > > >>
> >> > > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> >> > > > >> matches
> >> > > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> >> > > > >>
> >> > > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> >> > > > >> matches
> >> > > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> >> > > > >>
> >> > > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> >> > > > >> matches
> >> > > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> >> > > > >>
> >> > > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> >> > > > >> matches
> >> > > > >> SD None
> >> > > > >>
> >> > > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
> >> > SD
> >> > > > >> spec. The driver currently sets the "UHS Mode Select" field to a
> >> > reserved
> >> > > > >> value 0x5.
> >> > > > >>
> >> > > > >
> >> > > > > Thank you Hao, above is on par with what the default UhsSignaling
> >> > > > > routine does in this patch. IMO especially in case the EMMC standard
> >> > > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> >> > > > > some way of updating HostControl2 register, depending on the
> >> > > > > implementation. What is your opinion Ard?
> >> > > > >
> >> > > >
> >> > > > I would like to know where the current values in SdMmcPciHcDxe come
> >> > > > from if they are not defined in any spec.
> >> > > >
> >> > > > How do we know which ones are the correct ones?
> >> > >
> >> > > Hao, can you justify used values?
> >> > >
> >> >
> >> > Hi Hao,
> >> >
> >> > Can you please take a look at the UHS_MODE_SEL values source for eMMC?
> >>
> >> Hi Marcin,
> >>
> >> Sorry for the delayed response.
> >>
> >> For the current implementation of the SdMmcPciHcDxe driver, the selecting
> >> of "UHS Mode Select" field value of the Host Control 2 Register is based
> >> on a Max Clock Frequency & Data Rate (Single or Dual) matching
> >> relationship between the:
> >>
> >> A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
> >> Specification Version 4.10
> >>
> >> and
> >>
> >> B. Table 4 of the EMMC Electrical Standard Spec 5.1
> >>
> >> The matching details was included in my previous reply. The only missing
> >> part is there seems no matching for the EMMC HS400 mode in the SD
> >> specifications. For this case, we are currently using the same approach
> >> with the Linux implementation, that is to set the "UHS Mode Select" to a
> >> value of 0x5 (not standard).
> >>
> >
> > Hao,
> >
> > Thanks a lot for the clarification.
> >
> > Ard,
> >
> > Knowing the numbers details, what is your view of the UhsSignaling handling?
> >
>
> I think it makes sense to be able to override the SD->MMC mapping for
> HC2 attributes. But it seems to me that this mapping is rather ad-hoc
> and so it should apply to all configuration that is inferred:
> UhsSignalling does not quite cover it.
>
> So I think the approach is correct, but we need a better name.
Do you mean to update more fields in HC2 than UHS_MODE_SEL?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-12 16:04 ` Marcin Wojtas
@ 2018-10-12 16:24 ` Ard Biesheuvel
2018-10-12 16:49 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Ard Biesheuvel @ 2018-10-12 16:24 UTC (permalink / raw)
To: Marcin Wojtas
Cc: Gao, Liming, Kinney, Michael D, Ni, Ruiyu, Tian, Feng,
Tomasz Michalec, Zeng, Star, edk2-devel-01, Eric Dong, Wu, Hao A,
Nadav Haklai
On Fri 12 Oct 2018 at 18:04, Marcin Wojtas <mw@semihalf.com> wrote:
>
> pt., 12 paź 2018 o 17:55 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> >
> > On 12 October 2018 at 07:06, Marcin Wojtas <mw@semihalf.com> wrote:
> > > pt., 12 paź 2018 o 03:41 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > >>
> > >> > -----Original Message-----
> > >> > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > >> > Sent: Thursday, October 11, 2018 11:43 PM
> > >> > To: Wu, Hao A
> > >> > Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
> > >> > devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
> > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> > >> > UhsSignaling to SdMmcOverride protocol
> > >> >
> > >> > wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
> > >> > >
> > >> > > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >> > napisał(a):
> > >> > > >
> > >> > > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > >> > > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > >> > > > >>
> > >> > > > >> > -----Original Message-----
> > >> > > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> > >> > Behalf Of Ard
> > >> > > > >> > Biesheuvel
> > >> > > > >> > Sent: Monday, October 08, 2018 11:10 PM
> > >> > > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > >> > > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
> > >> > Liming;
> > >> > > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > >> > > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
> > >> > Add
> > >> > > > >> > UhsSignaling to SdMmcOverride protocol
> > >> > > > >> >
> > >> > > > ...
> > >> > > > >> >
> > >> > > > >> > I suppose this is defined by the eMMC spec.
> > >> > > > >> >
> > >> > > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > >> > > > >> > for HS200/HS400 defined by the eMMC spec?
> > >> > > > >>
> > >> > > > >> Hi Ard and Marcin,
> > >> > > > >>
> > >> > > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
> > >> > not
> > >> > > > >> mention on how to set the "UHS Mode Select" field of the Host
> > >> > Control 2
> > >> > > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
> > >> > does not
> > >> > > > >> mention Host Control 2 Register at all)
> > >> > > > >>
> > >> > > > >> When it comes to setting the bus mode for EMMC devices, the current
> > >> > > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
> > >> > setting the
> > >> > > > >> Host Control 2 Register:
> > >> > > > >>
> > >> > > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> > >> > > > >> matches
> > >> > > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> > >> > > > >>
> > >> > > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> > >> > > > >> matches
> > >> > > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> > >> > > > >>
> > >> > > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> > >> > > > >> matches
> > >> > > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> > >> > > > >>
> > >> > > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> > >> > > > >> matches
> > >> > > > >> SD None
> > >> > > > >>
> > >> > > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
> > >> > SD
> > >> > > > >> spec. The driver currently sets the "UHS Mode Select" field to a
> > >> > reserved
> > >> > > > >> value 0x5.
> > >> > > > >>
> > >> > > > >
> > >> > > > > Thank you Hao, above is on par with what the default UhsSignaling
> > >> > > > > routine does in this patch. IMO especially in case the EMMC standard
> > >> > > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > >> > > > > some way of updating HostControl2 register, depending on the
> > >> > > > > implementation. What is your opinion Ard?
> > >> > > > >
> > >> > > >
> > >> > > > I would like to know where the current values in SdMmcPciHcDxe come
> > >> > > > from if they are not defined in any spec.
> > >> > > >
> > >> > > > How do we know which ones are the correct ones?
> > >> > >
> > >> > > Hao, can you justify used values?
> > >> > >
> > >> >
> > >> > Hi Hao,
> > >> >
> > >> > Can you please take a look at the UHS_MODE_SEL values source for eMMC?
> > >>
> > >> Hi Marcin,
> > >>
> > >> Sorry for the delayed response.
> > >>
> > >> For the current implementation of the SdMmcPciHcDxe driver, the selecting
> > >> of "UHS Mode Select" field value of the Host Control 2 Register is based
> > >> on a Max Clock Frequency & Data Rate (Single or Dual) matching
> > >> relationship between the:
> > >>
> > >> A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
> > >> Specification Version 4.10
> > >>
> > >> and
> > >>
> > >> B. Table 4 of the EMMC Electrical Standard Spec 5.1
> > >>
> > >> The matching details was included in my previous reply. The only missing
> > >> part is there seems no matching for the EMMC HS400 mode in the SD
> > >> specifications. For this case, we are currently using the same approach
> > >> with the Linux implementation, that is to set the "UHS Mode Select" to a
> > >> value of 0x5 (not standard).
> > >>
> > >
> > > Hao,
> > >
> > > Thanks a lot for the clarification.
> > >
> > > Ard,
> > >
> > > Knowing the numbers details, what is your view of the UhsSignaling handling?
> > >
> >
> > I think it makes sense to be able to override the SD->MMC mapping for
> > HC2 attributes. But it seems to me that this mapping is rather ad-hoc
> > and so it should apply to all configuration that is inferred:
> > UhsSignalling does not quite cover it.
> >
> > So I think the approach is correct, but we need a better name.
>
> Do you mean to update more fields in HC2 than UHS_MODE_SEL?
AIUI the EMMC spec does not mention HC2 at all, and yet we have to set
it to a sane value, and we are currently using fuzzy logic for it.
Or are the other fields less ambiguous?
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-12 16:24 ` Ard Biesheuvel
@ 2018-10-12 16:49 ` Marcin Wojtas
0 siblings, 0 replies; 47+ messages in thread
From: Marcin Wojtas @ 2018-10-12 16:49 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: Gao, Liming, Kinney, Michael D, Ni, Ruiyu, Tian, Feng,
Tomasz Michalec, Zeng, Star, edk2-devel-01, eric.dong, hao.a.wu,
nadavh
pt., 12 paź 2018 o 18:24 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
>
> On Fri 12 Oct 2018 at 18:04, Marcin Wojtas <mw@semihalf.com> wrote:
> >
> > pt., 12 paź 2018 o 17:55 Ard Biesheuvel <ard.biesheuvel@linaro.org> napisał(a):
> > >
> > > On 12 October 2018 at 07:06, Marcin Wojtas <mw@semihalf.com> wrote:
> > > > pt., 12 paź 2018 o 03:41 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > > >>
> > > >> > -----Original Message-----
> > > >> > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > > >> > Sent: Thursday, October 11, 2018 11:43 PM
> > > >> > To: Wu, Hao A
> > > >> > Cc: Ni, Ruiyu; Ard Biesheuvel; Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-
> > > >> > devel-01; Gao, Liming; nadavh@marvell.com; Kinney, Michael D; Zeng, Star
> > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> > > >> > UhsSignaling to SdMmcOverride protocol
> > > >> >
> > > >> > wt., 9 paź 2018 o 13:51 Marcin Wojtas <mw@semihalf.com> napisał(a):
> > > >> > >
> > > >> > > wt., 9 paź 2018 o 13:45 Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > > >> > napisał(a):
> > > >> > > >
> > > >> > > > On 9 October 2018 at 13:32, Marcin Wojtas <mw@semihalf.com> wrote:
> > > >> > > > > wt., 9 paź 2018 o 13:28 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > > >> > > > >>
> > > >> > > > >> > -----Original Message-----
> > > >> > > > >> > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On
> > > >> > Behalf Of Ard
> > > >> > > > >> > Biesheuvel
> > > >> > > > >> > Sent: Monday, October 08, 2018 11:10 PM
> > > >> > > > >> > To: Marcin Wojtas; Ni, Ruiyu; Wu, Hao A
> > > >> > > > >> > Cc: Tian, Feng; Tomasz Michalec; Dong, Eric; edk2-devel-01; Gao,
> > > >> > Liming;
> > > >> > > > >> > Nadav Haklai; Kinney, Michael D; Zeng, Star
> > > >> > > > >> > Subject: Re: [edk2] [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe:
> > > >> > Add
> > > >> > > > >> > UhsSignaling to SdMmcOverride protocol
> > > >> > > > >> >
> > > >> > > > ...
> > > >> > > > >> >
> > > >> > > > >> > I suppose this is defined by the eMMC spec.
> > > >> > > > >> >
> > > >> > > > >> > Ruiyu, Hao, could you clarify? Are the host control 2 register values
> > > >> > > > >> > for HS200/HS400 defined by the eMMC spec?
> > > >> > > > >>
> > > >> > > > >> Hi Ard and Marcin,
> > > >> > > > >>
> > > >> > > > >> As far as I know, the EMMC Electrical Standard Spec 5.1 (latest) does
> > > >> > not
> > > >> > > > >> mention on how to set the "UHS Mode Select" field of the Host
> > > >> > Control 2
> > > >> > > > >> Register when switching to HS200/HS400. (Actually, the EMMC spec
> > > >> > does not
> > > >> > > > >> mention Host Control 2 Register at all)
> > > >> > > > >>
> > > >> > > > >> When it comes to setting the bus mode for EMMC devices, the current
> > > >> > > > >> implementation of the SdMmcPciHcDxe driver does a mapping when
> > > >> > setting the
> > > >> > > > >> Host Control 2 Register:
> > > >> > > > >>
> > > >> > > > >> EMMC High Speed SDR - Freq: 0-52 MHz, Data Rate: Single
> > > >> > > > >> matches
> > > >> > > > >> SD SDR25 - Freq: 0-50 MHz, Data Rate: Single
> > > >> > > > >>
> > > >> > > > >> EMMC High Speed DDR - Freq: 0-52 MHz, Data Rate: Dual
> > > >> > > > >> matches
> > > >> > > > >> SD DDR50 - Freq: 0-50 MHz, Data Rate: Dual
> > > >> > > > >>
> > > >> > > > >> EMMC HS200 - Freq: 0-200 MHz, Data Rate: Single
> > > >> > > > >> matches
> > > >> > > > >> SD SDR104 - Freq: 0-208 MHz, Data Rate: Single
> > > >> > > > >>
> > > >> > > > >> EMMC HS400 - Freq: 0-200 MHz, Data Rate: Dual
> > > >> > > > >> matches
> > > >> > > > >> SD None
> > > >> > > > >>
> > > >> > > > >> And there is no obvious counterpart for the EMMC HS400 mode in the
> > > >> > SD
> > > >> > > > >> spec. The driver currently sets the "UHS Mode Select" field to a
> > > >> > reserved
> > > >> > > > >> value 0x5.
> > > >> > > > >>
> > > >> > > > >
> > > >> > > > > Thank you Hao, above is on par with what the default UhsSignaling
> > > >> > > > > routine does in this patch. IMO especially in case the EMMC standard
> > > >> > > > > is not unequivocal regarding UHS_MODE_SEL, I'd encourage to accept
> > > >> > > > > some way of updating HostControl2 register, depending on the
> > > >> > > > > implementation. What is your opinion Ard?
> > > >> > > > >
> > > >> > > >
> > > >> > > > I would like to know where the current values in SdMmcPciHcDxe come
> > > >> > > > from if they are not defined in any spec.
> > > >> > > >
> > > >> > > > How do we know which ones are the correct ones?
> > > >> > >
> > > >> > > Hao, can you justify used values?
> > > >> > >
> > > >> >
> > > >> > Hi Hao,
> > > >> >
> > > >> > Can you please take a look at the UHS_MODE_SEL values source for eMMC?
> > > >>
> > > >> Hi Marcin,
> > > >>
> > > >> Sorry for the delayed response.
> > > >>
> > > >> For the current implementation of the SdMmcPciHcDxe driver, the selecting
> > > >> of "UHS Mode Select" field value of the Host Control 2 Register is based
> > > >> on a Max Clock Frequency & Data Rate (Single or Dual) matching
> > > >> relationship between the:
> > > >>
> > > >> A. Table 3-6 of the SD Specifications Part 1 Physical Layer Simplified
> > > >> Specification Version 4.10
> > > >>
> > > >> and
> > > >>
> > > >> B. Table 4 of the EMMC Electrical Standard Spec 5.1
> > > >>
> > > >> The matching details was included in my previous reply. The only missing
> > > >> part is there seems no matching for the EMMC HS400 mode in the SD
> > > >> specifications. For this case, we are currently using the same approach
> > > >> with the Linux implementation, that is to set the "UHS Mode Select" to a
> > > >> value of 0x5 (not standard).
> > > >>
> > > >
> > > > Hao,
> > > >
> > > > Thanks a lot for the clarification.
> > > >
> > > > Ard,
> > > >
> > > > Knowing the numbers details, what is your view of the UhsSignaling handling?
> > > >
> > >
> > > I think it makes sense to be able to override the SD->MMC mapping for
> > > HC2 attributes. But it seems to me that this mapping is rather ad-hoc
> > > and so it should apply to all configuration that is inferred:
> > > UhsSignalling does not quite cover it.
> > >
> > > So I think the approach is correct, but we need a better name.
> >
> > Do you mean to update more fields in HC2 than UHS_MODE_SEL?
>
> AIUI the EMMC spec does not mention HC2 at all, and yet we have to set
> it to a sane value, and we are currently using fuzzy logic for it.
> Or are the other fields less ambiguous?
I don't think so. How about renaming the phase type to:
EdkiiSdMmcBusSpeedModeSelect?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread
* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-10-05 13:25 ` [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol Marcin Wojtas
2018-10-05 15:12 ` Philippe Mathieu-Daudé
2018-10-08 12:41 ` Ard Biesheuvel
@ 2018-11-01 7:04 ` Wu, Hao A
2018-11-02 8:21 ` Marcin Wojtas
2 siblings, 1 reply; 47+ messages in thread
From: Wu, Hao A @ 2018-11-01 7:04 UTC (permalink / raw)
To: 'Marcin Wojtas', edk2-devel@lists.01.org
Cc: Kinney, Michael D, Gao, Liming, leif.lindholm@linaro.org,
ard.biesheuvel@linaro.org, nadavh@marvell.com, jsd@semihalf.com,
tm@semihalf.com
Hi Marcin,
> -----Original Message-----
> From: Marcin Wojtas [mailto:mw@semihalf.com]
> Sent: Friday, October 05, 2018 9:25 PM
> To: edk2-devel@lists.01.org
> Cc: Tian, Feng; Kinney, Michael D; Gao, Liming; leif.lindholm@linaro.org; Wu,
> Hao A; ard.biesheuvel@linaro.org; nadavh@marvell.com;
> mw@semihalf.com; jsd@semihalf.com; tm@semihalf.com
> Subject: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling
> to SdMmcOverride protocol
>
> From: Tomasz Michalec <tm@semihalf.com>
>
> Some SD Host Controlers use different values in Host Control 2 Register
> to select UHS Mode. This patch adds a new UhsSignaling type routine to
> the NotifyPhase of the SdMmcOverride protocol.
>
> UHS signaling configuration is moved to a common, default routine
> (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> cover this functionality.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> ++++++++++++--------
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> 5 files changed, 243 insertions(+), 68 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> index e389d52..a03160d 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> #define SD_MMC_HC_CTRL_VER 0xFE
>
> //
> +// SD Host Controler bits to HOST_CTRL2 register
> +//
> +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
I think SD_MMC_HC_CTRL_MMC_SDR50 is not needed here.
Since according to the SD Physical Layer Simplified Specification, max clock
frequency for SD bus mode SDR50 is 100MHz. And there is no eMMC bus mode whose
max clock frequency is at 100MHz in Embedded Multi-Media Card Electrical
Standard (5.1).
> +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> +#define SD_MMC_HC_CTRL_HS200 0x0003
> +#define SD_MMC_HC_CTRL_HS400 0x0005
How about the below renames & reorder?
SD_MMC_HC_CTRL_MMC_LEGACY 0x0000
SD_MMC_HC_CTRL_MMC_HS_SDR 0x0001
SD_MMC_HC_CTRL_MMC_HS_DDR 0x0004
SD_MMC_HC_CTRL_MMC_HS200 0x0003
SD_MMC_HC_CTRL_MMC_HS400 0x0005
> +
> +//
> +// Timing modes for uhs
> +//
> +typedef enum {
> + SdMmcUhsSdr12,
> + SdMmcUhsSdr25,
> + SdMmcUhsSdr50,
> + SdMmcUhsSdr104,
> + SdMmcUhsDdr50,
> + SdMmcMmcDdr52,
> + SdMmcMmcSdr50,
> + SdMmcMmcSdr25,
> + SdMmcMmcSdr12,
> + SdMmcMmcHs200,
> + SdMmcMmcHs400,
> +} SD_MMC_UHS_TIMING;
Suggest a similar drop of 'SdMmcMmcSdr50' and rename according to the above
comments upon HOST_CTRL2 register value definitions. Also, how about a rename
for enum to SD_MMC_BUS_MODE?
> +
> +//
> // The transfer modes supported by SD Host Controller
> // Simplified Spec 3.0 Table 1-2
> //
> @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> IN UINT8 Slot
> );
>
> +/**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + );
> +
> #endif
> diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> index 178945f..25db98a 100644
> --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> @@ -17,6 +17,7 @@
> #ifndef __SD_MMC_OVERRIDE_H__
> #define __SD_MMC_OVERRIDE_H__
>
> +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
Please do not expose a module private header file here.
One approach comes to me is to keep the SD/MMC bus mode enumeration structure
in this protocol header file. SdMmcPciHcDxe driver and producers of the
Override protocol keep a version of the HOST_CTRL2 register value macros of
their own.
> #include <Protocol/SdMmcPassThru.h>
>
> #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> @@ -31,6 +32,7 @@ typedef enum {
> EdkiiSdMmcResetPost,
> EdkiiSdMmcInitHostPre,
> EdkiiSdMmcInitHostPost,
> + EdkiiSdMmcUhsSignaling,
> } EDKII_SD_MMC_PHASE_TYPE;
>
> /**
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> index c5fd214..05bd4a0 100755
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT8 HostCtrl1;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> if (EFI_ERROR (Status)) {
> @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> return Status;
> }
>
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> - //
> if (IsDdr) {
> - HostCtrl2 = BIT2;
> + Timing = SdMmcMmcDdr52;
> } else if (ClockFreq == 52) {
> - HostCtrl2 = BIT0;
> + Timing = SdMmcMmcSdr50;
> + } else if (ClockFreq == 26) {
> + Timing = SdMmcMmcSdr25;
> } else {
> - HostCtrl2 = 0;
> + Timing = SdMmcMmcSdr12;
> }
As mentioned above, "SdMmcMmcSdr50" can be dropped here.
And considering the rename above, how about:
if (IsDdr) {
Timing = SdMmcMmcHsDdr;
} else if (ClockFreq == 52) {
Timing = SdMmcMmcHsSdr;
} else {
Timing = SdMmcMmcLegacy;
}
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
I have concern for this, current existing hook points for the NotifyPhase()
service are performing additional operations during the controller
initialization process.
Producer of the override protocol can simply return EFI_SUCCESS, if there is
nothing to do for a specific hook point.
But this hook here is to override the behavior when setting the "UHS Mode
Select" field of Host Control 2 Register. If the override protocol producer
does not want to override the behavior at the 'EdkiiSdMmcUhsSignaling' hook,
but has to do something in other hooks, one cannot directly return EFI_SUCCESS
for the 'EdkiiSdMmcUhsSignaling' hook. For this case, one has to implement the
'EdkiiSdMmcUhsSignaling' hook even if the behavior will be exactly the same as
the SdMmcPciHcDxe driver.
Best Regards,
Hao Wu
>
> HsTiming = 1;
> @@ -814,10 +827,13 @@ EmmcSwitchToHS200 (
> IN UINT8 BusWidth
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> - UINT16 ClockCtrl;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + UINT16 ClockCtrl;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> if ((BusWidth != 4) && (BusWidth != 8)) {
> return EFI_INVALID_PARAMETER;
> @@ -837,21 +853,30 @@ EmmcSwitchToHS200 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to SDR104
> - //
> - HostCtrl2 = BIT0 | BIT1;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs200;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
> //
> // Wait Internal Clock Stable in the Clock Control register to be 1 before set
> SD Clock Enable bit
> @@ -910,9 +935,12 @@ EmmcSwitchToHS400 (
> IN UINT32 ClockFreq
> )
> {
> - EFI_STATUS Status;
> - UINT8 HsTiming;
> - UINT8 HostCtrl2;
> + EFI_STATUS Status;
> + UINT8 HsTiming;
> + SD_MMC_UHS_TIMING Timing;
> + SD_MMC_HC_PRIVATE_DATA *Private;
> +
> + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
>
> Status = EmmcSwitchToHS200 (PciIo, PassThru, Slot, Rca, ClockFreq, 8);
> if (EFI_ERROR (Status)) {
> @@ -933,21 +961,30 @@ EmmcSwitchToHS400 (
> if (EFI_ERROR (Status)) {
> return Status;
> }
> - //
> - // Clean UHS Mode Select field of Host Control 2 reigster before update
> - //
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - //
> - // Set UHS Mode Select field of Host Control 2 reigster to HS400
> - //
> - HostCtrl2 = BIT0 | BIT2;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> +
> + Timing = SdMmcMmcHs400;
> +
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> HsTiming = 3;
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> index 8c93933..5645a71 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c
> @@ -784,8 +784,8 @@ SdCardSetBusMode (
> UINT8 BusWidth;
> UINT8 AccessMode;
> UINT8 HostCtrl1;
> - UINT8 HostCtrl2;
> UINT8 SwitchResp[64];
> + SD_MMC_UHS_TIMING Timing;
> SD_MMC_HC_PRIVATE_DATA *Private;
>
> Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> @@ -817,18 +817,23 @@ SdCardSetBusMode (
> if (S18A && (Capability->Sdr104 != 0) && ((SwitchResp[13] & BIT3) != 0)) {
> ClockFreq = 208;
> AccessMode = 3;
> + Timing = SdMmcUhsSdr104;
> } else if (S18A && (Capability->Sdr50 != 0) && ((SwitchResp[13] & BIT2) != 0))
> {
> ClockFreq = 100;
> AccessMode = 2;
> + Timing = SdMmcUhsSdr50;
> } else if (S18A && (Capability->Ddr50 != 0) && ((SwitchResp[13] & BIT4) !=
> 0)) {
> ClockFreq = 50;
> AccessMode = 4;
> + Timing = SdMmcUhsDdr50;
> } else if ((SwitchResp[13] & BIT1) != 0) {
> ClockFreq = 50;
> AccessMode = 1;
> + Timing = SdMmcUhsSdr25;
> } else {
> ClockFreq = 25;
> AccessMode = 0;
> + Timing = SdMmcUhsSdr12;
> }
>
> Status = SdCardSwitch (PassThru, Slot, AccessMode, 0xF, 0xF, 0xF, TRUE,
> SwitchResp);
> @@ -854,15 +859,27 @@ SdCardSetBusMode (
> }
> }
>
> - HostCtrl2 = (UINT8)~0x7;
> - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> - }
> - HostCtrl2 = AccessMode;
> - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> (HostCtrl2), &HostCtrl2);
> - if (EFI_ERROR (Status)) {
> - return Status;
> + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> + Status = mOverride->NotifyPhase (
> + Private->ControllerHandle,
> + Slot,
> + EdkiiSdMmcUhsSignaling,
> + &Timing
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((
> + DEBUG_ERROR,
> + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> + __FUNCTION__,
> + Status
> + ));
> + return Status;
> + }
> + } else {
> + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> }
>
> Status = SdMmcHcClockSupply (PciIo, Slot, ClockFreq * 1000, *Capability);
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> index 02eb4ad..38d6202 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> @@ -1137,6 +1137,75 @@ SdMmcHcInitHost (
> }
>
> /**
> + Set SD Host Controler control 2 registry according to selected speed.
> +
> + @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] Timing The timing to select.
> +
> + @retval EFI_SUCCESS The timing is set successfully.
> + @retval Others The timing isn't set successfully.
> +**/
> +EFI_STATUS
> +SdMmcHcUhsSignaling (
> + IN EFI_PCI_IO_PROTOCOL *PciIo,
> + IN UINT8 Slot,
> + IN SD_MMC_UHS_TIMING Timing
> + )
> +{
> + EFI_STATUS Status;
> + UINT8 HostCtrl2;
> +
> + HostCtrl2 = (UINT8)~SD_MMC_HC_CTRL_UHS_MASK;
> + Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof (HostCtrl2), &HostCtrl2);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> +
> + switch (Timing) {
> + case SdMmcUhsSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR12;
> + break;
> + case SdMmcUhsSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR25;
> + break;
> + case SdMmcUhsSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR50;
> + break;
> + case SdMmcUhsSdr104:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_SDR104;
> + break;
> + case SdMmcUhsDdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_UHS_DDR50;
> + break;
> + case SdMmcMmcDdr52:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_DDR52;
> + break;
> + case SdMmcMmcSdr50:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR50;
> + break;
> + case SdMmcMmcSdr25:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR25;
> + break;
> + case SdMmcMmcSdr12:
> + HostCtrl2 = SD_MMC_HC_CTRL_MMC_SDR12;
> + break;
> + case SdMmcMmcHs200:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS200;
> + break;
> + case SdMmcMmcHs400:
> + HostCtrl2 = SD_MMC_HC_CTRL_HS400;
> + break;
> + default:
> + HostCtrl2 = 0;
> + break;
> + }
> + Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> (HostCtrl2), &HostCtrl2);
> +
> + return Status;
> +}
> +
> +/**
> Turn on/off LED.
>
> @param[in] PciIo The PCI IO protocol instance.
> --
> 2.7.4
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-11-01 7:04 ` Wu, Hao A
@ 2018-11-02 8:21 ` Marcin Wojtas
2018-11-02 12:16 ` Marcin Wojtas
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-11-02 8:21 UTC (permalink / raw)
To: hao.a.wu
Cc: edk2-devel-01, Kinney, Michael D, Gao, Liming, Leif Lindholm,
Ard Biesheuvel, nadavh, jsd@semihalf.com, Tomasz Michalec
Hi Hao,
czw., 1 lis 2018 o 08:06 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
>
> Hi Marcin,
>
> > -----Original Message-----
> > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > Sent: Friday, October 05, 2018 9:25 PM
> > To: edk2-devel@lists.01.org
> > Cc: Tian, Feng; Kinney, Michael D; Gao, Liming; leif.lindholm@linaro.org; Wu,
> > Hao A; ard.biesheuvel@linaro.org; nadavh@marvell.com;
> > mw@semihalf.com; jsd@semihalf.com; tm@semihalf.com
> > Subject: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling
> > to SdMmcOverride protocol
> >
> > From: Tomasz Michalec <tm@semihalf.com>
> >
> > Some SD Host Controlers use different values in Host Control 2 Register
> > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> > the NotifyPhase of the SdMmcOverride protocol.
> >
> > UHS signaling configuration is moved to a common, default routine
> > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> > cover this functionality.
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > ---
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> > ++++++++++++--------
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> > 5 files changed, 243 insertions(+), 68 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > index e389d52..a03160d 100644
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> > ANY KIND, EITHER EXPRESS OR IMPLIED.
> > #define SD_MMC_HC_CTRL_VER 0xFE
> >
> > //
> > +// SD Host Controler bits to HOST_CTRL2 register
> > +//
> > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
>
> I think SD_MMC_HC_CTRL_MMC_SDR50 is not needed here.
>
> Since according to the SD Physical Layer Simplified Specification, max clock
> frequency for SD bus mode SDR50 is 100MHz. And there is no eMMC bus mode whose
> max clock frequency is at 100MHz in Embedded Multi-Media Card Electrical
> Standard (5.1).
Ok, will drop it.
>
> > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > +#define SD_MMC_HC_CTRL_HS400 0x0005
>
> How about the below renames & reorder?
>
> SD_MMC_HC_CTRL_MMC_LEGACY 0x0000
> SD_MMC_HC_CTRL_MMC_HS_SDR 0x0001
> SD_MMC_HC_CTRL_MMC_HS_DDR 0x0004
> SD_MMC_HC_CTRL_MMC_HS200 0x0003
> SD_MMC_HC_CTRL_MMC_HS400 0x0005
Ok.
>
> > +
> > +//
> > +// Timing modes for uhs
> > +//
> > +typedef enum {
> > + SdMmcUhsSdr12,
> > + SdMmcUhsSdr25,
> > + SdMmcUhsSdr50,
> > + SdMmcUhsSdr104,
> > + SdMmcUhsDdr50,
> > + SdMmcMmcDdr52,
> > + SdMmcMmcSdr50,
> > + SdMmcMmcSdr25,
> > + SdMmcMmcSdr12,
> > + SdMmcMmcHs200,
> > + SdMmcMmcHs400,
> > +} SD_MMC_UHS_TIMING;
>
> Suggest a similar drop of 'SdMmcMmcSdr50' and rename according to the above
> comments upon HOST_CTRL2 register value definitions. Also, how about a rename
> for enum to SD_MMC_BUS_MODE?
Ok.
>
> > +
> > +//
> > // The transfer modes supported by SD Host Controller
> > // Simplified Spec 3.0 Table 1-2
> > //
> > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> > IN UINT8 Slot
> > );
> >
> > +/**
> > + Set SD Host Controler control 2 registry according to selected speed.
> > +
> > + @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] Timing The timing to select.
> > +
> > + @retval EFI_SUCCESS The timing is set successfully.
> > + @retval Others The timing isn't set successfully.
> > +**/
> > +EFI_STATUS
> > +SdMmcHcUhsSignaling (
> > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > + IN UINT8 Slot,
> > + IN SD_MMC_UHS_TIMING Timing
> > + );
> > +
> > #endif
> > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > index 178945f..25db98a 100644
> > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > @@ -17,6 +17,7 @@
> > #ifndef __SD_MMC_OVERRIDE_H__
> > #define __SD_MMC_OVERRIDE_H__
> >
> > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
>
> Please do not expose a module private header file here.
>
> One approach comes to me is to keep the SD/MMC bus mode enumeration structure
> in this protocol header file. SdMmcPciHcDxe driver and producers of the
> Override protocol keep a version of the HOST_CTRL2 register value macros of
> their own.
Agree. I will move necessary defines to
Include/Protocol/SdMmcOverride.h instead of exposing SdMmcPciHci.h.
HOST_CTRL2 contents will be a local define in producer code.
>
> > #include <Protocol/SdMmcPassThru.h>
> >
> > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> > @@ -31,6 +32,7 @@ typedef enum {
> > EdkiiSdMmcResetPost,
> > EdkiiSdMmcInitHostPre,
> > EdkiiSdMmcInitHostPost,
> > + EdkiiSdMmcUhsSignaling,
> > } EDKII_SD_MMC_PHASE_TYPE;
> >
> > /**
> > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > index c5fd214..05bd4a0 100755
> > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> > IN UINT8 BusWidth
> > )
> > {
> > - EFI_STATUS Status;
> > - UINT8 HsTiming;
> > - UINT8 HostCtrl1;
> > - UINT8 HostCtrl2;
> > + EFI_STATUS Status;
> > + UINT8 HsTiming;
> > + UINT8 HostCtrl1;
> > + SD_MMC_UHS_TIMING Timing;
> > + SD_MMC_HC_PRIVATE_DATA *Private;
> > +
> > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> >
> > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> > if (EFI_ERROR (Status)) {
> > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> > return Status;
> > }
> >
> > - //
> > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > - //
> > - HostCtrl2 = (UINT8)~0x7;
> > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> > sizeof (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > - }
> > - //
> > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> > - //
> > if (IsDdr) {
> > - HostCtrl2 = BIT2;
> > + Timing = SdMmcMmcDdr52;
> > } else if (ClockFreq == 52) {
> > - HostCtrl2 = BIT0;
> > + Timing = SdMmcMmcSdr50;
> > + } else if (ClockFreq == 26) {
> > + Timing = SdMmcMmcSdr25;
> > } else {
> > - HostCtrl2 = 0;
> > + Timing = SdMmcMmcSdr12;
> > }
>
> As mentioned above, "SdMmcMmcSdr50" can be dropped here.
> And considering the rename above, how about:
>
> if (IsDdr) {
> Timing = SdMmcMmcHsDdr;
> } else if (ClockFreq == 52) {
> Timing = SdMmcMmcHsSdr;
> } else {
> Timing = SdMmcMmcLegacy;
> }
Ok.
>
> > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> > (HostCtrl2), &HostCtrl2);
> > - if (EFI_ERROR (Status)) {
> > - return Status;
> > +
> > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > + Status = mOverride->NotifyPhase (
> > + Private->ControllerHandle,
> > + Slot,
> > + EdkiiSdMmcUhsSignaling,
> > + &Timing
> > + );
> > + if (EFI_ERROR (Status)) {
> > + DEBUG ((
> > + DEBUG_ERROR,
> > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > + __FUNCTION__,
> > + Status
> > + ));
> > + return Status;
> > + }
> > + } else {
> > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > + if (EFI_ERROR (Status)) {
> > + return Status;
> > + }
> > }
>
> I have concern for this, current existing hook points for the NotifyPhase()
> service are performing additional operations during the controller
> initialization process.
>
> Producer of the override protocol can simply return EFI_SUCCESS, if there is
> nothing to do for a specific hook point.
>
> But this hook here is to override the behavior when setting the "UHS Mode
> Select" field of Host Control 2 Register. If the override protocol producer
> does not want to override the behavior at the 'EdkiiSdMmcUhsSignaling' hook,
> but has to do something in other hooks, one cannot directly return EFI_SUCCESS
> for the 'EdkiiSdMmcUhsSignaling' hook. For this case, one has to implement the
> 'EdkiiSdMmcUhsSignaling' hook even if the behavior will be exactly the same as
> the SdMmcPciHcDxe driver.
I see your point. It's not additional code, but replacing the default.
IMO the easiest way to handle it is to go back to a separate
UhsSignaling callback, so that it's either omitted or explicitly
defined by Override protocol producer driver. What do you think?
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-11-02 8:21 ` Marcin Wojtas
@ 2018-11-02 12:16 ` Marcin Wojtas
2018-11-03 2:57 ` Wu, Hao A
0 siblings, 1 reply; 47+ messages in thread
From: Marcin Wojtas @ 2018-11-02 12:16 UTC (permalink / raw)
To: hao.a.wu
Cc: edk2-devel-01, Kinney, Michael D, Gao, Liming, Leif Lindholm,
Ard Biesheuvel, nadavh, jsd@semihalf.com, Tomasz Michalec
pt., 2 lis 2018 o 09:21 Marcin Wojtas <mw@semihalf.com> napisał(a):
>
> Hi Hao,
>
> czw., 1 lis 2018 o 08:06 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> >
> > Hi Marcin,
> >
> > > -----Original Message-----
> > > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > > Sent: Friday, October 05, 2018 9:25 PM
> > > To: edk2-devel@lists.01.org
> > > Cc: Tian, Feng; Kinney, Michael D; Gao, Liming; leif.lindholm@linaro.org; Wu,
> > > Hao A; ard.biesheuvel@linaro.org; nadavh@marvell.com;
> > > mw@semihalf.com; jsd@semihalf.com; tm@semihalf.com
> > > Subject: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling
> > > to SdMmcOverride protocol
> > >
> > > From: Tomasz Michalec <tm@semihalf.com>
> > >
> > > Some SD Host Controlers use different values in Host Control 2 Register
> > > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> > > the NotifyPhase of the SdMmcOverride protocol.
> > >
> > > UHS signaling configuration is moved to a common, default routine
> > > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> > > cover this functionality.
> > >
> > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > > ---
> > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> > > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> > > ++++++++++++--------
> > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69 +++++++++
> > > 5 files changed, 243 insertions(+), 68 deletions(-)
> > >
> > > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > index e389d52..a03160d 100644
> > > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> > > ANY KIND, EITHER EXPRESS OR IMPLIED.
> > > #define SD_MMC_HC_CTRL_VER 0xFE
> > >
> > > //
> > > +// SD Host Controler bits to HOST_CTRL2 register
> > > +//
> > > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> >
> > I think SD_MMC_HC_CTRL_MMC_SDR50 is not needed here.
> >
> > Since according to the SD Physical Layer Simplified Specification, max clock
> > frequency for SD bus mode SDR50 is 100MHz. And there is no eMMC bus mode whose
> > max clock frequency is at 100MHz in Embedded Multi-Media Card Electrical
> > Standard (5.1).
>
> Ok, will drop it.
>
> >
> > > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > > +#define SD_MMC_HC_CTRL_HS400 0x0005
> >
> > How about the below renames & reorder?
> >
> > SD_MMC_HC_CTRL_MMC_LEGACY 0x0000
> > SD_MMC_HC_CTRL_MMC_HS_SDR 0x0001
> > SD_MMC_HC_CTRL_MMC_HS_DDR 0x0004
> > SD_MMC_HC_CTRL_MMC_HS200 0x0003
> > SD_MMC_HC_CTRL_MMC_HS400 0x0005
>
> Ok.
>
> >
> > > +
> > > +//
> > > +// Timing modes for uhs
> > > +//
> > > +typedef enum {
> > > + SdMmcUhsSdr12,
> > > + SdMmcUhsSdr25,
> > > + SdMmcUhsSdr50,
> > > + SdMmcUhsSdr104,
> > > + SdMmcUhsDdr50,
> > > + SdMmcMmcDdr52,
> > > + SdMmcMmcSdr50,
> > > + SdMmcMmcSdr25,
> > > + SdMmcMmcSdr12,
> > > + SdMmcMmcHs200,
> > > + SdMmcMmcHs400,
> > > +} SD_MMC_UHS_TIMING;
> >
> > Suggest a similar drop of 'SdMmcMmcSdr50' and rename according to the above
> > comments upon HOST_CTRL2 register value definitions. Also, how about a rename
> > for enum to SD_MMC_BUS_MODE?
>
> Ok.
>
> >
> > > +
> > > +//
> > > // The transfer modes supported by SD Host Controller
> > > // Simplified Spec 3.0 Table 1-2
> > > //
> > > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> > > IN UINT8 Slot
> > > );
> > >
> > > +/**
> > > + Set SD Host Controler control 2 registry according to selected speed.
> > > +
> > > + @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] Timing The timing to select.
> > > +
> > > + @retval EFI_SUCCESS The timing is set successfully.
> > > + @retval Others The timing isn't set successfully.
> > > +**/
> > > +EFI_STATUS
> > > +SdMmcHcUhsSignaling (
> > > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > > + IN UINT8 Slot,
> > > + IN SD_MMC_UHS_TIMING Timing
> > > + );
> > > +
> > > #endif
> > > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > index 178945f..25db98a 100644
> > > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > @@ -17,6 +17,7 @@
> > > #ifndef __SD_MMC_OVERRIDE_H__
> > > #define __SD_MMC_OVERRIDE_H__
> > >
> > > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> >
> > Please do not expose a module private header file here.
> >
> > One approach comes to me is to keep the SD/MMC bus mode enumeration structure
> > in this protocol header file. SdMmcPciHcDxe driver and producers of the
> > Override protocol keep a version of the HOST_CTRL2 register value macros of
> > their own.
>
> Agree. I will move necessary defines to
> Include/Protocol/SdMmcOverride.h instead of exposing SdMmcPciHci.h.
> HOST_CTRL2 contents will be a local define in producer code.
>
> >
> > > #include <Protocol/SdMmcPassThru.h>
> > >
> > > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> > > @@ -31,6 +32,7 @@ typedef enum {
> > > EdkiiSdMmcResetPost,
> > > EdkiiSdMmcInitHostPre,
> > > EdkiiSdMmcInitHostPost,
> > > + EdkiiSdMmcUhsSignaling,
> > > } EDKII_SD_MMC_PHASE_TYPE;
> > >
> > > /**
> > > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > index c5fd214..05bd4a0 100755
> > > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> > > IN UINT8 BusWidth
> > > )
> > > {
> > > - EFI_STATUS Status;
> > > - UINT8 HsTiming;
> > > - UINT8 HostCtrl1;
> > > - UINT8 HostCtrl2;
> > > + EFI_STATUS Status;
> > > + UINT8 HsTiming;
> > > + UINT8 HostCtrl1;
> > > + SD_MMC_UHS_TIMING Timing;
> > > + SD_MMC_HC_PRIVATE_DATA *Private;
> > > +
> > > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> > >
> > > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr, BusWidth);
> > > if (EFI_ERROR (Status)) {
> > > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> > > return Status;
> > > }
> > >
> > > - //
> > > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > > - //
> > > - HostCtrl2 = (UINT8)~0x7;
> > > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> > > sizeof (HostCtrl2), &HostCtrl2);
> > > - if (EFI_ERROR (Status)) {
> > > - return Status;
> > > - }
> > > - //
> > > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> > > - //
> > > if (IsDdr) {
> > > - HostCtrl2 = BIT2;
> > > + Timing = SdMmcMmcDdr52;
> > > } else if (ClockFreq == 52) {
> > > - HostCtrl2 = BIT0;
> > > + Timing = SdMmcMmcSdr50;
> > > + } else if (ClockFreq == 26) {
> > > + Timing = SdMmcMmcSdr25;
> > > } else {
> > > - HostCtrl2 = 0;
> > > + Timing = SdMmcMmcSdr12;
> > > }
> >
> > As mentioned above, "SdMmcMmcSdr50" can be dropped here.
> > And considering the rename above, how about:
> >
> > if (IsDdr) {
> > Timing = SdMmcMmcHsDdr;
> > } else if (ClockFreq == 52) {
> > Timing = SdMmcMmcHsSdr;
> > } else {
> > Timing = SdMmcMmcLegacy;
> > }
>
> Ok.
>
> >
> > > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2, sizeof
> > > (HostCtrl2), &HostCtrl2);
> > > - if (EFI_ERROR (Status)) {
> > > - return Status;
> > > +
> > > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > > + Status = mOverride->NotifyPhase (
> > > + Private->ControllerHandle,
> > > + Slot,
> > > + EdkiiSdMmcUhsSignaling,
> > > + &Timing
> > > + );
> > > + if (EFI_ERROR (Status)) {
> > > + DEBUG ((
> > > + DEBUG_ERROR,
> > > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > > + __FUNCTION__,
> > > + Status
> > > + ));
> > > + return Status;
> > > + }
> > > + } else {
> > > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > > + if (EFI_ERROR (Status)) {
> > > + return Status;
> > > + }
> > > }
> >
> > I have concern for this, current existing hook points for the NotifyPhase()
> > service are performing additional operations during the controller
> > initialization process.
> >
> > Producer of the override protocol can simply return EFI_SUCCESS, if there is
> > nothing to do for a specific hook point.
> >
> > But this hook here is to override the behavior when setting the "UHS Mode
> > Select" field of Host Control 2 Register. If the override protocol producer
> > does not want to override the behavior at the 'EdkiiSdMmcUhsSignaling' hook,
> > but has to do something in other hooks, one cannot directly return EFI_SUCCESS
> > for the 'EdkiiSdMmcUhsSignaling' hook. For this case, one has to implement the
> > 'EdkiiSdMmcUhsSignaling' hook even if the behavior will be exactly the same as
> > the SdMmcPciHcDxe driver.
>
> I see your point. It's not additional code, but replacing the default.
> IMO the easiest way to handle it is to go back to a separate
> UhsSignaling callback, so that it's either omitted or explicitly
> defined by Override protocol producer driver. What do you think?
>
Second thought here, as previously I discussed a lot with Ard, how to
keep only Notify and Capability callbacks. I think the best compromise
would be to call SdMmcHcUhsSignaling unconditionally before
SdMmcOverride callback. In case the producer does nothing, the
defaults would be used. This way, in case of deviations from standard,
the the producer driver would have to handle updating only affected
timing values.
Best regards,
Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread* Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
2018-11-02 12:16 ` Marcin Wojtas
@ 2018-11-03 2:57 ` Wu, Hao A
0 siblings, 0 replies; 47+ messages in thread
From: Wu, Hao A @ 2018-11-03 2:57 UTC (permalink / raw)
To: Marcin Wojtas
Cc: edk2-devel-01, Kinney, Michael D, Gao, Liming, Leif Lindholm,
Ard Biesheuvel, nadavh@marvell.com, jsd@semihalf.com,
Tomasz Michalec
> -----Original Message-----
> From: Marcin Wojtas [mailto:mw@semihalf.com]
> Sent: Friday, November 02, 2018 8:17 PM
> To: Wu, Hao A
> Cc: edk2-devel-01; Kinney, Michael D; Gao, Liming; Leif Lindholm; Ard
> Biesheuvel; nadavh@marvell.com; jsd@semihalf.com; Tomasz Michalec
> Subject: Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling
> to SdMmcOverride protocol
>
> pt., 2 lis 2018 o 09:21 Marcin Wojtas <mw@semihalf.com> napisał(a):
> >
> > Hi Hao,
> >
> > czw., 1 lis 2018 o 08:06 Wu, Hao A <hao.a.wu@intel.com> napisał(a):
> > >
> > > Hi Marcin,
> > >
> > > > -----Original Message-----
> > > > From: Marcin Wojtas [mailto:mw@semihalf.com]
> > > > Sent: Friday, October 05, 2018 9:25 PM
> > > > To: edk2-devel@lists.01.org
> > > > Cc: Tian, Feng; Kinney, Michael D; Gao, Liming; leif.lindholm@linaro.org;
> Wu,
> > > > Hao A; ard.biesheuvel@linaro.org; nadavh@marvell.com;
> > > > mw@semihalf.com; jsd@semihalf.com; tm@semihalf.com
> > > > Subject: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add
> UhsSignaling
> > > > to SdMmcOverride protocol
> > > >
> > > > From: Tomasz Michalec <tm@semihalf.com>
> > > >
> > > > Some SD Host Controlers use different values in Host Control 2 Register
> > > > to select UHS Mode. This patch adds a new UhsSignaling type routine to
> > > > the NotifyPhase of the SdMmcOverride protocol.
> > > >
> > > > UHS signaling configuration is moved to a common, default routine
> > > > (SdMmcHcUhsSignaling), which is called when SdMmcOverride does not
> > > > cover this functionality.
> > > >
> > > > Contributed-under: TianoCore Contribution Agreement 1.1
> > > > Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> > > > ---
> > > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h | 50 +++++++
> > > > MdeModulePkg/Include/Protocol/SdMmcOverride.h | 2 +
> > > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c | 153
> > > > ++++++++++++--------
> > > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdDevice.c | 37 +++--
> > > > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 69
> +++++++++
> > > > 5 files changed, 243 insertions(+), 68 deletions(-)
> > > >
> > > > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > > index e389d52..a03160d 100644
> > > > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h
> > > > @@ -63,6 +63,39 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> > > > ANY KIND, EITHER EXPRESS OR IMPLIED.
> > > > #define SD_MMC_HC_CTRL_VER 0xFE
> > > >
> > > > //
> > > > +// SD Host Controler bits to HOST_CTRL2 register
> > > > +//
> > > > +#define SD_MMC_HC_CTRL_UHS_MASK 0x0007
> > > > +#define SD_MMC_HC_CTRL_UHS_SDR12 0x0000
> > > > +#define SD_MMC_HC_CTRL_UHS_SDR25 0x0001
> > > > +#define SD_MMC_HC_CTRL_UHS_SDR50 0x0002
> > > > +#define SD_MMC_HC_CTRL_UHS_SDR104 0x0003
> > > > +#define SD_MMC_HC_CTRL_UHS_DDR50 0x0004
> > > > +#define SD_MMC_HC_CTRL_MMC_DDR52 0x0004
> > > > +#define SD_MMC_HC_CTRL_MMC_SDR50 0x0002
> > >
> > > I think SD_MMC_HC_CTRL_MMC_SDR50 is not needed here.
> > >
> > > Since according to the SD Physical Layer Simplified Specification, max clock
> > > frequency for SD bus mode SDR50 is 100MHz. And there is no eMMC bus
> mode whose
> > > max clock frequency is at 100MHz in Embedded Multi-Media Card Electrical
> > > Standard (5.1).
> >
> > Ok, will drop it.
> >
> > >
> > > > +#define SD_MMC_HC_CTRL_MMC_SDR25 0x0001
> > > > +#define SD_MMC_HC_CTRL_MMC_SDR12 0x0000
> > > > +#define SD_MMC_HC_CTRL_HS200 0x0003
> > > > +#define SD_MMC_HC_CTRL_HS400 0x0005
> > >
> > > How about the below renames & reorder?
> > >
> > > SD_MMC_HC_CTRL_MMC_LEGACY 0x0000
> > > SD_MMC_HC_CTRL_MMC_HS_SDR 0x0001
> > > SD_MMC_HC_CTRL_MMC_HS_DDR 0x0004
> > > SD_MMC_HC_CTRL_MMC_HS200 0x0003
> > > SD_MMC_HC_CTRL_MMC_HS400 0x0005
> >
> > Ok.
> >
> > >
> > > > +
> > > > +//
> > > > +// Timing modes for uhs
> > > > +//
> > > > +typedef enum {
> > > > + SdMmcUhsSdr12,
> > > > + SdMmcUhsSdr25,
> > > > + SdMmcUhsSdr50,
> > > > + SdMmcUhsSdr104,
> > > > + SdMmcUhsDdr50,
> > > > + SdMmcMmcDdr52,
> > > > + SdMmcMmcSdr50,
> > > > + SdMmcMmcSdr25,
> > > > + SdMmcMmcSdr12,
> > > > + SdMmcMmcHs200,
> > > > + SdMmcMmcHs400,
> > > > +} SD_MMC_UHS_TIMING;
> > >
> > > Suggest a similar drop of 'SdMmcMmcSdr50' and rename according to the
> above
> > > comments upon HOST_CTRL2 register value definitions. Also, how about a
> rename
> > > for enum to SD_MMC_BUS_MODE?
> >
> > Ok.
> >
> > >
> > > > +
> > > > +//
> > > > // The transfer modes supported by SD Host Controller
> > > > // Simplified Spec 3.0 Table 1-2
> > > > //
> > > > @@ -508,4 +541,21 @@ SdMmcHcInitTimeoutCtrl (
> > > > IN UINT8 Slot
> > > > );
> > > >
> > > > +/**
> > > > + Set SD Host Controler control 2 registry according to selected speed.
> > > > +
> > > > + @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] Timing The timing to select.
> > > > +
> > > > + @retval EFI_SUCCESS The timing is set successfully.
> > > > + @retval Others The timing isn't set successfully.
> > > > +**/
> > > > +EFI_STATUS
> > > > +SdMmcHcUhsSignaling (
> > > > + IN EFI_PCI_IO_PROTOCOL *PciIo,
> > > > + IN UINT8 Slot,
> > > > + IN SD_MMC_UHS_TIMING Timing
> > > > + );
> > > > +
> > > > #endif
> > > > diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > > b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > > index 178945f..25db98a 100644
> > > > --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > > +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> > > > @@ -17,6 +17,7 @@
> > > > #ifndef __SD_MMC_OVERRIDE_H__
> > > > #define __SD_MMC_OVERRIDE_H__
> > > >
> > > > +#include <Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.h>
> > >
> > > Please do not expose a module private header file here.
> > >
> > > One approach comes to me is to keep the SD/MMC bus mode enumeration
> structure
> > > in this protocol header file. SdMmcPciHcDxe driver and producers of the
> > > Override protocol keep a version of the HOST_CTRL2 register value macros
> of
> > > their own.
> >
> > Agree. I will move necessary defines to
> > Include/Protocol/SdMmcOverride.h instead of exposing SdMmcPciHci.h.
> > HOST_CTRL2 contents will be a local define in producer code.
> >
> > >
> > > > #include <Protocol/SdMmcPassThru.h>
> > > >
> > > > #define EDKII_SD_MMC_OVERRIDE_PROTOCOL_GUID \
> > > > @@ -31,6 +32,7 @@ typedef enum {
> > > > EdkiiSdMmcResetPost,
> > > > EdkiiSdMmcInitHostPre,
> > > > EdkiiSdMmcInitHostPost,
> > > > + EdkiiSdMmcUhsSignaling,
> > > > } EDKII_SD_MMC_PHASE_TYPE;
> > > >
> > > > /**
> > > > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > > index c5fd214..05bd4a0 100755
> > > > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/EmmcDevice.c
> > > > @@ -740,10 +740,13 @@ EmmcSwitchToHighSpeed (
> > > > IN UINT8 BusWidth
> > > > )
> > > > {
> > > > - EFI_STATUS Status;
> > > > - UINT8 HsTiming;
> > > > - UINT8 HostCtrl1;
> > > > - UINT8 HostCtrl2;
> > > > + EFI_STATUS Status;
> > > > + UINT8 HsTiming;
> > > > + UINT8 HostCtrl1;
> > > > + SD_MMC_UHS_TIMING Timing;
> > > > + SD_MMC_HC_PRIVATE_DATA *Private;
> > > > +
> > > > + Private = SD_MMC_HC_PRIVATE_FROM_THIS (PassThru);
> > > >
> > > > Status = EmmcSwitchBusWidth (PciIo, PassThru, Slot, Rca, IsDdr,
> BusWidth);
> > > > if (EFI_ERROR (Status)) {
> > > > @@ -758,27 +761,37 @@ EmmcSwitchToHighSpeed (
> > > > return Status;
> > > > }
> > > >
> > > > - //
> > > > - // Clean UHS Mode Select field of Host Control 2 reigster before update
> > > > - //
> > > > - HostCtrl2 = (UINT8)~0x7;
> > > > - Status = SdMmcHcAndMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> > > > sizeof (HostCtrl2), &HostCtrl2);
> > > > - if (EFI_ERROR (Status)) {
> > > > - return Status;
> > > > - }
> > > > - //
> > > > - // Set UHS Mode Select field of Host Control 2 reigster to SDR12/25/50
> > > > - //
> > > > if (IsDdr) {
> > > > - HostCtrl2 = BIT2;
> > > > + Timing = SdMmcMmcDdr52;
> > > > } else if (ClockFreq == 52) {
> > > > - HostCtrl2 = BIT0;
> > > > + Timing = SdMmcMmcSdr50;
> > > > + } else if (ClockFreq == 26) {
> > > > + Timing = SdMmcMmcSdr25;
> > > > } else {
> > > > - HostCtrl2 = 0;
> > > > + Timing = SdMmcMmcSdr12;
> > > > }
> > >
> > > As mentioned above, "SdMmcMmcSdr50" can be dropped here.
> > > And considering the rename above, how about:
> > >
> > > if (IsDdr) {
> > > Timing = SdMmcMmcHsDdr;
> > > } else if (ClockFreq == 52) {
> > > Timing = SdMmcMmcHsSdr;
> > > } else {
> > > Timing = SdMmcMmcLegacy;
> > > }
> >
> > Ok.
> >
> > >
> > > > - Status = SdMmcHcOrMmio (PciIo, Slot, SD_MMC_HC_HOST_CTRL2,
> sizeof
> > > > (HostCtrl2), &HostCtrl2);
> > > > - if (EFI_ERROR (Status)) {
> > > > - return Status;
> > > > +
> > > > + if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
> > > > + Status = mOverride->NotifyPhase (
> > > > + Private->ControllerHandle,
> > > > + Slot,
> > > > + EdkiiSdMmcUhsSignaling,
> > > > + &Timing
> > > > + );
> > > > + if (EFI_ERROR (Status)) {
> > > > + DEBUG ((
> > > > + DEBUG_ERROR,
> > > > + "%a: SD/MMC uhs signaling notifier callback failed - %r\n",
> > > > + __FUNCTION__,
> > > > + Status
> > > > + ));
> > > > + return Status;
> > > > + }
> > > > + } else {
> > > > + Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
> > > > + if (EFI_ERROR (Status)) {
> > > > + return Status;
> > > > + }
> > > > }
> > >
> > > I have concern for this, current existing hook points for the NotifyPhase()
> > > service are performing additional operations during the controller
> > > initialization process.
> > >
> > > Producer of the override protocol can simply return EFI_SUCCESS, if there is
> > > nothing to do for a specific hook point.
> > >
> > > But this hook here is to override the behavior when setting the "UHS Mode
> > > Select" field of Host Control 2 Register. If the override protocol producer
> > > does not want to override the behavior at the 'EdkiiSdMmcUhsSignaling'
> hook,
> > > but has to do something in other hooks, one cannot directly return
> EFI_SUCCESS
> > > for the 'EdkiiSdMmcUhsSignaling' hook. For this case, one has to implement
> the
> > > 'EdkiiSdMmcUhsSignaling' hook even if the behavior will be exactly the
> same as
> > > the SdMmcPciHcDxe driver.
> >
> > I see your point. It's not additional code, but replacing the default.
> > IMO the easiest way to handle it is to go back to a separate
> > UhsSignaling callback, so that it's either omitted or explicitly
> > defined by Override protocol producer driver. What do you think?
> >
>
> Second thought here, as previously I discussed a lot with Ard, how to
> keep only Notify and Capability callbacks. I think the best compromise
> would be to call SdMmcHcUhsSignaling unconditionally before
> SdMmcOverride callback. In case the producer does nothing, the
> defaults would be used. This way, in case of deviations from standard,
> the the producer driver would have to handle updating only affected
> timing values.
Yes, I was thinking quite the same:
A. Set the "UHS Mode Select" field more than 1 time
Abstracted code:
Status = SdMmcHcUhsSignaling (PciIo, Slot, Timing);
if (EFI_ERROR (Status)) {
return Status;
}
if (mOverride != NULL && mOverride->NotifyPhase != NULL) {
Status = mOverride->NotifyPhase (EdkiiSdMmcUhsSignaling);
...
}
For this approach, I am not very sure if setting the "UHS Mode Select" field
multiple times will bring any side effect.
Another possible approach comes to my mind is that:
B. Introduce a new return status to the NotifyPhase() service to indicate
nothing has been done (in other words, the hook type is just ignored by the
implementation)
The current implementation of the NotifyPhase() service will return EFI_SUCCESS
when:
1) the additional operations finished successfully;
2) nothing has been done for a specific hook type.
I am thinking whether a new return status (like EFI_UNSUPPORTED) can be
introduced to distinguish the above 2 cases.
For this approach, the caller of the NotifyPhase() will then not treat this new
return status as a fatal error, and the initialization process should continue.
Best Regards,
Hao Wu
>
> Best regards,
> Marcin
^ permalink raw reply [flat|nested] 47+ messages in thread