From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Marcin Wojtas <mw@semihalf.com>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
"Leif Lindholm" <leif.lindholm@linaro.org>,
"Nadav Haklai" <nadavh@marvell.com>,
"Neta Zur Hershkovits" <neta@marvell.com>,
"Kostya Porotchkin" <kostap@marvell.com>,
"Hua Jing" <jinghua@marvell.com>, "Jan Dąbroś" <jsd@semihalf.com>,
ka@semihalf.com
Subject: Re: [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming
Date: Thu, 7 Dec 2017 19:49:19 +0000 [thread overview]
Message-ID: <CAKv+Gu_LD8ewHrAoovg-S3jW-nJhv8=va7x0zG5eNHmd=WcMLA@mail.gmail.com> (raw)
In-Reply-To: <1512674434-32326-6-git-send-email-mw@semihalf.com>
Hi Marcin,
On 7 December 2017 at 19:20, Marcin Wojtas <mw@semihalf.com> 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 <mw@semihalf.com>
> ---
> 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?
> 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
>
next prev parent reply other threads:[~2017-12-07 19:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 19:20 [platforms: PATCH v2 0/5] Armada 7k/8k files reorganization Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 1/5] Marvell: Reorganize file structure Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 2/5] Marvell/Armada7k8k: Use '7k8k' prefix in the SoC drivers/libraries Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 3/5] Marvell/Armada70x0Db: Rename fd file Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 4/5] Marvell/Drivers: Rename SPI master driver Marcin Wojtas
2017-12-07 19:48 ` Ard Biesheuvel
2017-12-07 23:01 ` Marcin Wojtas
2017-12-07 19:20 ` [platforms: PATCH v2 5/5] Marvell/Drivers: Drop 'PciEmulation' naming Marcin Wojtas
2017-12-07 19:49 ` Ard Biesheuvel [this message]
2017-12-07 23:08 ` Marcin Wojtas
2017-12-08 8:40 ` Ard Biesheuvel
2017-12-08 12:11 ` Marcin Wojtas
2017-12-08 14:08 ` Leif Lindholm
2017-12-08 14:13 ` Marcin Wojtas
2017-12-08 14:23 ` Leif Lindholm
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_LD8ewHrAoovg-S3jW-nJhv8=va7x0zG5eNHmd=WcMLA@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