claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Port code related to coreboot BIOS from MTRR

Browse Source 
Only used if MACHINE_COREBOOT is set in machine flags, so this is a pretty safe one
This commit is contained in:
Jasmine Iwanek
2022-11-05 21:43:09 -04:00
parent 4901e89e51
commit 5def97d138
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/device/keyboard_at.c
View File

@@ -1120,11 +1120,20 @@ write_output(atkbd_t *dev, uint8_t val)
if (!(val & 0x01)) { /* Pin 0 selected. */ if (!(val & 0x01)) { /* Pin 0 selected. */
/* Pin 0 selected. */ /* Pin 0 selected. */
kbd_log("write_output(): Pulse reset!\n"); kbd_log("write_output(): Pulse reset!\n");
softresetx86(); /*Pulse reset!*/ if (machines[machine].flags & MACHINE_COREBOOT) {
cpu_set_edx(); /* The SeaBIOS hard reset code attempts a KBC reset if ACPI RESET_REG
flushmmucache(); is not available. However, the KBC reset is normally a soft reset, so
if (kbc_ven == KBC_VEN_ALI) SeaBIOS gets caught in a soft reset loop as it tries to hard reset the
smbase = 0x00030000; machine. Hack around this by making the KBC reset a hard reset only on
coreboot machines. */
pc_reset_hard();
} else {
softresetx86(); /*Pulse reset!*/
cpu_set_edx();
flushmmucache();
if (kbc_ven == KBC_VEN_ALI)
smbase = 0x00030000;
}
} }
} }

1
src/include/86box/machine.h
View File

@@ -107,6 +107,7 @@
#define MACHINE_SCSI_SEC 0x02000000 /* sys has int sec SCSI */ #define MACHINE_SCSI_SEC 0x02000000 /* sys has int sec SCSI */
#define MACHINE_USB_PRI 0x04000000 /* sys has int pri USB */ #define MACHINE_USB_PRI 0x04000000 /* sys has int pri USB */
#define MACHINE_USB_SEC 0x08000000 /* sys has int sec USB */ #define MACHINE_USB_SEC 0x08000000 /* sys has int sec USB */
#define MACHINE_COREBOOT 0x10000000 /* sys has coreboot BIOS */
/* Combined flags. */ /* Combined flags. */
#define MACHINE_IDE (MACHINE_IDE_PRI) /* sys has int single IDE/ATAPI - mark as pri IDE/ATAPI */ #define MACHINE_IDE (MACHINE_IDE_PRI) /* sys has int single IDE/ATAPI - mark as pri IDE/ATAPI */
#define MACHINE_IDE_DUAL (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */ #define MACHINE_IDE_DUAL (MACHINE_IDE_PRI | MACHINE_IDE_SEC) /* sys has int dual IDE/ATAPI - mark as both pri and sec IDE/ATAPI */