If run on PlatformVersion <0.3 then we have EHCI controller (not
working) instead of XHCI one.
*BSD platforms hang with wrong combination.
---
Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 4 ++--
Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 4 ++--
Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 4 ++--
.../Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf | 4 ++--
.../Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c | 4 ++--
Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
index 913d1d75ef29..5e6578068fc8 100644
--- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
+++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec
@@ -32,8 +32,8 @@ [PcdsFixedAtBuild.common]
# Non discoverable devices Pcds
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase|0|UINT64|0x00000001
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize|0x10000|UINT32|0x00000002
-
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase|0|UINT64|0x00000003
-
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize|0x10000|UINT32|0x00000004
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbBase|0|UINT64|0x00000003
+
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbSize|0x10000|UINT32|0x00000004
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress|0x10000000000|UINT64|0x00000005
# PCDs complementing PCIe layout pulled into ACPI tables
diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index 36723e21d7b5..3900fed0c7dc 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -432,8 +432,8 @@ [PcdsFixedAtBuild.common]
# Non discoverable devices (AHCI,XHCI)
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase|0x60100000
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize|0x00010000
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase|0x60110000
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize|0x00010000
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbBase|0x60110000
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbSize|0x00010000
# PL011 - Serial Terminal
gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x60000000
diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
index 8d4905362edc..42cc203eeb7b 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf
@@ -68,8 +68,8 @@ [FixedPcd]
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbBase
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbSize
[Pcd]
gArmTokenSpaceGuid.PcdGicDistributorBase
diff --git
a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
index 19534b7a274a..4cda4eae0f7b 100644
--- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
+++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.inf
@@ -37,8 +37,8 @@ [LibraryClasses]
[Pcd]
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciBase
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciBase
- gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformXhciSize
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbBase
+ gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformUsbSize
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMajor
gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformVersionMinor
diff --git
a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
index 36ada4270bbf..9aca789b5673 100644
--- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
+++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuPlatformDxe/SbsaQemuPlatformDxe.c
@@ -57,9 +57,9 @@ InitializeSbsaQemuPlatformDxe (
return Status;
}
- Base = (VOID*)(UINTN)PcdGet64 (PcdPlatformXhciBase);
+ Base = (VOID*)(UINTN)PcdGet64 (PcdPlatformUsbBase);
ASSERT (Base != NULL);
- Size = (UINTN)PcdGet32 (PcdPlatformXhciSize);
+ Size = (UINTN)PcdGet32 (PcdPlatformUsbSize);
ASSERT (Size != 0);
DEBUG ((DEBUG_INFO, "%a: Got platform XHCI %llx %u\n",
diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
index 543b5782580a..4ff267e00802 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Dsdt.asl
@@ -79,8 +79,8 @@ DefinitionBlock ("DsdtTable.aml", "DSDT",
Method (_CRS, 0x0, Serialized) {
Name (RBUF, ResourceTemplate() {
Memory32Fixed (ReadWrite,
- FixedPcdGet32 (PcdPlatformXhciBase),
- FixedPcdGet32 (PcdPlatformXhciSize))
+ FixedPcdGet32 (PcdPlatformUsbBase),
+ FixedPcdGet32 (PcdPlatformUsbSize))
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) {
43 }
})
Return (RBUF)
--
2.41.0
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#109588): https://edk2.groups.io/g/devel/message/109588
Mute This Topic: https://groups.io/mt/101938738/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
