diff --git a/sys/arch/arm64/dev/pci_machdep.c b/sys/arch/arm64/dev/pci_machdep.c
index 86b8edd67..fbfb07e56 100644
--- a/sys/arch/arm64/dev/pci_machdep.c
+++ b/sys/arch/arm64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.6 2024/02/03 10:37:25 kettenis Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.7 2024/07/05 22:53:57 patrick Exp $	*/
 
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
@@ -32,7 +32,7 @@ pci_intr_enable_msivec(struct pci_attach_args *pa, int num_vec)
 	pcireg_t reg;
 	int mmc, mme, off;
 
-	if ((pa->pa_flags & PCI_FLAGS_MSI_ENABLED) == 0 ||
+	if ((pa->pa_flags & PCI_FLAGS_MSIVEC_ENABLED) == 0 ||
 	    pci_get_capability(pc, tag, PCI_CAP_MSI, &off, &reg) == 0)
 		return 1;
 
diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c
index 7303fb502..f9877af26 100644
--- a/sys/dev/fdt/dwpcie.c
+++ b/sys/dev/fdt/dwpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwpcie.c,v 1.54 2024/07/02 19:44:37 patrick Exp $	*/
+/*	$OpenBSD: dwpcie.c,v 1.55 2024/07/05 22:52:25 patrick Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -1505,6 +1505,9 @@ dwpcie_sc8280xp_init(struct dwpcie_softc *sc)
 {
 	sc->sc_num_viewport = 8;
 
+	if (OF_getproplen(sc->sc_node, "msi-map") <= 0)
+		return dwpcie_msi_init(sc);
+
 	return 0;
 }
 
diff --git a/sys/dev/pci/if_qwx_pci.c b/sys/dev/pci/if_qwx_pci.c
index f3e2df6b5..b3f5bbc6b 100644
--- a/sys/dev/pci/if_qwx_pci.c
+++ b/sys/dev/pci/if_qwx_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_qwx_pci.c,v 1.20 2024/06/11 10:06:35 stsp Exp $	*/
+/*	$OpenBSD: if_qwx_pci.c,v 1.21 2024/07/05 21:24:13 patrick Exp $	*/
 
 /*
  * Copyright 2023 Stefan Sperling <stsp@openbsd.org>
@@ -4130,9 +4130,11 @@ qwx_pci_intr(void *arg)
 				ret = 1;
 		}
 
-		for (i = 0; i < nitems(sc->ext_irq_grp); i++) {
-			if (qwx_dp_service_srng(sc, i))
-				ret = 1;
+		if (test_bit(QWX_FLAG_EXT_IRQ_ENABLED, sc->sc_flags)) {
+			for (i = 0; i < nitems(sc->ext_irq_grp); i++) {
+				if (qwx_dp_service_srng(sc, i))
+					ret = 1;
+			}
 		}
 	}
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 41c73c797..05c114c65 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.319 2024/02/03 18:51:58 beck Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.320 2024/07/05 05:42:08 jsg Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -2225,18 +2225,6 @@ reassignbuf(struct buf *bp)
 	bufinsvn(bp, listheadp);
 }
 
-/*
- * Check if vnode represents a disk device
- */
-int
-vn_isdisk(struct vnode *vp, int *errp)
-{
-	if (vp->v_type != VBLK && vp->v_type != VCHR)
-		return (0);
-
-	return (1);
-}
-
 #ifdef DDB
 #include <machine/db_machdep.h>
 #include <ddb/db_interface.h>
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 23eebf371..b97d486f1 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.170 2024/02/03 18:51:58 beck Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.171 2024/07/05 05:42:08 jsg Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -642,7 +642,6 @@ void	vn_initialize_syncerd(void);
 void	vn_syncer_add_to_worklist(struct vnode *, int);
 
 /* misc */
-int	vn_isdisk(struct vnode *, int *);
 int 	getvnode(struct proc *, int, struct file **);
 
 /* uvm */