From 344fe49ad4c55b6c5533b21eeefc470b917ca484 Mon Sep 17 00:00:00 2001
From: kettenis <kettenis@openbsd.org>
Date: Thu, 4 Jun 2026 10:07:22 +0000
Subject: [PATCH] Fix interrupt barriers for the integrated MSI controller.

ok jca@
---
 sys/dev/fdt/dwpcie.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/dev/fdt/dwpcie.c b/sys/dev/fdt/dwpcie.c
index 0e1e76e1514..a24634798f4 100644
--- a/sys/dev/fdt/dwpcie.c
+++ b/sys/dev/fdt/dwpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwpcie.c,v 1.61 2026/04/25 11:41:41 kettenis Exp $	*/
+/*	$OpenBSD: dwpcie.c,v 1.62 2026/06/04 10:07:22 kettenis Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -2111,7 +2111,7 @@ dwpcie_intr_establish(void *v, pci_intr_handle_t ih, int level,
 {
 	struct dwpcie_softc *sc = v;
 	struct dwpcie_intr_handle *pih;
-	void *cookie = NULL;
+	void *cookie;
 
 	KASSERT(ih.ih_type != PCI_NONE);
 
@@ -2128,6 +2128,7 @@ dwpcie_intr_establish(void *v, pci_intr_handle_t ih, int level,
 				return NULL;
 			addr = sc->sc_msi_addr;
 			data = dm->dm_vec;
+			cookie = sc->sc_msi_ih[dm->dm_vec / 32];
 		} else {
 			/*
 			 * Assume hardware passes Requester ID as