Hello Patrick,

thank you for working on the arm64 things.

On Fri, 23 May 2025 08:46:16 +0200
Patrick Wildt <patrick@blueri.se> wrote:
[...] 
> Please give this a go on machines where `dmesg | grep ^smmu' gives
> output, and especially on QC machines with X1E, or SC8280XP/ThinkPad
> x13s.
[...]
On Fri, 23 May 2025 16:55:48 +0200
Patrick Wildt <patrick@blueri.se> wrote:
> It's not you, it's me.  I'm sorry, I missed a tiny chunk that's in conf/
> and I was sooo sure it was part of the mail.  Same diff + the chunk for
> conf/:
[...]

Below is the dmesg from ThinkPad x13s with your (second) patch applied.
I have not compiled OpenBSD kernel in something like 10 years, so I hope
I did it right. Please let me know if you need anything else
tested on this laptop.
--
Andre

-----------
OpenBSD 7.7-current (GENERIC) #0: Fri May 23 19:15:33 EDT 2025
    andre@lenovo-arm.home:/build/openbsd/src/sys/arch/arm64/compile/GENERIC
real mem  = 16522309632 (15756MB)
avail mem = 15970365440 (15230MB)
random: good seed from bootblocks
mainbus0 at root: Lenovo ThinkPad X13s
psci0 at mainbus0: PSCI 1.1, SMCCC 1.1
efi0 at mainbus0: UEFI 2.7
efi0: Lenovo rev 0x1640
smbios0 at efi0: SMBIOS 3.3
smbios0: vendor LENOVO version "N3HET92W (1.64 )" date 03/03/2025
smbios0: LENOVO 21BX0007US
cpu0 at mainbus0 mpidr 0: ARM Cortex-A78C r0p0
cpu0: 32KB 64b/line 4-way L1 PIPT I-cache, 32KB 64b/line 4-way L1 D-cache
cpu0: 512KB 64b/line 8-way L2 cache
cpu0: 8192KB 64b/line 16-way L3 cache
cpu0: mismatched ID_AA64ISAR1_EL1
cpu0: TS,DP,RDM,Atomic,CRC32,SHA2,SHA1,AES+PMULL,GPA,LRCPC+LDAPUR,APA+EPAC2,DPB,ASID16,PAN+ATS1E1,LO,HPDS,VH,HAFDBS,AT,CSV3,CSV2,RAS,AdvSIMD+HP,FP+HP,SSBS
apm0 at mainbus0
qcscm0 at mainbus0
"reserved-region" at mainbus0 not configured
"cmd-db-region" at mainbus0 not configured
"reserved-region" at mainbus0 not configured
qcsmem0 at mainbus0
"reserved-region" at mainbus0 not configured
"reserved-region" at mainbus0 not configured
"reserved-region" at mainbus0 not configured
"adsp-region" at mainbus0 not configured
"cdsp0-region" at mainbus0 not configured
"cdsp1-region" at mainbus0 not configured
"reserved-region" at mainbus0 not configured
"gpu-mem" at mainbus0 not configured
"linux,cma" at mainbus0 not configured
"clocks" at mainbus0 not configured
"firmware" at mainbus0 not configured
"interconnect-aggre1-noc" at mainbus0 not configured
"interconnect-aggre2-noc" at mainbus0 not configured
"interconnect-clk-virt" at mainbus0 not configured
"interconnect-config-noc" at mainbus0 not configured
"interconnect-dc-noc" at mainbus0 not configured
"interconnect-gem-noc" at mainbus0 not configured
"interconnect-lpass-ag-noc" at mainbus0 not configured
"interconnect-mc-virt" at mainbus0 not configured
"interconnect-mmss-noc" at mainbus0 not configured
"interconnect-nspa-noc" at mainbus0 not configured
"interconnect-nspb-noc" at mainbus0 not configured
"interconnect-system-noc" at mainbus0 not configured
"opp-table-cpu0" at mainbus0 not configured
"opp-table-cpu4" at mainbus0 not configured
"opp-table-qup100mhz" at mainbus0 not configured
"pmu" at mainbus0 not configured
qcsmptp0 at mainbus0
qcsmptp1 at mainbus0
qcsmptp2 at mainbus0
simplebus0 at mainbus0: "soc"
qcmtx0 at simplebus0
syscon0 at simplebus0: "syscon"
smmu0 at simplebus0: 7 CBs (0 S2-only), bypass quirk
qcgpio0 at simplebus0
smmu1 at simplebus0: 110 CBs (0 S2-only), bypass quirk
smmu1: SMR[0] = 0xe0/0x0
smmu1: SMR[1] = 0x4a0/0x0
smmu1: SMR[2] = 0x4e0/0x0
smmu1: SMR[3] = 0xc0/0x0
smmu1: SMR[4] = 0x1000/0x402
smmu1: SMR[5] = 0x584/0x11
smmu1: SMR[6] = 0x820/0x0
smmu1: SMR[7] = 0x860/0x0
smmu1: SMR[8] = 0x800/0x0
agintc0 at simplebus0 shift 4:4 nirq 992 nredist 8: "interrupt-controller"
agintcmsi0 at agintc0
"clock-controller" at simplebus0 not configured
qcipcc0 at simplebus0
"efuse" at simplebus0 not configured
smmu1: establishing sid 0xa3
simplebus1 at simplebus0: "geniqup"
qciic0 at simplebus1
iic0 at qciic0
ihidev0 at iic0 addr 0x15 irq, vendor 0x4f3 product 0x3193, hid-over-i2c
ihidev0: 92 report ids
imt0 at ihidev0: clickpad, 5 contacts
wsmouse0 at imt0 mux 0
ims0 at ihidev0 reportid 1: 2 buttons
wsmouse1 at ims0 mux 0
hid at ihidev0 reportid 5 not configured
hid at ihidev0 reportid 6 not configured
hid at ihidev0 reportid 7 not configured
hid at ihidev0 reportid 11 not configured
hid at ihidev0 reportid 12 not configured
hid at ihidev0 reportid 13 not configured
ims1 at ihidev0 reportid 14: 0 buttons
wsmouse2 at ims1 mux 0
hid at ihidev0 reportid 92 not configured
ihidev1 at iic0 addr 0x2c, failed fetching initial HID descriptor
ihidev2 at iic0 addr 0x68 irq, vendor 0x4f3 product 0xd, hid-over-i2c
ihidev2: 11 report ids
ims2 at ihidev2 reportid 1: 3 buttons
wsmouse3 at ims2 mux 0
ikbd0 at ihidev2 reportid 8: 8 variable keys, 6 key codes
wskbd0 at ikbd0: console keyboard
icc0 at ihidev2 reportid 9: 573 usages, 20 keys, array
wskbd1 at icc0 mux 1
hid at ihidev2 reportid 10 not configured
hid at ihidev2 reportid 11 not configured
smmu1: establishing sid 0x563
simplebus2 at simplebus0: "geniqup"
"serial" at simplebus2 not configured
qciic1 at simplebus2
iic1 at qciic1
"elan,ekth5015m" at iic1 addr 0x10 not configured
smmu1: establishing sid 0x83
simplebus3 at simplebus0: "geniqup"
qciic2 at simplebus3
iic2 at qciic2
"qcom,pm8008" at iic2 addr 0xc not configured
qcrng0 at simplebus0
dwpcie0 at simplebus0
"phy" at simplebus0 not configured
dwpcie1 at simplebus0
"phy" at simplebus0 not configured
smmu0: establishing sid 0x0
"gpu" at simplebus0 not configured
smmu0: establishing sid 0x5
"gmu" at simplebus0 not configured
"clock-controller" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
qcpas0 at simplebus0
"rxmacro" at simplebus0 not configured
"soundwire" at simplebus0 not configured
"txmacro" at simplebus0 not configured
"codec" at simplebus0 not configured
"soundwire" at simplebus0 not configured
"clock-controller" at simplebus0 not configured
"soundwire" at simplebus0 not configured
"codec" at simplebus0 not configured
"pinctrl" at simplebus0 not configured
"clock-controller" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"phy" at simplebus0 not configured
"pmu" at simplebus0 not configured
"pmu" at simplebus0 not configured
"system-cache-controller" at simplebus0 not configured
qcdwusb0 at simplebus0: "usb"
smmu1: establishing sid 0x820
smmu1: took over 6/820/0 for sid 820
xhci0 at qcdwusb0, 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
qcdwusb1 at simplebus0: "usb"
smmu1: establishing sid 0x860
smmu1: took over 7/860/0 for sid 860
xhci1 at qcdwusb1, 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
"cci" at simplebus0 not configured
smmu1: establishing sid 0x2000
"camss" at simplebus0 not configured
"clock-controller" at simplebus0 not configured
smmu1: establishing sid 0x1000
smmu1: took over 4/1000/402 for sid 1000
"display-subsystem" at simplebus0 not configured
"phy" at simplebus0 not configured
"clock-controller" at simplebus0 not configured
qcpdc0 at simplebus0
qctsens0 at simplebus0
qctsens1 at simplebus0
qctsens1: missing phandle on node
qctsens2 at simplebus0
"restart" at simplebus0 not configured
qctsens3 at simplebus0
qcaoss0 at simplebus0
"sram" at simplebus0 not configured
qcspmi0 at simplebus0
qcpmic0 at qcspmi0 sid 0x0
qcpon0 at qcpmic0
qcrtc0 at qcpmic0
qcsdam0 at qcpmic0
qcpmic1 at qcspmi0 sid 0x1
qcpmicgpio0 at qcpmic1
qcpmic2 at qcspmi0 sid 0x2
qcpmicgpio1 at qcpmic2
qcpwm0 at qcpmic2
qcpmic3 at qcspmi0 sid 0x3
qcpmicgpio2 at qcpmic3
qcpmic4 at qcspmi0 sid 0x4
qcpmicgpio3 at qcpmic4
"watchdog" at simplebus0 not configured
"timer" at simplebus0 not configured
"rsc" at simplebus0 not configured
"interconnect" at simplebus0 not configured
qccpu0 at simplebus0
"remoteproc" at simplebus0 not configured
pci0 at dwpcie0
ppb0 at pci0 dev 0 function 0 "Qualcomm SC8280XP PCIe" rev 0x00: msi
pci1 at ppb0 bus 1
qwx0 at pci1 dev 0 function 0 "Qualcomm QCNFA765" rev 0x01: msi
pci2 at dwpcie1
ppb1 at pci2 dev 0 function 0 "Qualcomm SC8280XP PCIe" rev 0x00: msi
pci3 at ppb1 bus 1
nvme0 at pci3 dev 0 function 0 "Union Memory AM630" rev 0x03: msix, NVMe 1.3
nvme0: UMIS RPJTJ512MGE1QDQ, firmware 1.5Q0630, serial SS0L25210X4LC23A02K6
scsibus0 at nvme0: 2 targets, initiator 0
sd0 at scsibus0 targ 1 lun 0: <NVMe, UMIS RPJTJ512MGE, 1.5Q>
sd0: 488386MB, 512 bytes/sector, 1000215216 sectors
"sound" at mainbus0 not configured
agtimer0 at mainbus0: 19200 kHz
"audio-codec" at mainbus0 not configured
pwmbl0 at mainbus0
gpiokeys0 at mainbus0
gpioleds0 at mainbus0: "indicator"
"pmic-glink" at mainbus0 not configured
"regulator-edp-3p3" at mainbus0 not configured
"regulator-edp-bl" at mainbus0 not configured
"regulator-misc-3p3" at mainbus0 not configured
"regulator-nvme" at mainbus0 not configured
"regulator-vph-pwr" at mainbus0 not configured
"regulator-wlan" at mainbus0 not configured
"regulator-wwan" at mainbus0 not configured
"usb0-sbu-mux" at mainbus0 not configured
"usb1-sbu-mux" at mainbus0 not configured
"wcn6855-pmu" at mainbus0 not configured
uhidev0 at uhub0 port 1 configuration 1 interface 0 "vendor 0x1ea7 2.4G Mouse" rev 1.10/2.00 addr 2
uhidev0: iclass 3/1, 181 report ids
ums0 at uhidev0 reportid 2: 8 buttons, Z and W dir
wsmouse4 at ums0 mux 0
uhid0 at uhidev0 reportid 181: input=7, output=7, feature=0
uhub2 at uhub1 port 1 configuration 1 interface 0 "Generic 4-Port USB 2.0 Hub" rev 2.10/1.49 addr 2
vscsi0 at root
scsibus1 at vscsi0: 256 targets
softraid0 at root
scsibus2 at softraid0: 256 targets
root on sd0a (1630a765b9cf5f24.a) swap on sd0b dump on sd0b
qcpas0: all intents in use
wsmouse4 detached
ums0 detached
uhid0 detached
uhidev0 detached
qwx0: wcn6855 hw2.1 fw 0x11088c35 address 00:03:7f:12:c6:19
simplefb0 at mainbus0: 1920x1200, 32bpp
wsdisplay0 at simplefb0 mux 1: console (std, vt100 emulation), using wskbd0
wskbd1: connecting to wsdisplay0
wsdisplay0: screen 1-5 added (std, vt100 emulation)
uhidev0 at uhub0 port 1 configuration 1 interface 0 "vendor 0x1ea7 2.4G Mouse" rev 1.10/2.00 addr 2
uhidev0: iclass 3/1, 181 report ids
ums0 at uhidev0 reportid 2: 8 buttons, Z and W dir
wsmouse4 at ums0 mux 0
uhid0 at uhidev0 reportid 181: input=7, output=7, feature=0
uhub3 at uhub1 port 2 configuration 1 interface 0 "Generic 4-Port USB 3.0 Hub" rev 3.10/1.49 addr 3
uhub3 detached
uhub2 detached
uhub2 at uhub1 port 1 configuration 1 interface 0 "Generic 4-Port USB 2.0 Hub" rev 2.10/1.49 addr 2