diff options
| author | Anton Lindqvist <anton@cvs.openbsd.org> | 2021-12-16 08:03:18 +0000 |
|---|---|---|
| committer | Anton Lindqvist <anton@cvs.openbsd.org> | 2021-12-16 08:03:18 +0000 |
| commit | d6004058cd4516d862123c1159d2e4b6d841aed4 (patch) | |
| tree | c1a9d6a4b772c1c5d4deb4ac8d0a4d8bbe54bfed /sys/arch | |
| parent | de62c896038462aa8b2ade99da8e0c5219edd8d2 (diff) | |
Attach com over acpi on amd64. Some hardware uses a different interrupt
assignment compared to the the legacy one supported by com over isa.
This causes the console to halt once userland takes over as no
interrupts are received. The actual address and irq can be read from
ACPI, kettenis@ already added support for arm64 which paved the way for
amd64.
Some consoles that previously attached over isa are now expected to
attach over acpi.
Thanks to patrick@ for testing on arm64.
ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index ecccd1323d9..3b1e7dc6876 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.505 2021/11/02 08:25:47 patrick Exp $ +# $OpenBSD: GENERIC,v 1.506 2021/12/16 08:03:17 anton Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -65,6 +65,11 @@ amdgpio* at acpi? aplgpio* at acpi? bytgpio* at acpi? chvgpio* at acpi? +com0 at acpi? +com1 at acpi? +com2 at acpi? +com3 at acpi? +com* at acpi? glkgpio* at acpi? pchgpio* at acpi? sdhc* at acpi? diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index 6041293b287..7141e7a7762 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.83 2021/03/19 04:30:56 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.84 2021/12/16 08:03:17 anton Exp $ machine amd64 maxusers 4 @@ -34,6 +34,9 @@ acpipci* at acpi? acpiprt* at acpi? acpimadt0 at acpi? #acpitz* at acpi? +com0 at acpi? +com1 at acpi? +com* at acpi? mpbios0 at bios0 diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 8bd646b4ea3..b60148c3c3a 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.194 2021/11/07 16:06:31 patrick Exp $ +# $OpenBSD: RAMDISK_CD,v 1.195 2021/12/16 08:03:17 anton Exp $ machine amd64 maxusers 4 @@ -51,6 +51,10 @@ bytgpio* at acpi? sdhc* at acpi? acpihve* at acpi? chvgpio* at acpi? +com0 at acpi? +com1 at acpi? +com2 at acpi? +com* at acpi? glkgpio* at acpi? mpbios0 at bios0 |