[edk2,edk2-platforms,v1,11/12] Hisilicon/D06: Modify Gic base

Message ID 20181029033249.45363-12-ming.huang@linaro.org
State Superseded
Headers show
Series
  • [edk2,edk2-platforms,v1,01/12] Silicon/Hisilicon/D06: Add watchdog to GTDT
Related show

Commit Message

Ming Huang Oct. 29, 2018, 3:32 a.m.
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.18.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Leif Lindholm Nov. 14, 2018, 12:29 a.m. | #1
On Mon, Oct 29, 2018 at 11:32:48AM +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


I'm confused here. How could this ever have worked?
And what is the change? I see values changing, but what do they mean?

/
    Leif

> 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 8ee20342b1..6296fcd9ec 100644

> --- a/Platform/Hisilicon/D06/D06.dsc

> +++ b/Platform/Hisilicon/D06/D06.dsc

> @@ -183,7 +183,7 @@

>    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 43b43142af..d3de69a3ef 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.18.0

> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ming Huang Nov. 14, 2018, 2:31 p.m. | #2
On 11/14/2018 8:29 AM, Leif Lindholm wrote:
> On Mon, Oct 29, 2018 at 11:32:48AM +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

> 

> I'm confused here. How could this ever have worked?

> And what is the change? I see values changing, but what do they mean?


We boot from TB(Totem B,similar to die) originally, then switch to boot from TA.
0xAA000000 is GICD base of TB,0xAE000000 is GICD base of TA,
the 0xAE000000 should be used for TA boot, otherwise some feature may
not work like this SBSA test case.
The PcdGicInterruptInterfaceBase(0xFE000000) is wrong, it just copy from D05/D03,
maybe somewhere will need the right value of Pcd.

> 

> /

>     Leif

> 

>> 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 8ee20342b1..6296fcd9ec 100644

>> --- a/Platform/Hisilicon/D06/D06.dsc

>> +++ b/Platform/Hisilicon/D06/D06.dsc

>> @@ -183,7 +183,7 @@

>>    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 43b43142af..d3de69a3ef 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.18.0

>>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc
index 8ee20342b1..6296fcd9ec 100644
--- a/Platform/Hisilicon/D06/D06.dsc
+++ b/Platform/Hisilicon/D06/D06.dsc
@@ -183,7 +183,7 @@ 
   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 43b43142af..d3de69a3ef 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