[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by b...

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

details:   https://anonhg.NetBSD.org/src/rev/0178548a610b
branches:  netbsd-9
changeset: 371227:0178548a610b
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 29 18:26:42 2022 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #1534):

        sys/dev/pci/mfii.c: revision 1.28

Convert from pci_intr_map() to pci_intr_alloc(); makes the driver use
MSI/MSI-x when available. Tested by Edgar Fu?.

diffstat:

 sys/dev/pci/mfii.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 6c995b7250c8 -r 0178548a610b sys/dev/pci/mfii.c
--- a/sys/dev/pci/mfii.c        Sat Sep 24 08:11:46 2022 +0000
+++ b/sys/dev/pci/mfii.c        Thu Sep 29 18:26:42 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfii.c,v 1.4.4.2 2022/09/16 18:27:38 martin Exp $ */
+/* $NetBSD: mfii.c,v 1.4.4.3 2022/09/29 18:26:42 martin Exp $ */
 /* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.4.4.2 2022/09/16 18:27:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.4.4.3 2022/09/29 18:26:42 martin Exp $");
 
 #include "bio.h"
 
@@ -655,7 +655,7 @@
        struct mfii_softc *sc = device_private(self);
        struct pci_attach_args *pa = aux;
        pcireg_t memtype;
-       pci_intr_handle_t ih;
+       pci_intr_handle_t *ihp;
        char intrbuf[PCI_INTRSTR_LEN];
        const char *intrstr;
        u_int32_t status, scpad2, scpad3;
@@ -705,12 +705,12 @@
        /* disable interrupts */
        mfii_write(sc, MFI_OMSK, 0xffffffff);
 
-       if (pci_intr_map(pa, &ih) != 0) {
+       if (pci_intr_alloc(pa, &ihp, NULL, 0)) {
                aprint_error(": unable to map interrupt\n");
                goto pci_unmap;
        }
-       intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
-       pci_intr_setattr(pa->pa_pc, &ih, PCI_INTR_MPSAFE, true);
+       intrstr = pci_intr_string(pa->pa_pc, ihp[0], intrbuf, sizeof(intrbuf));
+       pci_intr_setattr(pa->pa_pc, &ihp[0], PCI_INTR_MPSAFE, true);
 
        /* lets get started */
        if (mfii_transition_firmware(sc))
@@ -819,7 +819,7 @@
        aprint_normal("\n");
        aprint_naive("\n");
 
-       sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_BIO,
+       sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ihp[0], IPL_BIO,
            mfii_intr, sc, DEVNAME(sc));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "can't establish interrupt");