[siemens/jailhouse] ea82a3: arm: Restore building of mach-vexpress

11 views
Skip to first unread message

GitHub

unread,
Oct 11, 2017, 12:41:16 AM10/11/17
to jailho...@googlegroups.com
Branch: refs/heads/next
Home: https://github.com/siemens/jailhouse
Commit: ea82a3c7df9d62f0add485fa29409e18c83b88d8
https://github.com/siemens/jailhouse/commit/ea82a3c7df9d62f0add485fa29409e18c83b88d8
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm/Kbuild

Log Message:
-----------
arm: Restore building of mach-vexpress

Got accidentally lost in the merge of 837e95234580.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 70709316d9024a2b71e1b6f54de87fc480fa7d0b
https://github.com/siemens/jailhouse/commit/70709316d9024a2b71e1b6f54de87fc480fa7d0b
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm-common/gic-v2.c
M hypervisor/arch/arm-common/gic-v3.c
M hypervisor/arch/arm/mach-vexpress.c

Log Message:
-----------
arm, arm-common: Remove unneeded asm/setup.h inclusions

Nothing in those files refers to the content of setup.h.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 80a9eb46f5b71ece8a31f6484e3269b06adce45a
https://github.com/siemens/jailhouse/commit/80a9eb46f5b71ece8a31f6484e3269b06adce45a
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
A hypervisor/arch/arm-common/include/asm/dcaches.h
M hypervisor/arch/arm/include/asm/paging.h
M hypervisor/arch/arm64/include/asm/paging.h

Log Message:
-----------
arm-common: Pull arm_*dcaches_flush into common header

No need to declare those prototypes and the enum twice.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: b358b89bbe9fe1b5b0425ef770e8dae3b918d179
https://github.com/siemens/jailhouse/commit/b358b89bbe9fe1b5b0425ef770e8dae3b918d179
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm/include/asm/setup.h
M hypervisor/arch/arm/setup.c

Log Message:
-----------
arm: Move cpu_prepare_return_el1 out of header

This inline function is just a local helper to mmu_hyp.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 202c1bc2002b0f22facc02497a889bb550470cb8
https://github.com/siemens/jailhouse/commit/202c1bc2002b0f22facc02497a889bb550470cb8
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm/Kbuild
M hypervisor/arch/arm/entry.S
R hypervisor/arch/arm/exception.S
M hypervisor/arch/arm/include/asm/control.h
A hypervisor/arch/arm/include/asm/entry.h
M hypervisor/arch/arm/mmu_hyp.c

Log Message:
-----------
arm: Move setup and hypervisor entry together

While this split-up makes sense on x86 with the two different CPU
vendors, it's artificial on ARM. So move the hypervisor (exception)
entry over into entry.S and define a corresponding header that holds all
interfaces.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: b6a9316fc90af4ddb61508dafa5b45691a7e786b
https://github.com/siemens/jailhouse/commit/b6a9316fc90af4ddb61508dafa5b45691a7e786b
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm64/entry.S

Log Message:
-----------
arm64: Reorganize code in entry.S

Move the functions of the trampoline section to the end and put enabling
before shutdown. And bootstrap_vectors is not used outside of this
module.

No functional changes.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: f87dcb41d71e1abb971f7ae850985f831219b8e8
https://github.com/siemens/jailhouse/commit/f87dcb41d71e1abb971f7ae850985f831219b8e8
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm64/Kbuild
M hypervisor/arch/arm64/entry.S
R hypervisor/arch/arm64/exception.S
M hypervisor/arch/arm64/include/asm/control.h
A hypervisor/arch/arm64/include/asm/entry.h
R hypervisor/arch/arm64/include/asm/setup.h
M hypervisor/arch/arm64/setup.c
M hypervisor/arch/arm64/traps.c

Log Message:
-----------
arm64: Move setup and hypervisor entry together

Same reasoning and some strategy as for arm: pull the exception code
into entry.S. This allows to shutdown_el2 to fall through to vmreturn.
asm/setup.h effectively becomes the new entry.h here.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 8ae23b0471b8a27fa30d76feffc7cc02a695f3bc
https://github.com/siemens/jailhouse/commit/8ae23b0471b8a27fa30d76feffc7cc02a695f3bc
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M hypervisor/arch/arm/include/asm/control.h
A hypervisor/arch/arm/include/asm/mmu_hyp.h
R hypervisor/arch/arm/include/asm/setup.h
M hypervisor/arch/arm/mmu_hyp.c
M hypervisor/arch/arm/setup.c

Log Message:
-----------
arm: Convert setup.h into mmu_hyp.h

This new header contains everything that mmu_hyp.c exports, while
setup.h suggested to be related to setup.c.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 2d4147def08d0dc00d3b18297b317c8ef2a29242
https://github.com/siemens/jailhouse/commit/2d4147def08d0dc00d3b18297b317c8ef2a29242
Author: Jan Kiszka <jan.k...@siemens.com>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
R hypervisor/arch/arm-common/include/asm/setup-common.h
A hypervisor/arch/arm-common/include/asm/setup.h
M hypervisor/arch/arm-common/setup.c
M hypervisor/arch/arm/setup.c
M hypervisor/arch/arm64/setup.c

Log Message:
-----------
arm-common: Rename setup-common.h to setup.h

The namespace is now free, so let's use it.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Commit: 2be7ea62732df5899ab3002aee89004db06eba2a
https://github.com/siemens/jailhouse/commit/2be7ea62732df5899ab3002aee89004db06eba2a
Author: Ralf Ramsauer <ralf.r...@oth-regensburg.de>
Date: 2017-10-10 (Tue, 10 Oct 2017)

Changed paths:
M configs/jetson-tk1.c

Log Message:
-----------
configs: TK1: allow 32-bit wide access to apbmisc

The following crash is observed since 4.14-rc4:

FATAL: Invalid MMIO read, address: 70000804, size: 4
FATAL: forbidden access (exception class 0x24)
pc=0xc0499424 cpsr=0x20010093 hsr=0x93800007
r0=0x0000002f r1=0xa0010093 r2=0x00000004 r3=0xfe000800
r4=0xc0e21650 r5=0xde40fc80 r6=0xde5c7488 r7=0x0000000a
r8=0xdddfc000 r9=0x00000008 r10=0xc04e6998 r11=0xdddf6d80
r12=0x00000000 r13=0xdddfde80 r14=0xc049060c
Parking CPU 0 (Cell: "Jetson-TK1")

PC points to:
c0499418 <tegra_read_chipid>:
c0499418: e30d34b8 movw r3, #54456 ; 0xd4b8
c049941c: e34c30e9 movt r3, #49385 ; 0xc0e9
c0499420: e5933000 ldr r3, [r3]
c0499424: e5930004 ldr r0, [r3, #4] ; <-- Peng
c0499428: e12fff1e bx lr

While this area is actually exposed to the root cell as subpage, the
hypervisor panics the cell because no width is specified. Accesses are
apparently 32-bit wide, so let's allow 32-bit accesses.

Fixes: 592ebc72960bb ("configs: TK1: reorder memory regions")
Signed-off-by: Ralf Ramsauer <ralf.r...@oth-regensburg.de>
Signed-off-by: Jan Kiszka <jan.k...@siemens.com>


Compare: https://github.com/siemens/jailhouse/compare/f763955670df...2be7ea62732d
Reply all
Reply to author
Forward
0 new messages