On 08.06.20 12:42, [email protected] wrote:
> From: Nikhil Devshatwar <[email protected]>
>
> Fix errors reported by jailhouse-config-check
> Fix overlap of baremetal demos with IVSHMEM.
> Remove regions of memory which is already covered as part of
> some other memory region.
>
> Signed-off-by: Nikhil Devshatwar <[email protected]>
> ---
> configs/arm64/k3-j721e-evm-inmate-demo.c | 4 +--
> configs/arm64/k3-j721e-evm-linux-demo.c | 4 +--
> configs/arm64/k3-j721e-evm.c | 31 ++++--------------------
> 3 files changed, 9 insertions(+), 30 deletions(-)
>
> diff --git a/configs/arm64/k3-j721e-evm-inmate-demo.c
> b/configs/arm64/k3-j721e-evm-inmate-demo.c
> index 39c6c414..b070e643 100644
> --- a/configs/arm64/k3-j721e-evm-inmate-demo.c
> +++ b/configs/arm64/k3-j721e-evm-inmate-demo.c
> @@ -86,9 +86,9 @@ struct {
> JAILHOUSE_MEM_IO,
> },
> /* RAM */ {
> - .phys_start = 0x89ff00000,
> + .phys_start = 0x89ff40000,
> .virt_start = 0,
> - .size = 0x00010000,
> + .size = 0x000c0000,
Why making it larger?
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_LOADABLE,
> },
> diff --git a/configs/arm64/k3-j721e-evm-linux-demo.c
> b/configs/arm64/k3-j721e-evm-linux-demo.c
> index 05517751..02b0a248 100644
> --- a/configs/arm64/k3-j721e-evm-linux-demo.c
> +++ b/configs/arm64/k3-j721e-evm-linux-demo.c
> @@ -163,9 +163,9 @@ struct {
> JAILHOUSE_MEM_IO,
> },
> /* linux-loader space */ {
> - .phys_start = 0x89ff00000,
> + .phys_start = 0x89ff40000,
> .virt_start = 0x0,
> - .size = 0x10000, /* 64KB */
> + .size = 0xc0000, /* 64KB */
Also here. Plus the comment is now wrong.
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_LOADABLE,
> },
> diff --git a/configs/arm64/k3-j721e-evm.c b/configs/arm64/k3-j721e-evm.c
> index 41f4c456..971aac22 100644
> --- a/configs/arm64/k3-j721e-evm.c
> +++ b/configs/arm64/k3-j721e-evm.c
> @@ -152,20 +152,6 @@ struct {
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_IO,
> },
> - /* usbss0 */ {
> - .phys_start = 0x06000000,
> - .virt_start = 0x06000000,
> - .size = 0x00400000,
> - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> - JAILHOUSE_MEM_IO,
> - },
> - /* usbss1 */ {
> - .phys_start = 0x06400000,
> - .virt_start = 0x06400000,
> - .size = 0x00400000,
> - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> - JAILHOUSE_MEM_IO,
> - },
> /* Most peripherals */ {
> .phys_start = 0x01000000,
> .virt_start = 0x01000000,
> @@ -222,13 +208,6 @@ struct {
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_IO,
> },
> - /* MSMC SRAM */ {
> - .phys_start = 0x4E20000000,
> - .virt_start = 0x4E20000000,
> - .size = 0x00080000,
> - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> - JAILHOUSE_MEM_DMA,
> - },
>
> /* MCU NAVSS */ {
> .phys_start = 0x28380000,
> @@ -275,7 +254,7 @@ struct {
> /* MCU WKUP peripheral window */ {
> .phys_start = 0x42040000,
> .virt_start = 0x42040000,
> - .size = 0x03ac3000,
> + .size = 0x030c0000,
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_IO,
> },
> @@ -338,10 +317,10 @@ struct {
> JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA |
> JAILHOUSE_MEM_LOADABLE,
> },
> - /* RAM - reserved for ivshmem and baremetal apps */ {
> - .phys_start = 0x89fe00000,
> - .virt_start = 0x89fe00000,
> - .size = 0x200000,
> + /* RAM - reserved for baremetal apps */ {
> + .phys_start = 0x89ff40000,
> + .virt_start = 0x89ff40000,
> + .size = 0xc0000,
> .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
> JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_LOADABLE,
> },
>
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].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/85d95c1b-2ef9-185e-bfb3-44f5a4d7dbe0%40siemens.com.
