[src/trunk]: src/sys/arch/arm/pci Support pci_intr_release for INTx interrupts

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c057183a1ba3
branches:  trunk
changeset: 962565:c057183a1ba3
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jul 25 00:42:43 2019 +0000

description:
Support pci_intr_release for INTx interrupts

diffstat:

 sys/arch/arm/pci/pci_msi_machdep.c |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 3ea93ab260e7 -r c057183a1ba3 sys/arch/arm/pci/pci_msi_machdep.c
--- a/sys/arch/arm/pci/pci_msi_machdep.c        Thu Jul 25 00:30:45 2019 +0000
+++ b/sys/arch/arm/pci/pci_msi_machdep.c        Thu Jul 25 00:42:43 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_msi_machdep.c,v 1.5 2018/12/01 20:38:45 skrll Exp $ */
+/* $NetBSD: pci_msi_machdep.c,v 1.6 2019/07/25 00:42:43 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.5 2018/12/01 20:38:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_msi_machdep.c,v 1.6 2019/07/25 00:42:43 jmcneill Exp $");
 
 #include <sys/kernel.h>
 #include <sys/kmem.h>
@@ -237,14 +237,16 @@
 void 
 pci_intr_release(pci_chipset_tag_t pc, pci_intr_handle_t *pih, int count)
 {
-       struct arm_pci_msi *msi;
+       struct arm_pci_msi *msi = NULL;
 
        if (pih == NULL || count == 0)
                return;
 
-       msi = arm_pci_msi_find_frame(pih[0]);
-       KASSERT(msi != NULL);
-       msi->msi_intr_release(msi, pih, count);
+       if ((pih[0] & (ARM_PCI_INTR_MSIX|ARM_PCI_INTR_MSI)) != 0) {
+               msi = arm_pci_msi_find_frame(pih[0]);
+               KASSERT(msi != NULL);
+               msi->msi_intr_release(msi, pih, count);
+       }
 
        kmem_free(pih, sizeof(*pih) * count);
 }