mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 05:47:34 +00:00
Kernel: Fixing PCI MMIO access mechanism
During initialization of PCI MMIO access mechanism we ensure that we have an allocation from the kernel virtual address space that cannot be taken by other components in the OS. Also, now we ensure that interrupts are disabled so mapping the region doesn't fail. In order to reduce overhead, map_device() will map the requested PCI address only if it's not mapped already. The run script has been changed so now we can boot a Q35 machine, that supports PCI ECAM. To ensure we will be able to load the machine, a PIIX3 IDE controller was added to the Q35 machine configuration in the run script. An AHCI controller was added to the i440fx machine configuration.
This commit is contained in:
parent
5e430e4eb4
commit
2a4a19aed8
4 changed files with 110 additions and 24 deletions
30
Kernel/run
30
Kernel/run
|
@ -22,6 +22,22 @@ $SERENITY_EXTRA_QEMU_ARGS
|
|||
-d cpu_reset,guest_errors
|
||||
-device VGA,vgamem_mb=64
|
||||
-hda _disk_image
|
||||
-device ich9-ahci
|
||||
-debugcon stdio
|
||||
-soundhw pcspk
|
||||
-soundhw sb16
|
||||
"
|
||||
|
||||
[ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS="
|
||||
$SERENITY_EXTRA_QEMU_ARGS
|
||||
-s -m $SERENITY_RAM_SIZE
|
||||
-cpu max
|
||||
-machine q35
|
||||
-d cpu_reset,guest_errors
|
||||
-device VGA,vgamem_mb=64
|
||||
-device piix3-ide
|
||||
-drive file=_disk_image,id=disk,if=none
|
||||
-device ide-hd,bus=ide.6,drive=disk,unit=0
|
||||
-debugcon stdio
|
||||
-soundhw pcspk
|
||||
-soundhw sb16
|
||||
|
@ -57,6 +73,20 @@ elif [ "$1" = "qgrub" ]; then
|
|||
$SERENITY_PACKET_LOGGING_ARG \
|
||||
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \
|
||||
-device e1000,netdev=breh
|
||||
elif [ "$1" = "q35_cmd" ]; then
|
||||
SERENITY_KERNEL_CMDLINE=""
|
||||
# FIXME: Someone who knows sh syntax better, please help:
|
||||
for i in `seq 2 $#`; do
|
||||
shift
|
||||
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE $1"
|
||||
done
|
||||
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
|
||||
# ./run: qemu with SerenityOS with custom commandline
|
||||
$SERENITY_QEMU_BIN \
|
||||
$SERENITY_COMMON_QEMU_Q35_ARGS \
|
||||
-device e1000 \
|
||||
-kernel kernel \
|
||||
-append "${SERENITY_KERNEL_CMDLINE}"
|
||||
elif [ "$1" = "qcmd" ]; then
|
||||
SERENITY_KERNEL_CMDLINE=""
|
||||
# FIXME: Someone who knows sh syntax better, please help:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue