* [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665
@ 2021-10-04 9:29 Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 01/15] Platform/Comcast: Use FdtClientDxe from EmbeddedPkg Abner Chang
` (15 more replies)
0 siblings, 16 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer, Peng Xie,
Ling Jia, Yiqi Shu, Thomas Abraham, Sami Mujawar, Graeme Gregory,
Radoslaw Biernacki, Wenyi Xie
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
BZ:#3665 is to migrate some modules from ArmVirtPkg
to under OvmfPkg for the upcoming RiscVVirtPkg that can leverage
those modules without the dependency with Arm*Pkg.
Refer to below message of the pacthes of edk2 portion.
https://edk2.groups.io/g/devel/message/81306
This edk2-platforms patch set is the corresponding platform DSC/FDF/INF
changes to compliant with BZ:#3665.
We will merge this patch set when the time the changes of edk2 are merged
once this patch set is reviewed.
FYI,
The modules moved from ArmVirtPkg to OvmfPkg are:
- FdtClientDxe
- PciPcdProducerLib
- HighMemDxe
- QemuFwCfgLib
- FdtPciHostBridgeLib
- VirtioFdtDxe
Below PCDs are moved to under MdePkg and leverage by RiscVVirtPkg.
This change also remove the dependency on ArmPkg of OvmfPkg.
- PcdPciIoTranslation
- PcdPciIoTranslation
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Peng Xie <xiepeng@phytium.com.cn>
Cc: Ling Jia <jialing@phytium.com.cn>
Cc: Yiqi Shu <shuyiqi@phytium.com.cn>
Cc: Thomas Abraham <thomas.abraham@arm.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Graeme Gregory <graeme@nuviainc.com>
Cc: Radoslaw Biernacki <rad@semihalf.com>
Cc: Wenyi Xie <xiewenyi2@huawei.com>
Abner Chang (15):
Platform/Comcast: Use FdtClientDxe from EmbeddedPkg
Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg
Platform/SbsaQemu: Use PcdPciIoTranslation PCD from MdePkg
Platform/AMD: Use PcdPciIoTranslation PCD from MdePkg
Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
Platform/Comcast: Use PcdPciIoTranslation PCD from MdePkg
Platform/LeMaker: Use PcdPciIoTranslation PCD from MdePkg
Platform/Phytium: Use PcdPciIoTranslation PCD from MdePkg
Platform/SoftIron: Use PcdPciIoTranslation PCD from MdePkg
Platform/Socionext: Use PcdPciIoTranslation PCD from MdePkg
Platform/Comcast: Use PciPcdProducerLib in OvmfPkg.
Platform/Comcast: Use HighMemDxe provided by OvmfPkg
Platform/Comcast: Use QemuFwCfgMmio provided by OvmfPkg
Platform/Comcast: Use FdtPciHostBridgeLib provided by OvmfPkg.
Platform/Comcast: Use VirtioFdtDxe provided by OvmfPkg.
Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
.../AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +-
Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
Platform/Comcast/RDKQemu/RDKQemu.dsc | 20 +++++++++----------
Platform/Hisilicon/D03/D03.dsc | 2 +-
Platform/Hisilicon/D05/D05.dsc | 2 +-
Platform/Hisilicon/D06/D06.dsc | 2 +-
Platform/LeMaker/CelloBoard/CelloBoard.dsc | 2 +-
Platform/Phytium/DurianPkg/DurianPkg.dsc | 2 +-
Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 +-
.../Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
.../JunoPciHostBridgeLib.inf | 3 ++-
.../Library/PlatformLib/PlatformLib.inf | 2 +-
.../Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 2 +-
.../SynQuacerPciHostBridgeLib.inf | 2 +-
15 files changed, 27 insertions(+), 24 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 01/15] Platform/Comcast: Use FdtClientDxe from EmbeddedPkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 02/15] Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
` (14 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
FdtClientDxe is relocated to under EmbeddedPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 13f00d86da..2e961959a2 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -309,7 +309,7 @@
# Platform Driver
#
ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
- ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+ EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
ArmVirtPkg/HighMemDxe/HighMemDxe.inf
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 02/15] Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 01/15] Platform/Comcast: Use FdtClientDxe from EmbeddedPkg Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 03/15] Platform/SbsaQemu: " Abner Chang
` (13 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Ard Biesheuvel, Wenyi Xie, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Wenyi Xie <xiewenyi2@huawei.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Hisilicon/D03/D03.dsc | 2 +-
Platform/Hisilicon/D05/D05.dsc | 2 +-
Platform/Hisilicon/D06/D06.dsc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc
index c3858aa0b1..0c17815d71 100644
--- a/Platform/Hisilicon/D03/D03.dsc
+++ b/Platform/Hisilicon/D03/D03.dsc
@@ -124,7 +124,7 @@
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdCoreCount|8
- gArmTokenSpaceGuid.PcdPciIoTranslation|0
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc
index 0d27bbffce..e01f6e335f 100644
--- a/Platform/Hisilicon/D05/D05.dsc
+++ b/Platform/Hisilicon/D05/D05.dsc
@@ -127,7 +127,7 @@
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdCoreCount|8
- gArmTokenSpaceGuid.PcdPciIoTranslation|0
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0
gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000
diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index fecc3cfb1b..2c5afa5b0e 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -223,7 +223,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiExposedTableVersions|0x20
gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x0
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0
################################################################################
#
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 03/15] Platform/SbsaQemu: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 01/15] Platform/Comcast: Use FdtClientDxe from EmbeddedPkg Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 02/15] Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 04/15] Platform/AMD: " Abner Chang
` (12 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel
Cc: Ard Biesheuvel, Leif Lindholm, Graeme Gregory, Radoslaw Biernacki,
Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Graeme Gregory <graeme@nuviainc.com>
Cc: Radoslaw Biernacki <rad@semihalf.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 +-
Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index 063a45b3ce..d404e08a67 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -486,7 +486,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciExpressBarSize|0x10000000
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciExpressBarLimit|0xFFFFFFFF
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x7fff0000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x7fff0000
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI
diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
index 9be34488eb..0ad9cc7ce4 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
@@ -51,7 +51,7 @@
gArmTokenSpaceGuid.PcdPciIoBase
gArmTokenSpaceGuid.PcdPciIoSize
- gArmTokenSpaceGuid.PcdPciIoTranslation
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciIoLimit
gArmTokenSpaceGuid.PcdPciMmio32Base
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 04/15] Platform/AMD: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (2 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 03/15] Platform/SbsaQemu: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 05/15] Platform/ARM: " Abner Chang
` (11 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 31be381cf7..91b8c7792e 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -398,7 +398,7 @@ DEFINE X64EMU_ENABLE = FALSE
gArmTokenSpaceGuid.PcdPciIoBase|0x1000
gArmTokenSpaceGuid.PcdPciIoSize|0xF000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (3 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 04/15] Platform/AMD: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 18:09 ` Sami Mujawar
2021-10-14 17:21 ` [edk2-devel] " PierreGondois
2021-10-04 9:29 ` [edk2-platforms][PATCH 06/15] Platform/Comcast: " Abner Chang
` (10 subsequent siblings)
15 siblings, 2 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Thomas Abraham, Sami Mujawar, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Thomas Abraham <thomas.abraham@arm.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
.../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
index 7e37732fb9..6679939d3b 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
@@ -1,5 +1,6 @@
#
# Copyright (c) 2018-2021, ARM Limited. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -150,7 +151,7 @@
gArmTokenSpaceGuid.PcdPciBusMax|255
gArmTokenSpaceGuid.PcdPciIoBase|0x0
gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x77800000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index fdfc8cd9e2..3b7a63b643 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -1,5 +1,6 @@
#
# Copyright (c) 2013-2018, ARM Limited. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -178,7 +179,7 @@
gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
# List of Device Paths that support BootMonFs
diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
index 8b4a6e2fad..fb513d7b3d 100644
--- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
+++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
@@ -2,6 +2,7 @@
# PCI Host Bridge Library instance for ARM Juno
#
# Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
#
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
@@ -51,7 +52,7 @@
gArmTokenSpaceGuid.PcdPciBusMax
gArmTokenSpaceGuid.PcdPciIoBase
gArmTokenSpaceGuid.PcdPciIoSize
- gArmTokenSpaceGuid.PcdPciIoTranslation
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
gArmTokenSpaceGuid.PcdPciMmio32Base
gArmTokenSpaceGuid.PcdPciMmio32Size
gArmTokenSpaceGuid.PcdPciMmio32Translation
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 06/15] Platform/Comcast: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (4 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 05/15] Platform/ARM: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 07/15] Platform/LeMaker: " Abner Chang
` (9 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 2e961959a2..281081959d 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -198,7 +198,7 @@
# PCD and PcdPciDisableBusEnumeration above have not been assigned yet
gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x0
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0
#
# Set video resolution for boot options and for text setup.
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 07/15] Platform/LeMaker: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (5 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 06/15] Platform/Comcast: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 08/15] Platform/Phytium: " Abner Chang
` (8 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/LeMaker/CelloBoard/CelloBoard.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index cf2754a509..d826e34fdd 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -388,7 +388,7 @@ DEFINE NUM_CORES = 4
gArmTokenSpaceGuid.PcdPciIoBase|0x1000
gArmTokenSpaceGuid.PcdPciIoSize|0xF000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 08/15] Platform/Phytium: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (6 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 07/15] Platform/LeMaker: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 09/15] Platform/SoftIron: " Abner Chang
` (7 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Leif Lindholm, Peng Xie, Ling Jia, Yiqi Shu, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Peng Xie <xiepeng@phytium.com.cn>
Cc: Ling Jia <jialing@phytium.com.cn>
Cc: Yiqi Shu <shuyiqi@phytium.com.cn>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Phytium/DurianPkg/DurianPkg.dsc | 2 +-
Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Platform/Phytium/DurianPkg/DurianPkg.dsc b/Platform/Phytium/DurianPkg/DurianPkg.dsc
index 56ed7fffc5..7df7e0f1d5 100644
--- a/Platform/Phytium/DurianPkg/DurianPkg.dsc
+++ b/Platform/Phytium/DurianPkg/DurianPkg.dsc
@@ -111,7 +111,7 @@
gArmTokenSpaceGuid.PcdPciBusMax|255
gArmTokenSpaceGuid.PcdPciIoBase|0x00000
gArmTokenSpaceGuid.PcdPciIoSize|0xf00000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0x50000000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x50000000
gArmTokenSpaceGuid.PcdPciMmio32Base|0x58000000
gArmTokenSpaceGuid.PcdPciMmio32Size|0x28000000
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
diff --git a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
index 40c070767a..6d5951c62d 100644
--- a/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
+++ b/Silicon/Phytium/FT2000-4Pkg/Library/PlatformLib/PlatformLib.inf
@@ -44,7 +44,7 @@
gArmTokenSpaceGuid.PcdPciBusMax
gArmTokenSpaceGuid.PcdPciIoBase
gArmTokenSpaceGuid.PcdPciIoSize
- gArmTokenSpaceGuid.PcdPciIoTranslation
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
gArmTokenSpaceGuid.PcdPciMmio32Base
gArmTokenSpaceGuid.PcdPciMmio32Size
gArmTokenSpaceGuid.PcdPciMmio32Translation
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 09/15] Platform/SoftIron: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (7 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 08/15] Platform/Phytium: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 10/15] Platform/Socionext: " Abner Chang
` (6 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 7211f3e562..0f61665cbb 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -387,7 +387,7 @@ DEFINE NUM_CORES = 4
gArmTokenSpaceGuid.PcdPciIoBase|0x1000
gArmTokenSpaceGuid.PcdPciIoSize|0xF000
- gArmTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0xEFFF0000
gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
gArmTokenSpaceGuid.PcdPciMmio32Base|0x40000000
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 10/15] Platform/Socionext: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (8 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 09/15] Platform/SoftIron: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 11/15] Platform/Comcast: Use PciPcdProducerLib in OvmfPkg Abner Chang
` (5 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
both ARM and RISC-V arch. This patch uses the one from MdePkg
instead the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
.../SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
index 32399ecc05..8924ad97d5 100644
--- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
+++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.inf
@@ -43,7 +43,7 @@
UefiBootServicesTableLib
[FixedPcd]
- gArmTokenSpaceGuid.PcdPciIoTranslation
+ gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
[Pcd]
gSynQuacerTokenSpaceGuid.PcdPcieEnableMask
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 11/15] Platform/Comcast: Use PciPcdProducerLib in OvmfPkg.
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (9 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 10/15] Platform/Socionext: " Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 12/15] Platform/Comcast: Use HighMemDxe provided by OvmfPkg Abner Chang
` (4 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
PciPcdProducerLib is relocated from ArmVirtPkg to OvmfPkg/Fdt, use
OvmfPkg one instead.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 281081959d..cea3a20675 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -64,7 +64,7 @@
FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
- PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+ PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
@@ -370,12 +370,12 @@
#
ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
<LibraryClasses>
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
}
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses>
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
}
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
OvmfPkg/Virtio10Dxe/Virtio10.inf
@@ -417,5 +417,5 @@
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
<LibraryClasses>
- NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+ NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
}
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 12/15] Platform/Comcast: Use HighMemDxe provided by OvmfPkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (10 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 11/15] Platform/Comcast: Use PciPcdProducerLib in OvmfPkg Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 13/15] Platform/Comcast: Use QemuFwCfgMmio " Abner Chang
` (3 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
HighMemDxe is relocated from ArmVirtPkg to OvmfPkg/Fdt, use the
OvmfPkg one instead.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index cea3a20675..981632674e 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -310,7 +310,7 @@
#
ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
- ArmVirtPkg/HighMemDxe/HighMemDxe.inf
+ OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
OvmfPkg/VirtioNetDxe/VirtioNet.inf
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 13/15] Platform/Comcast: Use QemuFwCfgMmio provided by OvmfPkg
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (11 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 12/15] Platform/Comcast: Use HighMemDxe provided by OvmfPkg Abner Chang
@ 2021-10-04 9:29 ` Abner Chang
2021-10-04 9:30 ` [edk2-platforms][PATCH 14/15] Platform/Comcast: Use FdtPciHostBridgeLib " Abner Chang
` (2 subsequent siblings)
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:29 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
QemuFwCfg is relocated from ArmVirtPkg to OvmfPkg/Library/QemuFwCfgLib and renamed as QemuFwCfgMmio, use the OvmfPkg one
instead of the one under ArmVirtPkg.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 981632674e..5443122815 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -48,7 +48,7 @@
# Virtio Support
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
- QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+ QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.inf
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
ArmPlatformLib|ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 14/15] Platform/Comcast: Use FdtPciHostBridgeLib provided by OvmfPkg.
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (12 preceding siblings ...)
2021-10-04 9:29 ` [edk2-platforms][PATCH 13/15] Platform/Comcast: Use QemuFwCfgMmio " Abner Chang
@ 2021-10-04 9:30 ` Abner Chang
2021-10-04 9:30 ` [edk2-platforms][PATCH 15/15] Platform/Comcast: Use VirtioFdtDxe " Abner Chang
2021-10-12 10:23 ` [edk2-devel] [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Leif Lindholm
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:30 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
FdtPciHostBridgeLib is relocated from ArmVirtPkg to OvmfPkg/Fdt,
use OvmfPkg one instead.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 5443122815..4fba316598 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -66,7 +66,7 @@
FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
- PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+ PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
RdkBootManagerLib|Platform/Comcast/Library/RdkBootManagerLib/RdkBootManagerLib.inf
[LibraryClasses.common.PEIM]
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [edk2-platforms][PATCH 15/15] Platform/Comcast: Use VirtioFdtDxe provided by OvmfPkg.
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (13 preceding siblings ...)
2021-10-04 9:30 ` [edk2-platforms][PATCH 14/15] Platform/Comcast: Use FdtPciHostBridgeLib " Abner Chang
@ 2021-10-04 9:30 ` Abner Chang
2021-10-12 10:23 ` [edk2-devel] [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Leif Lindholm
15 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-04 9:30 UTC (permalink / raw)
To: devel; +Cc: Ard Biesheuvel, Leif Lindholm, Daniel Schaefer
Complaint with BZ: #3665
https://bugzilla.tianocore.org/show_bug.cgi?id=3665
VirtioFdtDxe is relocated from ArmVirtPkg to OvmfPkg/Fdt, use the
OvmfPkg one instead.
Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
---
Platform/Comcast/RDKQemu/RDKQemu.dsc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQemu/RDKQemu.dsc
index 4fba316598..5d14fd8cb8 100644
--- a/Platform/Comcast/RDKQemu/RDKQemu.dsc
+++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc
@@ -308,7 +308,7 @@
#
# Platform Driver
#
- ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
+ OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf
EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
--
2.17.1
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 ` [edk2-platforms][PATCH 05/15] Platform/ARM: " Abner Chang
@ 2021-10-04 18:09 ` Sami Mujawar
2021-10-14 17:21 ` [edk2-devel] " PierreGondois
1 sibling, 0 replies; 20+ messages in thread
From: Sami Mujawar @ 2021-10-04 18:09 UTC (permalink / raw)
To: Abner Chang, devel; +Cc: Ard Biesheuvel, Thomas Abraham, Daniel Schaefer, nd
Hi Abner,
Thank you for this patch. This change looks good to me.
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Regards,
Sami Mujawar
On 04/10/2021 10:29 AM, Abner Chang wrote:
> Complaint with BZ: #3665
> https://bugzilla.tianocore.org/show_bug.cgi?id=3665
>
> PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
> both ARM and RISC-V arch. This patch uses the one from MdePkg
> instead the one under ArmVirtPkg.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> ---
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
> .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> index 7e37732fb9..6679939d3b 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2018-2021, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -150,7 +151,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax|255
> gArmTokenSpaceGuid.PcdPciIoBase|0x0
> gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
> gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
> index fdfc8cd9e2..3b7a63b643 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -178,7 +179,7 @@
> gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
>
> gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
>
> # List of Device Paths that support BootMonFs
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> index 8b4a6e2fad..fb513d7b3d 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> @@ -2,6 +2,7 @@
> # PCI Host Bridge Library instance for ARM Juno
> #
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -51,7 +52,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax
> gArmTokenSpaceGuid.PcdPciIoBase
> gArmTokenSpaceGuid.PcdPciIoSize
> - gArmTokenSpaceGuid.PcdPciIoTranslation
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
> gArmTokenSpaceGuid.PcdPciMmio32Base
> gArmTokenSpaceGuid.PcdPciMmio32Size
> gArmTokenSpaceGuid.PcdPciMmio32Translation
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
` (14 preceding siblings ...)
2021-10-04 9:30 ` [edk2-platforms][PATCH 15/15] Platform/Comcast: Use VirtioFdtDxe " Abner Chang
@ 2021-10-12 10:23 ` Leif Lindholm
15 siblings, 0 replies; 20+ messages in thread
From: Leif Lindholm @ 2021-10-12 10:23 UTC (permalink / raw)
To: devel, abner.chang
Cc: Ard Biesheuvel, Daniel Schaefer, Peng Xie, Ling Jia, Yiqi Shu,
Thomas Abraham, Sami Mujawar, Graeme Gregory, Radoslaw Biernacki,
Wenyi Xie
No issues with these, as long as they're merged (very shortly) after
the edk2 set.
Although please fix the typo in all of the commit messages
complaint ->
compliant
(But please don't send a v4 just for that.)
For the ones where you need it:
Acked-by: Leif Lindholm <leif@nuviainc.com>
On Mon, Oct 04, 2021 at 17:29:46 +0800, Abner Chang wrote:
> https://bugzilla.tianocore.org/show_bug.cgi?id=3665
> BZ:#3665 is to migrate some modules from ArmVirtPkg
> to under OvmfPkg for the upcoming RiscVVirtPkg that can leverage
> those modules without the dependency with Arm*Pkg.
> Refer to below message of the pacthes of edk2 portion.
> https://edk2.groups.io/g/devel/message/81306
>
> This edk2-platforms patch set is the corresponding platform DSC/FDF/INF
> changes to compliant with BZ:#3665.
> We will merge this patch set when the time the changes of edk2 are merged
> once this patch set is reviewed.
>
> FYI,
> The modules moved from ArmVirtPkg to OvmfPkg are:
> - FdtClientDxe
> - PciPcdProducerLib
> - HighMemDxe
> - QemuFwCfgLib
> - FdtPciHostBridgeLib
> - VirtioFdtDxe
>
> Below PCDs are moved to under MdePkg and leverage by RiscVVirtPkg.
> This change also remove the dependency on ArmPkg of OvmfPkg.
> - PcdPciIoTranslation
> - PcdPciIoTranslation
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> Cc: Peng Xie <xiepeng@phytium.com.cn>
> Cc: Ling Jia <jialing@phytium.com.cn>
> Cc: Yiqi Shu <shuyiqi@phytium.com.cn>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Graeme Gregory <graeme@nuviainc.com>
> Cc: Radoslaw Biernacki <rad@semihalf.com>
> Cc: Wenyi Xie <xiewenyi2@huawei.com>
>
> Abner Chang (15):
> Platform/Comcast: Use FdtClientDxe from EmbeddedPkg
> Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg
> Platform/SbsaQemu: Use PcdPciIoTranslation PCD from MdePkg
> Platform/AMD: Use PcdPciIoTranslation PCD from MdePkg
> Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
> Platform/Comcast: Use PcdPciIoTranslation PCD from MdePkg
> Platform/LeMaker: Use PcdPciIoTranslation PCD from MdePkg
> Platform/Phytium: Use PcdPciIoTranslation PCD from MdePkg
> Platform/SoftIron: Use PcdPciIoTranslation PCD from MdePkg
> Platform/Socionext: Use PcdPciIoTranslation PCD from MdePkg
> Platform/Comcast: Use PciPcdProducerLib in OvmfPkg.
> Platform/Comcast: Use HighMemDxe provided by OvmfPkg
> Platform/Comcast: Use QemuFwCfgMmio provided by OvmfPkg
> Platform/Comcast: Use FdtPciHostBridgeLib provided by OvmfPkg.
> Platform/Comcast: Use VirtioFdtDxe provided by OvmfPkg.
>
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
> .../AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
> Platform/Comcast/RDKQemu/RDKQemu.dsc | 20 +++++++++----------
> Platform/Hisilicon/D03/D03.dsc | 2 +-
> Platform/Hisilicon/D05/D05.dsc | 2 +-
> Platform/Hisilicon/D06/D06.dsc | 2 +-
> Platform/LeMaker/CelloBoard/CelloBoard.dsc | 2 +-
> Platform/Phytium/DurianPkg/DurianPkg.dsc | 2 +-
> Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 +-
> .../Overdrive1000Board/Overdrive1000Board.dsc | 2 +-
> .../JunoPciHostBridgeLib.inf | 3 ++-
> .../Library/PlatformLib/PlatformLib.inf | 2 +-
> .../Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 2 +-
> .../SynQuacerPciHostBridgeLib.inf | 2 +-
> 15 files changed, 27 insertions(+), 24 deletions(-)
>
> --
> 2.17.1
>
>
>
>
>
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
2021-10-04 9:29 ` [edk2-platforms][PATCH 05/15] Platform/ARM: " Abner Chang
2021-10-04 18:09 ` Sami Mujawar
@ 2021-10-14 17:21 ` PierreGondois
2021-10-15 7:20 ` Abner Chang
1 sibling, 1 reply; 20+ messages in thread
From: PierreGondois @ 2021-10-14 17:21 UTC (permalink / raw)
To: devel, abner.chang
Cc: Ard Biesheuvel, Thomas Abraham, Sami Mujawar, Daniel Schaefer
Hi Abner,
This patch:
https://edk2.groups.io/g/devel/message/81310
renames:
gArmTokenSpaceGuid.PcdPciMmio32Translation
to:
gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
but gArmTokenSpaceGuid.PcdPciMmio32Translation is still used in ARM
platforms,
e.g.: SgiPkg/SgiPlatform.dsc.inc:155:
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
The RdN2 platform which uses this .dsc.inc file can be built with:
build -a AARCH64 -t GCC5 -p Platform/ARM/SgiPkg/RdN2/RdN2.dsc
Regards,
Pierre
On 10/4/21 10:29, Abner Chang via groups.io wrote:
> Complaint with BZ: #3665
> https://bugzilla.tianocore.org/show_bug.cgi?id=3665
>
> PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
> both ARM and RISC-V arch. This patch uses the one from MdePkg
> instead the one under ArmVirtPkg.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> ---
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
> .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> index 7e37732fb9..6679939d3b 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2018-2021, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -150,7 +151,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax|255
> gArmTokenSpaceGuid.PcdPciIoBase|0x0
> gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
> gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
> index fdfc8cd9e2..3b7a63b643 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -178,7 +179,7 @@
> gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
>
> gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
>
> # List of Device Paths that support BootMonFs
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> index 8b4a6e2fad..fb513d7b3d 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> @@ -2,6 +2,7 @@
> # PCI Host Bridge Library instance for ARM Juno
> #
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -51,7 +52,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax
> gArmTokenSpaceGuid.PcdPciIoBase
> gArmTokenSpaceGuid.PcdPciIoSize
> - gArmTokenSpaceGuid.PcdPciIoTranslation
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
> gArmTokenSpaceGuid.PcdPciMmio32Base
> gArmTokenSpaceGuid.PcdPciMmio32Size
> gArmTokenSpaceGuid.PcdPciMmio32Translation
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [edk2-devel] [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
2021-10-14 17:21 ` [edk2-devel] " PierreGondois
@ 2021-10-15 7:20 ` Abner Chang
0 siblings, 0 replies; 20+ messages in thread
From: Abner Chang @ 2021-10-15 7:20 UTC (permalink / raw)
To: Pierre Gondois, devel@edk2.groups.io
Cc: Ard Biesheuvel, Thomas Abraham, Sami Mujawar, Schaefer, Daniel
[-- Attachment #1: Type: text/plain, Size: 4716 bytes --]
Hi Pierre,
Seems like I missed the platform corresponding changes with these two PCDs.
I am fixing it now.
thanks
Abner
________________________________
From: Pierre Gondois <pierre.gondois@arm.com>
Sent: Friday, October 15, 2021 1:21 AM
To: devel@edk2.groups.io <devel@edk2.groups.io>; Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>; Thomas Abraham <thomas.abraham@arm.com>; Sami Mujawar <sami.mujawar@arm.com>; Schaefer, Daniel <daniel.schaefer@hpe.com>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 05/15] Platform/ARM: Use PcdPciIoTranslation PCD from MdePkg
Hi Abner,
This patch:
https://edk2.groups.io/g/devel/message/81310
renames:
gArmTokenSpaceGuid.PcdPciMmio32Translation
to:
gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
but gArmTokenSpaceGuid.PcdPciMmio32Translation is still used in ARM
platforms,
e.g.: SgiPkg/SgiPlatform.dsc.inc:155:
gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
The RdN2 platform which uses this .dsc.inc file can be built with:
build -a AARCH64 -t GCC5 -p Platform/ARM/SgiPkg/RdN2/RdN2.dsc
Regards,
Pierre
On 10/4/21 10:29, Abner Chang via groups.io wrote:
> Complaint with BZ: #3665
> https://bugzilla.tianocore.org/show_bug.cgi?id=3665
>
> PcdPciIoTranslation PCD is relocated to MdePkg that leveraged by
> both ARM and RISC-V arch. This patch uses the one from MdePkg
> instead the one under ArmVirtPkg.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> ---
> Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 3 ++-
> Platform/ARM/JunoPkg/ArmJuno.dsc | 3 ++-
> .../Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf | 3 ++-
> 3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> index 7e37732fb9..6679939d3b 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2018-2021, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -150,7 +151,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax|255
> gArmTokenSpaceGuid.PcdPciIoBase|0x0
> gArmTokenSpaceGuid.PcdPciIoSize|0x00800000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x77800000
> gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0
> gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
> diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
> index fdfc8cd9e2..3b7a63b643 100644
> --- a/Platform/ARM/JunoPkg/ArmJuno.dsc
> +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
> @@ -1,5 +1,6 @@
> #
> # Copyright (c) 2013-2018, ARM Limited. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -178,7 +179,7 @@
> gArmTokenSpaceGuid.PcdPciMmio64Size|0x100000000
>
> gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000
> - gArmTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x5f800000
> gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|24
>
> # List of Device Paths that support BootMonFs
> diff --git a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> index 8b4a6e2fad..fb513d7b3d 100644
> --- a/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> +++ b/Platform/ARM/JunoPkg/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.inf
> @@ -2,6 +2,7 @@
> # PCI Host Bridge Library instance for ARM Juno
> #
> # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent
> #
> @@ -51,7 +52,7 @@
> gArmTokenSpaceGuid.PcdPciBusMax
> gArmTokenSpaceGuid.PcdPciIoBase
> gArmTokenSpaceGuid.PcdPciIoSize
> - gArmTokenSpaceGuid.PcdPciIoTranslation
> + gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
> gArmTokenSpaceGuid.PcdPciMmio32Base
> gArmTokenSpaceGuid.PcdPciMmio32Size
> gArmTokenSpaceGuid.PcdPciMmio32Translation
[-- Attachment #2: Type: text/html, Size: 9828 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2021-10-15 7:21 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-04 9:29 [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 01/15] Platform/Comcast: Use FdtClientDxe from EmbeddedPkg Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 02/15] Platform/Hisilicon: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 03/15] Platform/SbsaQemu: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 04/15] Platform/AMD: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 05/15] Platform/ARM: " Abner Chang
2021-10-04 18:09 ` Sami Mujawar
2021-10-14 17:21 ` [edk2-devel] " PierreGondois
2021-10-15 7:20 ` Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 06/15] Platform/Comcast: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 07/15] Platform/LeMaker: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 08/15] Platform/Phytium: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 09/15] Platform/SoftIron: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 10/15] Platform/Socionext: " Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 11/15] Platform/Comcast: Use PciPcdProducerLib in OvmfPkg Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 12/15] Platform/Comcast: Use HighMemDxe provided by OvmfPkg Abner Chang
2021-10-04 9:29 ` [edk2-platforms][PATCH 13/15] Platform/Comcast: Use QemuFwCfgMmio " Abner Chang
2021-10-04 9:30 ` [edk2-platforms][PATCH 14/15] Platform/Comcast: Use FdtPciHostBridgeLib " Abner Chang
2021-10-04 9:30 ` [edk2-platforms][PATCH 15/15] Platform/Comcast: Use VirtioFdtDxe " Abner Chang
2021-10-12 10:23 ` [edk2-devel] [edk2-platforms][PATCH 00/15] Changes to compliant with BZ:#3665 Leif Lindholm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox