public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Marcin Wojtas <mw@semihalf.com>
Cc: "Zeng, Star" <star.zeng@intel.com>,
	Eric Dong <eric.dong@intel.com>,
	 "Ni, Ruiyu" <ruiyu.ni@intel.com>,
	edk2-devel-01 <edk2-devel@lists.01.org>,
	 "Tian, Feng" <feng.tian@intel.com>,
	"Kinney, Michael D" <michael.d.kinney@intel.com>,
	 "Gao, Liming" <liming.gao@intel.com>,
	Leif Lindholm <leif.lindholm@linaro.org>,
	"Wu, Hao A" <hao.a.wu@intel.com>,
	Nadav Haklai <nadavh@marvell.com>,
	 "jsd@semihalf.com" <jsd@semihalf.com>,
	Tomasz Michalec <tm@semihalf.com>
Subject: Re: [PATCH v2 2/4] MdeModulePkg/SdMmcPciHcDxe: Add UhsSignaling to SdMmcOverride protocol
Date: Mon, 8 Oct 2018 15:07:20 +0200	[thread overview]
Message-ID: <CAKv+Gu_4jfZk-CYr57oN28jBRDgjpS1FSM-_aasAvo4+kNALYg@mail.gmail.com> (raw)
In-Reply-To: <CAPv3WKeeOo3srrtMf2dfamL5tha=hZFKrbh3u4BRJi3FPdK-uw@mail.gmail.com>

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


  reply	other threads:[~2018-10-08 13:07 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-05 13:25 [PATCH v2 0/4] SdMmcOverride extension Marcin Wojtas
2018-10-05 13:25 ` [PATCH v2 1/4] MdeModulePkg/SdMmcPciHcDxe: Add an optional parameter in NotifyPhase Marcin Wojtas
2018-10-08 12:21   ` Ard Biesheuvel
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-10-08 12:59     ` Marcin Wojtas
2018-10-08 13:07       ` Ard Biesheuvel [this message]
2018-10-08 13:17         ` Marcin Wojtas
2018-10-08 13:27           ` Ard Biesheuvel
2018-10-08 13:37             ` Marcin Wojtas
2018-10-08 13:43               ` Ard Biesheuvel
2018-10-08 14:52                 ` Marcin Wojtas
2018-10-08 15:10                   ` Ard Biesheuvel
2018-10-09 11:22                     ` Wu, Hao A
2018-10-09 11:32                       ` Marcin Wojtas
2018-10-09 11:45                         ` Ard Biesheuvel
2018-10-09 11:51                           ` Marcin Wojtas
2018-10-11 15:43                             ` Marcin Wojtas
2018-10-12  1:39                               ` Wu, Hao A
2018-10-12  5:06                                 ` Marcin Wojtas
2018-10-12 15:55                                   ` Ard Biesheuvel
2018-10-12 16:04                                     ` Marcin Wojtas
2018-10-12 16:24                                       ` Ard Biesheuvel
2018-10-12 16:49                                         ` Marcin Wojtas
2018-11-01  7:04   ` Wu, Hao A
2018-11-02  8:21     ` Marcin Wojtas
2018-11-02 12:16       ` Marcin Wojtas
2018-11-03  2:57         ` Wu, Hao A
2018-10-05 13:25 ` [PATCH v2 3/4] MdeModulePkg/SdMmcPciHcDxe: Add SwitchClockFreqPost to SdMmcOverride Marcin Wojtas
2018-10-08 12:44   ` Ard Biesheuvel
2018-11-01  7:06   ` Wu, Hao A
2018-11-02  9:39     ` Marcin Wojtas
2018-11-03  3:19       ` Wu, Hao A
2018-10-05 13:25 ` [PATCH v2 4/4] MdeModulePkg/SdMmcPciHcDxe: Allow overriding base clock frequency Marcin Wojtas
2018-10-08 12:49   ` Ard Biesheuvel
2018-11-01  7:11   ` Wu, Hao A
2018-11-02  9:52     ` Marcin Wojtas
2018-10-12  5:24 ` [PATCH v2 0/4] SdMmcOverride extension Wu, Hao A
2018-10-12  5:33   ` Marcin Wojtas
2018-10-12 12:48     ` Wu, Hao A
2018-10-12 12:50       ` Marcin Wojtas
2018-10-25 12:43         ` Marcin Wojtas
2018-10-26  7:22           ` Wu, Hao A
2018-11-01  7:11 ` Wu, Hao A
2018-11-02 10:09   ` Marcin Wojtas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAKv+Gu_4jfZk-CYr57oN28jBRDgjpS1FSM-_aasAvo4+kNALYg@mail.gmail.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox