> Date: Fri, 18 Dec 2020 13:04:42 +0100 > From: Alexander Bluhm <alexander.bl...@gmx.net> > > On Fri, Dec 18, 2020 at 10:36:28AM +1000, Jonathan Matthew wrote: > > Here are a couple of relatively easy ones, applying changes from r1.86 of > > amd64's acpi_machdep.c to i386 and arm64. I've tested i386 but it turns > > out I > > don't have any arm64 machines with acpi. > > A machine like this? Something special to test? Runs fine with > your diff.
Yeah, that's good enough ;). ok kettenis@ on the diff (and thanks Jonathan for helping out) > OpenBSD 6.8-current (GENERIC.MP) #0: Fri Dec 18 11:01:32 CET 2020 > r...@ot11.obsd-lab.genua.de:/usr/src/sys/arch/arm64/compile/GENERIC.MP > real mem = 136874385408 (130533MB) > avail mem = 132543135744 (126402MB) > random: good seed from bootblocks > mainbus0 at root: ACPI > psci0 at mainbus0: PSCI 1.1, SMCCC 65535.65535 > cpu0 at mainbus0 mpidr 0: Applied Micro X-Gene r3p2 > cpu0: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu0: 256KB 64b/line 32-way L2 cache > cpu0: CRC32,SHA2,SHA1,AES+PMULL > cpu1 at mainbus0 mpidr 1: Applied Micro X-Gene r3p2 > cpu1: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu1: 256KB 64b/line 32-way L2 cache > cpu1: CRC32,SHA2,SHA1,AES+PMULL > cpu2 at mainbus0 mpidr 100: Applied Micro X-Gene r3p2 > cpu2: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu2: 256KB 64b/line 32-way L2 cache > cpu2: CRC32,SHA2,SHA1,AES+PMULL > cpu3 at mainbus0 mpidr 101: Applied Micro X-Gene r3p2 > cpu3: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu3: 256KB 64b/line 32-way L2 cache > cpu3: CRC32,SHA2,SHA1,AES+PMULL > cpu4 at mainbus0 mpidr 200: Applied Micro X-Gene r3p2 > cpu4: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu4: 256KB 64b/line 32-way L2 cache > cpu4: CRC32,SHA2,SHA1,AES+PMULL > cpu5 at mainbus0 mpidr 201: Applied Micro X-Gene r3p2 > cpu5: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu5: 256KB 64b/line 32-way L2 cache > cpu5: CRC32,SHA2,SHA1,AES+PMULL > cpu6 at mainbus0 mpidr 300: Applied Micro X-Gene r3p2 > cpu6: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu6: 256KB 64b/line 32-way L2 cache > cpu6: CRC32,SHA2,SHA1,AES+PMULL > cpu7 at mainbus0 mpidr 301: Applied Micro X-Gene r3p2 > cpu7: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu7: 256KB 64b/line 32-way L2 cache > cpu7: CRC32,SHA2,SHA1,AES+PMULL > cpu8 at mainbus0 mpidr 400: Applied Micro X-Gene r3p2 > cpu8: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu8: 256KB 64b/line 32-way L2 cache > cpu8: CRC32,SHA2,SHA1,AES+PMULL > cpu9 at mainbus0 mpidr 401: Applied Micro X-Gene r3p2 > cpu9: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu9: 256KB 64b/line 32-way L2 cache > cpu9: CRC32,SHA2,SHA1,AES+PMULL > cpu10 at mainbus0 mpidr 500: Applied Micro X-Gene r3p2 > cpu10: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu10: 256KB 64b/line 32-way L2 cache > cpu10: CRC32,SHA2,SHA1,AES+PMULL > cpu11 at mainbus0 mpidr 501: Applied Micro X-Gene r3p2 > cpu11: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu11: 256KB 64b/line 32-way L2 cache > cpu11: CRC32,SHA2,SHA1,AES+PMULL > cpu12 at mainbus0 mpidr 600: Applied Micro X-Gene r3p2 > cpu12: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu12: 256KB 64b/line 32-way L2 cache > cpu12: CRC32,SHA2,SHA1,AES+PMULL > cpu13 at mainbus0 mpidr 601: Applied Micro X-Gene r3p2 > cpu13: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu13: 256KB 64b/line 32-way L2 cache > cpu13: CRC32,SHA2,SHA1,AES+PMULL > cpu14 at mainbus0 mpidr 700: Applied Micro X-Gene r3p2 > cpu14: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu14: 256KB 64b/line 32-way L2 cache > cpu14: CRC32,SHA2,SHA1,AES+PMULL > cpu15 at mainbus0 mpidr 701: Applied Micro X-Gene r3p2 > cpu15: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu15: 256KB 64b/line 32-way L2 cache > cpu15: CRC32,SHA2,SHA1,AES+PMULL > cpu16 at mainbus0 mpidr 800: Applied Micro X-Gene r3p2 > cpu16: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu16: 256KB 64b/line 32-way L2 cache > cpu16: CRC32,SHA2,SHA1,AES+PMULL > cpu17 at mainbus0 mpidr 801: Applied Micro X-Gene r3p2 > cpu17: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu17: 256KB 64b/line 32-way L2 cache > cpu17: CRC32,SHA2,SHA1,AES+PMULL > cpu18 at mainbus0 mpidr 900: Applied Micro X-Gene r3p2 > cpu18: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu18: 256KB 64b/line 32-way L2 cache > cpu18: CRC32,SHA2,SHA1,AES+PMULL > cpu19 at mainbus0 mpidr 901: Applied Micro X-Gene r3p2 > cpu19: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu19: 256KB 64b/line 32-way L2 cache > cpu19: CRC32,SHA2,SHA1,AES+PMULL > cpu20 at mainbus0 mpidr a00: Applied Micro X-Gene r3p2 > cpu20: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu20: 256KB 64b/line 32-way L2 cache > cpu20: CRC32,SHA2,SHA1,AES+PMULL > cpu21 at mainbus0 mpidr a01: Applied Micro X-Gene r3p2 > cpu21: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu21: 256KB 64b/line 32-way L2 cache > cpu21: CRC32,SHA2,SHA1,AES+PMULL > cpu22 at mainbus0 mpidr b00: Applied Micro X-Gene r3p2 > cpu22: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu22: 256KB 64b/line 32-way L2 cache > cpu22: CRC32,SHA2,SHA1,AES+PMULL > cpu23 at mainbus0 mpidr b01: Applied Micro X-Gene r3p2 > cpu23: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu23: 256KB 64b/line 32-way L2 cache > cpu23: CRC32,SHA2,SHA1,AES+PMULL > cpu24 at mainbus0 mpidr c00: Applied Micro X-Gene r3p2 > cpu24: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu24: 256KB 64b/line 32-way L2 cache > cpu24: CRC32,SHA2,SHA1,AES+PMULL > cpu25 at mainbus0 mpidr c01: Applied Micro X-Gene r3p2 > cpu25: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu25: 256KB 64b/line 32-way L2 cache > cpu25: CRC32,SHA2,SHA1,AES+PMULL > cpu26 at mainbus0 mpidr d00: Applied Micro X-Gene r3p2 > cpu26: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu26: 256KB 64b/line 32-way L2 cache > cpu26: CRC32,SHA2,SHA1,AES+PMULL > cpu27 at mainbus0 mpidr d01: Applied Micro X-Gene r3p2 > cpu27: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu27: 256KB 64b/line 32-way L2 cache > cpu27: CRC32,SHA2,SHA1,AES+PMULL > cpu28 at mainbus0 mpidr e00: Applied Micro X-Gene r3p2 > cpu28: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu28: 256KB 64b/line 32-way L2 cache > cpu28: CRC32,SHA2,SHA1,AES+PMULL > cpu29 at mainbus0 mpidr e01: Applied Micro X-Gene r3p2 > cpu29: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu29: 256KB 64b/line 32-way L2 cache > cpu29: CRC32,SHA2,SHA1,AES+PMULL > cpu30 at mainbus0 mpidr f00: Applied Micro X-Gene r3p2 > cpu30: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu30: 256KB 64b/line 32-way L2 cache > cpu30: CRC32,SHA2,SHA1,AES+PMULL > cpu31 at mainbus0 mpidr f01: Applied Micro X-Gene r3p2 > cpu31: 32KB 64b/line 8-way L1 PIPT I-cache, 32KB 64b/line 8-way L1 D-cache > cpu31: 256KB 64b/line 32-way L2 cache > cpu31: CRC32,SHA2,SHA1,AES+PMULL > efi0 at mainbus0: UEFI 2.7 > efi0: American Megatrends rev 0x5000d > smbios0 at efi0: SMBIOS 3.2.0 > smbios0: vendor LENOVO version "hve104p-1.13" date 03/26/2020 > smbios0: Lenovo HR330A 7X33CTO1WW > apm0 at mainbus0 > agintc0 at mainbus0 shift 4:4 nirq 544 nredist 32 ipi: 0, 1: > "interrupt-controller" > agintcmsi0 at agintc0 > agtimer0 at mainbus0: tick rate 40000 KHz > acpi0 at mainbus0: ACPI 6.1 > acpi0: sleep states > acpi0: tables DSDT FACP FIDT DBG2 GTDT IORT MCFG SSDT SPMI APIC PCCT SPCR > PPTT PPTT > acpi0: wakeup devices > acpimcfg0 at acpi0 > acpimcfg0: addr 0x10000000000, bus 0-31 > acpimcfg0: addr 0x7800000000, bus 0-31 > acpimcfg0: addr 0x1000000000, bus 0-31 > acpimcfg0: addr 0x5800000000, bus 0-31 > acpimcfg0: addr 0x6000000000, bus 0-31 > acpimcfg0: addr 0x7000000000, bus 0-7 > acpimcfg0: addr 0x600000000, bus 0-7 > acpimcfg0: addr 0x400000000, bus 0-7 > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0010" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "ACPI0007" at acpi0 not configured > "APMC0D29" at acpi0 not configured > "APMC0D40" at acpi0 not configured > "APMC0D40" at acpi0 not configured > dwiic0 at acpi0 I2C4 addr 0x126b0000/0x1000 irq 105 > iic0 at dwiic0 > ipmi0 at iic0 addr 0x10: version 2.0 interface SSIF > "APMC0D06" at acpi0 not configured > dwgpio0 at acpi0 GPIO addr 0x126f0000/0x1000 irq 73 74 75 76 77 78 79, 8 pins > pluart0 at acpi0 URT0 addr 0x12600000/0x1000 irq 98: console > pluart1 at acpi0 URT1 addr 0x12610000/0x1000 irq 99 > ahci0 at acpi0 SAT0 addr 0x1c000000/0x1000 irq 111: AHCI 1.3.1 > ahci0: port 0: 6.0Gb/s > scsibus0 at ahci0: 32 targets > sd0 at scsibus0 targ 0 lun 0: <ATA, Micron_5200_MTFD, D1M> > naa.500a075120fc271d > sd0: 457862MB, 512 bytes/sector, 937703088 sectors, thin > ahci1 at acpi0 SAT1 addr 0x1c100000/0x1000 irq 112: AHCI 1.3.1 > scsibus1 at ahci1: 32 targets > xhci0 at acpi0 USB0 addr 0x13800000/0x100000 irq 115, xHCI 1.10 > usb0 at xhci0: USB revision 3.0 > uhub0 at usb0 configuration 1 interface 0 "Generic xHCI root hub" rev > 3.00/1.00 addr 1 > xhci1 at acpi0 USB1 addr 0x13900000/0x100000 irq 116, xHCI 1.10 > usb1 at xhci1: USB revision 3.0 > uhub1 at usb1 configuration 1 interface 0 "Generic xHCI root hub" rev > 3.00/1.00 addr 1 > "APMC0D89" at acpi0 not configured > acpibtn0 at acpi0: PWRB > acpige0 at acpi0 irq 84 > acpige1 at acpi0 irq 72 > "PNP0C33" at acpi0 not configured > "LNRO0007" at acpi0 not configured > "APMC0D83" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D84" at acpi0 not configured > "APMC0D87" at acpi0 not configured > "APMC0D87" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D88" at acpi0 not configured > "APMC0D85" at acpi0 not configured > "APMC0D86" at acpi0 not configured > acpipci0 at acpi0 PCI0 > pci0 at acpipci0 > ppb0 at pci0 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 131 > pci1 at ppb0 bus 1 > mcx0 at pci1 dev 0 function 0 "Mellanox ConnectX-4 Lx" rev 0x00: FW > 14.23.1020, msix, address b8:59:9f:0e:57:54 > mcx1 at pci1 dev 0 function 1 "Mellanox ConnectX-4 Lx" rev 0x00: FW > 14.23.1020, msix, address b8:59:9f:0e:57:55 > acpipci1 at acpi0 PCI2 > pci2 at acpipci1 > ppb1 at pci2 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 143 > pci3 at ppb1 bus 1 > em0 at pci3 dev 0 function 0 "Intel I210" rev 0x03: msi, address > 00:1b:21:e0:6d:40 > acpipci2 at acpi0 PCI3 > pci4 at acpipci2 > ppb2 at pci4 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 149 > pci5 at ppb2 bus 1 > acpipci3 at acpi0 PCI4 > pci6 at acpipci3 > ppb3 at pci6 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 155 > pci7 at ppb3 bus 1 > acpipci4 at acpi0 PCI5 > pci8 at acpipci4 > ppb4 at pci8 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 161 > pci9 at ppb4 bus 1 > acpipci5 at acpi0 PCI6 > pci10 at acpipci5 > ppb5 at pci10 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 167 > pci11 at ppb5 bus 1 > acpipci6 at acpi0 PCI7 > pci12 at acpipci6 > 0:0:0: bridge io address conflict 0x10000000/0x1000 > ppb6 at pci12 dev 0 function 0 "Ampere eMAG PCIE" rev 0x04: irq 173 > pci13 at ppb6 bus 1 > 1:0:0: bridge io address conflict 0x10000000/0x1000 > ppb7 at pci13 dev 0 function 0 "ASPEED Technology AST1150 PCI" rev 0x04 > pci14 at ppb7 bus 2 > 2:0:0: io address conflict 0x10000000/0x80 > "ASPEED Technology AST2000" rev 0x41 at pci14 dev 0 function 0 not configured > simplefb0 at mainbus0: 800x600, 32bpp > wsdisplay0 at simplefb0 mux 1 > wsdisplay0: screen 0-5 added (std, vt100 emulation) > uhub2 at uhub0 port 1 configuration 1 interface 0 "American Megatrends Inc. > Virtual Hub" rev 2.00/1.00 addr 2 > umass0 at uhub2 port 1 configuration 1 interface 0 "American Megatrends Inc. > Virtual Cdrom Device" rev 2.00/1.00 addr 3 > umass0: using SCSI over Bulk-Only > scsibus2 at umass0: 2 targets, initiator 0 > cd0 at scsibus2 targ 1 lun 0: <AMI, Virtual CDROM0, 1.00> removable > serial.046bff20AAABBBBCCCC1 > umass1 at uhub2 port 2 configuration 1 interface 0 "American Megatrends Inc. > Virtual HardDisk Device" rev 2.00/1.00 addr 4 > umass1: using SCSI over Bulk-Only > scsibus3 at umass1: 2 targets, initiator 0 > sd1 at scsibus3 targ 1 lun 0: <AMI, Virtual HDisk0, 1.00> removable > serial.046bff31AAABBBBCCCC3 > uhidev0 at uhub2 port 3 configuration 1 interface 0 "American Megatrends Inc. > Virtual Keyboard and Mouse" rev 1.10/1.00 addr 5 > uhidev0: iclass 3/1 > ukbd0 at uhidev0: 8 variable keys, 6 key codes > wskbd0 at ukbd0 mux 1 > wskbd0: connecting to wsdisplay0 > uhidev1 at uhub2 port 3 configuration 1 interface 1 "American Megatrends Inc. > Virtual Keyboard and Mouse" rev 1.10/1.00 addr 5 > uhidev1: iclass 3/1 > ums0 at uhidev1: 3 buttons, Z dir > wsmouse0 at ums0 mux 0 > uhub3 at uhub1 port 1 configuration 1 interface 0 "Cypress Semiconductor USB2 > Hub" rev 2.00/90.15 addr 2 > vscsi0 at root > scsibus4 at vscsi0: 256 targets > softraid0 at root > scsibus5 at softraid0: 256 targets > root on sd0a (015ced07b7c9aa1d.a) swap on sd0b dump on sd0b >
