From 0f738ed4ba2a26d272905c21a900c7d07982554e Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Tue, 13 Aug 2024 16:57:31 +0200
Subject: [PATCH] Fixed crash of Windows 98 SE setup with BIOS-bochs-latest
 (issue #334). Ported some lines of ACPI code from SeaBIOS.

---
 bochs/bios/BIOS-bochs-latest | Bin 131072 -> 131072 bytes
 bochs/bios/rombios.h         |   3 +++
 bochs/bios/rombios32.c       |   2 ++
 3 files changed, 5 insertions(+)

diff --git a/bochs/bios/BIOS-bochs-latest b/bochs/bios/BIOS-bochs-latest
index be83421236b98a11f95dd8d240ac0f5193fc9eae..cf7a25151a15e3afc31168662604dea183c2dc07 100644
GIT binary patch
delta 799
zcmYjPT}V@582;XQ%EO$S=%fv&rk*)xid$NkMX3l@1Wu7$Xt|rl$}R+5P+l~f7fu}w
zK0$B7e#FRrOin*jN`+Y?F!DnDK`+doI#$TUifQ84ceXCPc{%U%z3=lp@B1EygLODq
zt#NELCK92cYc%M$Hv31O9G9a}Bto(<)Vr29sC^b8y{DHWtEablw~t?l*abL<=l2ES
zDL=Je&A<*`mu|x&ycRVF9Pg8@0tETT@)Hbn<FB#VP>+>ymtmN{8Fz<)Su9o6!*{+(
zWd_*dr__3hM4E|7LK(cmWttA~;suQ{N)&WoN1`HDC6-GRnYb>o>Zrfev^ao})n966
zBs5ktjK9=E6hz@Kt+yj;ype`sWu_dtg2KcqA+CVcg9C|4(Q1laWrVaJgp7>ggrqKM
z9!1(2PS{?-Z<BJ>$7t#t=c+H&UR)bmA;i{M5b7{uHu<^wBz<kwND7_7So=nM38!?M
z&KSqqx=r|V@&T~$-;#9zy}Tkt4bgR?6kFk{<Wz#dA4$Ce(13f=F0(hp2S&)oGR|B)
z7*0M>DaGqZlkI&te@AoYxKdDW65<6qjpD&W3%!ObK3|N{r)d<p03kvb?&EUfcfu~s
zp|%*usoh44;KS>jhDC=$YC0UNP1SbL)A~y|1MQ|$YC=;6mZ{WFneBx{js)i~LU5Em
z0XJ&PBWI|WX5Rvy&{k-^gnh-)VoFe0LyMi`Ss{WRT#&B2#r>yd_E7tl2%-0Ln-tEa
z09^#@imwsvPY#+!{!l{ww8w3NR<`Y&0bG+UAMG3Nvy5MY5QF$)Zzrwr6c)8!AZ@Ca
zdHZkP;Jr&B>t4(+?uPyeMR+lN2KupAHvoUJEu(?0q<-j@&*SBcCisAB^(kGp`=H_-
jddu`n$eLyHbBwuf46{%L;m`Its7sfMXwKn0v~&9((ONTj

delta 708
zcmYjOUr1A76u;+s(=l}$xp2!lo!(7vt(>V3X3`2_4?VanP|<8J+EO8*Eg~x>(^98o
zoQJ}f3=AnyiyLVXI&n2fs23H*Jp^T3GjdVFjPUE*ZV$bDoIk%m=X}TKQ}}!eb8&E1
zlfp1B+vy|h{CqMKs8BJpOuUpPmqs_N&&=aVN}r%&T82iuc5jK1q+I|8*Y?C<KwM1L
za}dGr%HMDsH&R!D6X(;`0anDvs$(2n#V>mgffKbE%`hxp%eceAG%9r+@J{U1)d8%E
zi+X`&zY0jQs$m?f4Fhl=BZlJCxZ&UxChmy3?9=R)fNj~ehg-sqI*xtoXyC#Q7f};+
z*wNu-=)4~Ky!u5+eKBcioshmLWn(Pcn7%`ct(<gllaQGa%s1XsY7eNG0LM%0I);oT
zdOc13A-<vM{JD*}&xE)=M-z;4)Z|Qn5odEU^)`y>HL!MnOym6#sN%JQ&idkDf3IEK
z$|(To7BfwHNIykUt%{nyv%F4<ij{d60nXr9ezT%J-r%G%)be$?cjaV>TB%>8INgur
z{0+_hA+2P>0p5^ojS?a~zzM#jJR*<dO7u0p<GUW0w6IOc!$x|eo}ee)U&+yksC&G?
zFf~s1M_I54_nY(b+UZHdRlJQN=$3}Wma$LN>RX!oDXU_n05+K~rA$#y*ZgZ-G}jpB
zWPTP!QKr3-qWmFif;omKEd~3yf12EXnhSW-k_F2+Y%ys)RA9({qPL#(>$=yx+oEmy
z27a(ap&x?<ldy&zg_jkjRD}LX6K)oE!h5_Rn8XpmwT!`v+~;6j;mV3^<x{p5s0BF;
RtU{Yb8Lt){DP{g#{|lY!4h{eS

diff --git a/bochs/bios/rombios.h b/bochs/bios/rombios.h
index ad346c5b3..93f04e661 100644
--- a/bochs/bios/rombios.h
+++ b/bochs/bios/rombios.h
@@ -74,6 +74,9 @@
 #define SMB_IO_BASE       0xb100
 #define SMP_MSR_ADDR      0x0510
 
+#define PIIX_GPE0_BLK            0xafe0
+#define PIIX_GPE0_BLK_LEN        4
+
   // Define the application NAME
 #if defined(BX_QEMU)
 #  define BX_APPNAME "QEMU"
diff --git a/bochs/bios/rombios32.c b/bochs/bios/rombios32.c
index ea319978e..75e23fb1a 100644
--- a/bochs/bios/rombios32.c
+++ b/bochs/bios/rombios32.c
@@ -1742,9 +1742,11 @@ void acpi_bios_init(void)
     fadt->pm1a_evt_blk = cpu_to_le32(pm_io_base);
     fadt->pm1a_cnt_blk = cpu_to_le32(pm_io_base + 0x04);
     fadt->pm_tmr_blk = cpu_to_le32(pm_io_base + 0x08);
+    fadt->gpe0_blk = cpu_to_le32(PIIX_GPE0_BLK);
     fadt->pm1_evt_len = 4;
     fadt->pm1_cnt_len = 2;
     fadt->pm_tmr_len = 4;
+    fadt->gpe0_blk_len = PIIX_GPE0_BLK_LEN;
     fadt->plvl2_lat = cpu_to_le16(0xfff); // C2 state not supported
     fadt->plvl3_lat = cpu_to_le16(0xfff); // C3 state not supported
     /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */