From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.1540.1588190812145853867 for ; Wed, 29 Apr 2020 13:06:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=jDTU9cFd; spf=pass (domain: nuviainc.com, ip: 209.85.221.67, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f67.google.com with SMTP id d17so4044157wrg.11 for ; Wed, 29 Apr 2020 13:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=66Xc7PVHEKYq0IxQtzGXpH4btSjvCB6LL6YRQooWL9I=; b=jDTU9cFdgrmDxAEyvqyqv23v+AGY4EkUKD3fQqAZS00tOmokS+MTjVk0K6W5sAwSgT NVj2MMYGBX/nHg8ggcAFHw89mmenqAIcPy3idJTAT7QNd9FI3yy2n4OShO1Ax85++vUM Iifr50RrPYBibtcS/ZyI1/1nkeUWijrNu978+DS6Eod+Y24Td+UQO6T9H5UMOYh0YAYt 04ujWVP/vmaS0OqFbvqyCplf+MNJMxC5GdLY5pUs4whpfNO2wKaFO5vY4EdHtNEciNOZ jkoKa/PQBeghQDrmpb5i3MLageXXRE2qsP34lOucwppajSxIk8gAAfYfb9SaN33Iz5s2 qttA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=66Xc7PVHEKYq0IxQtzGXpH4btSjvCB6LL6YRQooWL9I=; b=O291zVaYlwmhsaknSarHBsuZC6gJCfL+xhl7WHo+zOLgtCK9Q6JFJ2rvwiSEHFFTV2 pmmxJW50O3eRBxOOn9GLZmhiHZ5/6mwOdsuPz4QUNuN6BfJGbChHlt1wQv9eKJKTpY0h TNRYYK9sHIS+oRDE9ifIm9JXocaYn4LjVVMhBXCxns92wWzjS4hl1O65mA+9fHXE1vhJ bQbGejP1GAkEqnUPErEbujle2t7LAiwk7ISWTsi8uyuNiPswciNpKVE4AOEaXudvwnyt 1yKTyHSkk4aCgWiHlrS4mTbCT5ZR9IF5GvosEhtQSPJoz9h6F4yNScqgqvXfXWNFYcHa LTnA== X-Gm-Message-State: AGi0PuY0wJv5xkyXQEe35m3JWjKLvFEZONTtogqfiHa1xOsImQBINy38 CjmCvfnguo0TOblvf8MSGNz/Yg== X-Google-Smtp-Source: APiQypIO5hSnO2zjjmI0A81rZ8O7Ok2u7FCjstr93sZws4U7XOVPveBIyDIeQI+iWmb4Qi4MYj1CGQ== X-Received: by 2002:adf:e84f:: with SMTP id d15mr43128265wrn.296.1588190810644; Wed, 29 Apr 2020 13:06:50 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id d133sm10358134wmc.27.2020.04.29.13.06.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2020 13:06:50 -0700 (PDT) Date: Wed, 29 Apr 2020 21:06:48 +0100 From: "Leif Lindholm" To: Ard Biesheuvel Cc: devel@edk2.groups.io Subject: Re: [PATCH] EmbeddedPkg: rename gEfiMmcHostProtocolGuid to gEdkiiMmcHostProtocolGuid Message-ID: <20200429200648.GJ21486@vanye> References: <20200429182704.8715-1-ard.biesheuvel@arm.com> MIME-Version: 1.0 In-Reply-To: <20200429182704.8715-1-ard.biesheuvel@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Apr 29, 2020 at 20:27:04 +0200, Ard Biesheuvel wrote: > In EDK2, identifiers carrying the EFI prefix are reserved for ones > that are defined in the UEFI or PI specifications. For protocols that > are part of the internal EDK2 implementation, we use EDKII instead. > > Since the MMC host protocol defined in EmbeddedPkg is not the one that > the UEFI spec defines, and given the confusion around this, let's rename > it to gEdkiiMmcHostProtocolGuid. 1) Yes, please, let's change this. 2) But not s/Efi/Edkii/ please. We want to get rid of this thing - and the "replacement" in MdeModulePkg has things called gEdkiiPeiSdMmcHostControllerPpiGuid and gEdkiiSdMmcOverrideProtocolGuid, so I think this would still be confusing. Could we call it plain gEmbeddedPkgMmcHostProtocolGuid or gEmbeddedMmcHostProtocolGuid instead? / Leif > Signed-off-by: Ard Biesheuvel > --- > ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c | 2 +- > ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf | 2 +- > EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 2 +- > EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf | 2 +- > EmbeddedPkg/EmbeddedPkg.dec | 2 +- > EmbeddedPkg/Include/Protocol/MmcHost.h | 4 ++-- > EmbeddedPkg/Universal/MmcDxe/Mmc.c | 10 +++++----- > EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf | 2 +- > 8 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c > index 365f78b306fa..0c9e4b7ce15e 100644 > --- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c > +++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180Mci.c > @@ -554,7 +554,7 @@ PL180MciDxeInitialize ( > //Publish Component Name, BlockIO protocol interfaces > Status = gBS->InstallMultipleProtocolInterfaces ( > &Handle, > - &gEfiMmcHostProtocolGuid, &gMciHost, > + &gEdkiiMmcHostProtocolGuid, &gMciHost, > NULL > ); > ASSERT_EFI_ERROR (Status); > diff --git a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > index c70377bc7cfa..2c7272c87a59 100644 > --- a/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > +++ b/ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf > @@ -36,7 +36,7 @@ [LibraryClasses] > [Protocols] > gEfiCpuArchProtocolGuid > gEfiDevicePathProtocolGuid > - gEfiMmcHostProtocolGuid > + gEdkiiMmcHostProtocolGuid > > [Pcd] > gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress > diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c > index 68c523a99f14..47b36e2e8656 100644 > --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c > +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c > @@ -679,7 +679,7 @@ DwEmmcDxeInitialize ( > //Publish Component Name, BlockIO protocol interfaces > Status = gBS->InstallMultipleProtocolInterfaces ( > &Handle, > - &gEfiMmcHostProtocolGuid, &gMciHost, > + &gEdkiiMmcHostProtocolGuid, &gMciHost, > NULL > ); > ASSERT_EFI_ERROR (Status); > diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf > index 21c372c5b200..f56e1beb0653 100644 > --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf > +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf > @@ -37,7 +37,7 @@ [LibraryClasses] > [Protocols] > gEfiCpuArchProtocolGuid > gEfiDevicePathProtocolGuid > - gEfiMmcHostProtocolGuid > + gEdkiiMmcHostProtocolGuid > > [Pcd] > gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress > diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec > index 69922802f473..20fed5441684 100644 > --- a/EmbeddedPkg/EmbeddedPkg.dec > +++ b/EmbeddedPkg/EmbeddedPkg.dec > @@ -71,7 +71,7 @@ [Protocols.common] > gEmbeddedExternalDeviceProtocolGuid = { 0x735F8C64, 0xD696, 0x44D0, { 0xBD, 0xF2, 0x44, 0x7F, 0xD0, 0x5A, 0x54, 0x06 }} > gEmbeddedGpioProtocolGuid = { 0x17a0a3d7, 0xc0a5, 0x4635, { 0xbb, 0xd5, 0x07, 0x21, 0x87, 0xdf, 0xe2, 0xee }} > gPeCoffLoaderProtocolGuid = { 0xB323179B, 0x97FB, 0x477E, { 0xB0, 0xFE, 0xD8, 0x85, 0x91, 0xFA, 0x11, 0xAB } } > - gEfiMmcHostProtocolGuid = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }} > + gEdkiiMmcHostProtocolGuid = { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B }} > gAndroidFastbootTransportProtocolGuid = { 0x74bd9fe0, 0x8902, 0x11e3, {0xb9, 0xd3, 0xf7, 0x22, 0x38, 0xfc, 0x9a, 0x31}} > gAndroidFastbootPlatformProtocolGuid = { 0x524685a0, 0x89a0, 0x11e3, {0x9d, 0x4d, 0xbf, 0xa9, 0xf6, 0xa4, 0x03, 0x08}} > gUsbDeviceProtocolGuid = { 0x021bd2ca, 0x51d2, 0x11e3, {0x8e, 0x56, 0xb7, 0x54, 0x17, 0xc7, 0x0b, 0x44 }} > diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h > index 9e070826805b..ef4aa2f65e75 100644 > --- a/EmbeddedPkg/Include/Protocol/MmcHost.h > +++ b/EmbeddedPkg/Include/Protocol/MmcHost.h > @@ -13,7 +13,7 @@ > /// > /// Global ID for the MMC Host Protocol > /// > -#define EFI_MMC_HOST_PROTOCOL_GUID \ > +#define EDKII_MMC_HOST_PROTOCOL_GUID \ > { 0x3e591c00, 0x9e4a, 0x11df, {0x92, 0x44, 0x00, 0x02, 0xA5, 0xD5, 0xC5, 0x1B } } > > #define MMC_RESPONSE_TYPE_R1 0 > @@ -178,7 +178,7 @@ struct _EFI_MMC_HOST_PROTOCOL { > #define MMC_HOST_HAS_ISMULTIBLOCK(Host) (Host->Revision >= MMC_HOST_PROTOCOL_REVISION && \ > Host->IsMultiBlock != NULL) > > -extern EFI_GUID gEfiMmcHostProtocolGuid; > +extern EFI_GUID gEdkiiMmcHostProtocolGuid; > > #endif > > diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/MmcDxe/Mmc.c > index c6170880debd..0088e27b9998 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c > +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c > @@ -216,7 +216,7 @@ MmcDriverBindingSupported ( > // > Status = gBS->OpenProtocol ( > Controller, > - &gEfiMmcHostProtocolGuid, > + &gEdkiiMmcHostProtocolGuid, > (VOID **) &MmcHost, > This->DriverBindingHandle, > Controller, > @@ -234,7 +234,7 @@ MmcDriverBindingSupported ( > // > gBS->CloseProtocol ( > Controller, > - &gEfiMmcHostProtocolGuid, > + &gEdkiiMmcHostProtocolGuid, > This->DriverBindingHandle, > Controller > ); > @@ -275,7 +275,7 @@ MmcDriverBindingStart ( > // > Status = gBS->OpenProtocol ( > Controller, > - &gEfiMmcHostProtocolGuid, > + &gEdkiiMmcHostProtocolGuid, > (VOID **) &MmcHost, > This->DriverBindingHandle, > Controller, > @@ -326,10 +326,10 @@ MmcDriverBindingStop ( > MmcHostInstance = MMC_HOST_INSTANCE_FROM_LINK(CurrentLink); > ASSERT(MmcHostInstance != NULL); > > - // Close gEfiMmcHostProtocolGuid > + // Close gEdkiiMmcHostProtocolGuid > Status = gBS->CloseProtocol ( > Controller, > - &gEfiMmcHostProtocolGuid, > + &gEdkiiMmcHostProtocolGuid, > This->DriverBindingHandle, > Controller > ); > diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > index 67cdce6c5b4d..ea1410f839ee 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > +++ b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf > @@ -38,7 +38,7 @@ [Protocols] > gEfiDiskIoProtocolGuid > gEfiBlockIoProtocolGuid > gEfiDevicePathProtocolGuid > - gEfiMmcHostProtocolGuid > + gEdkiiMmcHostProtocolGuid > gEfiDriverDiagnostics2ProtocolGuid > > [Depex] > -- > 2.17.1 >