Message ID | 20181116065702.30559-11-ming.huang@linaro.org |
---|---|
State | New |
Headers | show |
Series | Fix D06 SBSA/SBBR issue and improve | expand |
You said in reply to my comment on v1: --- The PcdGicInterruptInterfaceBase(0xFE000000) is wrong, it just copy from D05/D03, maybe somewhere will need the right value of Pcd. --- Please split that out as a separate change, with the above mentioned in the commit message. But if I understand correctly, the remainder of the patch will be incorrect until the other changes to book from TA have been applied (in the subsequent patch). So please move the MADT change to the other patch. / Leif On Fri, Nov 16, 2018 at 02:56:57PM +0800, Ming Huang wrote: > The values of PcdGicInterruptInterfaceBase and GICD are wrong, so modify it. > Fix SBSA test case 21: > 21 : Check GIC version > GIC version is 0 > Failed on PE - 0 for Level= 3 : Result: --FAIL-- 2 > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang <ming.huang@linaro.org> > --- > Platform/Hisilicon/D06/D06.dsc | 2 +- > Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc > index b6ef9fedf0a7..ac35564f4ac6 100644 > --- a/Platform/Hisilicon/D06/D06.dsc > +++ b/Platform/Hisilicon/D06/D06.dsc > @@ -183,7 +183,7 @@ [PcdsFixedAtBuild.common] > gHisiTokenSpaceGuid.PcdArmPrimaryCoreTemp|0x80010000 > gArmTokenSpaceGuid.PcdGicDistributorBase|0xAE000000 > gArmTokenSpaceGuid.PcdGicRedistributorsBase|0xAE100000 > - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFE000000 > + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x9B000000 > > > > diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc > index 43b43142aff4..d3de69a3ef6c 100644 > --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc > +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc > @@ -361,7 +361,7 @@ EFI_ACPI_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = { > 0x0, 0x0, 25, 0x4000AA000000 + 0x6C0000 /* GicRBase */, 0), > }, > > - EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAA000000, 0, 0x4), > + EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAE000000, 0, 0x4), > { > EFI_ACPI_6_1_GIC_ITS_INIT(0,0x202100000), //peri a > // EFI_ACPI_6_1_GIC_ITS_INIT(1,0x400202100000), //peri a > -- > 2.9.5 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index b6ef9fedf0a7..ac35564f4ac6 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -183,7 +183,7 @@ [PcdsFixedAtBuild.common] gHisiTokenSpaceGuid.PcdArmPrimaryCoreTemp|0x80010000 gArmTokenSpaceGuid.PcdGicDistributorBase|0xAE000000 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0xAE100000 - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFE000000 + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x9B000000 diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc index 43b43142aff4..d3de69a3ef6c 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc @@ -361,7 +361,7 @@ EFI_ACPI_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = { 0x0, 0x0, 25, 0x4000AA000000 + 0x6C0000 /* GicRBase */, 0), }, - EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAA000000, 0, 0x4), + EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAE000000, 0, 0x4), { EFI_ACPI_6_1_GIC_ITS_INIT(0,0x202100000), //peri a // EFI_ACPI_6_1_GIC_ITS_INIT(1,0x400202100000), //peri a
The values of PcdGicInterruptInterfaceBase and GICD are wrong, so modify it. Fix SBSA test case 21: 21 : Check GIC version GIC version is 0 Failed on PE - 0 for Level= 3 : Result: --FAIL-- 2 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang <ming.huang@linaro.org> --- Platform/Hisilicon/D06/D06.dsc | 2 +- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel