On 2017-02-10 17:48, [email protected] wrote: > From: Andreas Kölbl <[email protected]> > > Linux's TK1 device tree provides a second clock source, Nvidia Timers > (TMR). Those timers are enabled and available. The root cell will crash > if this timer is selected. > > Those timers are located at 0x400@0x60005000, so we can consolidate > preceding and succeeding memory regions to a single region with size > 0x3000. > > Signed-off-by: Andreas Kölbl <[email protected]> > Signed-off-by: Ralf Ramsauer <[email protected]> > --- > configs/jetson-tk1.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/configs/jetson-tk1.c b/configs/jetson-tk1.c > index 2cdb4924..ef4db0ba 100644 > --- a/configs/jetson-tk1.c > +++ b/configs/jetson-tk1.c > @@ -23,7 +23,7 @@ > struct { > struct jailhouse_system header; > __u64 cpus[1]; > - struct jailhouse_memory mem_regions[21]; > + struct jailhouse_memory mem_regions[20]; > struct jailhouse_irqchip irqchips[2]; > struct jailhouse_pci_device pci_devices[1]; > } __attribute__((packed)) config = { > @@ -115,17 +115,14 @@ struct { > .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | > JAILHOUSE_MEM_IO, > }, > - /* HACK: Legacy Interrupt Controller */ { > + /* > + * HACK: 0x0500@0x60004000: Legacy Interrupt Controller, > + * HACK: 0x0400@0x60005000: Nvidia Timers (TMR + WDT), > + * HACK: 0x1000@0x60006000: Clock and Reset Controller > + */ { > .phys_start = 0x60004000, > .virt_start = 0x60004000, > - .size = 0x00001000, > - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | > - JAILHOUSE_MEM_IO, > - }, > - /* HACK: Clock and Reset Controller */ { > - .phys_start = 0x60006000, > - .virt_start = 0x60006000, > - .size = 0x00001000, > + .size = 0x3000, > .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | > JAILHOUSE_MEM_IO, > }, > @@ -246,7 +243,7 @@ struct { > 0xffffff00, 0xffffffff, 0x00000000, > 0x00000000, 0x00000000, 0x00000000, > }, > - .shmem_region = 20, > + .shmem_region = 19, > .shmem_protocol = JAILHOUSE_SHMEM_PROTO_VETH, > }, > }, >
Thanks, applied. Jan -- Siemens AG, Corporate Technology, CT RDA ITP 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.
