On 2018-04-19 08:37, Claudio Scordino wrote:
> From: Luca Cuomo <[email protected]>
> 
> This patch fixes the root cell config for the Jetson TX2 platform to
> avoid a deadlock occurring when using accelerated graphics. It maps the
> VIC memory regions and increment the number of handled IRQs.
> 
> Signed-off-by: Claudio Scordino <[email protected]>
> Signed-off-by: Bruno Morelli <[email protected]>
> ---
>  configs/arm64/jetson-tx2.c | 41 ++++++++++++++++++++++++++++++++++++++---
>  1 file changed, 38 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/arm64/jetson-tx2.c b/configs/arm64/jetson-tx2.c
> index 0d23158..2350362 100644
> --- a/configs/arm64/jetson-tx2.c
> +++ b/configs/arm64/jetson-tx2.c
> @@ -26,8 +26,8 @@
>  struct {
>       struct jailhouse_system header;
>       __u64 cpus[1];
> -     struct jailhouse_memory mem_regions[57];
> -     struct jailhouse_irqchip irqchips[2];
> +     struct jailhouse_memory mem_regions[61];
> +     struct jailhouse_irqchip irqchips[3];
>  } __attribute__((packed)) config = {
>       .header = {
>               .signature = JAILHOUSE_SYSTEM_SIGNATURE,
> @@ -274,6 +274,13 @@ struct {
>                          .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
>                                  JAILHOUSE_MEM_EXECUTE,
>                  },
> +             /* VIC CAR */{
> +                        .phys_start = 0x05560000,
> +                        .virt_start = 0x05560000,
> +                        .size = 0x10000,
> +                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> +                                JAILHOUSE_MEM_EXECUTE,
> +                },
>               /* CSITE */ {
>                       .phys_start = 0x08000000,
>                       .virt_start = 0x08000000,
> @@ -281,6 +288,13 @@ struct {
>                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
>                               JAILHOUSE_MEM_EXECUTE,
>               },
> +             /* SCE VIC registers */ {
> +                     .phys_start = 0x0b020000,
> +                     .virt_start = 0x0b020000,
> +                     .size = 0x20000,
> +                     .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> +                             JAILHOUSE_MEM_EXECUTE,
> +             },
>               /* SCE_PM */ {
>                       .phys_start = 0x0b1f0000,
>                       .virt_start = 0x0b1f0000,
> @@ -295,6 +309,13 @@ struct {
>                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
>                               JAILHOUSE_MEM_EXECUTE,
>               },
> +             /* AON VIC registers */ {
> +                     .phys_start = 0x0c020000,
> +                     .virt_start = 0x0c020000,
> +                     .size = 0x20000,
> +                     .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> +                             JAILHOUSE_MEM_EXECUTE,
> +             },
>               /* More I2C + SPI */ {
>                       .phys_start = 0x0c230000,
>                       .virt_start = 0x0c230000,
> @@ -330,6 +351,13 @@ struct {
>                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
>                               JAILHOUSE_MEM_EXECUTE,
>               },
> +             /* BPMP VIC registers */ {
> +                     .phys_start = 0x0d020000,
> +                     .virt_start = 0x0d020000,
> +                     .size = 0x20000,
> +                     .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> +                             JAILHOUSE_MEM_EXECUTE,
> +             },
>               /* ACTMON  + SIMON + SOC_THERM */ {
>                       .phys_start = 0x0d230000,
>                       .virt_start = 0x0d230000,
> @@ -484,7 +512,14 @@ struct {
>                       .address = 0x03881000,
>                       .pin_base = 160,
>                       .pin_bitmap = {
> -                             0xffffffff, 0xffffffff
> +                             0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
> +                     },
> +             },
> +             /* GIC */ {
> +                     .address = 0x03881000,
> +                     .pin_base = 288,
> +                     .pin_bitmap = {
> +                             0xffffffff,
>                       },
>               },
>       },
> 

Thanks, applied.

Jan
-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to