Sun Apr 21 14:11:12 2024 UTC (18d)
apei(4), acpihed(4): Enable in x86 GENERIC.

Let's just see how this works out in practice.  Might need to reduce
the overhead of each GHES on machines with thousands of them, but
we'll see.

PR kern/58046


(riastradh)
diff -r1.610 -r1.611 src/sys/arch/amd64/conf/GENERIC
diff -r1.1254 -r1.1255 src/sys/arch/i386/conf/GENERIC
cvs diff -r1.610 -r1.611 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2024/04/02 22:56:50 1.610
+++ src/sys/arch/amd64/conf/GENERIC 2024/04/21 14:11:12 1.611
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.610 2024/04/02 22:56:50 charlotte Exp $ 1# $NetBSD: GENERIC,v 1.611 2024/04/21 14:11:12 riastradh Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.610 $" 25#ident "GENERIC-$Revision: 1.611 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -323,34 +323,36 @@ options MPBIOS_SCANPCI # MPBIOS config @@ -323,34 +323,36 @@ options MPBIOS_SCANPCI # MPBIOS config
323#options PCI_BUS_FIXUP # fixup PCI bus numbering 323#options PCI_BUS_FIXUP # fixup PCI bus numbering
324#options PCI_ADDR_FIXUP # fixup PCI I/O addresses 324#options PCI_ADDR_FIXUP # fixup PCI I/O addresses
325#options ACPI_ACTIVATE_DEV # If set, activate inactive devices 325#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
326options VGA_POST # in-kernel support for VGA POST 326options VGA_POST # in-kernel support for VGA POST
327 327
328# ACPI devices 328# ACPI devices
329acpiacad* at acpi? # ACPI AC Adapter 329acpiacad* at acpi? # ACPI AC Adapter
330acpibat* at acpi? # ACPI Battery 330acpibat* at acpi? # ACPI Battery
331acpibut* at acpi? # ACPI Button 331acpibut* at acpi? # ACPI Button
332acpidalb* at acpi? # ACPI Direct Application Launch Button 332acpidalb* at acpi? # ACPI Direct Application Launch Button
333acpiec* at acpi? # ACPI Embedded Controller (late) 333acpiec* at acpi? # ACPI Embedded Controller (late)
334acpiecdt* at acpi? # ACPI Embedded Controller (early) 334acpiecdt* at acpi? # ACPI Embedded Controller (early)
335acpifan* at acpi? # ACPI Fan 335acpifan* at acpi? # ACPI Fan
 336acpihed* at acpi? # ACPI Hardware Error Device
336acpilid* at acpi? # ACPI Lid Switch 337acpilid* at acpi? # ACPI Lid Switch
337#acpipmtr* at acpi? # ACPI Power Meter (experimental) 338#acpipmtr* at acpi? # ACPI Power Meter (experimental)
338#acpismbus* at acpi? # ACPI SMBus CMI (experimental) 339#acpismbus* at acpi? # ACPI SMBus CMI (experimental)
339acpitz* at acpi? # ACPI Thermal Zone 340acpitz* at acpi? # ACPI Thermal Zone
340acpivga* at acpi? # ACPI Display Adapter 341acpivga* at acpi? # ACPI Display Adapter
341acpiout* at acpivga? # ACPI Display Output Device 342acpiout* at acpivga? # ACPI Display Output Device
342acpiwdrt* at acpi? # ACPI Watchdog Resource Table 343acpiwdrt* at acpi? # ACPI Watchdog Resource Table
343acpiwmi* at acpi? # ACPI WMI Mapper 344acpiwmi* at acpi? # ACPI WMI Mapper
 345apei* at apeibus? # ACPI Platform Error Interfaces
344 346
345# Mainboard devices 347# Mainboard devices
346aibs* at acpi? # ASUSTeK AI Booster hardware monitor 348aibs* at acpi? # ASUSTeK AI Booster hardware monitor
347asus* at acpi? # ASUS hotkeys 349asus* at acpi? # ASUS hotkeys
348attimer* at acpi? # AT Timer 350attimer* at acpi? # AT Timer
349com0 at acpi? # Serial communications interface 351com0 at acpi? # Serial communications interface
350com1 at acpi? # Serial communications interface 352com1 at acpi? # Serial communications interface
351com* at acpi? # Serial communications interface 353com* at acpi? # Serial communications interface
352fdc* at acpi? # Floppy disk controller 354fdc* at acpi? # Floppy disk controller
353fd* at fdc? drive ? # the drives themselves 355fd* at fdc? drive ? # the drives themselves
354fujbp* at acpi? # Fujitsu Brightness & Pointer 356fujbp* at acpi? # Fujitsu Brightness & Pointer
355fujhk* at acpi? # Fujitsu Hotkeys 357fujhk* at acpi? # Fujitsu Hotkeys
356#hpacel* at acpi? # HP 3D DriveGuard accelerometer 358#hpacel* at acpi? # HP 3D DriveGuard accelerometer
cvs diff -r1.1254 -r1.1255 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2024/04/02 22:56:50 1.1254
+++ src/sys/arch/i386/conf/GENERIC 2024/04/21 14:11:12 1.1255
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.1254 2024/04/02 22:56:50 charlotte Exp $ 1# $NetBSD: GENERIC,v 1.1255 2024/04/21 14:11:12 riastradh Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.1254 $" 25#ident "GENERIC-$Revision: 1.1255 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# CPU-related options. 29# CPU-related options.
30options USER_LDT # user-settable LDT; used by WINE 30options USER_LDT # user-settable LDT; used by WINE
31#options PAE # PAE mode (36 bits physical addressing) 31#options PAE # PAE mode (36 bits physical addressing)
32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2 32makeoptions SPECTRE_V2_GCC_MITIGATION=1 # GCC Spectre variant 2
33 # migitation 33 # migitation
34options SPECTRE_V2_GCC_MITIGATION 34options SPECTRE_V2_GCC_MITIGATION
35 35
36# CPU features 36# CPU features
37acpicpu* at cpu? # ACPI CPU (including frequency scaling) 37acpicpu* at cpu? # ACPI CPU (including frequency scaling)
38coretemp* at cpu? # Intel on-die thermal sensor 38coretemp* at cpu? # Intel on-die thermal sensor
@@ -307,34 +307,36 @@ acpi0 at mainbus0 @@ -307,34 +307,36 @@ acpi0 at mainbus0
307 307
308#options ACPI_ACTIVATE_DEV # If set, activate inactive devices 308#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
309options VGA_POST # in-kernel support for VGA POST 309options VGA_POST # in-kernel support for VGA POST
310 310
311# ACPI devices 311# ACPI devices
312apm* at acpi? # ACPI apm emulation 312apm* at acpi? # ACPI apm emulation
313acpiacad* at acpi? # ACPI AC Adapter 313acpiacad* at acpi? # ACPI AC Adapter
314acpibat* at acpi? # ACPI Battery 314acpibat* at acpi? # ACPI Battery
315acpibut* at acpi? # ACPI Button 315acpibut* at acpi? # ACPI Button
316acpidalb* at acpi? # ACPI Direct Application Launch Button 316acpidalb* at acpi? # ACPI Direct Application Launch Button
317acpiec* at acpi? # ACPI Embedded Controller (late) 317acpiec* at acpi? # ACPI Embedded Controller (late)
318acpiecdt* at acpi? # ACPI Embedded Controller (early) 318acpiecdt* at acpi? # ACPI Embedded Controller (early)
319acpifan* at acpi? # ACPI Fan 319acpifan* at acpi? # ACPI Fan
 320acpihed* at acpi? # ACPI Hardware Error Device
320acpilid* at acpi? # ACPI Lid Switch 321acpilid* at acpi? # ACPI Lid Switch
321#acpipmtr* at acpi? # ACPI Power Meter (experimental) 322#acpipmtr* at acpi? # ACPI Power Meter (experimental)
322#acpismbus* at acpi? # ACPI SMBus CMI (experimental) 323#acpismbus* at acpi? # ACPI SMBus CMI (experimental)
323acpitz* at acpi? # ACPI Thermal Zone 324acpitz* at acpi? # ACPI Thermal Zone
324acpivga* at acpi? # ACPI Display Adapter 325acpivga* at acpi? # ACPI Display Adapter
325acpiout* at acpivga? # ACPI Display Output Device 326acpiout* at acpivga? # ACPI Display Output Device
326acpiwdrt* at acpi? # ACPI Watchdog Resource Table 327acpiwdrt* at acpi? # ACPI Watchdog Resource Table
327acpiwmi* at acpi? # ACPI WMI Mapper 328acpiwmi* at acpi? # ACPI WMI Mapper
 329apei* at apeibus? # ACPI Platform Error Interfaces
328 330
329# Mainboard devices 331# Mainboard devices
330aibs* at acpi? # ASUSTeK AI Booster hardware monitor 332aibs* at acpi? # ASUSTeK AI Booster hardware monitor
331asus* at acpi? # ASUS hotkeys 333asus* at acpi? # ASUS hotkeys
332attimer* at acpi? # AT Timer 334attimer* at acpi? # AT Timer
333#com* at acpi? # Serial communications interface 335#com* at acpi? # Serial communications interface
334#fdc* at acpi? # Floppy disk controller 336#fdc* at acpi? # Floppy disk controller
335fujbp* at acpi? # Fujitsu Brightness & Pointer 337fujbp* at acpi? # Fujitsu Brightness & Pointer
336fujhk* at acpi? # Fujitsu Hotkeys 338fujhk* at acpi? # Fujitsu Hotkeys
337#hpacel* at acpi? # HP 3D DriveGuard accelerometer 339#hpacel* at acpi? # HP 3D DriveGuard accelerometer
338#hpqlb* at acpi? # HP Quick Launch Buttons 340#hpqlb* at acpi? # HP Quick Launch Buttons
339hpet* at acpihpetbus? # High Precision Event Timer (table) 341hpet* at acpihpetbus? # High Precision Event Timer (table)
340hpet* at acpinodebus? # High Precision Event Timer (device) 342hpet* at acpinodebus? # High Precision Event Timer (device)