Re: [PATCH v2 1/4] MdeModulePkg/SdMmcPciHcDxe: Add an optional parameter in NotifyPhase

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

(add MdeModulePkg maintainers)

On 5 October 2018 at 15:25, Marcin Wojtas <mw@semihalf.com> wrote:
> In order to ensure bigger flexibility in the NotifyPhase
> routine of the SdMmcOverride protocol, enable using an
> optional phase-specific data. This will allow to exchange
> more information between the protocol producer driver
> and SdMmcPciHcDxe in the newly added callbacks.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>
> ---
>  MdeModulePkg/Include/Protocol/SdMmcOverride.h    |  4 +++-
>  MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c | 12 ++++++++----
>  2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/MdeModulePkg/Include/Protocol/SdMmcOverride.h b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> index 0766252..178945f 100644
> --- a/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> +++ b/MdeModulePkg/Include/Protocol/SdMmcOverride.h
> @@ -63,6 +63,7 @@ EFI_STATUS
>    @param[in]      PhaseType             The type of operation and whether the
>                                          hook is invoked right before (pre) or
>                                          right after (post)
> +  @param[in,out]  Data                  The pointer to a phase-specific data.
>
>    @retval EFI_SUCCESS           The override function completed successfully.
>    @retval EFI_NOT_FOUND         The specified controller or slot does not exist.
> @@ -74,7 +75,8 @@ EFI_STATUS
>  (EFIAPI * EDKII_SD_MMC_NOTIFY_PHASE) (
>    IN      EFI_HANDLE                      ControllerHandle,
>    IN      UINT8                           Slot,
> -  IN      EDKII_SD_MMC_PHASE_TYPE         PhaseType
> +  IN      EDKII_SD_MMC_PHASE_TYPE         PhaseType,
> +  IN OUT  VOID                            *OptParam

Please use the same name in the comment block and in the actual prototype.

Also, could we use PhaseData as the name perhaps?

With those changes

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>    );
>
>  struct _EDKII_SD_MMC_OVERRIDE {
> diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> index 25771dc..02eb4ad 100644
> --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
> @@ -444,7 +444,8 @@ SdMmcHcReset (
>      Status = mOverride->NotifyPhase (
>                            Private->ControllerHandle,
>                            Slot,
> -                          EdkiiSdMmcResetPre);
> +                          EdkiiSdMmcResetPre,
> +                          NULL);
>      if (EFI_ERROR (Status)) {
>        DEBUG ((DEBUG_WARN,
>          "%a: SD/MMC pre reset notifier callback failed - %r\n",
> @@ -494,7 +495,8 @@ SdMmcHcReset (
>      Status = mOverride->NotifyPhase (
>                            Private->ControllerHandle,
>                            Slot,
> -                          EdkiiSdMmcResetPost);
> +                          EdkiiSdMmcResetPost,
> +                          NULL);
>      if (EFI_ERROR (Status)) {
>        DEBUG ((DEBUG_WARN,
>          "%a: SD/MMC post reset notifier callback failed - %r\n",
> @@ -1087,7 +1089,8 @@ SdMmcHcInitHost (
>      Status = mOverride->NotifyPhase (
>                            Private->ControllerHandle,
>                            Slot,
> -                          EdkiiSdMmcInitHostPre);
> +                          EdkiiSdMmcInitHostPre,
> +                          NULL);
>      if (EFI_ERROR (Status)) {
>        DEBUG ((DEBUG_WARN,
>          "%a: SD/MMC pre init notifier callback failed - %r\n",
> @@ -1122,7 +1125,8 @@ SdMmcHcInitHost (
>      Status = mOverride->NotifyPhase (
>                            Private->ControllerHandle,
>                            Slot,
> -                          EdkiiSdMmcInitHostPost);
> +                          EdkiiSdMmcInitHostPost,
> +                          NULL);
>      if (EFI_ERROR (Status)) {
>        DEBUG ((DEBUG_WARN,
>          "%a: SD/MMC post init notifier callback failed - %r\n",
> --
> 2.7.4
>