From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::241; helo=mail-lf0-x241.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (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 DB6382218E95C for ; Fri, 8 Dec 2017 06:53:29 -0800 (PST) Received: by mail-lf0-x241.google.com with SMTP id j124so12188091lfg.2 for ; Fri, 08 Dec 2017 06:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Jnv1bQApoPHdKN7NcoXvO4xra9wWoEd6sArsNFfKlyQ=; b=ox89cj1VWBXRYGcq+pHoJTR84D85LT5wU1HJ9itI1DjU+axQg3roLYDoTH6uxB2jX6 ZjQRGXAE4FrHkLUoqxUuoBxW+O+MAfAS+2AGmYnBeuxGavSgNO07viQmBFBNcwRJ3VRk J/Ve3htGRc1FVp9IvbRoiYWfM6wrVBPavenc0ro5hnuKnYa5IFV9neGTsrnxCGTYof5m xtaiaoHyzrtpumOpd6+ZFW5dIvOfRJrRrIp3o6TysBDIzBProXk0a+uiG9UVTD5fazG+ 8bBjd3jVHxy9Ahw8i0O1rTK//lPqnWkjvcL5Dd/CBhi9J3k/MUwDppjEJHnLpP5gVkQs 0QGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Jnv1bQApoPHdKN7NcoXvO4xra9wWoEd6sArsNFfKlyQ=; b=R0zTrVznO6r0zFas5+g23mHX2TMRXmDC/8ffIjL3qNKaxVuaXxCDt7NAXYwgEVkv66 cmz6m/dtdoQSTqtuPthuJ5C/mQ2Ha8H/Pgqoccf1I3Vz98lr4JrfB87SFcQJTyUGYg+V LQgOrVAg/+BQOKGa34GYNJSAFWiXOYCuCM/jNecwlP3pkoXnXEtNbIjJyzIYmhwyeOv8 CbylaKUEUEv9PVjL6ErfZd/NpI0eqzOLNokWpALreM3OSIlhCOOzrN6+fu1fd5yujSG4 nN7Jufy1Tt+zs04YHdP65cnYDeGAplDLBy5q0S0WPofnAwGotbt5ggIMS/nVy12pbFVl oJ6Q== X-Gm-Message-State: AJaThX5j4HzIavVvOUcweIFD/RJ6raLlozdASLLeM6xId84tOpCSc/iT TVyR6tm4JJ7l3qnKLKlnppadOJLweqk= X-Google-Smtp-Source: AGs4zMazzrU+ltlb5cJmRlSem5/m9L6tQeJjE1O1UfcMBOFswtJVZD5I7YcZWl8J5xf/HrZnW/bGdg== X-Received: by 10.25.99.129 with SMTP id v1mr14151521lfi.78.1512745082300; Fri, 08 Dec 2017 06:58:02 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id e16sm1500011lja.29.2017.12.08.06.58.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Dec 2017 06:58:01 -0800 (PST) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, neta@marvell.com, kostap@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com, ka@semihalf.com Date: Fri, 8 Dec 2017 15:57:37 +0100 Message-Id: <1512745057-19038-8-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512745057-19038-1-git-send-email-mw@semihalf.com> References: <1512745057-19038-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 7/7] 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: Fri, 08 Dec 2017 14:53:30 -0000 '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. 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/NonDiscoverableDxe/NonDiscoverableDxe.c} | 26 ++++++++++---------- Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDxe/NonDiscoverableDxe.inf} | 8 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) rename Silicon/Marvell/{PciEmulation/PciEmulation.c => Drivers/NonDiscoverableDxe/NonDiscoverableDxe.c} (84%) rename Silicon/Marvell/{PciEmulation/PciEmulation.inf => Drivers/NonDiscoverableDxe/NonDiscoverableDxe.inf} (91%) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf b/Platform/Marvell/Armada70x0Db/Armada70x0Db.fdf index 7fcb90a..befb107 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/MvPhyDxe/MvPhyDxe.inf INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf - # PciEmulation - INF Silicon/Marvell/PciEmulation/PciEmulation.inf + # NonDiscoverableDevices + INF Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.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 9450830..5101b75 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/NonDiscoverableDxe/NonDiscoverableDxe.inf MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf # SCSI diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.c b/Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.c similarity index 84% rename from Silicon/Marvell/PciEmulation/PciEmulation.c rename to Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.c index 35f1a87..6ff90a5 100644 --- a/Silicon/Marvell/PciEmulation/PciEmulation.c +++ b/Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.c @@ -55,7 +55,7 @@ STATIC UINT8 * CONST SdhciDeviceTable = FixedPcdGetPtr (PcdPciESdhci); // STATIC EFI_STATUS -PciEmulationInitXhci ( +NonDiscoverableInitXhci ( ) { 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, "NonDiscoverable: 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, "NonDiscoverable: Cannot install Xhci device %d\n", i)); return Status; } } @@ -92,7 +92,7 @@ PciEmulationInitXhci ( STATIC EFI_STATUS -PciEmulationInitAhci ( +NonDiscoverableInitAhci ( ) { 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, "NonDiscoverable: 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, "NonDiscoverable: Cannot install Ahci device %d\n", i)); return Status; } } @@ -129,7 +129,7 @@ PciEmulationInitAhci ( STATIC EFI_STATUS -PciEmulationInitSdhci ( +NonDiscoverableInitSdhci ( ) { 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, "NonDiscoverable: 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, "NonDiscoverable: Cannot install Sdhci device %d\n", i)); return Status; } } @@ -169,24 +169,24 @@ PciEmulationInitSdhci ( // EFI_STATUS EFIAPI -PciEmulationEntryPoint ( +NonDiscoverableEntryPoint ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable ) { EFI_STATUS Status; - Status = PciEmulationInitXhci(); + Status = NonDiscoverableInitXhci(); if (EFI_ERROR(Status)) { return Status; } - Status = PciEmulationInitAhci(); + Status = NonDiscoverableInitAhci(); if (EFI_ERROR(Status)) { return Status; } - Status = PciEmulationInitSdhci(); + Status = NonDiscoverableInitSdhci(); if (EFI_ERROR(Status)) { return Status; } diff --git a/Silicon/Marvell/PciEmulation/PciEmulation.inf b/Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.inf similarity index 91% rename from Silicon/Marvell/PciEmulation/PciEmulation.inf rename to Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.inf index c6a3c99..b62b3fb 100644 --- a/Silicon/Marvell/PciEmulation/PciEmulation.inf +++ b/Silicon/Marvell/Drivers/NonDiscoverableDxe/NonDiscoverableDxe.inf @@ -32,15 +32,15 @@ [Defines] INF_VERSION = 0x00010019 - BASE_NAME = PciEmulation + BASE_NAME = NonDiscoverableDxe FILE_GUID = 3dfa08da-923b-4841-9435-c77a604d7493 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - ENTRY_POINT = PciEmulationEntryPoint + ENTRY_POINT = NonDiscoverableEntryPoint [Sources.common] - PciEmulation.c + NonDiscoverableDxe.c [Packages] EmbeddedPkg/EmbeddedPkg.dec @@ -53,9 +53,9 @@ UefiDriverEntryPoint [Pcd] - gMarvellTokenSpaceGuid.PcdPciEXhci gMarvellTokenSpaceGuid.PcdPciEAhci gMarvellTokenSpaceGuid.PcdPciESdhci + gMarvellTokenSpaceGuid.PcdPciEXhci [Depex] TRUE -- 2.7.4