Merge branch 'master' into process-binary

Cargo.toml

@@ -52,6 +52,8 @@ members = [
     "boards/qemu_rv32_virt",
     "boards/swervolf",
     "boards/weact_f401ccu6/",
+    "boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256",
+    "boards/configurations/nrf52840dk/nrf52840dk-test-kernel",
     "capsules/aes_gcm",
     "capsules/core",
     "capsules/extra",

arch/riscv/src/csr/mtvec.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 // Copyright Tock Contributors 2022.
 
-use kernel::utilities::registers::{register_bitfields, LocalRegisterCopy};
+use kernel::utilities::registers::register_bitfields;
 
 // mtvec contains the address(es) of the trap handler
 register_bitfields![usize,
@@ -14,13 +14,3 @@ register_bitfields![usize,
         ]
     ]
 ];
-
-trait MtvecHelpers {
-    fn get_trap_address(&self) -> usize;
-}
-
-impl MtvecHelpers for LocalRegisterCopy<usize, mtvec::Register> {
-    fn get_trap_address(&self) -> usize {
-        self.read(mtvec::trap_addr) << 2
-    }
-}

arch/riscv/src/csr/stvec.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 // Copyright Tock Contributors 2022.
 
-use kernel::utilities::registers::{register_bitfields, LocalRegisterCopy};
+use kernel::utilities::registers::register_bitfields;
 
 // stvec contains the address(es) of the trap handler
 register_bitfields![usize,
@@ -14,13 +14,3 @@ register_bitfields![usize,
         ]
     ]
 ];
-
-trait StvecHelpers {
-    fn get_trap_address(&self) -> usize;
-}
-
-impl StvecHelpers for LocalRegisterCopy<usize, stvec::Register> {
-    fn get_trap_address(&self) -> usize {
-        self.read(stvec::trap_addr) << 2
-    }
-}

arch/riscv/src/csr/utvec.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 // Copyright Tock Contributors 2022.
 
-use kernel::utilities::registers::{register_bitfields, LocalRegisterCopy};
+use kernel::utilities::registers::register_bitfields;
 
 // utvec contains the address(es) of the trap handler
 register_bitfields![usize,
@@ -14,13 +14,3 @@ register_bitfields![usize,
         ]
     ]
 ];
-
-trait UtvecHelpers {
-    fn get_trap_address(&self) -> usize;
-}
-
-impl UtvecHelpers for LocalRegisterCopy<usize, utvec::Register> {
-    fn get_trap_address(&self) -> usize {
-        self.read(utvec::trap_addr) << 2
-    }
-}

boards/components/src/nonvolatile_storage.rs

@@ -48,6 +48,8 @@ macro_rules! nonvolatile_storage_component_static {
     };};
 }
 
+pub type NonvolatileStorageComponentType = NonvolatileStorage<'static>;
+
 pub struct NonvolatileStorageComponent<
     F: 'static + hil::flash::Flash + hil::flash::HasClient<'static, NonvolatileToPages<'static, F>>,
 > {

boards/configurations/README.md

@@ -0,0 +1,36 @@
+Configuration Boards
+====================
+
+This folder contains Tock kernel configurations for boards designed for very
+specific purposes. These are not expected to be general purpose boards (the root
+boards/ directory stores those), but instead these boards are configured to
+expose specific functionality, likely for testing.
+
+Many functions in Tock are configurable, and each board is free to select the
+preferred configuration based on hardware features or intended use cases. This
+often means, however, that there are many kernel configurations that _no_ boards
+use, making it difficult to test those configurations.
+
+For example, checking process credentials can use different credential policies.
+A configuration board can be configured with a specific credential checker, even
+if no root-level board wants to use that configuration.
+
+Directory Structure and Naming
+------------------------------
+
+Boards in this `boards/configurations` directory should be organized by the root
+board type. The name must be `<board>-test-[configuration]`. For example:
+
+```
+boards/configurations/
+  nrf52840dk/
+    nrf52840k-test-[configuration1]
+    nrf52840k-test-[configuration2]
+  imix/
+    imix-test-[configuration1]
+    imix-test-[configuration2]
+```
+
+Each specific board configuration for each root board should have a descriptive
+name. For example, if a configuration of the nrf52840dk is designed for running
+kernel tests, the board might be called `nrf52840dk/nrf52840dk-test-kernel`.

boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256/Cargo.toml

@@ -0,0 +1,20 @@
+# Licensed under the Apache License, Version 2.0 or the MIT License.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+# Copyright Tock Contributors 2024.
+
+[package]
+name = "nrf52840dk-test-appid-sha256"
+version.workspace = true
+authors.workspace = true
+build = "../../../build.rs"
+edition.workspace = true
+
+[dependencies]
+components = { path = "../../../components" }
+cortexm4 = { path = "../../../../arch/cortex-m4" }
+kernel = { path = "../../../../kernel" }
+nrf52840 = { path = "../../../../chips/nrf52840" }
+nrf52_components = { path = "../../../nordic/nrf52_components" }
+
+capsules-core = { path = "../../../../capsules/core" }
+capsules-extra = { path = "../../../../capsules/extra" }

boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256/Makefile

@@ -0,0 +1,9 @@
+# Licensed under the Apache License, Version 2.0 or the MIT License.
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+# Copyright Tock Contributors 2024.
+
+TARGET=thumbv7em-none-eabi
+PLATFORM=nrf52840dk-test-appid-sha256
+
+include ../../../Makefile.common
+include ../nrf52840dk.mk

boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256/README.md

@@ -0,0 +1,4 @@
+nRF52840-DK SHA256 AppID Test Board
+===================================
+
+This is a minimal kernel for testing with SHA256 credential checking.

boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256/layout.ld

@@ -0,0 +1,6 @@
+/* Licensed under the Apache License, Version 2.0 or the MIT License. */
+/* SPDX-License-Identifier: Apache-2.0 OR MIT                         */
+/* Copyright Tock Contributors 2023.                                  */
+
+INCLUDE ../../../nordic/nrf52840_chip_layout.ld
+INCLUDE ../../../kernel_layout.ld

boards/configurations/nrf52840dk/nrf52840dk-test-appid-sha256/src/io.rs

@@ -0,0 +1,17 @@
+// Licensed under the Apache License, Version 2.0 or the MIT License.
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+// Copyright Tock Contributors 2024.
+
+use core::panic::PanicInfo;
+use nrf52840::gpio::Pin;
+
+#[cfg(not(test))]
+#[no_mangle]
+#[panic_handler]
+/// Panic handler
+pub unsafe fn panic_fmt(_pi: &PanicInfo) -> ! {
+    // The nRF52840DK LEDs (see back of board)
+    let led_kernel_pin = &nrf52840::gpio::GPIOPin::new(Pin::P0_13);
+    let led = &mut kernel::hil::led::LedLow::new(led_kernel_pin);
+    kernel::debug::panic_blink_forever(&mut [led])
+}