16.06.2024 00:35, Klemens Nanni пишет:
> GENERIC and GENERIC_MP both hang with this diff after
> cpu0: 4MB 64b/line 16-way L2 cache
> but I haven't looked into that yet.
brynet had the right idea, this diff makes it boot X, even VMM works
(I folded his indent/additional if into the existing one for brevity).
Index: arch/amd64/amd64/identcpu.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/identcpu.c,v
diff -u -p -r1.143 identcpu.c
--- arch/amd64/amd64/identcpu.c 14 May 2024 01:42:07 -0000 1.143
+++ arch/amd64/amd64/identcpu.c 16 Jun 2024 08:55:04 -0000
@@ -727,7 +727,8 @@ identifycpu(struct cpu_info *ci)
}
#ifndef SMALL_KERNEL
- if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR)) {
+ if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR) &&
+ ci->ci_vendor == CPUV_INTEL) {
ci->ci_sensor.type = SENSOR_TEMP;
sensor_task_register(ci, intelcore_update_sensor, 5);
sensor_attach(&ci->ci_sensordev, &ci->ci_sensor);
OpenBSD 7.5-current (GENERIC.MP) #1: Sun Jun 16 12:09:55 MSK 2024
kn@atar:/sys/arch/amd64/compile/GENERIC.MP
real mem = 8026165248 (7654MB)
avail mem = 7759757312 (7400MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 3.1 @ 0x9648a000 (37 entries)
bios0: vendor Byosoft version "R20" date 05/06/2022
bios0: IP3 Tech. ZEN1
efi0 at bios0: UEFI 2.6
efi0: Byosoft rev 0x10000
acpi0 at bios0: ACPI 6.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SLIC UEFI HPET APIC MCFG DMAR FPDT BGRT
acpi0: wakeup devices PE0S(S4) PE4S(S4) PE5S(S4) PE6S(S4) PE7S(S4) USB0(S3)
EHC1(S3) USB1(S3) USB2(S3) EHC2(S3) XHCI(S3) PS2M(S1) PS2K(S3) SLPB(S4)
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpihpet0 at acpi0: 14318179 Hz
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: ZHAOXIN KaiXian KX-6640MA@2.2+GHz, 2594.85 MHz, 07-0b-00
cpu0: cpuid 1
edx=bfcbfbff<FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PBE>
ecx=77da63eb<SSE3,PCLMUL,MWAIT,VMX,SMX,EST,TM2,SSSE3,CX16,xTPR,PCID,SSE4.1,SSE4.2,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND>
cpu0: cpuid 6 eax=3<SENSOR> ecx=1<EFFFREQ>
cpu0: cpuid 7.0
ebx=c258b<FSGSBASE,TSC_ADJUST,BMI1,SMEP,BMI2,INVPCID,RDSEED,ADX> ecx=4<UMIP>
edx=20000000
cpu0: cpuid a vers=2, gp=4, gpwidth=48, ff=3, ffwidth=48
cpu0: cpuid d.1 eax=1<XSAVEOPT>
cpu0: cpuid 80000001 edx=2c100800<NXE,PAGE1GB,RDTSCP,LONG>
ecx=121<LAHF,ABM,3DNOWP>
cpu0: cpuid 80000007 edx=100<ITSC>
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache
cpu0: 4MB 64b/line 16-way L2 cache
cpu0: apic clock running at 99MHz
cpu0: RNG AES AES-CTR SHA1 SHA256 RSA
cpu0: mwait min=64, max=64, C-substates=0.2.2.2.2, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: ZHAOXIN KaiXian KX-6640MA@2.2+GHz, 2594.86 MHz, 07-0b-00
cpu2 at mainbus0: apid 2 (application processor)
cpu2: ZHAOXIN KaiXian KX-6640MA@2.2+GHz, 2594.86 MHz, 07-0b-00
cpu3 at mainbus0: apid 3 (application processor)
cpu3: ZHAOXIN KaiXian KX-6640MA@2.2+GHz, 2594.90 MHz, 07-0b-00
ioapic0 at mainbus0: apid 9 pa 0xfec00000, version 3, 24 pins
ioapic1 at mainbus0: apid 10 pa 0xfecc0000, version 3, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xe0000000, bus 0-255
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (NPE0)
acpiprt2 at acpi0: bus 2 (NPE4)
acpiprt3 at acpi0: bus 3 (NPE5)
acpiprt4 at acpi0: bus 4 (NPE6)
acpiprt5 at acpi0: bus 5 (NPE7)
acpiec0 at acpi0
acpipci0 at acpi0 PCI0: 0x00000010 0x00000011 0x00000000
acpicmos0 at acpi0
acpibtn0 at acpi0: SLPB(wakeup)
acpibtn1 at acpi0: LID_
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT1 model "GN1S-140M-3S1P" serial YAEC3130G2000261 type
Real oem "ZX SR 1"
acpibtn2 at acpi0: PWRB
acpicpu0 at acpi0: !C3(500@80 io@0x815), !C2(750@50 io@0x814), C1(1000@1 halt),
PSS
acpicpu1 at acpi0: !C3(500@80 io@0x815), !C2(750@50 io@0x814), C1(1000@1 halt),
PSS
acpicpu2 at acpi0: !C3(500@80 io@0x815), !C2(750@50 io@0x814), C1(1000@1 halt),
PSS
acpicpu3 at acpi0: !C3(500@80 io@0x815), !C2(750@50 io@0x814), C1(1000@1 halt),
PSS
acpipwrres0 at acpi0: PWR0
acpivideo0 at acpi0: EUMA
acpivout0 at acpivideo0: EDP1
cpu0: Enhanced SpeedStep 2594 MHz: speeds: 2600, 2200, 1800, 1200 MHz
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 vendor "Zhaoxin", unknown product 0x1003 rev 0x80
pchb1 at pci0 dev 0 function 1 vendor "Zhaoxin", unknown product 0x31b0 rev 0x04
pchb2 at pci0 dev 0 function 2 vendor "Zhaoxin", unknown product 0x31b1 rev 0x04
pchb3 at pci0 dev 0 function 3 vendor "Zhaoxin", unknown product 0x31b2 rev 0x04
pchb4 at pci0 dev 0 function 4 vendor "Zhaoxin", unknown product 0x31b3 rev 0x04
pchb5 at pci0 dev 0 function 5 vendor "Zhaoxin", unknown product 0x31b4 rev 0x04
pchb6 at pci0 dev 0 function 6 vendor "Zhaoxin", unknown product 0x31b5 rev 0x04
vendor "Zhaoxin", unknown product 0x3a04 (class display subclass VGA, rev 0x00)
at pci0 dev 1 function 0 not configured
azalia0 at pci0 dev 1 function 1 vendor "Zhaoxin", unknown product 0x9144 rev
0x00: msi
azalia0: codecs: Zhaoxin/0x9f8a, Zhaoxin/0x9f8b
audio0 at azalia0
audio1 at azalia0
ppb0 at pci0 dev 3 function 0 vendor "Zhaoxin", unknown product 0x0717 rev
0x01: msi
pci1 at ppb0 bus 1
ppb1 at pci0 dev 4 function 0 vendor "Zhaoxin", unknown product 0x071b rev
0x01: msi
pci2 at ppb1 bus 2
ppb2 at pci0 dev 4 function 1 vendor "Zhaoxin", unknown product 0x071c rev
0x01: msi
pci3 at ppb2 bus 3
ppb3 at pci0 dev 5 function 0 vendor "Zhaoxin", unknown product 0x071d rev
0x01: msi
pci4 at ppb3 bus 4
iwm0 at pci4 dev 0 function 0 "Intel AC 7265" rev 0x59, msi
ppb4 at pci0 dev 5 function 1 vendor "Zhaoxin", unknown product 0x071e rev
0x01: msi
pci5 at ppb4 bus 5
ahci0 at pci0 dev 15 function 0 "Zhaoxin StorX AHCI" rev 0x01: apic 9 int 21,
AHCI 1.3.1
ahci0: port 0: 6.0Gb/s
scsibus1 at ahci0: 32 targets
sd0 at scsibus1 targ 0 lun 0: <ATA, 256GB SSD, V1.3> naa.5000000000000000
sd0: 244198MB, 512 bytes/sector, 500118192 sectors, thin
uhci0 at pci0 dev 16 function 0 vendor "Zhaoxin", unknown product 0x3038 rev
0xa0: apic 9 int 20
uhci1 at pci0 dev 16 function 1 vendor "Zhaoxin", unknown product 0x3038 rev
0xa0: apic 9 int 22
ehci0 at pci0 dev 16 function 7 vendor "Zhaoxin", unknown product 0x3104 rev
0x90: apic 9 int 21
usb0 at ehci0: USB revision 2.0
uhub0 at usb0 configuration 1 interface 0 "Zhaoxin EHCI root hub" rev 2.00/1.00
addr 1
pcib0 at pci0 dev 17 function 0 vendor "Zhaoxin", unknown product 0x1001 rev
0x03
pchb7 at pci0 dev 17 function 7 vendor "Zhaoxin", unknown product 0x31b7 rev
0x04
xhci0 at pci0 dev 18 function 0 vendor "Zhaoxin", unknown product 0x9204 rev
0x00: msi, xHCI 1.10
usb1 at xhci0: USB revision 3.0
uhub1 at usb1 configuration 1 interface 0 "Zhaoxin xHCI root hub" rev 3.00/1.00
addr 1
azalia1 at pci0 dev 20 function 0 vendor "Zhaoxin", unknown product 0x3288 rev
0x20: msi
azalia1: codecs: Realtek ALC269
audio2 at azalia1
usb2 at uhci0: USB revision 1.0
uhub2 at usb2 configuration 1 interface 0 "Zhaoxin UHCI root hub" rev 1.00/1.00
addr 1
usb3 at uhci1: USB revision 1.0
uhub3 at usb3 configuration 1 interface 0 "Zhaoxin UHCI root hub" rev 1.00/1.00
addr 1
isa0 at pcib0
isadma0 at isa0
com1 at isa0 port 0x2f8/8 irq 3: ns16550a, 16 byte fifo
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
pms0 at pckbc0 (aux slot)
wsmouse0 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: VMX/EPT (using slow L1TF mitigation)
efifb0 at mainbus0: 1920x1080, 32bpp
wsdisplay0 at efifb0 mux 1: console (std, vt100 emulation), using wskbd0
wsdisplay0: screen 1-5 added (std, vt100 emulation)
uhub4 at uhub0 port 2 configuration 1 interface 0 "Genesys Logic USB2.0 Hub"
rev 2.00/85.36 addr 2
ugen0 at uhub4 port 1 "Generic USB2.0-CRW" rev 2.00/39.60 addr 3
uvideo0 at uhub0 port 4 configuration 1 interface 0 "Sonix Technology Co., Ltd.
USB 2.0 Camera" rev 2.00/1.00 addr 4
video0 at uvideo0
uhub5 at uhub1 port 2 configuration 1 interface 0 "Generic 4-Port USB 2.1 Hub"
rev 2.10/1.01 addr 2
uhub6 at uhub1 port 4 configuration 1 interface 0 "Generic 4-Port USB 3.1 Hub"
rev 3.10/1.01 addr 3
ugen1 at uhub3 port 1 "Intel Bluetooth" rev 2.00/0.03 addr 2
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006>
sd1: 243938MB, 512 bytes/sector, 499585087 sectors
softraid0: volume sd1 is roaming, it used to be sd2, updating metadata
root on sd1a (83e3eff286214418.a) swap on sd1b dump on sd1b
iwm0: hw rev 0x210, fw ver 17.3216344376.0, address a4:6b:b6:02:b7:aa
