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::242; helo=mail-lf0-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) (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 D083921B02843 for ; Thu, 7 Dec 2017 11:16:27 -0800 (PST) Received: by mail-lf0-x242.google.com with SMTP id c140so2546493lfg.7 for ; Thu, 07 Dec 2017 11:21:01 -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=XEwL1AKmKNm+gWOkR+muGdcLdRiUYfdxTN/nL+7IBkM=; b=EZM2B4Hjxzd/aUx9l/VwRRo4jJBjA2mGVeICvrXV8aa9q2sXzA4pKgheDeZ79zJdku wahMtaJmh0VcYkrTWFVrM3gJAYGQnw/sdTpsGTzMELcQgrjztL52PmCAVqskvASpjjjC rZYa3i7n/Wk3i+I+qjPsPC3NwvA9xE511PaBV+cSWB+WUaEzHRxCkvxiuyLdUQpRxf23 3n/Gt0BrvrN7k2Khen9kpMLOugEisCUGJ+vLglt4mATgugsvXCiVXctzvTT1DDAwOPtl 53IHifgzx1G36KFLuWaqiVOJ41bF3TraGbsZJ5ZsPfXgvrrk9UHVWhGo2d83ITB5PIqS t6sQ== 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=XEwL1AKmKNm+gWOkR+muGdcLdRiUYfdxTN/nL+7IBkM=; b=g8ZZWAEF56GGkafzFrMhxbnrimueG3rDBMuX3PkeJ5zf6KtRZWfMpZA9634bkjVquE OAfll8dt6g3XaDL8tDIL5A4Vh8tjmybfU39kzZZqz60Wm7O3+CX/NAIodEZNdamfRoK3 wTMHry7wunWiLZD1EGa7nJbr8iyE0yrYIi3drovsV4XYZuWwjMf9PgYN8VGMc6xKIww4 QcEgfrnbWQCIj2R0vUYAo+2fdGYIzp/DYFAwkLUYLnhiGo3bgEV9AyhZhhlOSUef+OdG WeHEVcwIDOzA/CDZOIX9/LG7VT+RXU8nfG3Kp17J6Ca5zwt+gK508g2Llo6BCiv9KTxW y+2A== X-Gm-Message-State: AKGB3mJFpkSAbUrMBiPoaFRnNDSspig0H8zzhjlbed05m5QDve9nkUja sxc+xp75Z+P6D1vqT9GJbRtUcuNxVh8= X-Google-Smtp-Source: AGs4zMbHvpai45l7YIAwck3085EZxlP3r+1H7G3L64LuAuU0FGuCIiA1HncgGqLUQJGwD0d0oDHTsQ== X-Received: by 10.25.229.216 with SMTP id i85mr9669017lfk.42.1512674459334; Thu, 07 Dec 2017 11:20:59 -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 b84sm1164363ljf.60.2017.12.07.11.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 11:20:58 -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: Thu, 7 Dec 2017 20:20:34 +0100 Message-Id: <1512674434-32326-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512674434-32326-1-git-send-email-mw@semihalf.com> References: <1512674434-32326-1-git-send-email-mw@semihalf.com> Subject: [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 19:16:28 -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/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%) 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