From 2c1e25fcf7ad1024a255f53ecad45ee6377f6307 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Fri, 14 Mar 2025 16:27:48 +0100 Subject: [PATCH] nova: use branch with sanitized HIP population to avoid boot failures as seen with X201 after #5413. Fixes #5481 --- repos/base-nova/ports/nova.hash | 2 +- repos/base-nova/ports/nova.port | 2 +- repos/base-nova/src/core/platform.cc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash index fb2c200b86..5dcbd125a8 100644 --- a/repos/base-nova/ports/nova.hash +++ b/repos/base-nova/ports/nova.hash @@ -1 +1 @@ -a807a373a599ea40bebfc36790cf695d5cf89812 +29523a7f9e3ba8e0779cbde8f851e1e71e166803 diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port index f54be6711e..d884f18d4a 100644 --- a/repos/base-nova/ports/nova.port +++ b/repos/base-nova/ports/nova.port @@ -4,7 +4,7 @@ DOWNLOADS := nova.git # r10 branch URL(nova) := https://github.com/alex-ab/NOVA.git -REV(nova) := 62420ca0cc6e648946bab553045e9334a408b982 +REV(nova) := 133ed7702a4f6022c249c2171e2cfd0bfd03fd35 DIR(nova) := src/kernel/nova PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) diff --git a/repos/base-nova/src/core/platform.cc b/repos/base-nova/src/core/platform.cc index 7525bdc660..64762f9c7b 100644 --- a/repos/base-nova/src/core/platform.cc +++ b/repos/base-nova/src/core/platform.cc @@ -430,6 +430,9 @@ Core::Platform::Platform() region_alloc().remove_range((addr_t)__main_thread_utcb - get_page_size(), get_page_size() * 4); + /* exclude HIP */ + region_alloc().remove_range(addr_t(&hip), _vm_base + _vm_size - addr_t(&hip)); + /* sanity checks */ addr_t check [] = { reinterpret_cast(__main_thread_utcb), CORE_PAGER_UTCB_ADDR,