depot: update recipe hashes

So far this dummy was only triggered on AX devices after the driver
has been used for a few hours.

Issue #4488.

.gitignore

@@ -7,5 +7,10 @@
 /contrib
 /depot
 /public
+/repos/allwinner
+/repos/imx
+/repos/riscv
+/repos/rpi
 /repos/world
+/repos/zynq
 

VERSION

@@ -1 +1 @@
-21.11
+22.02

doc/components.txt

@@ -343,10 +343,6 @@ Separate components
   Provides each file contained in a tar file obtained via Genode's ROM session
   as separate ROM session.
 
-:_os/src/server/iso9660/_:
-  Provides each file of an ISO9660 file system accessed via a block session as
-  separate ROM session.
-
 :_os/src/server/lx_fs/_:
   A file system server that makes the file system of a Linux base platform
   available to Genode.
@@ -361,9 +357,6 @@ Separate components
 :_os/src/server/log_terminal/_:
   Adapter for forwarding terminal output to a LOG session.
 
-:_os/src/server/fs_log/_:
-  Adapter that writes LOG messages to files on a file system.
-
 :_demo/src/server/nitlog/_:
   Provides a LOG session, printing log output on screen via a GUI session.
 
@@ -377,9 +370,6 @@ Separate components
   switching between configuration variants dependent on the state of
   the system.
 
-:_os/src/server/log_terminal/_:
-  Forwards terminal output to a LOG session.
-
 :_gems/src/server/file_terminal/_:
   Provides terminal sessions that target files on a file system.
 
@@ -395,10 +385,6 @@ Separate components
   The terminal crosslink service allows to terminal clients to talk to each
   other.
 
-:_gems/src/server/http_block/_:
-  A block service that fetches a virtual block device over the network from
-  a HTTP server.
-
 :_os/src/server/fs_rom/_:
   A ROM service that translates the 'File_system' session interface to the
   'ROM' session' interface. Each request for a ROM file is handled by looking
@@ -454,6 +440,9 @@ implement the VFS-plugin interface. They can be combined with any application
 based on Genode's C runtime, with the VFS server, and with non-POSIX
 components that use the Genode's VFS library directly.
 
+:_os/src/lib/vfs/tap/_:
+  A VFS plugin that allows for packet-level access of a NIC or uplink session.
+
 :_gems/src/lib/vfs/trace/_:
   A VFS plugin that makes core's TRACE service accessible as a pseudo
   file system.
@@ -609,15 +598,11 @@ Package-management components
 Runtime environments
 ####################
 
-:_ports/src/app/seoul/_: Seoul is a virtual-machine monitor developed for
-  the use with the NOVA platform. It virtualizes 32bit x86 PC hardware
-  including various peripherals.
-
 :_os/src/server/loader/_: A service that allows the creation and destruction
   of Genode subsystems via a session interface. For further information,
   refer to _os/src/server/loader/README_.
 
-:_ports/src/virtualbox5/_: VirtualBox running on top of the NOVA hypervisor.
+:_ports/src/virtualbox6/_: VirtualBox running on top of the NOVA hypervisor.
 
 :_os/src/server/vmm/_: A virtual machine monitor that is based on
   hardware-assisted virtualization of ARM platforms. It is supported on

doc/news.txt

@@ -4,6 +4,74 @@
                                ===========
 
 
+Genode OS Framework release 22.02 | 2022-02-28
+##############################################
+
+| With Genode 22.02, 3D acceleration becomes available to guest operating
+| systems running in VirtualBox 6, Sculpt OS evolves into a versatile framework
+| for building special-purpose operating systems, and Genode starts to interact
+| with the modem of the Pinephone.
+
+The features mentioned above are merely the tip of the iceberg of version
+22.02. In fact, the majority of the development work during the release cycle
+was focused on topics beyond the visible surface, ranging from the
+reorganization of the code base for streamlining the targeting of new hardware,
+over the tightening of foundational framework APIs, to the raising of the
+default warning level used when building genuine Genode components. Over the
+course of this infrastructural work, almost no component was left unturned.
+
+Functionality-wise, improvements of the Genode-based Sculpt OS are at the
+center stage of the release. Originally pursued with the vision of a
+Genode-based general-purpose OS that is fit for day-to-day use on commodity PC
+hardware, the current release lifts the potential of Sculpt's architecture for
+the creation of special-purpose operating-system appliances. The gained
+flexibility took even us developers by surprise! Thanks to the new modular
+approach, we were able to demonstrate a bare-bones version of Sculpt OS on
+the Pinephone at FOSDEM, or accelerate our development workflow by routinely
+running Sculpt OS directly on the Linux kernel.
+
+The intensive device-driver-related developments of the previous releases
+continued as well. This time, we took our new approach for running Linux
+drivers in Genode to PC hardware, starting with a fresh port of the USB host
+controller driver. The Intel GPU driver received numerous performance
+improvements and can now even be combined with guest operating systems running
+in VirtualBox 6. Further notable driver-related improvements are the new
+ability to interact with the modem on the Pinephone and largely streamlined
+driver infrastructure for the Raspberry Pi.
+
+All the details of the new version can be found in the
+[https:/documentation/release-notes/22.02 - release documentation of version 22.02...]
+
+
+Road Map for 2022 | 2022-01-18
+##############################
+
+| Our plans for 2022 envision the use of Genode for advanced mobile
+| use cases such as video chat.
+
+Following Genode's major technical breakthroughs in the areas of reusing Linux
+drivers, hardware-accelerated graphics, and the native execution of Chromium
+during 2021, we will pursue _mobile usability_ as overarching theme in 2022.
+Specifically, we aspire the routine use of Genode on the Pinephone as a
+platform for video chat, using WireGuard to protect the communications.
+
+This vision motivates a large variety of challenging technical topics.
+To name a few, we have to squeeze good performance out of the
+resource-constrained Pinephone hardware, focus on UI latency and the quality
+of service of audio streaming, come up with a somewhat usable touch-based
+user interface, and get to the guts of power management.
+
+Aside this guiding theme, we put a broad update of our PC drivers on our
+agenda so that Sculpt OS remains a suitable basis for our day-to-day
+computing needs on recent generations of Intel hardware.
+As an additional line of development, we are excited to intensify the
+combination of Genode with reconfigurable hardware.
+
+More information about our review of the past year, this year's focus, and a
+rough schedule are presented at our official
+[https:/about/road-map - road-map page].
+
+
 Genode OS Framework release 21.11 | 2021-11-30
 ##############################################
 

doc/release_notes/18-02.txt

@@ -219,8 +219,9 @@ Base framework and OS-level infrastructure
 Increased default warning level
 ===============================
 
-For building Genode components written in C++, the compiler flags -Wextra,
--Weffc++, and -Werror are now enabled in addition to -Wall by default.
+For building Genode components written in C++, the compiler
+flags -Wextra, -Weffc++, and -Werror are now enabled in addition
+to -Wall by default.
 
 If this strict warning level is inapplicable for a given component or
 library, it is possible to explicitly disable the strictness in the

doc/road_map.txt

@@ -7,99 +7,89 @@
 Herein, we lay out our plans for evolving Genode. Progress in addition to this
 planning will very much depend on the degree of community support the project
 will receive. The
-[https://genode.org/about/challenges - Challenges] page collects some of our ideas to
-advance Genode in various further directions.
+[https://genode.org/about/challenges - Challenges] page collects some of our
+ideas to advance Genode in various further directions.
 
 The road map is not fixed. If there is commercial interest of pushing the
 Genode technology to a certain direction, we are willing to revisit our plans.
 
 
-Review of 2020
+Review of 2021
 ##############
 
-The overarching theme of our road map for 2020 was "Dwarfing the barrier of
-entry", which expressed the ambition to reach a wider audience. On that
-account, we identified four promising directions: First, making Sculpt OS
-palatable for a wider circle. Second, fostering the public perception of the
-high quality of Genode to reinforce the confidence of people who are sceptical
-towards novel operating-system technology. Third, lowering the barrier of
-entry by providing frictionless tooling. And fourth, publicly presenting use
-cases that prove the fitness and flexibility of Genode. These directions
-certainly did a good job of motivating the working topics of last year's four
-releases
-[https://genode.org/documentation/release-notes/20.02 - 20.02],
-[https://genode.org/documentation/release-notes/20.05 - 20.05],
-[https://genode.org/documentation/release-notes/20.08 - 20.08], and
-[https://genode.org/documentation/release-notes/20.11 - 20.11].
+Genode's year 2021 was defined by three extremely challenging lines of work.
 
-The UI improvements of Sculpt OS in version 20.02 largely eliminated the need
-to use the command line as presented
-[https://www.youtube.com/watch?v=vmgWgzeKAjU - here].
-The second direction - software quality - motivated the steady improvements of
-our POSIX runtime, ultimately enabling highly sophisticated workloads like the
-Chromium web engine on Genode. Regarding our stated commitment to 64-bit ARM
-hardware, in particular supporting the NXP i.MX8 SoC, we covered 64-bit
-multi-core virtualization, HDMI, touch input, OLED, networking, LTE, USB,
-clock and power management, VirtIO, up to running Sculpt OS on this platform.
+First, we conquered the territory of GPU support that was ridden with
+uncertainties and seemed almost impenetrable when we started. But at the end
+of the year, our custom Intel-GPU multiplexer has landed in Sculpt OS like it
+always belonged there. In tandem with the Intel-GPU work, we explored the
+Vivante GPU as a representative of an ARM platform. The work required a deep
+dive into the respective GPU architectures and the Mesa software stack. It
+eventually led us to the design of Genode's device-agnostic GPU interfaces.
 
-Granted, Genode's audience hasn't increased by a large margin as a direct
-result of these efforts. But as illustrated by the fruitful road-map
-discussion for 2021 on the
-[https://genode.org/community/mailing-lists - mailing list],
-our community is more engaged and enthusiastic than ever before.
+The second line of work was concerned with the reuse of Linux drivers as
+Genode components. Over the year, the puzzle pieces of our new Linux
+device-driver environment come together, replacing former confusion and chaos
+with knowledge and order, ultimately uncovering the treasure of Linux drivers
+for Genode with very little friction. On the way, we created new methodology
+and tooling, as well as extensive documentation in the form of the "Genode
+Platforms" document. Thanks to the new drivers ported from the Linux kernel,
+we were able to witness interactive Genode scenarios becoming alive on the
+Pinephone by the end of the year.
+
+The third major topic was the growing sophistication of Genode-native
+workloads, with the media features of the Chromium-based browser on 64-bit ARM
+being the most impressive example. Apart from the apparent functional benefits
+for Genode and Sculpt OS, this is the long outstanding validation of some bold
+design decisions we took years ago, in particular the role and architecture of
+the VFS and its interplay with the libc.
+
+When reviewing the road map for 2021, some items remained uncovered. In
+particular the seL4-related topics became stale. At the end of 2020 - when we
+assembled the road map for the past year - there was a tangible prospect of
+pursuing this topic as funded work. However, those plans were repeatedly
+deferred and remained uncertain. Also, there are some items that have seen
+healthy doses of progress - like the topics related to Ada/SPARK or Goa - but
+received less attention than anticipated. On the other hand, the four releases
+([https://genode.org/documentation/release-notes/21.02 - 21.02],
+[https://genode.org/documentation/release-notes/21.05 - 21.05],
+[https://genode.org/documentation/release-notes/21.08 - 21.08],
+[https://genode.org/documentation/release-notes/21.11 - 21.11])
+of 2021 covered quite a few topics not advertised at the road
+map, e.g., webcam support, Xilinx Zynq, or RISC-V.
+
+It is fair to say that the level of technical risks we took in 2021 had been
+unprecedented in Genode's development history. We are more than proud of the
+outcome, which will hopefully propel Genode to new heights in 2022.
 
 
-2021 - Optimization and Platform diversity
-##########################################
+2022 - Mobile Usability
+#######################
 
-For the initial conquering of 64-bit ARM territory, restraining our focus to
-one particular SoC - namely NXP i.MX8 - was a healthy approach. Now it is the
-right time to optimize and to branch out the development to further
-platforms. The following key aspects of our road map for 2021 reflect that.
+After having enabled the first interactive Genode scenarios on the Pinephone
+last year, we plan to take Genode on the Pinephone to a level where we can
+routinely use it for advanced applications, in particular video chat. This
+vision confronts us with a multitude of hard technical nuts to crack such as
+power efficiency, UI latency, quality-of-service of audio processing, drivers
+for multi-media devices, WebRTC performance, and usability. This grand theme
+will not only address the Pinephone specifically. The efficiency gains will
+benefit all Genode use cases large and small.
 
-:Pinephone:
-  By the end of the year, we want be able to use Genode on the
-  [https://pine64.com/product-category/pinephone/ - Pinephone]
-  as a feature phone, covering basic web-browsing needs, placing calls, and
-  SMS.
+Our theme of the Genode-based video chat on the Pinephone fuels several
+ambitions in closely related areas. In particular, we aspire using WireGuard
+to secure private communication, and experiment with the operation of
+hardware-based trust anchors as the basis for encrypted storage and
+communication.
 
-:Linux-device-driver environment re-imagined:
-  We are convinced that we have to dramatically reduce the engineering
-  effort needed to port device drivers from the Linux kernel to Genode. With
-  many years of driver-porting experience under our belts, we plan to condense
-  the lessons learned in the form of new tooling and documentation. This, in
-  turn, will hopefully pave the ground for more and more developers
-  contributing to Genode's device-driver coverage in the future.
-
-:Developer experience:
-  Speaking of new developers, we see Genode's existing tool set as a barrier
-  because it requires a rather steep learning curve. Hence, this year, we will
-  have a fresh take on tooling and workflows. The starting point will be the
-  experimental [https://github.com/nfeske/goa - Goa] tool, which in principle
-  allows developers to use familiar build systems for Genode development. We
-  plan to extend Goa to cover more build systems, and shape the tool towards
-  system-integration tasks and quick compile-test cycles targeting embedded
-  devices.
-
-:Optimization:
-  Motivated by usage scenarios like the Pinephone, we are eager to tap into
-  plenty of opportunities for optimization. Based on data gathered by improved
-  system tracing, we consider interface refinements to improve the batching of
-  I/O (file-system access, networking), micro-optimizations of hot code paths
-  (like TLS lookup, parsers, and allocators), as well as structural changes
-  (like the consolidation of low-level services).
-
-:GPU support:
-  Distantly related to optimization, GPU support is an increasingly requested
-  feature. We already
-  [https://genode.org/documentation/release-notes/17.08#Hardware-accelerated_graphics_for_Intel_Gen-8_GPUs - wetted our toes]
-  in the past. But GPU support has not yet become routinely supported in
-  system scenarios like Sculpt OS. In 2021, we want to change that, making GPU
-  support a feature that can be relied on. We will primarily address Intel
-  graphics first but also explore GPUs on ARM-based devices.
+Besides the Pinephone, we will steadily nurture the quality and scope of
+driver support on PC hardware, which remains the primary platform for the
+day-to-day use of Sculpt OS. So you can expect us to keep up with recent
+generations of Intel-based hardware. In this area, we plan to make IOMMU
+support available with kernels beyond NOVA, and explore the use of
+power-management features like suspend-resume with Sculpt OS.
 
 
-Milestones for 2021
+Milestones for 2022
 ###################
 
 In the following, we present a rough schedule of the planned work. As usual,
@@ -107,65 +97,45 @@ it is not set in stone. If you are interested in a particular line of work,
 please get in touch.
 
 
-February - Release 21.02
+February - Release 22.02
 ========================
 
-* Pluggable device drivers (NIC, WLAN, framebuffer, input)
-* VirtualBox 6
-* Sculpt: basic UI for the consistent block encrypter (CBE)
-* 64-bit ARM
-  * VirtIO block-device support for virtual machines
-  * Base platform support for the Pine A64 board (kernel base framework)
+* OpenGL in VirtualBox 6
+* Sculpt OS as tool kit for special-purpose OS images
+* Pinephone
+  * Modem access
+  * Touch-screen compatibility of Sculpt OS
 
 
-May - Release 21.05
+May - Release 22.05
 ===================
 
-* Annual documentation update, including the "Genode Foundations" book
-* GPU support
-  * MESA update
-  * Experiments on ARM (e.g., Vivante on i.MX8, or Mali-400 on A64)
-* Sculpt OS on Pine A64 (USB, input, framebuffer, SD-card, networking)
-* 64-bit ARM
-  * Platform-driver consolidation between ARM and x86
-  * PCI-express support for MNT Reform (i.MX8)
-* Tool-chain update (e.g., switching to hard-float on ARM)
-* Modernized client-side NIC and uplink APIs
-* Goa
-  * Broadened architecture support and testing workflow
-  * API projects
-  * Inter-project dependencies
+* Annual update of the "Genode Foundations" book
+* Second edition of the "Genode Platforms" documentation
+* WireGuard VPN
+* Updated drivers for PC hardware (Wifi, Intel framebuffer, USB)
+* New tracing tool with support for CTF and PCAP
+* Pinephone telephony
 
 
-August - Release 21.08
+August - Release 22.08
 ======================
 
-* Linux DDE re-imagined
-  * Improved tooling
-  * Exploring Goa-based development workflow
-* GPU support
-  * GPU multiplexer for Intel Gen9 graphics
-  * Harmonization of GPU driver with Intel framebuffer driver
-* Initial version of a custom kernel (Spunky) implemented in Ada/SPARK
-* System-level tracing infrastructure for guiding and validating optimizations
 * Pinephone
-  * Touchscreen and display
-  * Mobile web browser
-* Goa
-  * CMake-based Qt5 applications
-  * QML-based applications
+  * Morph browser
+  * Media record and playback capabilities
+* FPGA-powered DMA protection for the Zynq-7000 SoC
+* Kernel-agnostic IOMMU support for PC hardware
+* Optimized GUI latency and synchronization
 
 
-November - Release 21.11
+November - Release 22.11
 ========================
 
 * Pinephone
-  * Mobile data connectivity (LTE)
-  * Phone calls (audio)
-  * SMS
-* seL4
-  * Update to current kernel version, MCS scheduling
-  * Combining CAmkES with Genode
-* SMMU (I/O-MMU for ARM) support for our custom (base-hw) kernel
-* Multi-monitor support
+  * WebRTC-based video chat
+  * Power management
+* Base mechanism for suspend-resume on PC hardware
+* Support for hardware-based trust anchor for CBE and WireGuard
+* Software-hardware co-design example for the Zynq-7000 SoC
 

repos/README

@@ -103,6 +103,10 @@ but build upon of each other:
   The repository contains a server that uses a rump kernel to provide
   various NetBSD file systems to Genode.
 
+:'pc':
+  This source-code repository hosts device drivers that are specific for PC
+  platforms. It depends on the 'dde_linux' repository.
+
 :'ports':
 
   This source-code repository hosts ports of 3rd-party applications to

repos/base-fiasco/lib/mk/kernel-fiasco.inc

@@ -6,22 +6,22 @@ FIASCO_SRC       = $(L4_SRC_DIR)/kernel/fiasco
 
 KERNEL_BUILD_OUTPUT_FILTER = 2>&1 | sed "s/^/      [fiasco]  /"
 
+KERNEL_CXXFLAGS = -std=gnu++98 -fno-delete-null-pointer-checks $(CXXWARN) \
+                  -Wno-address-of-packed-member
+
 $(FIASCO_BUILD_DIR):
-	$(VERBOSE_MK) set -o pipefail; \
-	              MAKEFLAGS= $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
+	$(VERBOSE_MK) MAKEFLAGS= $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
 	                                 $(VERBOSE_DIR) -C $(FIASCO_SRC) BUILDDIR=$@ \
 	                                 $(KERNEL_BUILD_OUTPUT_FILTER)
 	$(VERBOSE)cp $(KERNEL_CONFIG) $@/globalconfig.out
-	$(VERBOSE_MK) set -o pipefail; \
-	              MAKEFLAGS= $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
+	$(VERBOSE_MK) MAKEFLAGS= $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
 	                                 $(VERBOSE_DIR) -C $@ oldconfig \
 	                                 $(KERNEL_BUILD_OUTPUT_FILTER)
 	$(VERBOSE)cp $(KERNEL_CONFIG) $@/globalconfig.out
 
 $(FIASCO): $(FIASCO_BUILD_DIR)
-	$(VERBOSE_MK) set -o pipefail; \
-	              MAKEFLAGS= CFLAGS="-std=gnu89 $(CWARN)" \
-	              CXXFLAGS="-std=gnu++98 -fno-delete-null-pointer-checks $(CXXWARN)" \
+	$(VERBOSE_MK) MAKEFLAGS= CFLAGS="-std=gnu89 $(CWARN)" \
+	              CXXFLAGS="$(KERNEL_CXXFLAGS)" \
 	              $(MAKE) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" \
 	                                 $(VERBOSE_DIR) -C $(FIASCO_BUILD_DIR) \
 	                                 $(KERNEL_BUILD_OUTPUT_FILTER)

repos/base-fiasco/lib/mk/l4_pkg.inc

@@ -33,6 +33,9 @@ ifeq ($(VERBOSE),)
 L4_VERBOSE = V=1
 endif
 
+# do not confuse third-party sub-makes
+unexport .SHELLFLAGS
+
 #
 # Execute the rules in this file only at the second build stage when we know
 # about the complete build settings, e.g., 'CROSS_DEV_PREFIX'.
@@ -61,8 +64,7 @@ CXXWARN = $(WARN) -Wno-bool-compare -Wno-c++11-compat -Wno-class-memaccess
 # 'off64_t' type, which is used by bootstrap.
 #
 %.tag:
-	$(VERBOSE_MK) set -o pipefail; \
-	              MAKEFLAGS= CPPFLAGS="$(CC_MARCH)" \
+	$(VERBOSE_MK) MAKEFLAGS= CPPFLAGS="$(CC_MARCH)" \
 	              CFLAGS="$(CC_MARCH) -std=gnu89 $(CWARN)" \
 	              CXXFLAGS="$(CC_MARCH) -D_GNU_SOURCE -std=gnu++98 $(CXXWARN)" \
 	              ASFLAGS="$(CC_MARCH)" LDFLAGS="$(LD_MARCH)" \

repos/base-fiasco/lib/mk/syscall-fiasco.inc

@@ -15,7 +15,7 @@ L4_BUILD_DIR := $(shell pwd)
 .Makeconf.bid.old:
 	$(VERBOSE)mkdir -p $(dir $@)
 	$(VERBOSE)cp $(L4_CONFIG) $(@:.old=)
-	$(VERBOSE_MK) set -o pipefail; \
+	$(VERBOSE_MK) \
 	   MAKEFLAGS= make $(VERBOSE_DIR) -C $(L4_SRC_DIR)/l4 \
 	   O=$(L4_BUILD_DIR) SYSTEM_TARGET="$(CROSS_DEV_PREFIX)" oldconfig \
 	   2>&1 | sed "s/^/      [l4build]  /"

repos/base-fiasco/recipes/src/base-fiasco/hash

@@ -1 +1 @@
-2021-11-29 dc3dc62ee3267db5cab87426b73323828cbc8d15
+2022-04-12 515112b4fff8f569ab6194cabbde0dc8e8446c82

repos/base-fiasco/src/core/include/platform_pd.h

@@ -46,6 +46,7 @@ class Genode::Platform_pd : public Address_space
 
 		enum {
 			VERSION_BITS   = 10,
+			VERSION_MASK   = (1 << VERSION_BITS) - 1,
 			PD_FIRST       = 0x10,
 			PD_MAX         = (1 << 11) - 1, /* leave 0x7ff free for L4_INVALID_ID */
 			PD_VERSION_MAX = (1 << 10) - 1,
@@ -101,7 +102,7 @@ class Genode::Platform_pd : public Address_space
 			unsigned version  : VERSION_BITS;
 
 			Pd_alloc(bool r, bool f, unsigned v)
-			: reserved(r), free(f), version(v) { }
+			: reserved(r), free(f), version(v & VERSION_MASK) { }
 
 			Pd_alloc() : reserved(0), free(0), version(0) { }
 		};

repos/base-fiasco/src/core/platform_pd.cc

@@ -58,10 +58,13 @@ void Platform_pd::init()
 
 void Platform_pd::_create_pd(bool syscall)
 {
+	enum { TASK_ID_MASK     = (1 << 11) - 1,
+	       VERSION_LOW_MASK = (1 << 10) - 1 };
+
 	l4_threadid_t l4t  = l4_myself();
-	l4t.id.task        = _pd_id;
+	l4t.id.task        = _pd_id & TASK_ID_MASK;
 	l4t.id.lthread     = 0;
-	l4t.id.version_low = _version;
+	l4t.id.version_low = _version & VERSION_LOW_MASK;
 
 	l4_taskid_t nt;
 	if (syscall)
@@ -203,8 +206,10 @@ bool Platform_pd::bind_thread(Platform_thread &thread)
 	}
 	thread_id = t;
 
+	enum { LTHREAD_MASK = (1 << 7) - 1 };
+
 	l4_thread_id = _l4_task_id;
-	l4_thread_id.id.lthread = thread_id;
+	l4_thread_id.id.lthread = thread_id & LTHREAD_MASK;
 
 	/* finally inform thread about binding */
 	thread.bind(thread_id, l4_thread_id, *this);

repos/base-fiasco/src/include/fiasco/syscall.h

@@ -15,6 +15,10 @@
 #define _INCLUDE__FIASCO__SYSCALL_H_
 
 namespace Fiasco {
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 #include <l4/sys/types.h>
 #include <l4/sys/kdebug.h>
 #include <l4/sys/ipc.h>
@@ -24,6 +28,8 @@ namespace Fiasco {
 #include <l4/sys/ktrace.h>
 #include <l4/sys/syscalls.h>
 #include <l4/sigma0/sigma0.h>
+
+#pragma GCC diagnostic pop  /* restore -Wconversion warnings */
 }
 
 #endif /* _INCLUDE__FIASCO__SYSCALL_H_ */

repos/base-fiasco/src/lib/base/ipc.cc

@@ -32,9 +32,9 @@ class Msg_header
 	private:
 
 		/* kernel-defined message header */
-		l4_fpage_t   rcv_fpage; /* unused */
-		l4_msgdope_t size_dope;
-		l4_msgdope_t send_dope;
+		l4_fpage_t   _rcv_fpage; /* unused */
+		l4_msgdope_t _size_dope;
+		l4_msgdope_t _send_dope;
 
 	public:
 
@@ -52,6 +52,8 @@ class Msg_header
 
 		enum { MAX_CAPS_PER_MSG = Msgbuf_base::MAX_CAPS_PER_MSG };
 
+		enum { SIZE_DOPE_MASK = 0x3ffff };
+
 		l4_threadid_t _cap_tid        [MAX_CAPS_PER_MSG];
 		unsigned long _cap_local_name [MAX_CAPS_PER_MSG];
 
@@ -68,7 +70,7 @@ class Msg_header
 
 	public:
 
-		void *msg_start() { return &rcv_fpage; }
+		void *msg_start() { return &_rcv_fpage; }
 
 		/**
 		 * Load header fields according to send-message buffer
@@ -79,7 +81,8 @@ class Msg_header
 			num_caps = min((unsigned)MAX_CAPS_PER_MSG, snd_msg.used_caps());
 
 			size_t const snd_words = snd_msg.data_size()/sizeof(l4_umword_t);
-			send_dope = L4_IPC_DOPE(_num_msg_words(snd_words), 0);
+
+			_send_dope = L4_IPC_DOPE(_num_msg_words(snd_words) & SIZE_DOPE_MASK, 0);
 
 			/* reset _cap_tid and _cap_local_name */
 			for (unsigned i = 0; i < MAX_CAPS_PER_MSG; i++) {
@@ -107,7 +110,7 @@ class Msg_header
 		{
 			size_t const rcv_max_words = rcv_msg.capacity()/sizeof(l4_umword_t);
 
-			size_dope = L4_IPC_DOPE(_num_msg_words(rcv_max_words), 0);
+			_size_dope = L4_IPC_DOPE(_num_msg_words(rcv_max_words) & SIZE_DOPE_MASK, 0);
 		}
 
 		/**
@@ -234,11 +237,8 @@ Genode::Rpc_request Genode::ipc_reply_wait(Reply_capability const &last_caller,
 		 * error condition to the user but want to wait for the next proper
 		 * incoming message.
 		 */
-		if (L4_IPC_IS_ERROR(ipc_result)) {
-			error("ipc_reply_and_wait error ", Hex(L4_IPC_ERROR(ipc_result)));
-		} else {
+		if (!L4_IPC_IS_ERROR(ipc_result))
 			need_to_wait = false;
-		}
 	}
 
 	while (need_to_wait) {

repos/base-fiasco/src/lib/base/thread_bootstrap.cc

@@ -25,8 +25,7 @@ using namespace Genode;
  ** Startup library support **
  *****************************/
 
-void prepare_init_main_thread()   { }
-void prepare_reinit_main_thread() { }
+void prepare_init_main_thread() { }
 
 
 /************

repos/base-foc/include/foc/syscall.h

@@ -14,6 +14,9 @@
 #ifndef _INCLUDE__FOC__SYSCALL_H_
 #define _INCLUDE__FOC__SYSCALL_H_
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+
 namespace Foc {
 #include <l4/sys/types.h>
 #include <l4/sys/kip>
@@ -33,4 +36,6 @@ namespace Foc {
 #include <l4/sigma0/sigma0.h>
 }
 
+#pragma GCC diagnostic pop  /* restore -Wconversion warnings */
+
 #endif /* _INCLUDE__FOC__SYSCALL_H_ */

repos/base-foc/include/foc/thread_state.h

@@ -26,7 +26,7 @@ namespace Genode { struct Foc_thread_state; }
 struct Genode::Foc_thread_state : Thread_state
 {
 	Foc::l4_cap_idx_t  kcap;         /* thread's gate cap in its PD */
-	int                id;           /* ID of gate capability */
+	uint16_t           id;           /* ID of gate capability */
 	addr_t             utcb;         /* thread's UTCB in its PD */
 
 	/**

repos/base-foc/lib/mk/kernel-foc.inc

@@ -8,15 +8,13 @@ MAKEOVERRIDES := $(filter-out KERNEL=%,$(MAKEOVERRIDES))
 unexport KERNEL
 
 $(FOC_BUILD_DIR):
-	$(VERBOSE_MK) set -o pipefail; \
-	              $(MAKE) CROSS_COMPILE="$(CROSS_DEV_PREFIX)" \
+	$(VERBOSE_MK) $(MAKE) CROSS_COMPILE="$(CROSS_DEV_PREFIX)" \
 	                      $(VERBOSE_DIR) -C $(FOC_SRC) BUILDDIR=$@ \
 	                      $(KERNEL_BUILD_OUTPUT_FILTER)
 	$(VERBOSE)cp $(KERNEL_CONFIG) $@/globalconfig.out
 
 $(FOC): $(FOC_BUILD_DIR)
-	$(VERBOSE_MK) set -o pipefail; \
-	              $(MAKE) CROSS_COMPILE="$(CROSS_DEV_PREFIX)" \
+	$(VERBOSE_MK) $(MAKE) CROSS_COMPILE="$(CROSS_DEV_PREFIX)" \
 	                      CC="$(CC)" CXX="$(CXX)" \
 	                      $(VERBOSE_DIR) -C $(FOC_BUILD_DIR) \
 	                      $(KERNEL_BUILD_OUTPUT_FILTER)

repos/base-foc/lib/mk/l4_pkg.inc

@@ -39,6 +39,9 @@ PKG_TAGS     = $(addsuffix .tag,$(addsuffix .$(BOARD),$(PKGS)))
 
 BUILD_OUTPUT_FILTER = 2>&1 | sed "s~^~      [$*]  ~"
 
+# do not confuse third-party sub-makes
+unexport .SHELLFLAGS
+
 #
 # Execute the rules in this file only at the second build stage when we know
 # about the complete build settings, e.g., 'CROSS_DEV_PREFIX'.
@@ -55,8 +58,7 @@ endif
 .NOTPARALLEL: $(PKG_TAGS)
 
 %.$(BOARD).tag:
-	$(VERBOSE_MK) set -o pipefail; \
-	              $(MAKE) $(VERBOSE_DIR) O=$(L4_BUILD_DIR) -C $(L4_PKG_DIR)/$* \
+	$(VERBOSE_MK) $(MAKE) $(VERBOSE_DIR) O=$(L4_BUILD_DIR) -C $(L4_PKG_DIR)/$* \
 	                      "$(L4_BUILD_OPT)" WARNINGS=$(WARNINGS) $(BUILD_OUTPUT_FILTER)
 	$(VERBOSE)mkdir -p $(dir $@) && touch $@
 

repos/base-foc/lib/mk/syscall-foc.inc

@@ -37,7 +37,7 @@ CC_OPT += -DL4SYS_USE_UTCB_WRAP=1 -Wno-unused-function
 # build system will stuble over predefined variables, i.e., 'LIB'
 #
 $(L4_BUILD_DIR)/.kconfig:
-	$(VERBOSE_MK) set -o pipefail; \
+	$(VERBOSE_MK) \
 	     MAKEFLAGS= $(MAKE) $(VERBOSE_DIR) -C $(L4_SRC_DIR)/l4 \
 	     B=$(L4_BUILD_DIR) DROPSCONF_DEFCONFIG="$(L4_CONFIG)" \
 	     VERBOSE="$(VERBOSE)" CROSS_COMPILE="$(CROSS_DEV_PREFIX)" \

repos/base-foc/recipes/src/base-foc-imx6q_sabrelite/hash

@@ -1 +1 @@
-2021-11-29 86ebd8f9b9c153fc0eb7ef7ef7604116f8438e04
+2022-04-12 b1e43bda46dcc2e180649bed9990230bbc6f5eb3

repos/base-foc/recipes/src/base-foc-imx7d_sabre/hash

@@ -1 +1 @@
-2021-11-29 731498ebe667555a14fdcbf3c1cab33e227fb036
+2022-04-12 587953d4a135f958b156bf9ec31adfbc2c84881a

repos/base-foc/recipes/src/base-foc-pbxa9/hash

@@ -1 +1 @@
-2021-11-29 ae5de8b6bf4f21e2cdc74151aff195c56f74032e
+2022-04-12 99c54bf391d7e438022b70b39ba175ee13a831f8

repos/base-foc/recipes/src/base-foc-pc/hash

@@ -1 +1 @@
-2021-11-29 6f4c635c08bbdd5610c157fd001955de4a2fb81e
+2022-04-12 4fe361144ecfe216246e5ba199f578c69ebbec57

repos/base-foc/recipes/src/base-foc-rpi3/hash

@@ -1 +1 @@
-2021-11-29 af285a52c89b07a1cfd2c03dac4905d8d7a498e3
+2022-04-12 b920fe281256f366f1565444ba07bc136897ba06

repos/base-foc/src/core/include/cap_id_alloc.h

@@ -25,6 +25,12 @@ namespace Genode { class Cap_id_allocator; }
 
 class Genode::Cap_id_allocator
 {
+	public:
+
+		using id_t = uint16_t;
+
+		enum { ID_MASK = 0xffff };
+
 	private:
 
 		enum {
@@ -44,8 +50,8 @@ class Genode::Cap_id_allocator
 
 		Cap_id_allocator(Allocator &);
 
-		unsigned long alloc();
-		void free(unsigned long id);
+		id_t alloc();
+		void free(id_t id);
 };
 
 #endif /* _CORE__INCLUDE__CAP_ID_ALLOC_H_ */

repos/base-foc/src/core/include/irq_object.h

@@ -38,7 +38,7 @@ class Genode::Irq_object
 		Irq_session::Polarity  _polarity; /* interrupt polarity */
 
 		unsigned               _irq;
-		addr_t                 _msi_addr;
+		uint64_t               _msi_addr;
 		addr_t                 _msi_data;
 
 		Signal_context_capability _sig_cap { };
@@ -53,8 +53,8 @@ class Genode::Irq_object
 		Irq_session::Trigger  trigger()  const { return _trigger; }
 		Irq_session::Polarity polarity() const { return _polarity; }
 
-		Genode::addr_t msi_address() const { return _msi_addr; }
-		Genode::addr_t msi_value()   const { return _msi_data; }
+		uint64_t msi_address() const { return _msi_addr; }
+		addr_t   msi_value()   const { return _msi_data; }
 
 		void sigh(Genode::Signal_context_capability cap) { _sig_cap = cap; }
 		void notify() { Genode::Signal_transmitter(_sig_cap).submit(1); }

repos/base-foc/src/core/include/map_local.h

@@ -45,7 +45,7 @@ namespace Genode {
 			using namespace Foc;
 
 			l4_fpage_t snd_fpage = l4_fpage(from_addr + offset,
-			                                page_size_log2, L4_FPAGE_RW);
+			                                (unsigned)page_size_log2, L4_FPAGE_RW);
 
 			if (l4_msgtag_has_error(l4_task_map(L4_BASE_TASK_CAP,
 			                                    L4_BASE_TASK_CAP,
@@ -95,13 +95,13 @@ namespace Genode {
 			if (can_use_super_page(from_addr + offset, size))
 				page_size_log2 = get_super_page_size_log2();
 			l4_utcb_mr()->mr[1] = l4_fpage(from_addr + offset,
-			                               page_size_log2, L4_FPAGE_RWX).raw;
+			                               (unsigned)page_size_log2, L4_FPAGE_RWX).raw;
 
 			/* open receive window for mapping */
 			l4_utcb_br()->bdr   = 0;
 			l4_utcb_br()->br[0] = L4_ITEM_MAP;
 			l4_utcb_br()->br[1] = l4_fpage((addr_t)to_addr + offset,
-			                               page_size_log2, L4_FPAGE_RWX).raw;
+			                               (unsigned)page_size_log2, L4_FPAGE_RWX).raw;
 
 			l4_msgtag_t tag = l4_msgtag(L4_PROTO_SIGMA0, 2, 0, 0);
 			tag = l4_ipc_call(L4_BASE_PAGER_CAP, l4_utcb(), tag, L4_IPC_NEVER);

repos/base-foc/src/core/io_mem_session_support.cc

@@ -34,7 +34,7 @@ addr_t Io_mem_session_component::_map_local(addr_t base, size_t size)
 	                                                   : get_page_size_log2();
 
 	/* find appropriate region for mapping */
-	return platform().region_alloc().alloc_aligned(size, alignment).convert<addr_t>(
+	return platform().region_alloc().alloc_aligned(size, (unsigned)alignment).convert<addr_t>(
 
 		[&] (void *local_base) {
 			if (!map_local_io(base, (addr_t)local_base, size >> get_page_size_log2())) {

repos/base-foc/src/core/ipc_pager.cc

@@ -86,7 +86,7 @@ void Ipc_pager::wait_for_fault()
 
 	do {
 		_tag = l4_ipc_wait(l4_utcb(), &label, L4_IPC_NEVER);
-		int err = l4_ipc_error(_tag, l4_utcb());
+		l4_umword_t err = l4_ipc_error(_tag, l4_utcb());
 		if (!err) {
 			_parse(label);
 			return;
@@ -121,7 +121,7 @@ void Ipc_pager::reply_and_wait_for_fault()
 	};
 
 	l4_fpage_t const fpage = l4_fpage(_reply_mapping.src_addr,
-	                                  _reply_mapping.size_log2,
+	                                  (unsigned)_reply_mapping.size_log2,
 	                                  rights(_reply_mapping.writeable,
 	                                         _reply_mapping.executable));
 
@@ -129,7 +129,7 @@ void Ipc_pager::reply_and_wait_for_fault()
 
 	_tag = l4_ipc_send_and_wait(_last.kcap, l4_utcb(), snd_tag,
 	                            &label, L4_IPC_SEND_TIMEOUT_0);
-	int const err = l4_ipc_error(_tag, l4_utcb());
+	l4_umword_t const err = l4_ipc_error(_tag, l4_utcb());
 	if (err) {
 		error("Ipc error ", err, " in pagefault from ", Hex(label & ~0x3));
 		wait_for_fault();

repos/base-foc/src/core/irq_session_component.cc

@@ -139,7 +139,7 @@ void Irq_object::ack_irq()
 {
 	using namespace Foc;
 
-	int err;
+	l4_umword_t err;
 	l4_msgtag_t tag = l4_irq_unmask(_capability());
 	if ((err = l4_ipc_error(tag, l4_utcb())))
 		error("IRQ unmask: ", err);
@@ -148,7 +148,7 @@ void Irq_object::ack_irq()
 
 Irq_object::Irq_object()
 :
-	 _cap(cap_map().insert(platform_specific().cap_id_alloc().alloc())),
+	 _cap(cap_map().insert((Cap_index::id_t)platform_specific().cap_id_alloc().alloc())),
 	 _trigger(Irq_session::TRIGGER_UNCHANGED),
 	 _polarity(Irq_session::POLARITY_UNCHANGED),
 	 _irq(~0U), _msi_addr(0), _msi_data(0)
@@ -170,7 +170,7 @@ Irq_object::~Irq_object()
 	if (l4_error(l4_irq_detach(_capability())))
 		error("cannot detach IRQ");
 
-	if (l4_error(l4_icu_unbind(L4_BASE_ICU_CAP, irq, _capability())))
+	if (l4_error(l4_icu_unbind(L4_BASE_ICU_CAP, (unsigned)irq, _capability())))
 		error("cannot unbind IRQ");
 
 	cap_map().remove(_cap);
@@ -184,7 +184,7 @@ Irq_object::~Irq_object()
 Irq_session_component::Irq_session_component(Range_allocator &irq_alloc,
                                              const char      *args)
 :
-	_irq_number(Arg_string::find_arg(args, "irq_number").long_value(-1)),
+	_irq_number((unsigned)Arg_string::find_arg(args, "irq_number").long_value(-1)),
 	_irq_alloc(irq_alloc), _irq_object()
 {
 	long const msi = Arg_string::find_arg(args, "device_config_phys").long_value(0);
@@ -252,7 +252,7 @@ Irq_session::Info Irq_session_component::info()
 
 	return {
 		.type    = Genode::Irq_session::Info::Type::MSI,
-		.address = _irq_object.msi_address(),
+		.address = (addr_t)_irq_object.msi_address(),
 		.value   = _irq_object.msi_value()
 	};
 }
@@ -269,7 +269,7 @@ void Interrupt_handler::entry()
 {
 	using namespace Foc;
 
-	int         err;
+	l4_umword_t err;
 	l4_msgtag_t tag;
 	l4_umword_t label;
 

repos/base-foc/src/core/platform.cc

@@ -293,14 +293,14 @@ void Platform::_setup_mem_alloc()
 	for ( ; beg < end; beg += L4_PAGESIZE) (void)(*beg);
 
 	/* request pages of known page size starting with largest */
-	size_t const log2_sizes[] = { L4_LOG2_SUPERPAGESIZE, L4_LOG2_PAGESIZE };
+	unsigned const log2_sizes[] = { L4_LOG2_SUPERPAGESIZE, L4_LOG2_PAGESIZE };
 
 	for (unsigned i = 0; i < sizeof(log2_sizes)/sizeof(*log2_sizes); ++i) {
-		size_t const log2_size = log2_sizes[i];
-		size_t const size      = 1UL << log2_size;
+		unsigned const log2_size = log2_sizes[i];
+		size_t   const size      = 1UL << log2_size;
 
-		int    err       = 0;
-		addr_t addr      = 0;
+		Foc::l4_umword_t err = 0;
+		addr_t addr = 0;
 		Region region;
 
 		/* request any page of current size from sigma0 */

repos/base-foc/src/core/platform_pd.cc

@@ -122,12 +122,13 @@ void Platform_pd::flush(addr_t, size_t size, Core_local_addr core_local)
 
 static Native_capability debug_cap()
 {
-	unsigned long const id = platform_specific().cap_id_alloc().alloc();
+	Cap_index::id_t const id = platform_specific().cap_id_alloc().alloc();
 	static Cap_index * idx = cap_map().insert(id, DEBUG_CAP);
 	static Native_capability debug_cap(reinterpret_cast<Core_cap_index*>(idx));
 	return debug_cap;
 }
 
+
 Platform_pd::Platform_pd(Core_cap_index &ci)
 :
 	_task(Native_capability(&ci), TASK_CAP)

repos/base-foc/src/core/platform_thread.cc

@@ -32,7 +32,10 @@ using namespace Foc;
 Trace::Execution_time Platform_thread::execution_time() const
 {
 	Foc::l4_kernel_clock_t us = 0;
+	/* syscall does not return ever, if thread is on remote cpu,
+	   see issue #4357
 	l4_thread_stats_time(_thread.local.data()->kcap(), &us);
+	*/
 	return { us, 0, 10000 /* quantum readable ?*/, _prio };
 }
 
@@ -211,7 +214,7 @@ Foc_thread_state Platform_thread::state()
 		s = _pager_obj->state.state;
 
 	s.kcap = _gate.remote;
-	s.id   = _gate.local.local_name();
+	s.id   = (uint16_t)_gate.local.local_name();
 	s.utcb = _utcb;
 
 	return s;

repos/base-foc/src/core/rpc_cap_factory.cc

@@ -49,7 +49,7 @@ Cap_index_allocator &Genode::cap_idx_alloc()
 
 Core_cap_index *Cap_mapping::_get_cap()
 {
-	int const id = platform_specific().cap_id_alloc().alloc();
+	Cap_index::id_t const id = platform_specific().cap_id_alloc().alloc();
 	return static_cast<Core_cap_index*>(cap_map().insert(id));
 }
 
@@ -104,7 +104,7 @@ Native_capability Rpc_cap_factory::alloc(Native_capability ep)
 		/*
 		 * Allocate new id, and ipc-gate and set id as gate-label
 		 */
-		unsigned long const id = platform_specific().cap_id_alloc().alloc();
+		Cap_index::id_t const id = platform_specific().cap_id_alloc().alloc();
 		Core_cap_index *idx = static_cast<Core_cap_index*>(cap_map().insert(id));
 
 		if (!idx) {
@@ -194,17 +194,21 @@ Cap_id_allocator::Cap_id_allocator(Allocator &alloc)
 }
 
 
-unsigned long Cap_id_allocator::alloc()
+Cap_id_allocator::id_t Cap_id_allocator::alloc()
 {
 	Mutex::Guard lock_guard(_mutex);
 
-	return _id_alloc.try_alloc(CAP_ID_OFFSET).convert<unsigned long>(
-		[&] (void *id) { return (unsigned long)id; },
-		[&] (Range_allocator::Alloc_error) -> unsigned long { throw Out_of_ids(); });
+	return _id_alloc.try_alloc(CAP_ID_OFFSET).convert<id_t>(
+
+		[&] (void *id) -> id_t {
+			return (addr_t)id & ID_MASK; },
+
+		[&] (Range_allocator::Alloc_error) -> id_t {
+			throw Out_of_ids(); });
 }
 
 
-void Cap_id_allocator::free(unsigned long id)
+void Cap_id_allocator::free(id_t id)
 {
 	Mutex::Guard lock_guard(_mutex);
 

repos/base-foc/src/core/signal_source_component.cc

@@ -41,7 +41,7 @@ void Signal_source_component::submit(Signal_context_component &context,
                                      unsigned long             cnt)
 {
 	/* enqueue signal to context */
-	context.increment_signal_cnt(cnt);
+	context.increment_signal_cnt((int)cnt);
 
 	if (!context.enqueued()) {
 		_signal_queue.enqueue(context);

repos/base-foc/src/core/thread_start.cc

@@ -78,14 +78,22 @@ void Thread::start()
 		Info trace_source_info() const override
 		{
 			uint64_t const sc_time = 0;
-			addr_t const kcap = (addr_t) platform_thread.pager_object_badge();
 
 			using namespace Foc;
 			l4_kernel_clock_t ec_time = 0;
-			l4_msgtag_t res = l4_thread_stats_time(kcap, &ec_time);
-			if (l4_error(res))
-				Genode::error("cpu time for ", thread.name(),
-				              " is not available ", l4_error(res));
+
+			/*
+			 * The 'l4_thread_stats_time' syscall does not always return if
+			 * the thread is on remote CPU. Disable the feature to keep core
+			 * safe (see issue #4357).
+			 */
+			if (0) {
+				addr_t const kcap = (addr_t) platform_thread.pager_object_badge();
+				l4_msgtag_t res = l4_thread_stats_time(kcap, &ec_time);
+				if (l4_error(res))
+					Genode::error("cpu time for ", thread.name(),
+					              " is not available ", l4_error(res));
+			}
 
 			return { Session_label("core"), thread.name(),
 			         Trace::Execution_time(ec_time, sc_time, 10000,

repos/base-foc/src/core/vm_session_component.cc

@@ -49,7 +49,7 @@ Vcpu::Vcpu(Rpc_entrypoint            &ep,
 	}
 
 	try {
-		unsigned const vcpu_id = _vcpu_ids.alloc();
+		unsigned const vcpu_id = (unsigned)_vcpu_ids.alloc();
 		_task_index_client = thread.setup_vcpu(vcpu_id, task_cap, recall_cap(),
 	                                           _foc_vcpu_state);
 		if (_task_index_client == Foc::L4_INVALID_CAP) {
@@ -76,7 +76,7 @@ Vcpu::~Vcpu()
 	}
 
 	if (_foc_vcpu_state) {
-		unsigned const vcpu_id = ((addr_t)_foc_vcpu_state -
+		addr_t const vcpu_id = ((addr_t)_foc_vcpu_state -
 		                          Platform::VCPU_VIRT_EXT_START) / L4_PAGESIZE;
 		_vcpu_ids.free(vcpu_id);
 	}
@@ -176,7 +176,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc,
 	using namespace Foc;
 
 	uint8_t flags = L4_FPAGE_RO;
-	if (dsc.writable() && attribute.writeable)
+	if (dsc.writeable() && attribute.writeable)
 		if (attribute.executable)
 			flags = L4_FPAGE_RWX;
 		else
@@ -187,7 +187,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc,
 
 	Flexpage page = flex.page();
 	while (page.valid()) {
-		l4_fpage_t fp = l4_fpage(page.addr, page.log2_order, flags);
+		l4_fpage_t fp = l4_fpage(page.addr, (unsigned)page.log2_order, flags);
 		l4_msgtag_t msg = l4_task_map(_task_vcpu.local.data()->kcap(),
 		                              L4_BASE_TASK_CAP, fp,
 		                              l4_map_obj_control(page.hotspot,
@@ -210,7 +210,7 @@ void Vm_session_component::_detach_vm_memory(addr_t guest_phys, size_t size)
 		using namespace Foc;
 
 		l4_task_unmap(_task_vcpu.local.data()->kcap(),
-		              l4_fpage(page.addr, page.log2_order, L4_FPAGE_RWX),
+		              l4_fpage(page.addr, (unsigned)page.log2_order, L4_FPAGE_RWX),
 		              L4_FP_ALL_SPACES);
 
 		page = flex.page();

repos/base-foc/src/include/base/internal/cap_map.h

@@ -190,7 +190,7 @@ class Genode::Capability_map : private Noncopyable
 		 * \param  id the global capability id
 		 * \return    pointer of Cap_index when found, otherwise zero
 		 */
-		Cap_index* find(int id);
+		Cap_index* find(Cap_index::id_t id);
 
 		/**
 		 * Create and insert a new Cap_index with a specific capability id
@@ -203,7 +203,7 @@ class Genode::Capability_map : private Noncopyable
 		 * \return    pointer to the new Cap_index object, or zero
 		 *            when allocation failed
 		 */
-		Cap_index* insert(int id);
+		Cap_index* insert(Cap_index::id_t id);
 
 
 		/**
@@ -217,7 +217,7 @@ class Genode::Capability_map : private Noncopyable
 		 * \return      pointer to the new Cap_index object, or zero
 		 *              when allocation failed
 		 */
-		Cap_index* insert(int id, addr_t kcap);
+		Cap_index* insert(Cap_index::id_t id, addr_t kcap);
 
 		/**
 		 * Create and insert a new Cap_index with a specific capability id
@@ -236,7 +236,7 @@ class Genode::Capability_map : private Noncopyable
 		 *            with the same id exists and it's kernel-object
 		 *            differs to the one given by kcap
 		 */
-		Cap_index *insert_map(int id, addr_t kcap);
+		Cap_index *insert_map(Cap_index::id_t id, addr_t kcap);
 
 		/**
 		 * Remove (resp. invalidate) a Cap_index object

repos/base-foc/src/include/base/internal/capability_data.h

@@ -28,13 +28,17 @@
  */
 class Genode::Native_capability::Data : public Avl_node<Data>
 {
+	public:
+
+		using id_t = uint16_t;
+
 	private:
 
 		constexpr static uint16_t INVALID_ID = ~0;
 		constexpr static uint16_t UNUSED     =  0;
 
-		uint8_t  _ref_cnt; /* reference counter    */
-		uint16_t _id;      /* global capability id */
+		uint8_t _ref_cnt; /* reference counter    */
+		id_t    _id;      /* global capability id */
 
 	public:
 
@@ -56,7 +60,7 @@ class Genode::Native_capability::Data : public Avl_node<Data>
 		 ************************/
 
 		bool higher(Data *n);
-		Data *find_by_id(uint16_t id);
+		Data *find_by_id(id_t id);
 };
 
 #endif /* _INCLUDE__BASE__INTERNAL__CAPABILITY_DATA_H_ */

repos/base-foc/src/include/base/internal/parent_cap.h

@@ -30,7 +30,7 @@ namespace Genode {
 
 	static inline Parent_capability parent_cap()
 	{
-		unsigned long const local_name = _parent_cap;
+		Cap_index::id_t const local_name = (Cap_index::id_t)_parent_cap;
 
 		static Cap_index *i = cap_map().insert(local_name, Foc::PARENT_CAP);
 		/*

repos/base-foc/src/lib/base/cap_map.cc

@@ -104,7 +104,7 @@ uint8_t Cap_index::dec()
  **  Capability_map class  **
  ****************************/
 
-Cap_index* Capability_map::find(int id)
+Cap_index* Capability_map::find(Cap_index::id_t id)
 {
 	Lock_guard<Spin_lock> guard(_lock);
 
@@ -112,7 +112,7 @@ Cap_index* Capability_map::find(int id)
 }
 
 
-Cap_index* Capability_map::insert(int id)
+Cap_index* Capability_map::insert(Cap_index::id_t id)
 {
 	Lock_guard<Spin_lock> guard(_lock);
 
@@ -128,7 +128,7 @@ Cap_index* Capability_map::insert(int id)
 }
 
 
-Cap_index* Capability_map::insert(int id, addr_t kcap)
+Cap_index* Capability_map::insert(Cap_index::id_t id, addr_t kcap)
 {
 	Lock_guard<Spin_lock> guard(_lock);
 
@@ -146,7 +146,7 @@ Cap_index* Capability_map::insert(int id, addr_t kcap)
 }
 
 
-Cap_index* Capability_map::insert_map(int id, addr_t kcap)
+Cap_index* Capability_map::insert_map(Cap_index::id_t id, addr_t kcap)
 {
 	using namespace Foc;
 

repos/base-foc/src/lib/base/ipc.cc

@@ -49,13 +49,13 @@ enum Debug { DEBUG_MSG = 1 };
 
 static inline bool ipc_error(l4_msgtag_t tag, bool print)
 {
-	int const ipc_error = l4_ipc_error(tag, l4_utcb());
+	Foc::l4_umword_t const ipc_error = l4_ipc_error(tag, l4_utcb());
 	if (ipc_error && print) raw("Ipc error: ", ipc_error, " occurred!");
 	return ipc_error;
 }
 
 
-static constexpr unsigned long INVALID_BADGE = ~0UL;
+static constexpr Cap_index::id_t INVALID_BADGE = 0xffff;
 
 
 /**
@@ -63,9 +63,9 @@ static constexpr unsigned long INVALID_BADGE = ~0UL;
  */
 struct Cap_info
 {
-	bool          valid = false;
-	unsigned long sel   = 0;
-	unsigned long badge = 0;
+	bool            valid = false;
+	unsigned long   sel   = 0;
+	Cap_index::id_t badge = 0;
 };
 
 
@@ -74,9 +74,9 @@ struct Cap_info
  *
  * \return  protocol word (local name or exception code)
  */
-static unsigned long extract_msg_from_utcb(l4_msgtag_t     tag,
-                                           Receive_window &rcv_window,
-                                           Msgbuf_base    &rcv_msg)
+static int extract_msg_from_utcb(l4_msgtag_t     tag,
+                                 Receive_window &rcv_window,
+                                 Msgbuf_base    &rcv_msg)
 {
 	unsigned num_msg_words = l4_msgtag_words(tag);
 
@@ -90,7 +90,7 @@ static unsigned long extract_msg_from_utcb(l4_msgtag_t     tag,
 	unsigned long const protocol_word = *msg_words++;
 
 	/* read number of capability arguments from second message word */
-	size_t const num_caps = min(*msg_words, Msgbuf_base::MAX_CAPS_PER_MSG);
+	unsigned const num_caps = (unsigned)min(*msg_words, Msgbuf_base::MAX_CAPS_PER_MSG);
 	msg_words++;
 
 	num_msg_words -= 2;
@@ -114,7 +114,7 @@ static unsigned long extract_msg_from_utcb(l4_msgtag_t     tag,
 
 	for (unsigned i = 0, sel_idx = 0; i < num_caps; i++) {
 
-		unsigned long const badge = *msg_words++;
+		Cap_index::id_t const badge = (Cap_index::id_t)(*msg_words++);
 
 		if (badge == INVALID_BADGE)
 			continue;
@@ -135,7 +135,7 @@ static unsigned long extract_msg_from_utcb(l4_msgtag_t     tag,
 	if ((num_msg_words)*sizeof(l4_mword_t) > rcv_msg.capacity()) {
 		if (DEBUG_MSG)
 			raw("receive message buffer too small");
-		num_msg_words = rcv_msg.capacity()/sizeof(l4_mword_t);
+		num_msg_words = (unsigned)(rcv_msg.capacity()/sizeof(l4_mword_t));
 	}
 
 	/* read message payload beginning from the second UTCB message register */
@@ -160,7 +160,7 @@ static unsigned long extract_msg_from_utcb(l4_msgtag_t     tag,
 		}
 	}
 
-	return protocol_word;
+	return (int)protocol_word;
 }
 
 
@@ -175,8 +175,8 @@ static l4_msgtag_t copy_msgbuf_to_utcb(Msgbuf_base &snd_msg,
                                        unsigned long protocol_word)
 {
 
-	unsigned const num_data_words = snd_msg.data_size() / sizeof(l4_mword_t);
-	unsigned const num_caps       = snd_msg.used_caps();
+	unsigned const num_data_words = (unsigned)(snd_msg.data_size() / sizeof(l4_mword_t));
+	unsigned const num_caps       = (unsigned)snd_msg.used_caps();
 
 	/* validate capabilities present in the message buffer */
 	for (unsigned i = 0; i < num_caps; i++) {
@@ -201,7 +201,7 @@ static l4_msgtag_t copy_msgbuf_to_utcb(Msgbuf_base &snd_msg,
 		Native_capability const &cap = snd_msg.cap(i);
 		if (cap.valid()) {
 			caps[i].valid = true;
-			caps[i].badge = cap.local_name();
+			caps[i].badge = (Cap_index::id_t)cap.local_name();
 			caps[i].sel   = cap.data()->kcap();
 		}
 	}

repos/base-foc/src/lib/base/thread_bootstrap.cc

@@ -38,14 +38,6 @@ void prepare_init_main_thread()
 }
 
 
-void prepare_reinit_main_thread()
-{
-	construct_at<Capability_map>(&cap_map());
-	cap_idx_alloc().reinit();
-	prepare_init_main_thread();
-}
-
-
 /************
  ** Thread **
  ************/

repos/base-foc/src/lib/base/x86/vm.cc

@@ -29,9 +29,12 @@
 #include <foc/native_capability.h>
 
 namespace Foc {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
 #include <l4/sys/vcpu.h>
 #include <l4/sys/__vm-svm.h>
 #include <l4/sys/__vm-vmx.h>
+#pragma GCC diagnostic pop  /* restore -Wconversion warnings */
 }
 
 using namespace Genode;
@@ -218,9 +221,9 @@ struct Foc_vcpu : Thread, Noncopyable
 			CR0_PG = 0 /* 1U << 31 - not needed in case of UG */
 		};
 
-		addr_t const _cr0_mask       { CR0_NM | CR0_CD };
-		addr_t const vmcb_ctrl0      { CTRL0_IO | CTRL0_MSR };
-		addr_t const vmcb_ctrl1      { 0 };
+		addr_t   const _cr0_mask  { CR0_NM | CR0_CD };
+		uint32_t const vmcb_ctrl0 { CTRL0_IO | CTRL0_MSR };
+		uint32_t const vmcb_ctrl1 { 0 };
 
 		addr_t       vmcb_cr0_shadow { 0 };
 		addr_t       vmcb_cr4_shadow { 0 };
@@ -481,7 +484,7 @@ struct Foc_vcpu : Thread, Noncopyable
 		 * Convert to AMD (and Genode) format comprising 16 bits.
 		 */
 		uint16_t _convert_ar_16(addr_t value) {
-			return ((value & 0x1f000) >> 4) | (value & 0xff); }
+			return (uint16_t)(((value & 0x1f000) >> 4) | (value & 0xff)); }
 
 		void _read_intel_state(Vcpu_state &state, void *vmcs,
 		                       Foc::l4_vcpu_state_t *vcpu)
@@ -495,18 +498,15 @@ struct Foc_vcpu : Thread, Noncopyable
 			state.di.charge(vcpu->r.di);
 			state.si.charge(vcpu->r.si);
 
-			state.flags.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::FLAGS));
-
-			state.sp.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::SP));
-
-			state.ip.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::IP));
-			state.ip_len.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::INST_LEN));
-
-			state.dr7.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::DR7));
+			state.flags .charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::FLAGS));
+			state.sp    .charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::SP));
+			state.ip    .charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::IP));
+			state.ip_len.charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::INST_LEN));
+			state.dr7   .charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::DR7));
 
 #ifdef __x86_64__
-			state.r8.charge(vcpu->r.r8);
-			state.r9.charge(vcpu->r.r9);
+			state.r8 .charge(vcpu->r.r8);
+			state.r9 .charge(vcpu->r.r9);
 			state.r10.charge(vcpu->r.r10);
 			state.r11.charge(vcpu->r.r11);
 			state.r12.charge(vcpu->r.r12);
@@ -516,21 +516,25 @@ struct Foc_vcpu : Thread, Noncopyable
 #endif
 
 			{
-				addr_t const cr0 = Foc::l4_vm_vmx_read(vmcs, Vmcs::CR0);
-				addr_t const cr0_shadow = Foc::l4_vm_vmx_read(vmcs, Vmcs::CR0_SHADOW);
+				addr_t const cr0        = (addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CR0);
+				addr_t const cr0_shadow = (addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CR0_SHADOW);
+
 				state.cr0.charge((cr0 & ~vmcs_cr0_mask) | (cr0_shadow & vmcs_cr0_mask));
+
 				if (state.cr0.value() != cr0_shadow)
 					Foc::l4_vm_vmx_write(vmcs, Vmcs::CR0_SHADOW, state.cr0.value());
 			}
 
 			unsigned const cr2 = Foc::l4_vm_vmx_get_cr2_index(vmcs);
-			state.cr2.charge(Foc::l4_vm_vmx_read(vmcs, cr2));
-			state.cr3.charge(Foc::l4_vm_vmx_read(vmcs, Vmcs::CR3));
+			state.cr2.charge((addr_t)Foc::l4_vm_vmx_read(vmcs, cr2));
+			state.cr3.charge((addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CR3));
 
 			{
-				addr_t const cr4 = Foc::l4_vm_vmx_read(vmcs, Vmcs::CR4);
-				addr_t const cr4_shadow = Foc::l4_vm_vmx_read(vmcs, Vmcs::CR4_SHADOW);
+				addr_t const cr4        = (addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CR4);
+				addr_t const cr4_shadow = (addr_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CR4_SHADOW);
+
 				state.cr4.charge((cr4 & ~vmcs_cr4_mask) | (cr4_shadow & vmcs_cr4_mask));
+
 				if (state.cr4.value() != cr4_shadow)
 					Foc::l4_vm_vmx_write(vmcs, Vmcs::CR4_SHADOW,
 					                        state.cr4.value());
@@ -545,7 +549,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment cs { l4_vm_vmx_read_16(vmcs, Vmcs::CS_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::CS_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::CS_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::CS_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::CS_BASE) };
 
@@ -554,7 +558,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment ss { l4_vm_vmx_read_16(vmcs, Vmcs::SS_SEL),
-				            _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::SS_AR)),
+				            _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::SS_AR)),
 				            l4_vm_vmx_read_32(vmcs, Vmcs::SS_LIMIT),
 				            l4_vm_vmx_read_nat(vmcs, Vmcs::SS_BASE) };
 
@@ -563,7 +567,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment es { l4_vm_vmx_read_16(vmcs, Vmcs::ES_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::ES_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::ES_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::ES_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::ES_BASE) };
 
@@ -572,7 +576,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment ds { l4_vm_vmx_read_16(vmcs, Vmcs::DS_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::DS_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::DS_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::DS_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::DS_BASE) };
 
@@ -581,7 +585,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment fs { l4_vm_vmx_read_16(vmcs, Vmcs::FS_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::FS_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::FS_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::FS_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::FS_BASE) };
 
@@ -590,7 +594,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment gs { l4_vm_vmx_read_16(vmcs, Vmcs::GS_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::GS_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::GS_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::GS_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::GS_BASE) };
 
@@ -599,7 +603,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment tr { l4_vm_vmx_read_16(vmcs, Vmcs::TR_SEL),
-				             _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::TR_AR)),
+				             _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::TR_AR)),
 				             l4_vm_vmx_read_32(vmcs, Vmcs::TR_LIMIT),
 				             l4_vm_vmx_read_nat(vmcs, Vmcs::TR_BASE) };
 
@@ -608,7 +612,7 @@ struct Foc_vcpu : Thread, Noncopyable
 
 			{
 				Segment ldtr { l4_vm_vmx_read_16(vmcs, Vmcs::LDTR_SEL),
-				               _convert_ar_16(l4_vm_vmx_read(vmcs, Vmcs::LDTR_AR)),
+				               _convert_ar_16((addr_t)l4_vm_vmx_read(vmcs, Vmcs::LDTR_AR)),
 				               l4_vm_vmx_read_32(vmcs, Vmcs::LDTR_LIMIT),
 				               l4_vm_vmx_read_nat(vmcs, Vmcs::LDTR_BASE) };
 
@@ -621,35 +625,35 @@ struct Foc_vcpu : Thread, Noncopyable
 			state.idtr.charge(Range{.limit = l4_vm_vmx_read_32(vmcs, Vmcs::IDTR_LIMIT),
 			                        .base  = l4_vm_vmx_read_nat(vmcs, Vmcs::IDTR_BASE)});
 
-			state.sysenter_cs.charge(l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_CS));
-			state.sysenter_sp.charge(l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_SP));
-			state.sysenter_ip.charge(l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_IP));
+			state.sysenter_cs.charge((addr_t)l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_CS));
+			state.sysenter_sp.charge((addr_t)l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_SP));
+			state.sysenter_ip.charge((addr_t)l4_vm_vmx_read(vmcs, Vmcs::SYSENTER_IP));
 
-			state.qual_primary.charge(l4_vm_vmx_read(vmcs, Vmcs::EXIT_QUAL));
+			state.qual_primary  .charge(l4_vm_vmx_read(vmcs, Vmcs::EXIT_QUAL));
 			state.qual_secondary.charge(l4_vm_vmx_read(vmcs, Vmcs::GUEST_PHYS));
 
-			state.ctrl_primary.charge(l4_vm_vmx_read(vmcs, Vmcs::CTRL_0));
-			state.ctrl_secondary.charge(l4_vm_vmx_read(vmcs, Vmcs::CTRL_1));
+			state.ctrl_primary  .charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::CTRL_0));
+			state.ctrl_secondary.charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::CTRL_1));
 
 			if (state.exit_reason == INTEL_EXIT_INVALID ||
 			    state.exit_reason == VMEXIT_PAUSED)
 			{
-				state.inj_info.charge(l4_vm_vmx_read(vmcs, Vmcs::INTR_INFO));
-				state.inj_error.charge(l4_vm_vmx_read(vmcs, Vmcs::INTR_ERROR));
+				state.inj_info .charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::INTR_INFO));
+				state.inj_error.charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::INTR_ERROR));
 			} else {
-				state.inj_info.charge(l4_vm_vmx_read(vmcs, Vmcs::IDT_INFO));
-				state.inj_error.charge(l4_vm_vmx_read(vmcs, Vmcs::IDT_ERROR));
+				state.inj_info .charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::IDT_INFO));
+				state.inj_error.charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::IDT_ERROR));
 			}
 
-			state.intr_state.charge(l4_vm_vmx_read(vmcs, Vmcs::STATE_INTR));
-			state.actv_state.charge(l4_vm_vmx_read(vmcs, Vmcs::STATE_ACTV));
+			state.intr_state.charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::STATE_INTR));
+			state.actv_state.charge((uint32_t)l4_vm_vmx_read(vmcs, Vmcs::STATE_ACTV));
 
 			state.tsc.charge(Trace::timestamp());
 			state.tsc_offset.charge(_tsc_offset);
 
-			state.efer.charge(l4_vm_vmx_read(vmcs, Vmcs::EFER));
+			state.efer.charge((addr_t)l4_vm_vmx_read(vmcs, Vmcs::EFER));
 
-			state.star.charge(l4_vm_vmx_read(vmcs, Vmcs::MSR_STAR));
+			state.star .charge(l4_vm_vmx_read(vmcs, Vmcs::MSR_STAR));
 			state.lstar.charge(l4_vm_vmx_read(vmcs, Vmcs::MSR_LSTAR));
 			state.cstar.charge(l4_vm_vmx_read(vmcs, Vmcs::MSR_CSTAR));
 			state.fmask.charge(l4_vm_vmx_read(vmcs, Vmcs::MSR_FMASK));
@@ -665,7 +669,7 @@ struct Foc_vcpu : Thread, Noncopyable
 		void _read_amd_state(Vcpu_state &state, Foc::l4_vm_svm_vmcb_t *vmcb,
 		                     Foc::l4_vcpu_state_t * const vcpu)
 		{
-			state.ax.charge(vmcb->state_save_area.rax);
+			state.ax.charge((addr_t)vmcb->state_save_area.rax);
 			state.cx.charge(vcpu->r.cx);
 			state.dx.charge(vcpu->r.dx);
 			state.bx.charge(vcpu->r.bx);
@@ -674,18 +678,18 @@ struct Foc_vcpu : Thread, Noncopyable
 			state.si.charge(vcpu->r.si);
 			state.bp.charge(vcpu->r.bp);
 
-			state.flags.charge(vmcb->state_save_area.rflags);
+			state.flags.charge((addr_t)vmcb->state_save_area.rflags);
 
-			state.sp.charge(vmcb->state_save_area.rsp);
+			state.sp.charge((addr_t)vmcb->state_save_area.rsp);
 
-			state.ip.charge(vmcb->state_save_area.rip);
+			state.ip.charge((addr_t)vmcb->state_save_area.rip);
 			state.ip_len.charge(0); /* unsupported on AMD */
 
-			state.dr7.charge(vmcb->state_save_area.dr7);
+			state.dr7.charge((addr_t)vmcb->state_save_area.dr7);
 
 #ifdef __x86_64__
-			state.r8.charge(vcpu->r.r8);
-			state.r9.charge(vcpu->r.r9);
+			state.r8 .charge(vcpu->r.r8);
+			state.r9 .charge(vcpu->r.r9);
 			state.r10.charge(vcpu->r.r10);
 			state.r11.charge(vcpu->r.r11);
 			state.r12.charge(vcpu->r.r12);
@@ -695,15 +699,15 @@ struct Foc_vcpu : Thread, Noncopyable
 #endif
 
 			{
-				addr_t const cr0 = vmcb->state_save_area.cr0;
+				addr_t const cr0 = (addr_t)vmcb->state_save_area.cr0;
 				state.cr0.charge((cr0 & ~vmcb_cr0_mask) | (vmcb_cr0_shadow & vmcb_cr0_mask));
 				if (state.cr0.value() != vmcb_cr0_shadow)
 					vmcb_cr0_shadow = state.cr0.value();
 			}
-			state.cr2.charge(vmcb->state_save_area.cr2);
-			state.cr3.charge(vmcb->state_save_area.cr3);
+			state.cr2.charge((addr_t)vmcb->state_save_area.cr2);
+			state.cr3.charge((addr_t)vmcb->state_save_area.cr3);
 			{
-				addr_t const cr4 = vmcb->state_save_area.cr4;
+				addr_t const cr4 = (addr_t)vmcb->state_save_area.cr4;
 				state.cr4.charge((cr4 & ~vmcb_cr4_mask) | (vmcb_cr4_shadow & vmcb_cr4_mask));
 				if (state.cr4.value() != vmcb_cr4_shadow)
 					vmcb_cr4_shadow = state.cr4.value();
@@ -712,44 +716,44 @@ struct Foc_vcpu : Thread, Noncopyable
 			typedef Vcpu_state::Segment Segment;
 
 			state.cs.charge(Segment{vmcb->state_save_area.cs.selector,
-			                       vmcb->state_save_area.cs.attrib,
-			                       vmcb->state_save_area.cs.limit,
-			                       (addr_t)vmcb->state_save_area.cs.base});
+			                        vmcb->state_save_area.cs.attrib,
+			                        vmcb->state_save_area.cs.limit,
+			                        (addr_t)vmcb->state_save_area.cs.base});
 
 			state.ss.charge(Segment{vmcb->state_save_area.ss.selector,
-			                       vmcb->state_save_area.ss.attrib,
-			                       vmcb->state_save_area.ss.limit,
-			                       (addr_t)vmcb->state_save_area.ss.base});
+			                        vmcb->state_save_area.ss.attrib,
+			                        vmcb->state_save_area.ss.limit,
+			                        (addr_t)vmcb->state_save_area.ss.base});
 
 			state.es.charge(Segment{vmcb->state_save_area.es.selector,
-			                       vmcb->state_save_area.es.attrib,
-			                       vmcb->state_save_area.es.limit,
-			                       (addr_t)vmcb->state_save_area.es.base});
+			                        vmcb->state_save_area.es.attrib,
+			                        vmcb->state_save_area.es.limit,
+			                        (addr_t)vmcb->state_save_area.es.base});
 
 			state.ds.charge(Segment{vmcb->state_save_area.ds.selector,
-			                       vmcb->state_save_area.ds.attrib,
-			                       vmcb->state_save_area.ds.limit,
-			                       (addr_t)vmcb->state_save_area.ds.base});
+			                        vmcb->state_save_area.ds.attrib,
+			                        vmcb->state_save_area.ds.limit,
+			                        (addr_t)vmcb->state_save_area.ds.base});
 
 			state.fs.charge(Segment{vmcb->state_save_area.fs.selector,
-			                       vmcb->state_save_area.fs.attrib,
-			                       vmcb->state_save_area.fs.limit,
-			                       (addr_t)vmcb->state_save_area.fs.base});
+			                        vmcb->state_save_area.fs.attrib,
+			                        vmcb->state_save_area.fs.limit,
+			                        (addr_t)vmcb->state_save_area.fs.base});
 
 			state.gs.charge(Segment{vmcb->state_save_area.gs.selector,
-			                       vmcb->state_save_area.gs.attrib,
-			                       vmcb->state_save_area.gs.limit,
-			                       (addr_t)vmcb->state_save_area.gs.base});
+			                        vmcb->state_save_area.gs.attrib,
+			                        vmcb->state_save_area.gs.limit,
+			                        (addr_t)vmcb->state_save_area.gs.base});
 
 			state.tr.charge(Segment{vmcb->state_save_area.tr.selector,
-			                       vmcb->state_save_area.tr.attrib,
-			                       vmcb->state_save_area.tr.limit,
-			                       (addr_t)vmcb->state_save_area.tr.base});
+			                        vmcb->state_save_area.tr.attrib,
+			                        vmcb->state_save_area.tr.limit,
+			                        (addr_t)vmcb->state_save_area.tr.base});
 
 			state.ldtr.charge(Segment{vmcb->state_save_area.ldtr.selector,
-			                         vmcb->state_save_area.ldtr.attrib,
-			                         vmcb->state_save_area.ldtr.limit,
-			                         (addr_t)vmcb->state_save_area.ldtr.base});
+			                          vmcb->state_save_area.ldtr.attrib,
+			                          vmcb->state_save_area.ldtr.limit,
+			                          (addr_t)vmcb->state_save_area.ldtr.base});
 
 			typedef Vcpu_state::Range Range;
 
@@ -759,11 +763,11 @@ struct Foc_vcpu : Thread, Noncopyable
 			state.idtr.charge(Range{.limit = vmcb->state_save_area.idtr.limit,
 			                        .base  = (addr_t)vmcb->state_save_area.idtr.base });
 
-			state.sysenter_cs.charge(vmcb->state_save_area.sysenter_cs);
-			state.sysenter_sp.charge(vmcb->state_save_area.sysenter_esp);
-			state.sysenter_ip.charge(vmcb->state_save_area.sysenter_eip);
+			state.sysenter_cs.charge((addr_t)vmcb->state_save_area.sysenter_cs);
+			state.sysenter_sp.charge((addr_t)vmcb->state_save_area.sysenter_esp);
+			state.sysenter_ip.charge((addr_t)vmcb->state_save_area.sysenter_eip);
 
-			state.qual_primary.charge(vmcb->control_area.exitinfo1);
+			state.qual_primary  .charge(vmcb->control_area.exitinfo1);
 			state.qual_secondary.charge(vmcb->control_area.exitinfo2);
 
 			uint32_t inj_info = 0;
@@ -771,22 +775,22 @@ struct Foc_vcpu : Thread, Noncopyable
 			if (state.exit_reason == AMD_EXIT_INVALID ||
 			    state.exit_reason == VMEXIT_PAUSED)
 			{
-				inj_info  = vmcb->control_area.eventinj;
-				inj_error = vmcb->control_area.eventinj >> 32;
+				inj_info  = (uint32_t)vmcb->control_area.eventinj;
+				inj_error = (uint32_t)(vmcb->control_area.eventinj >> 32);
 			} else {
-				inj_info  = vmcb->control_area.exitintinfo;
-				inj_error = vmcb->control_area.exitintinfo >> 32;
+				inj_info  = (uint32_t)vmcb->control_area.exitintinfo;
+				inj_error = (uint32_t)(vmcb->control_area.exitintinfo >> 32);
 			}
-			state.inj_info.charge(inj_info);
+			state.inj_info .charge(inj_info);
 			state.inj_error.charge(inj_error);
 
-			state.intr_state.charge(vmcb->control_area.interrupt_shadow);
+			state.intr_state.charge((uint32_t)vmcb->control_area.interrupt_shadow);
 			state.actv_state.charge(0);
 
 			state.tsc.charge(Trace::timestamp());
 			state.tsc_offset.charge(_tsc_offset);
 
-			state.efer.charge(vmcb->state_save_area.efer);
+			state.efer.charge((addr_t)vmcb->state_save_area.efer);
 
 			if (state.pdpte_0.charged() || state.pdpte_1.charged() ||
 			    state.pdpte_2.charged() || state.pdpte_3.charged()) {
@@ -894,9 +898,9 @@ struct Foc_vcpu : Thread, Noncopyable
 			}
 
 			if (state.inj_info.charged() || state.inj_error.charged()) {
-				addr_t ctrl_0 = state.ctrl_primary.charged() ?
-				                state.ctrl_primary.value() :
-				                Foc::l4_vm_vmx_read(vmcs, Vmcs::CTRL_0);
+				uint32_t ctrl_0 = state.ctrl_primary.charged()
+				              ? (uint32_t)state.ctrl_primary.value()
+				              : (uint32_t)Foc::l4_vm_vmx_read(vmcs, Vmcs::CTRL_0);
 
 				if (state.inj_info.value() & 0x2000)
 					warning("unimplemented ", state.inj_info.value() & 0x1000, " ",

repos/base-foc/src/test/cap_integrity/main.cc

@@ -38,7 +38,8 @@ Main::Main(Env &env)
 	Foc::l4_cap_idx_t tid = Capability_space::kcap(env.pd_session_cap());
 
 	/* try the first 1000 local name IDs */
-	for (int local_name = 0; local_name < COUNT; local_name++, idx++) {
+	using id_t = Native_capability::Data::id_t;
+	for (id_t local_name = 0; local_name < COUNT; local_name++, idx++) {
 		idx->id(local_name);
 		l4_task_map(L4_BASE_TASK_CAP, L4_BASE_TASK_CAP,
 		            l4_obj_fpage(tid, 0, L4_FPAGE_RWX),

repos/base-hw/board/riscv_qemu/arch

@@ -1 +0,0 @@
-riscv

repos/base-hw/board/riscv_qemu/image_link_address

@@ -1 +0,0 @@
-0x80200000

repos/base-hw/board/rpi/arch

@@ -1 +0,0 @@
-arm_v6

repos/base-hw/board/rpi/image_link_address

@@ -1 +0,0 @@
-0x00800000

repos/base-hw/board/rpi3/arch

@@ -1 +0,0 @@
-arm_v8a

repos/base-hw/board/rpi3/image_link_address

@@ -1 +0,0 @@
-0x00800000

repos/base-hw/include/kernel/interface.h

@@ -16,7 +16,6 @@
 
 /* base-hw includes */
 #include <kernel/types.h>
-#include <kernel/interface_support.h>
 
 namespace Kernel {
 
@@ -92,12 +91,11 @@ namespace Kernel {
 	 * \param  duration_us  timeout duration in microseconds
 	 * \param  sigid        local name of signal context to trigger
 	 *
-	 * This call always overwrites the last timeout installed by the thread
-	 * if any.
+	 * This call overwrites the last timeout installed by the thread.
 	 */
 	inline int timeout(timeout_t const duration_us, capid_t const sigid)
 	{
-		return call(call_id_timeout(), duration_us, sigid);
+		return (int)call(call_id_timeout(), duration_us, sigid);
 	}
 
 
@@ -130,7 +128,7 @@ namespace Kernel {
 	 *
 	 * The stop syscall always targets the calling thread that, therefore must
 	 * be in the 'active' thread state. The thread then switches to the
-	 * 'stopped' thread state in wich it waits for a restart. The restart
+	 * 'stopped' thread state, in which it waits for a restart. The restart
 	 * syscall can only be used on a thread in the 'stopped' or the 'active'
 	 * thread state. The thread then switches back to the 'active' thread
 	 * state and the syscall returns whether the thread was stopped. Both
@@ -151,7 +149,7 @@ namespace Kernel {
 	/**
 	 * End blocking of a stopped thread
 	 *
-	 * \param thread_id  capability id of the targeted thread
+	 * \param thread_id  capability ID of the targeted thread
 	 *
 	 * \return  wether the thread was stopped beforehand
 	 *
@@ -164,9 +162,9 @@ namespace Kernel {
 
 
 	/**
-	 * Yield the callers remaining CPU time for this super period
+	 * Yield the caller's remaining CPU time for this super period
 	 *
-	 * Does its best that the caller is scheduled as few as possible in the
+	 * Tell the kernel to schedule the caller as little as possible in the
 	 * current scheduling super-period without touching the thread or pause
 	 * state of the thread. In the next superperiod, however, the thread is
 	 * scheduled 'normal' again. The syscall is not core-restricted and always
@@ -217,25 +215,25 @@ namespace Kernel {
 
 
 	/**
-	 * Send request message and await receipt of corresponding reply message
+	 * Send request message and await reception of corresponding reply message
 	 *
-	 * \param thread_id  capability id of targeted thread
+	 * \param thread_id  capability ID of targeted thread
 	 *
 	 * \retval  0  succeeded
 	 * \retval -1  failed
 	 * \retval -2  failed due to out-of-memory for capability reception
 	 *
 	 * If the call returns successful, the received message is located at the
-	 * base of the callers userland thread-context.
+	 * base of the caller's userland thread-context.
 	 */
 	inline int send_request_msg(capid_t const thread_id, unsigned rcv_caps)
 	{
-		return call(call_id_send_request_msg(), thread_id, rcv_caps);
+		return (int)call(call_id_send_request_msg(), thread_id, rcv_caps);
 	}
 
 
 	/**
-	 * Await receipt of request message
+	 * Await reception of request message
 	 *
 	 * \param rcv_caps number of capabilities willing to accept
 	 *
@@ -243,37 +241,37 @@ namespace Kernel {
 	 * \retval -1  canceled
 	 * \retval -2  failed due to out-of-memory for capability reception
 	 *
-	 * If the call returns successful, the received message is located at the
-	 * base of the callers userland thread-context.
+	 * If the call returns successfully, the received message is located at the
+	 * base of the caller's userland thread-context.
 	 */
 	inline int await_request_msg(unsigned rcv_caps)
 	{
-		return call(call_id_await_request_msg(), rcv_caps);
+		return (int)call(call_id_await_request_msg(), rcv_caps);
 	}
 
 
 	/**
-	 * Reply to lastly received request message
+	 * Reply to previously received request message
 	 *
 	 * \param rcv_caps number of capabilities to accept when awaiting again
-	 * \param await_request_msg  wether the call shall await a request message
+	 * \param await_request_msg  whether the call shall await a request message
 	 *
-	 * \retval  0  await_request_msg == 0 or request-message receipt succeeded
-	 * \retval -1  await_request_msg == 1 and request-message receipt failed
+	 * \retval  0  await_request_msg == 0 or request-message received
+	 * \retval -1  await_request_msg == 1 and request-message failed
 	 *
 	 * If the call returns successful and await_request_msg == 1, the received
-	 * message is located at the base of the callers userland thread-context.
+	 * message is located at the base of the caller's userland thread context.
 	 */
 	inline int send_reply_msg(unsigned rcv_caps, bool const await_request_msg)
 	{
-		return call(call_id_send_reply_msg(), rcv_caps, await_request_msg);
+		return (int)call(call_id_send_reply_msg(), rcv_caps, await_request_msg);
 	}
 
 
 	/**
-	 * Print a char c to the kernels serial ouput
+	 * Print a char c to the kernel's serial ouput
 	 *
-	 * If c is set to 0 the kernel prints a table of all threads and their
+	 * If 'c' is set to 0 the kernel prints a table of all threads and their
 	 * current activities to the serial output.
 	 */
 	inline void print_char(char const c)
@@ -285,13 +283,13 @@ namespace Kernel {
 	/**
 	 * Await any context of a receiver and optionally ack a context before
 	 *
-	 * \param receiver_id  capability id of the targeted signal receiver
+	 * \param receiver_id  capability ID of the targeted signal receiver
 	 *
 	 * \retval  0  suceeded
 	 * \retval -1  failed
 	 *
 	 * If this call returns 0, an instance of 'Signal::Data' is located at the
-	 * base of the callers UTCB. Every occurence of a signal is provided
+	 * base of the caller's UTCB. Every occurence of a signal is provided
 	 * through this function until it gets delivered through this function or
 	 * context respectively receiver get destructed. If multiple threads
 	 * listen at the same receiver, and/or multiple contexts of the receiver
@@ -302,7 +300,7 @@ namespace Kernel {
 	 */
 	inline int await_signal(capid_t const receiver_id)
 	{
-		return call(call_id_await_signal(), receiver_id);
+		return (int)call(call_id_await_signal(), receiver_id);
 	}
 
 
@@ -310,7 +308,7 @@ namespace Kernel {
 	 * Check for any pending signal of a context of a receiver the calling
 	 * thread relates to
 	 *
-	 * \param receiver_id  capability id of the targeted signal receiver
+	 * \param receiver_id  capability ID of the targeted signal receiver
 	 *
 	 * \retval  0  suceeded
 	 * \retval -1  failed
@@ -320,14 +318,14 @@ namespace Kernel {
 	 */
 	inline int pending_signal(capid_t const receiver_id)
 	{
-		return call(call_id_pending_signal(), receiver_id);
+		return (int)call(call_id_pending_signal(), receiver_id);
 	}
 
 
 	/**
 	 * Request to cancel the next signal blocking of a local thread
 	 *
-	 * \param thread_id  capability id of the targeted thread
+	 * \param thread_id  capability ID of the targeted thread
 	 *
 	 * Does not block. Targeted thread must be in the same PD as the caller.
 	 * If the targeted thread is in a signal blocking, cancels the blocking
@@ -344,7 +342,7 @@ namespace Kernel {
 	/**
 	 * Trigger a specific signal context
 	 *
-	 * \param context  capability id of the targeted signal context
+	 * \param context  capability ID of the targeted signal context
 	 * \param num      how often the context shall be triggered by this call
 	 *
 	 * \retval  0  suceeded
@@ -352,14 +350,14 @@ namespace Kernel {
 	 */
 	inline int submit_signal(capid_t const context, unsigned const num)
 	{
-		return call(call_id_submit_signal(), context, num);
+		return (int)call(call_id_submit_signal(), context, num);
 	}
 
 
 	/**
 	 * Acknowledge the processing of the last delivery of a signal context
 	 *
-	 * \param context  capability id of the targeted signal context
+	 * \param context  capability ID of the targeted signal context
 	 */
 	inline void ack_signal(capid_t const context)
 	{
@@ -370,20 +368,20 @@ namespace Kernel {
 	/**
 	 * Halt processing of a signal context synchronously
 	 *
-	 * \param context  capability id of the targeted signal context
+	 * \param context  capability ID of the targeted signal context
 	 *
 	 * \retval  0  suceeded
 	 * \retval -1  failed
 	 */
 	inline int kill_signal_context(capid_t const context)
 	{
-		return call(call_id_kill_signal_context(), context);
+		return (int)call(call_id_kill_signal_context(), context);
 	}
 
 	/**
 	 * Acknowledge reception of a capability
 	 *
-	 * \param cap  capability id to acknowledge
+	 * \param cap  capability ID to acknowledge
 	 */
 	inline void ack_cap(capid_t const cap)
 	{
@@ -391,9 +389,9 @@ namespace Kernel {
 	}
 
 	/**
-	 * Delete a capability id
+	 * Delete a capability ID
 	 *
-	 * \param cap  capability id to delete
+	 * \param cap  capability ID to delete
 	 */
 	inline void delete_cap(capid_t const cap)
 	{
@@ -404,7 +402,7 @@ namespace Kernel {
 	/**
 	 * Execute a virtual-machine (again)
 	 *
-	 * \param vm  pointer to vm kernel object
+	 * \param vm  pointer to VM kernel object
 	 */
 	inline void run_vm(capid_t const cap)
 	{
@@ -415,7 +413,7 @@ namespace Kernel {
 	/**
 	 * Stop execution of a virtual-machine
 	 *
-	 * \param vm  pointer to vm kernel object
+	 * \param vm  pointer to VM kernel object
 	 */
 	inline void pause_vm(capid_t const cap)
 	{

repos/base-hw/include/kernel/types.h

@@ -14,8 +14,8 @@
 #ifndef _KERNEL__TYPES_H_
 #define _KERNEL__TYPES_H_
 
-/* base-hw includes */
-#include <kernel/interface_support.h>
+/* Genode includes */
+#include <base/stdint.h>
 
 namespace Kernel {
 
@@ -25,6 +25,11 @@ namespace Kernel {
 	using time_t    = Genode::uint64_t;
 	using timeout_t = Genode::uint32_t;
 
+	using Call_arg  = Genode::umword_t;
+	using Call_ret  = Genode::umword_t;
+
+	using Call_ret_64 = Genode::uint64_t;
+
 	constexpr capid_t cap_id_invalid() { return 0; }
 }
 

repos/base-hw/include/spec/arm/kernel/interface_support.h

@@ -1,26 +0,0 @@
-/*
- * \brief  Interface between kernel and userland
- * \author Martin Stein
- * \date   2011-11-30
- */
-
-/*
- * Copyright (C) 2011-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_
-#define _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_
-
-/* Genode includes */
-#include <base/stdint.h>
-
-namespace Kernel {
-	typedef Genode::uint32_t Call_arg;
-	typedef Genode::uint32_t Call_ret;
-	typedef Genode::uint64_t Call_ret_64;
-}
-
-#endif /* _INCLUDE__SPEC__ARM__KERNEL__INTERFACE_SUPPORT_H_ */

repos/base-hw/include/spec/arm_64/kernel/interface_support.h

@@ -1,26 +0,0 @@
-/*
- * \brief  Interface between kernel and userland
- * \author Stefan Kalkowski
- * \date   2019-05-09
- */
-
-/*
- * Copyright (C) 2019 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _INCLUDE__SPEC__ARM_64__KERNEL__INTERFACE_SUPPORT_H_
-#define _INCLUDE__SPEC__ARM_64__KERNEL__INTERFACE_SUPPORT_H_
-
-/* Genode includes */
-#include <base/stdint.h>
-
-namespace Kernel {
-	typedef Genode::uint64_t Call_arg;
-	typedef Genode::uint64_t Call_ret;
-	typedef Genode::uint64_t Call_ret_64;
-}
-
-#endif /* _INCLUDE__SPEC__ARM_64__KERNEL__INTERFACE_SUPPORT_H_ */

repos/base-hw/include/spec/riscv/kernel/interface_support.h

@@ -1,26 +0,0 @@
-/*
- * \brief  Interface between kernel and userland
- * \author Sebastian Sumpf
- * \date   2015-06-02
- */
-
-/*
- * Copyright (C) 2015-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _KERNEL__INTERFACE_SUPPORT_H_
-#define _KERNEL__INTERFACE_SUPPORT_H_
-
-/* Genode includes */
-#include <base/stdint.h>
-
-namespace Kernel {
-	typedef Genode::uint64_t Call_arg;
-	typedef Genode::uint64_t Call_ret;
-	typedef Genode::uint64_t Call_ret_64;
-}
-
-#endif /* _KERNEL__INTERFACE_SUPPORT_H_ */

repos/base-hw/include/spec/x86_64/kernel/interface_support.h

@@ -1,26 +0,0 @@
-/*
- * \brief  Interface between kernel and userland
- * \author Reto Buerki
- * \date   2015-02-06
- */
-
-/*
- * Copyright (C) 2015-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_
-#define _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_
-
-/* Genode includes */
-#include <base/stdint.h>
-
-namespace Kernel {
-	typedef Genode::uint64_t Call_arg;
-	typedef Genode::uint64_t Call_ret;
-	typedef Genode::uint64_t Call_ret_64;
-}
-
-#endif /* _INCLUDE__SPEC__X86_64__KERNEL__INTERFACE_SUPPORT_H_ */

repos/base-hw/lib/mk/bootstrap-hw.inc

@@ -38,3 +38,5 @@ vpath hw/%          $(BASE_HW_DIR)/src/lib
 vpath lib/base/%    $(BASE_HW_DIR)/src
 vpath lib/base/%    $(BASE_DIR)/src
 vpath lib/startup/% $(BASE_DIR)/src
+
+CC_CXX_WARN_STRICT_CONVERSION =

repos/base-hw/lib/mk/spec/arm_v6/bootstrap-hw-rpi.mk

@@ -1,8 +0,0 @@
-REP_INC_DIR += src/bootstrap/board/rpi
-
-SRC_CC  += bootstrap/board/rpi/platform.cc
-SRC_CC  += bootstrap/spec/arm/arm_v6_cpu.cc
-SRC_CC  += hw/spec/32bit/memory_map.cc
-SRC_S   += bootstrap/spec/arm/crt0.s
-
-include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)

repos/base-hw/lib/mk/spec/arm_v6/core-hw-rpi.mk

@@ -1,16 +0,0 @@
-#
-# \brief  Build config for Genodes core process
-# \author Norman Feske
-# \date   2013-04-05
-#
-
-# add include paths
-REP_INC_DIR += src/core/board/rpi
-
-# add C++ sources
-SRC_CC += platform_services.cc
-SRC_CC += spec/arm/bcm2835_pic.cc
-SRC_CC += spec/arm/bcm2835_system_timer.cc
-
-# include less specific configuration
-include $(call select_from_repositories,lib/mk/spec/arm_v6/core-hw.inc)

repos/base-hw/lib/mk/spec/arm_v6/core-hw.inc

@@ -1,20 +0,0 @@
-#
-# \brief  Build config for Genodes core process
-# \author Martin Stein
-# \author Stefan Kalkowski
-# \date   2012-10-04
-#
-
-# add include paths
-REP_INC_DIR += src/core/spec/arm_v6
-
-# add C++ sources
-SRC_CC += spec/arm_v6/perf_counter.cc
-SRC_CC += kernel/vm_thread_off.cc
-SRC_CC += kernel/cpu_up.cc
-SRC_CC += kernel/lock.cc
-
-SRC_S  += spec/arm/vfpv2.s
-
-# include less specific configuration
-include $(call select_from_repositories,lib/mk/spec/arm/core-hw.inc)

repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc

@@ -1,16 +1,8 @@
-#
-# \brief  Build config for Genodes core process
-# \author Stefan Kalkowski
-# \author Martin Stein
-# \date   2012-10-24
-#
-
-# add include paths
 REP_INC_DIR += src/core/board/imx53_qsb
 
 SRC_CC += spec/arm/imx_epit.cc
 SRC_CC += spec/arm/imx_tzic.cc
 
-# include less specific configuration
 include $(call select_from_repositories,lib/mk/spec/cortex_a8/core-hw.inc)
 
+CC_CXX_WARN_STRICT_CONVERSION =

repos/base-hw/lib/mk/spec/arm_v7/core-hw-imx53_qsb_tz.mk

@@ -11,4 +11,3 @@ SRC_S += spec/arm_v7/trustzone/exception_vector.s
 
 # include less specific configuration
 include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw-imx53_qsb.inc)
-

repos/base-hw/lib/mk/spec/arm_v7/core-hw-virt_qemu.mk

@@ -16,6 +16,6 @@ SRC_S += spec/arm_v7/virtualization/exception_vector.s
 
 NR_OF_CPUS = 2
 
-CC_MARCH = -march=armv7ve -mtune=cortex-a15 -mfpu=vfpv3 -mfloat-abi=soft
+CC_MARCH = -march=armv7ve -mtune=cortex-a15 -mfpu=vfpv3 -mfloat-abi=softfp
 
 include $(call select_from_repositories,lib/mk/spec/cortex_a15/core-hw.inc)

repos/base-hw/lib/mk/spec/arm_v8/bootstrap-hw-rpi3.mk

@@ -1,13 +0,0 @@
-REP_INC_DIR += src/bootstrap/board/rpi3
-
-SRC_CC  += bootstrap/spec/arm_64/cortex_a53_mmu.cc
-SRC_CC  += bootstrap/board/rpi3/platform.cc
-SRC_CC  += lib/base/arm_64/kernel/interface.cc
-SRC_CC  += spec/64bit/memory_map.cc
-SRC_S   += bootstrap/spec/arm_64/crt0.s
-
-NR_OF_CPUS = 4
-
-vpath spec/64bit/memory_map.cc $(call select_from_repositories,src/lib/hw)
-
-include $(call select_from_repositories,lib/mk/bootstrap-hw.inc)

repos/base-hw/lib/mk/spec/arm_v8/core-hw-rpi3.mk

@@ -1,11 +0,0 @@
-REP_INC_DIR += src/core/board/rpi3
-
-# add C++ sources
-SRC_CC += kernel/vm_thread_off.cc
-SRC_CC += platform_services.cc
-SRC_CC += spec/arm/bcm2837_pic.cc
-
-NR_OF_CPUS = 4
-
-# include less specific configuration
-include $(call select_from_repositories,lib/mk/spec/arm_v8/core-hw.inc)

repos/base-hw/lib/mk/spec/cortex_a15/core-hw.inc

@@ -11,3 +11,5 @@ SRC_CC += spec/arm/kernel/lock.cc
 
 # include less specific configuration
 include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw.inc)
+
+CC_CXX_WARN_STRICT_CONVERSION =

repos/base-hw/lib/mk/spec/cortex_a8/core-hw.inc

@@ -12,3 +12,5 @@ NR_OF_CPUS = 1
 
 # include less specific configuration
 include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw.inc)
+
+CC_CXX_WARN_STRICT_CONVERSION =

repos/base-hw/lib/mk/spec/cortex_a9/core-hw.inc

@@ -15,3 +15,5 @@ SRC_CC += kernel/cpu_mp.cc
 
 # include less specific configuration
 include $(call select_from_repositories,lib/mk/spec/arm_v7/core-hw.inc)
+
+CC_CXX_WARN_STRICT_CONVERSION =

repos/base-hw/lib/mk/spec/riscv/bootstrap-hw-riscv_qemu.mk

@@ -1,10 +0,0 @@
-INC_DIR += $(REP_DIR)/src/bootstrap/board/riscv_qemu
-
-SRC_CC  += bootstrap/spec/riscv/platform.cc
-SRC_S   += bootstrap/spec/riscv/crt0.s
-SRC_CC  += lib/base/riscv/kernel/interface.cc
-SRC_CC  += spec/64bit/memory_map.cc
-
-vpath spec/64bit/memory_map.cc $(REP_DIR)/src/lib/hw
-
-include $(REP_DIR)/lib/mk/bootstrap-hw.inc

repos/base-hw/lib/mk/spec/riscv/core-hw-riscv_qemu.mk

@@ -1,27 +0,0 @@
-REP_INC_DIR += src/core/spec/riscv src/core/board/riscv_qemu
-
-CC_OPT += -fno-delete-null-pointer-checks
-
-# add C++ sources
-SRC_CC += platform_services.cc
-SRC_CC += kernel/vm_thread_off.cc
-SRC_CC += kernel/cpu_up.cc
-SRC_CC += kernel/lock.cc
-SRC_CC += spec/riscv/kernel/thread.cc
-SRC_CC += spec/riscv/kernel/cpu.cc
-SRC_CC += spec/riscv/kernel/interface.cc
-SRC_CC += spec/riscv/kernel/pd.cc
-SRC_CC += spec/riscv/cpu.cc
-SRC_CC += spec/riscv/pic.cc
-SRC_CC += spec/riscv/platform_support.cc
-SRC_CC += spec/riscv/timer.cc
-SRC_CC += spec/64bit/memory_map.cc
-
-#add assembly sources
-SRC_S += spec/riscv/exception_vector.s
-SRC_S += spec/riscv/crt0.s
-
-vpath spec/64bit/memory_map.cc $(call select_from_repositories,src/lib/hw)
-
-# include less specific configuration
-include $(call select_from_repositories,lib/mk/core-hw.inc)

repos/base-hw/recipes/api/base-hw/hash

@@ -1 +1 @@
-2021-10-13 e4a9e369a9c321759fdc73d5e2b2b9ac1e2d7795
+2022-02-27 86bd429179fd08dcb42e5fe852040d7e2785f4fb

repos/base-hw/recipes/src/base-hw-imx53_qsb/hash

@@ -1 +1 @@
-2021-11-29 b165dd50f62e2d73910c5ecf28315c6589368409
+2022-04-12 97ecc02ab7544f8b8bad04a2d23178ce0f14f566

repos/base-hw/recipes/src/base-hw-imx53_qsb_tz/hash

@@ -1 +1 @@
-2021-11-29 8640feb279f3a881867f809ae912975347c0b1b8
+2022-04-12 46afb000e6e14e6580e66f489891b14ea7765ddc

repos/base-hw/recipes/src/base-hw-imx6q_sabrelite/hash

@@ -1 +1 @@
-2021-11-29 a01852908262310fc409888a30b4765af289aa31
+2022-04-12 2dcfe4b1dc0cf006c4c2acbcfb6b72fcf8e50890

repos/base-hw/recipes/src/base-hw-imx7d_sabre/hash

@@ -1 +1 @@
-2021-11-29 17cbcd9ba4667f79e4aba4798b413f081c22de40
+2022-04-12 90a97e63f9870468b957b2493a6c433dd5b0a64c

repos/base-hw/recipes/src/base-hw-nit6_solox/hash

@@ -1 +1 @@
-2021-11-29 dfa1d469c3fc106655d9a50920daffd1dd89677a
+2022-04-12 1eb2a74c06a2130d39d57edcb31e19365e1ee2d9

repos/base-hw/recipes/src/base-hw-pbxa9/hash

@@ -1 +1 @@
-2021-11-29 fbf5af570d706af8f13ea996fd720c529d594497
+2022-04-12 d562748afbe8ef29883d33de8c2c63740a3adc30

repos/base-hw/recipes/src/base-hw-pc/hash

@@ -1 +1 @@
-2021-11-29 52defb3af4f16f183ef35f5956079711053ff753
+2022-04-12 0af1ada2933e4af5b0d07c8586f39f60d31d68f9

repos/base-hw/recipes/src/base-hw-riscv_qemu/content.mk

@@ -1 +0,0 @@
-include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc

repos/base-hw/recipes/src/base-hw-riscv_qemu/hash

@@ -1 +0,0 @@
-2021-11-29 065c3a960169cb275938c657083d377e8a86ad35

repos/base-hw/recipes/src/base-hw-riscv_qemu/used_apis

@@ -1,2 +0,0 @@
-base-hw
-base

repos/base-hw/recipes/src/base-hw-rpi/content.mk

@@ -1 +0,0 @@
-include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc

repos/base-hw/recipes/src/base-hw-rpi/hash

@@ -1 +0,0 @@
-2021-11-29 5e42f43a7df531cdf5c8cec4b8b292c930456955

repos/base-hw/recipes/src/base-hw-rpi/used_apis

@@ -1,2 +0,0 @@
-base-hw
-base

repos/base-hw/recipes/src/base-hw-rpi3/content.mk

@@ -1 +0,0 @@
-include $(GENODE_DIR)/repos/base-hw/recipes/src/base-hw_content.inc

repos/base-hw/recipes/src/base-hw-rpi3/hash

@@ -1 +0,0 @@
-2021-11-29 d458f8d92ed61428b73297d8b0e45de09e2e3456

repos/base-hw/recipes/src/base-hw-rpi3/used_apis

@@ -1,2 +0,0 @@
-base-hw
-base

repos/base-hw/recipes/src/base-hw-virt_qemu/hash

@@ -1 +1 @@
-2021-11-29 860f33fd363c0518df12ea1260b5140da88dbddf
+2022-04-12 8ed294db10dc8aad6f6c379d3f8ec6359e1bbd5d

repos/base-hw/src/bootstrap/board/riscv_qemu/board.h

@@ -1,25 +0,0 @@
-/*
- * \brief   RISC-V Qemu specific board definitions
- * \author  Stefan Kalkowski
- * \date    2017-02-20
- */
-
-/*
- * Copyright (C) 2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _SRC__BOOTSTRAP__SPEC__RISCV_QEMU__BOARD_H_
-#define _SRC__BOOTSTRAP__SPEC__RISCV_QEMU__BOARD_H_
-
-#include <hw/spec/riscv/qemu_board.h>
-
-namespace Board { using namespace Hw::Riscv_board; }
-
-template <typename E, unsigned B, unsigned S>
-void Sv39::Level_x_translation_table<E, B, S>::_translation_added(addr_t, size_t)
-{ }
-
-#endif /* _SRC__BOOTSTRAP__SPEC__RISCV_QEMU__BOARD_H_ */

repos/base-hw/src/bootstrap/board/rpi/board.h

@@ -1,32 +0,0 @@
-/*
- * \brief   Raspberry PI specific board definitions
- * \author  Stefan Kalkowski
- * \date    2017-02-20
- */
-
-/*
- * Copyright (C) 2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _SRC__BOOTSTRAP__SPEC__RPI__BOARD_H_
-#define _SRC__BOOTSTRAP__SPEC__RPI__BOARD_H_
-
-#include <hw/spec/arm/rpi_board.h>
-#include <hw/spec/arm/page_table.h>
-#include <spec/arm/cpu.h>
-
-namespace Board { using namespace Hw::Rpi_board; }
-
-
-constexpr unsigned Hw::Page_table::Descriptor_base::_device_tex() { return 0; }
-
-
-constexpr bool Hw::Page_table::Descriptor_base::_smp() { return false; }
-
-
-void Hw::Page_table::_table_changed(unsigned long, unsigned long) { }
-
-#endif /* _SRC__BOOTSTRAP__SPEC__RPI__BOARD_H_ */

repos/base-hw/src/bootstrap/board/rpi/platform.cc

@@ -1,92 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Raspberry Pi
- * \author  Norman Feske
- * \author  Stefan Kalkowski
- * \date    2013-04-05
- */
-
-/*
- * Copyright (C) 2013-2017 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#include <hw/assert.h>
-#include <platform.h>
-
-using namespace Rpi;
-
-
-/**
- * Leave out the first page (being 0x0) from bootstraps RAM allocator,
- * some code does not feel happy with addresses being zero
- */
-Bootstrap::Platform::Board::Board()
-:
-	early_ram_regions(Memory_region { RAM_0_BASE + 0x1000,
-	                                  RAM_0_SIZE - 0x1000 }),
-	late_ram_regions(Memory_region { RAM_0_BASE, 0x1000 }),
-	core_mmio(Memory_region { PL011_0_MMIO_BASE,
-	                          PL011_0_MMIO_SIZE },
-	          Memory_region { SYSTEM_TIMER_MMIO_BASE,
-	                          SYSTEM_TIMER_MMIO_SIZE },
-	          Memory_region { IRQ_CONTROLLER_BASE,
-	                          IRQ_CONTROLLER_SIZE },
-	          Memory_region { USB_DWC_OTG_BASE,
-	                          USB_DWC_OTG_SIZE })
-{ }
-
-
-unsigned Bootstrap::Platform::enable_mmu()
-{
-	using ::Board::Cpu;
-
-	Cpu::Sctlr::init();
-
-	Cpu::Cpsr::init();
-
-	struct Ctr : Cpu::Ctr
-	{
-		struct P : Bitfield<23, 1> { }; /* page mapping restriction on */
-	};
-
-	/* check for mapping restrictions */
-	assert(!Ctr::P::get(Cpu::Ctr::read()));
-
-	/* invalidate TLB */
-	Cpu::Tlbiall::write(0);
-
-	/* address space ID to zero */
-	Cpu::Cidr::write(0);
-
-	/* do not use domains, but permission bits in table */
-	Cpu::Dacr::write(Cpu::Dacr::D0::bits(1));
-
-	Cpu::Ttbcr::write(1);
-
-	Genode::addr_t table = (Genode::addr_t)core_pd->table_base;
-	Cpu::Ttbr::access_t ttbr = Cpu::Ttbr::init(table);
-	Cpu::Ttbr0::write(ttbr);
-	Cpu::Ttbr1::write(ttbr);
-
-	struct Sctlr : Cpu::Sctlr
-	{
-		struct U  : Bitfield<22,1> { }; /* enable unaligned data access */
-		struct Xp : Bitfield<23,1> { }; /* disable subpage AP bits */
-	};
-
-	Cpu::Sctlr::access_t sctlr = Cpu::Sctlr::read();
-	Cpu::Sctlr::C::set(sctlr, 1);
-	Cpu::Sctlr::I::set(sctlr, 1);
-	Sctlr::U::set(sctlr, 1);
-	Sctlr::Xp::set(sctlr, 1);
-	Cpu::Sctlr::Z::set(sctlr, 1);
-	Cpu::Sctlr::M::set(sctlr, 1);
-	Cpu::Sctlr::write(sctlr);
-
-	/* invalidate branch predictor */
-	Cpu::Bpiall::write(0);
-
-	return 0;
-}

repos/base-hw/src/bootstrap/board/rpi3/board.h

@@ -1,33 +0,0 @@
-/*
- * \brief  Board driver for bootstrap
- * \author Stefan Kalkowski
- * \date   2019-05-10
- */
-
-/*
- * Copyright (C) 2019 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#ifndef _BOOTSTRAP__SPEC__RPI3__BOARD_H_
-#define _BOOTSTRAP__SPEC__RPI3__BOARD_H_
-
-#include <hw/spec/arm_64/rpi3_board.h>
-#include <hw/spec/arm_64/cpu.h>
-#include <hw/spec/arm/lpae.h>
-
-namespace Board {
-
-	using namespace Hw::Rpi3_board;
-
-	struct Cpu : Hw::Arm_64_cpu
-	{
-		static void wake_up_all_cpus(void*);
-	};
-
-	struct Pic { }; /* dummy object */
-};
-
-#endif /* _BOOTSTRAP__SPEC__RPI3__BOARD_H_ */

repos/base-hw/src/bootstrap/board/rpi3/platform.cc

@@ -1,48 +0,0 @@
-/*
- * \brief   Platform implementations specific for base-hw and Raspberry Pi3
- * \author  Stefan Kalkowski
- * \date    2019-05-11
- */
-
-/*
- * Copyright (C) 2019 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU Affero General Public License version 3.
- */
-
-#include <platform.h>
-
-/**
- * Leave out the first page (being 0x0) from bootstraps RAM allocator,
- * some code does not feel happy with addresses being zero
- */
-Bootstrap::Platform::Board::Board()
-:
-	early_ram_regions(Memory_region { ::Board::RAM_BASE + 0x1000,
-	                                  ::Board::RAM_SIZE - 0x1000 }),
-	late_ram_regions(Memory_region { ::Board::RAM_BASE, 0x1000 }),
-	core_mmio(Memory_region { ::Board::UART_BASE, ::Board::UART_SIZE },
-	          Memory_region { ::Board::LOCAL_IRQ_CONTROLLER_BASE,
-	                          ::Board::LOCAL_IRQ_CONTROLLER_SIZE },
-	          Memory_region { ::Board::IRQ_CONTROLLER_BASE,
-	                          ::Board::IRQ_CONTROLLER_SIZE })
-{ }
-
-
-extern unsigned int _crt0_qemu_start_secondary_cpus;
-
-
-void Board::Cpu::wake_up_all_cpus(void * ip)
-{
-	/* start when in qemu */
-	_crt0_qemu_start_secondary_cpus = 1;
-
-	/* start on real hardware */
-	*((void * volatile *) 0xe0) = ip;   /* cpu 1 */
-	*((void * volatile *) 0xe8) = ip;   /* cpu 2 */
-	*((void * volatile *) 0xf0) = ip;   /* cpu 3 */
-
-	/* send event for both variants */
-	asm volatile("dsb #15; sev");
-}

repos/base-hw/src/bootstrap/platform.cc

@@ -31,8 +31,9 @@ void * Platform::Ram_allocator::alloc_aligned(size_t size, unsigned align)
 {
 	using namespace Genode;
 
-	return Base::alloc_aligned(Hw::round_page(size),
-	                           max(align, get_page_size_log2())).convert<void *>(
+	align = max(align, (unsigned)get_page_size_log2());
+
+	return Base::alloc_aligned(Hw::round_page(size), align).convert<void *>(
 
 		[&] (void *ptr) { return ptr; },
 		[&] (Ram_allocator::Alloc_error e) -> void *

repos/base-hw/src/bootstrap/spec/arm/crt0.s

@@ -51,16 +51,17 @@
 	 *****************************************************/
 
 	mov sp, #0                  /* for boot cpu use id 0    */
-	cps #31                     /* change to system mode    */
+	bl _start_setup_stack
+	_boot_cpu_lr:
+	nop
 
 	.global _start_setup_stack  /* entrypoint for all cpus */
 	_start_setup_stack:
 
-	mrs r2, cpsr
-	cmp r2, #31                 /* check for system mode */
+	adr r0, _boot_cpu_lr
+	cmp r0, lr                  /* check for boot cpu */
 	mrcne p15, 0, sp, c0, c0, 5 /* read multiprocessor affinity register */
 	andne sp, sp, #0xff         /* set cpu id for non-boot cpu */
-	cps #19                     /* change to supervisor mode */
 
 	adr r0, _start_stack        /* load stack address into r0 */
 	adr r1, _start_stack_size   /* load stack size per cpu into r1 */

repos/base-hw/src/bootstrap/spec/arm_64/cortex_a53_mmu.cc

@@ -138,11 +138,8 @@ static inline void prepare_hypervisor(Cpu::Ttbr::access_t const ttbr,
 
 unsigned Bootstrap::Platform::enable_mmu()
 {
-	static volatile bool primary_cpu = true;
-	bool primary = primary_cpu;
-	if (primary) primary_cpu = false;
-
-	unsigned cpu_id = (Cpu::Mpidr::read() & 0xff);
+	unsigned const cpu_id  { Cpu::current_core_id() };
+	bool     const primary { cpu_id == 0 };
 
 	Cpu::Ttbr::access_t ttbr =
 		Cpu::Ttbr::Baddr::masked((Genode::addr_t)core_pd->table_base);