Branch: refs/heads/next
Home: https://github.com/siemens/jailhouse
Commit: d22033b6367bedcc2890260fc23be3d5934df95b
https://github.com/siemens/jailhouse/commit/d22033b6367bedcc2890260fc23be3d5934df95b
Author: Peng Fan <[email protected]>
Date: 2021-04-17 (Sat, 17 Apr 2021)
Changed paths:
M hypervisor/arch/arm-common/uart-imx.c
M inmates/lib/arm-common/uart-imx.c
Log Message:
-----------
Check UART UCR1_UARTEN bit before writing data
There is frequent start/shutdown operation in kernel reboot process.
And at the end of kernel reboot, kernel will switch to use console
output,saying imx_console_write on i.MX8MM.
imx_console_write will save/restore uart configuration.
However before imx_console_write the UCR1_UARTEN already set to 0.
when restore, it is also 0. Then when we runs into jailhouse
disable, jailhouse write to uart will trigger hardware exceptions.
So let's add a check.
However to hypervisor itself, there is still risk that
kernel disable uart, whenh jailhouse is going to write
data registers even with this patch applied.
There is no good way to avoid such contention,
the best way to avoid such issue is that
use a different uart from Linux or remove
`.type = JAILHOUSE_CON_TYPE_IMX,` from configs/arm64/imx8mm.c.
Remove `.type = JAILHOUSE_CON_TYPE_IMX,` means
jailhouse hypervisor will not output to uart, but you still
could see jailhouse log by `cat /dev/jailhouse`
Signed-off-by: Peng Fan <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Commit: 8a82d38ee12c3ab64b0cc95bee35a74ac9bdd391
https://github.com/siemens/jailhouse/commit/8a82d38ee12c3ab64b0cc95bee35a74ac9bdd391
Author: Peng Fan <[email protected]>
Date: 2021-04-17 (Sat, 17 Apr 2021)
Changed paths:
M hypervisor/arch/arm-common/gic-v3.c
M hypervisor/arch/arm-common/include/asm/control.h
Log Message:
-----------
arm: gic-v3: not overwrite interrupt settings needed by EL2
SGI_INJECT, SGI_EVENT, and maint interrupt are needed by Jailhouse and
must not be controlled by the inmate. E.g., we allowed the inmate to
disabled those interrupts, stalling Jailhouse on management operations.
Signed-off-by: Peng Fan <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Commit: 1423b55d303d0f27b97b0ee223a451c3e50cda91
https://github.com/siemens/jailhouse/commit/1423b55d303d0f27b97b0ee223a451c3e50cda91
Author: Peng Fan <[email protected]>
Date: 2021-04-17 (Sat, 17 Apr 2021)
Changed paths:
M configs/arm64/imx8mp-linux-demo.c
M configs/arm64/imx8mp.c
Log Message:
-----------
imx8mp: support virtio console/block
Support virtio console/block, the reserved memory
has already been reserved in linux dts, we reserved 2MB when
initially support ivshmem which 1MB is not used at that time,
but now the left 1MB is well fit for virtio console/block.
Signed-off-by: Peng Fan <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Commit: b8f4aebd7ae665dc8011dc7070e8f978acb0de55
https://github.com/siemens/jailhouse/commit/b8f4aebd7ae665dc8011dc7070e8f978acb0de55
Author: Peng Fan <[email protected]>
Date: 2021-04-17 (Sat, 17 Apr 2021)
Changed paths:
M configs/arm64/imx8mm-linux-demo.c
M configs/arm64/imx8mm.c
M configs/arm64/imx8mp-inmate-demo.c
M configs/arm64/imx8mp-linux-demo.c
M configs/arm64/imx8mp.c
M configs/arm64/imx8mq-linux-demo.c
M configs/arm64/imx8mq.c
Log Message:
-----------
arm64: imx8m: correct pci domain
After linux moved to use linux,pci-domain, we update to
correct pci domain here to use a domain not used by pci hardware.
i.MX8MQ: 2
i.MX8MM: 1
i.MX8MN: 0
i.MX8MP: 2
Working with NXP vendor tree is 5.10.
Upstream tree only has i.MX8MQ pcie, since 5.11.
Signed-off-by: Peng Fan <[email protected]>
Signed-off-by: Jan Kiszka <[email protected]>
Commit: 87aa37d4236dedd81c1c9219ef3f5e6713d42d52
https://github.com/siemens/jailhouse/commit/87aa37d4236dedd81c1c9219ef3f5e6713d42d52
Author: Chase Conklin <[email protected]>
Date: 2021-04-17 (Sat, 17 Apr 2021)
Changed paths:
M hypervisor/paging.c
Log Message:
-----------
core: avoid overflow in paging_destroy
It is possible for the ending address in paging_destroy to overflow to
exactly 0. For example, in a build with 32-bit addresses, a request to
unmap 512MB at 0xe0000000 will result in an overflow (0xe0000000 +
0x20000000 = 0x100000000 which exceeds 32 bits).
This overflow can be avoided by comparing the last address in the
region to be unmapped rather than the first address to not be
unmapped.
Fixes: 7cffb9b7d54d ("core: fix hugepage splitting in paging_destroy")
Signed-off-by: Chase Conklin <[email protected]>
[Jan: tweak comment to address also size == 0 case]
Signed-off-by: Jan Kiszka <[email protected]>
Compare:
https://github.com/siemens/jailhouse/compare/ecd3cf0ae00e...87aa37d4236d
--
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/siemens/jailhouse/push/refs/heads/next/ecd3cf-87aa37%40github.com.
