Skip to content

Commit

Permalink
Fix issues with Scheduler Interface
Browse files Browse the repository at this point in the history
  • Loading branch information
@gus33000
gus33000 committed Jul 31, 2024
1 parent cfa10bc commit 765f05f
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 23 deletions.
4 changes: 2 additions & 2 deletions Platforms/KailuaPkg/Device/ayaneo-aps/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerExitDisableDisplay|FALSE
gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|1000

# Necessary Addresses
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0xA703A948
gSurfaceDuoFamilyPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703A0C8
gQcomPkgTokenSpaceGuid.KernelProtocolAddress|0xA703A948
gQcomPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703A0C8

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1440
Expand Down
4 changes: 2 additions & 2 deletions Platforms/KailuaPkg/Device/ayn-odin2/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailModel|"Odin"
gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"HDK"

# Necessary Addresses
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0xA703A948
gSurfaceDuoFamilyPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703A0C8
gQcomPkgTokenSpaceGuid.KernelProtocolAddress|0xA703A948
gQcomPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703A0C8

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1080
Expand Down
4 changes: 2 additions & 2 deletions Platforms/KailuaPkg/Device/qcom-qrd8550/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosBoardModel|"QRD"
gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"6"

# Necessary Addresses
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0xA703B948
gSurfaceDuoFamilyPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703B0C8
gQcomPkgTokenSpaceGuid.KernelProtocolAddress|0xA703B948
gQcomPkgTokenSpaceGuid.XBLDTProtocolAddress|0xA703B0C8


[PcdsDynamicDefault.common]
Expand Down
2 changes: 1 addition & 1 deletion Platforms/KonaPkg/Device/qcom-mtp8250/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"6"
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC35658
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC35658

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1440
Expand Down
2 changes: 1 addition & 1 deletion Platforms/SurfaceDuo2Pkg/Device/qcom-hhg8350/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosProcessorRetailModel|"SM8350P"
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC37968
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC37968

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1080
Expand Down
2 changes: 1 addition & 1 deletion Platforms/SurfaceDuo2Pkg/Device/qcom-mtp8350/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"6"
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC37980
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC37980

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1080
Expand Down
2 changes: 1 addition & 1 deletion Platforms/SurfaceDuo2Pkg/Device/qcom-qrd8350/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"6"
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC37980
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC37980

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1080
Expand Down
2 changes: 1 addition & 1 deletion Platforms/SurfaceDuo2Pkg/Device/samsung-q2q/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"Galaxy_Z_Fold_3_5G_
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC37980
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC37980

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|2208
Expand Down
2 changes: 1 addition & 1 deletion Platforms/SurfaceDuo2Pkg/Device/zte-p875a02/PcdsFixedAtBuild.dsc.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdSmbiosSystemRetailSku|"MP"
# gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|2000000

# Scheduler Protocol Address
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x9FC37980
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x9FC37980

[PcdsDynamicDefault.common]
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|1080
Expand Down
4 changes: 0 additions & 4 deletions Platforms/SurfaceDuoFamilyPkg/SurfaceDuoFamilyPkg.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,6 @@
gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerExitDisableDisplay|FALSE|BOOLEAN|0x0000a701
gSurfaceDuoFamilyPkgTokenSpaceGuid.PcdDisplayCallerStallBeforeEnable|0|UINT64|0x0000a702

# Previous XBL's Protcol Addresses.
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress|0x00000000|UINT64|0x0000a801
gSurfaceDuoFamilyPkgTokenSpaceGuid.XBLDTProtocolAddress|0x00000000|UINT64|0x0000a802

## This PCD points to the file name GUID of the UFPMenuApp
# Platform can customize the PCD to point to different application for UFP Menu
# @Prompt UFP Menu File
Expand Down
2 changes: 1 addition & 1 deletion Silicon/QC/Sm8250/QcomPkg/PlatformPei/PlatformPeiLib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ VOID InstallPlatformHob()
LocateMemoryMapAreaByName("Info Blk", &InfoBlk);

UINTN InfoBlkAddress = InfoBlk.Address;
UINTN SchedIntfAddress = PcdGet64(KernelProtocolAddress);
UINTN SchedIntfAddress = PcdGet64(SchedIntfProtocolAddress);
UINTN ShLibAddress = (UINTN)&ShLib;
UINTN FvDecompressAddress = 0x9FC403D0;
BOOLEAN gProdmodeInfo = FALSE;
Expand Down
2 changes: 1 addition & 1 deletion Silicon/QC/Sm8250/QcomPkg/PlatformPei/PlatformPeiLib.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

[Pcd]
gArmTokenSpaceGuid.PcdFvBaseAddress
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress

[Depex]
gEfiPeiMemoryDiscoveredPpiGuid
6 changes: 5 additions & 1 deletion Silicon/QC/Sm8250/QcomPkg/QcomPkg.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
Include # Root include for the package

[Guids.common]
gQcomPkgTokenSpaceGuid = { 0x59f58449, 0x99e1, 0x4a19, { 0x86, 0x65, 0x12, 0xd6, 0x37, 0xed, 0xbe, 0x5e } }
gQcomPkgTokenSpaceGuid = { 0x59f58449, 0x99e1, 0x4a19, { 0x86, 0x65, 0x12, 0xd6, 0x37, 0xed, 0xbe, 0x5e } }

[PcdsFixedAtBuild.common]
# Previous XBL's Protcol Addresses.
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x00000000|UINT64|0x0000a801
2 changes: 1 addition & 1 deletion Silicon/QC/Sm8350/QcomPkg/PlatformPei/PlatformPeiLib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ VOID InstallPlatformHob()
UINTN XBL_UEFI_FD = 0x9FC00000;

UINTN InfoBlkAddress = InfoBlk.Address;
UINTN SchedIntfAddress = XBL_UEFI_FD + 0x37980;
UINTN SchedIntfAddress = PcdGet64(SchedIntfProtocolAddress);
UINTN ShLibAddress = (UINTN)&ShLib;
UINTN FvDecompressAddress = XBL_UEFI_FD + 0x403C8;

Expand Down
1 change: 1 addition & 0 deletions Silicon/QC/Sm8350/QcomPkg/PlatformPei/PlatformPeiLib.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@

[Pcd]
gArmTokenSpaceGuid.PcdFvBaseAddress
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress

[Depex]
gEfiPeiMemoryDiscoveredPpiGuid
6 changes: 5 additions & 1 deletion Silicon/QC/Sm8350/QcomPkg/QcomPkg.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@

[PcdsDynamic, PcdsDynamicEx]
gQcomPkgTokenSpaceGuid.PcdStr3|{ 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x33, 0x31, 0x31, 0x2E, 0x37, 0x36, 0x2E, 0x39, 0x2E, 0x31, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x40000147
gQcomPkgTokenSpaceGuid.PcdStr4|{ 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x33, 0x31, 0x31, 0x2E, 0x37, 0x36, 0x2E, 0x39, 0x2E, 0x31, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x40000148
gQcomPkgTokenSpaceGuid.PcdStr4|{ 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x33, 0x31, 0x31, 0x2E, 0x37, 0x36, 0x2E, 0x39, 0x2E, 0x31, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x40000148

[PcdsFixedAtBuild.common]
# Previous XBL's Protcol Addresses.
gQcomPkgTokenSpaceGuid.SchedIntfProtocolAddress|0x00000000|UINT64|0x0000a801
4 changes: 2 additions & 2 deletions Silicon/QC/Sm8550/QcomPkg/PlatformPei/PlatformPeiLib.inf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

[FixedPcd]
gArmTokenSpaceGuid.PcdFvSize
gSurfaceDuoFamilyPkgTokenSpaceGuid.KernelProtocolAddress
gSurfaceDuoFamilyPkgTokenSpaceGuid.XBLDTProtocolAddress
gQcomPkgTokenSpaceGuid.KernelProtocolAddress
gQcomPkgTokenSpaceGuid.XBLDTProtocolAddress

[Pcd]
gArmTokenSpaceGuid.PcdFvBaseAddress
Expand Down
5 changes: 5 additions & 0 deletions Silicon/QC/Sm8550/QcomPkg/QcomPkg.dec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@
[PcdsDynamic, PcdsDynamicEx]
gQcomPkgTokenSpaceGuid.PcdStr3|{ 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x33, 0x31, 0x31, 0x2E, 0x37, 0x36, 0x2E, 0x39, 0x2E, 0x31, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x40000147
gQcomPkgTokenSpaceGuid.PcdStr4|{ 0x31, 0x2E, 0x33, 0x2E, 0x36, 0x2E, 0x31, 0x2E, 0x34, 0x2E, 0x31, 0x2E, 0x33, 0x31, 0x31, 0x2E, 0x37, 0x36, 0x2E, 0x39, 0x2E, 0x31, 0x37, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x40000148

[PcdsFixedAtBuild.common]
# Previous XBL's Protcol Addresses.
gQcomPkgTokenSpaceGuid.KernelProtocolAddress|0x00000000|UINT64|0x0000a801
gQcomPkgTokenSpaceGuid.XBLDTProtocolAddress|0x00000000|UINT64|0x0000a802

0 comments on commit 765f05f

Please sign in to comment.