From 10ef9af2916443c53f39dcb425cc631533273f32 Mon Sep 17 00:00:00 2001 From: vboxsync Date: Thu, 2 Dec 2021 23:47:32 +0000 Subject: ValKit/bootsectors: Corrected BS2_SEL_MMIO16 and BS2_SEL_MMIO16_BASE to 0xdf000. Missed this when moving the VMMDevTesting MMIO page in r148398. Corrected address in Bs3Gdte_R0_MMIO16 comment. bugref:9044 git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@92725 cfe28804-0f27-0410-a406-dd0f0b0b656f --- src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac | 4 ++-- src/VBox/ValidationKit/bootsectors/bs3kit/bs3-system-data.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac index a95e7bc4579..cfa88e8afb8 100644 --- a/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac +++ b/src/VBox/ValidationKit/bootsectors/bootsector2-common-init-code.mac @@ -678,8 +678,8 @@ bs2Gdt: dw 0ffffh, 00000h, 09300h, 000afh ; 64-bit stack and data segment. dw 00000h, 00000h, 00000h, 00000h ; Unused %define BS2_SEL_MMIO16 50h -%define BS2_SEL_MMIO16_BASE 0100000h - dw 0ffffh, 00000h, 09310h, 00000h ; 16-bit VMMDev MMIO segment with base 0100000h. +%define BS2_SEL_MMIO16_BASE 00df000h + dw 0ffffh, 0f000h, 0930dh, 00000h ; 16-bit VMMDev MMIO segment with base 0df000h. dw 00000h, 00000h, 00000h, 00000h ; Unused %define BS2_SEL_LDT 60h ; LDT usage requires manual LLDT and setting up. dw BS2_LDT_SIZE, BS2_LDT_BASE & 0xffff, 08200h | ((BS2_LDT_BASE >> 16) & 0xff), 00000h diff --git a/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-system-data.asm b/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-system-data.asm index c858977882e..e834e86fc1a 100644 --- a/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-system-data.asm +++ b/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-system-data.asm @@ -188,7 +188,7 @@ BS3_GLOBAL_DATA Bs3Gdte_X1TEXT16_CS, 8 ; Entry 0f0h dw 0fffeh, 00000h ; 16-bit conforming code (read+exec) segment, accessed. Will be finalized at startup. dw 09f00h, 00000h BS3_GLOBAL_DATA Bs3Gdte_R0_MMIO16, 8 ; Entry 0f8h - dw 0ffffh, 0f000h, 0930dh, 00000h ; 16-bit VMMDev MMIO segment with base 0100000h. + dw 0ffffh, 0f000h, 0930dh, 00000h ; 16-bit VMMDev MMIO segment with base 0df000h. BS3GdtAssertOffset 0100h -- cgit v1.2.1