From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::22e; helo=mail-it0-x22e.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-it0-x22e.google.com (mail-it0-x22e.google.com [IPv6:2607:f8b0:4001:c0b::22e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 40B0721B02820 for ; Thu, 7 Dec 2017 15:04:21 -0800 (PST) Received: by mail-it0-x22e.google.com with SMTP id f143so964573itb.0 for ; Thu, 07 Dec 2017 15:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=vW40hYeZB4kxeREoyD9rC+D3pmfFdV1pyMcd3gn7BuM=; b=tiQdnlSrwCj99x9mlDG/6zx/n/rtcQxHCjv3LocyyJ2cwoBH6KMjqzpZ7uJMMqkwE5 nRc8ov9hMqTj/iT23jfLHoL+QMKOyPBBEGevLRIMMUYpgrZX/kBQVfI58uJdMtpphQ89 zmLB2kTbyeQT/RIsyOIiD51VaNXVK1Vf0ZyNdB1hJKgYAWAO/ra6BdLQZIrIB3YsEESD 4X/7XS/U55ontDJlQHu2iFNjKXQxW1pUJIOT6udlRKd/hDwM3nGNGJIWgpKKCqkXXaxy P0OihhikKulMsFC9gguoGlesDNbhZs06U6NIIVjSnNa8Hoy7YgsvaSWAxZ/VD2Ov+ukr ts2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=vW40hYeZB4kxeREoyD9rC+D3pmfFdV1pyMcd3gn7BuM=; b=SmckOezxAn4PTj7X+8T2PtJzgMl8jPmiDRCTdgJXDc+uFlEeMpGWKWeMBJv3yAVFGq 2jD6JeJs6yAq5E2VXoLPlM1M/n3zP7eC3DlWTdTwtvAOksuJO+wH4uKEMegKoIrFxKgW VDMQZsvz1lRdw/0An66JVxPi2VSxHL1mL6EgCuHzm2H5myWUiAJ4TkSQAHZLubyR2xGi CwC5I6E6lGLoUHmg2zTij4UFWIvAl2/d1AasZb1Qg2LiXSc+S6GIYj0ZEZjIl1GaGLlP 6CWPdQAbCyTTyMuXTevWh0B3UDQ8Xkm/N9bzAlAmMzyLoQpeCGxlCM+Q3jLFhGt87PnD QPgg== X-Gm-Message-State: AKGB3mI+xG+lflz+I8aOLiXTU1BXIbkALgXQ5Vn7Cc8NsJHanEbePZN0 vNtAsvAyqlo8IjC36G2brWlDShwNMRNJBOALv5vw4B6MQZE= X-Google-Smtp-Source: AGs4zMYmdhhUQ7xMoGwVu53A+wm+5Jmz1B7lTnAAl/g7dejbkZmePLv/3Ki6t+4IVVKiNhHT8/x5IajhxeC6SPzH9C4= X-Received: by 10.36.131.200 with SMTP id d191mr3622498ite.97.1512688133631; Thu, 07 Dec 2017 15:08:53 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.132.164 with HTTP; Thu, 7 Dec 2017 15:08:53 -0800 (PST) In-Reply-To: References: <1512674434-32326-1-git-send-email-mw@semihalf.com> <1512674434-32326-6-git-send-email-mw@semihalf.com> From: Marcin Wojtas Date: Fri, 8 Dec 2017 00:08:53 +0100 Message-ID: To: Ard Biesheuvel Cc: "edk2-devel@lists.01.org" , Leif Lindholm , Nadav Haklai , Neta Zur Hershkovits , Kostya Porotchkin , Hua Jing , =?UTF-8?B?SmFuIETEhWJyb8Wb?= , Konrad Adamczyk Subject: Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 23:04:21 -0000 Content-Type: text/plain; charset="UTF-8" Hi Ard, 2017-12-07 20:49 GMT+01:00 Ard Biesheuvel : > Hi Marcin, > > On 7 December 2017 at 19:20, Marcin Wojtas wrote: >> 'PciEmulation' is not a proper naming for a driver, which >> uses NonDiscoverableDeviceRegistrationLib for handling >> the devices attached via internal bus of the SoC. >> Rename it to MvNonDiscoverableDxe and move under >> Silicon/Marvell/Drivers directory. >> > > Thank you! > >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Marcin Wojtas >> --- >> Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf | 4 +-- >> Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 4 +-- >> Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} | 26 ++++++++++---------- >> Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} | 8 +++--- >> 4 files changed, 21 insertions(+), 21 deletions(-) >> rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c} (84%) >> rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf} (91%) >> > > Could we please have > > Drivers/MvNonDiscoverableDxe/MvNonDiscoverableDxe.inf > > instead? > My intention was to keep a generic naming at the first level inside the Silicon/Drivers/Marvell: I2c Net SdMmc Spi I can change it in a way you want, but to my taste MvNonDiscoverableDxe doesn't fully fit the company above. Do you see any possible compromise? :) Best regards, Marcin > > > >> diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf >> index 6d57b9a..2bf409e 100644 >> --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf >> +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf >> @@ -135,8 +135,8 @@ FvNameGuid = 5eda4200-2c5f-43cb-9da3-0baf74b1b30c >> INF Silicon/Marvell/Drivers/Net/Phy/MvPhyDxe/MvPhyDxe.inf >> INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf >> >> - # PciEmulation >> - INF Silicon/Marvell/PciEmulation/PciEmulation.inf >> + # NonDiscoverableDevices >> + INF Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf >> INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf >> >> # SCSI >> diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc >> index 0eb3ef3..598810e 100644 >> --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc >> +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc >> @@ -440,8 +440,8 @@ >> EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf >> EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf >> >> - # PciEmulation >> - Silicon/Marvell/PciEmulation/PciEmulation.inf >> + # NonDiscoverableDevices >> + Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf >> MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf >> >> # SCSI >> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c >> similarity index 84% >> rename from Silicon/Marvell/PciEmulation/PciEmulation.c >> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c >> index 35f1a87..abb2940 100644 >> --- a/Silicon/Marvell/PciEmulation/PciEmulation.c >> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.c >> @@ -55,7 +55,7 @@ STATIC UINT8 * CONST SdhciDeviceTable = FixedPcdGetPtr (PcdPciESdhci); >> // >> STATIC >> EFI_STATUS >> -PciEmulationInitXhci ( >> +MvNonDiscoverableInitXhci ( >> ) >> { >> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate; >> @@ -63,7 +63,7 @@ PciEmulationInitXhci ( >> UINT8 i; >> >> if (PcdGetSize (PcdPciEXhci) < Desc->XhciDevCount) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEXhci format\n")); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEXhci format\n")); >> return EFI_INVALID_PARAMETER; >> } >> >> @@ -82,7 +82,7 @@ PciEmulationInitXhci ( >> ); >> >> if (EFI_ERROR(Status)) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Xhci device %d\n", i)); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Xhci device %d\n", i)); >> return Status; >> } >> } >> @@ -92,7 +92,7 @@ PciEmulationInitXhci ( >> >> STATIC >> EFI_STATUS >> -PciEmulationInitAhci ( >> +MvNonDiscoverableInitAhci ( >> ) >> { >> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate; >> @@ -100,7 +100,7 @@ PciEmulationInitAhci ( >> UINT8 i; >> >> if (PcdGetSize (PcdPciEAhci) < Desc->AhciDevCount) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciEAhci format\n")); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciEAhci format\n")); >> return EFI_INVALID_PARAMETER; >> } >> >> @@ -119,7 +119,7 @@ PciEmulationInitAhci ( >> ); >> >> if (EFI_ERROR(Status)) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Ahci device %d\n", i)); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Ahci device %d\n", i)); >> return Status; >> } >> } >> @@ -129,7 +129,7 @@ PciEmulationInitAhci ( >> >> STATIC >> EFI_STATUS >> -PciEmulationInitSdhci ( >> +MvNonDiscoverableInitSdhci ( >> ) >> { >> MVHW_NONDISCOVERABLE_DESC *Desc = &mA7k8kNonDiscoverableDescTemplate; >> @@ -137,7 +137,7 @@ PciEmulationInitSdhci ( >> UINT8 i; >> >> if (PcdGetSize (PcdPciESdhci) < Desc->SdhciDevCount) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Wrong PcdPciESdhci format\n")); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Wrong PcdPciESdhci format\n")); >> return EFI_INVALID_PARAMETER; >> } >> >> @@ -156,7 +156,7 @@ PciEmulationInitSdhci ( >> ); >> >> if (EFI_ERROR(Status)) { >> - DEBUG((DEBUG_ERROR, "PciEmulation: Cannot install Sdhci device %d\n", i)); >> + DEBUG((DEBUG_ERROR, "MvNonDiscoverable: Cannot install Sdhci device %d\n", i)); >> return Status; >> } >> } >> @@ -169,24 +169,24 @@ PciEmulationInitSdhci ( >> // >> EFI_STATUS >> EFIAPI >> -PciEmulationEntryPoint ( >> +MvNonDiscoverableEntryPoint ( >> IN EFI_HANDLE ImageHandle, >> IN EFI_SYSTEM_TABLE *SystemTable >> ) >> { >> EFI_STATUS Status; >> >> - Status = PciEmulationInitXhci(); >> + Status = MvNonDiscoverableInitXhci(); >> if (EFI_ERROR(Status)) { >> return Status; >> } >> >> - Status = PciEmulationInitAhci(); >> + Status = MvNonDiscoverableInitAhci(); >> if (EFI_ERROR(Status)) { >> return Status; >> } >> >> - Status = PciEmulationInitSdhci(); >> + Status = MvNonDiscoverableInitSdhci(); >> if (EFI_ERROR(Status)) { >> return Status; >> } >> diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf >> similarity index 91% >> rename from Silicon/Marvell/PciEmulation/PciEmulation.inf >> rename to Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf >> index c6a3c99..3f94c32 100644 >> --- a/Silicon/Marvell/PciEmulation/PciEmulation.inf >> +++ b/Silicon/Marvell/Drivers/NonDiscoverableDevices/MvNonDiscoverableDxe.inf >> @@ -32,15 +32,15 @@ >> >> [Defines] >> INF_VERSION = 0x00010019 >> - BASE_NAME = PciEmulation >> + BASE_NAME = MvNonDiscoverableDxe >> FILE_GUID = 3dfa08da-923b-4841-9435-c77a604d7493 >> MODULE_TYPE = DXE_DRIVER >> VERSION_STRING = 1.0 >> >> - ENTRY_POINT = PciEmulationEntryPoint >> + ENTRY_POINT = MvNonDiscoverableEntryPoint >> >> [Sources.common] >> - PciEmulation.c >> + MvNonDiscoverableDxe.c >> >> [Packages] >> EmbeddedPkg/EmbeddedPkg.dec >> @@ -53,9 +53,9 @@ >> UefiDriverEntryPoint >> >> [Pcd] >> - gMarvellTokenSpaceGuid.PcdPciEXhci >> gMarvellTokenSpaceGuid.PcdPciEAhci >> gMarvellTokenSpaceGuid.PcdPciESdhci >> + gMarvellTokenSpaceGuid.PcdPciEXhci >> >> [Depex] >> TRUE >> -- >> 2.7.4 >>