Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/nvidia use fdtbus_intr_establish_xname



details:   https://anonhg.NetBSD.org/src/rev/478213e10bf8
branches:  trunk
changeset: 979871:478213e10bf8
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 15 23:11:59 2021 +0000

description:
use fdtbus_intr_establish_xname

diffstat:

 sys/arch/arm/nvidia/tegra_ahcisata.c |   8 ++++----
 sys/arch/arm/nvidia/tegra_apbdma.c   |   8 ++++----
 sys/arch/arm/nvidia/tegra_cec.c      |   8 ++++----
 sys/arch/arm/nvidia/tegra_com.c      |   8 ++++----
 sys/arch/arm/nvidia/tegra_drm_mode.c |   8 ++++----
 sys/arch/arm/nvidia/tegra_ehci.c     |   8 ++++----
 sys/arch/arm/nvidia/tegra_hdaudio.c  |   8 ++++----
 sys/arch/arm/nvidia/tegra_i2c.c      |   8 ++++----
 sys/arch/arm/nvidia/tegra_mc.c       |   8 ++++----
 sys/arch/arm/nvidia/tegra_nouveau.c  |   8 ++++----
 sys/arch/arm/nvidia/tegra_pcie.c     |   8 ++++----
 sys/arch/arm/nvidia/tegra_sdhc.c     |   8 ++++----
 sys/arch/arm/nvidia/tegra_xusb.c     |  13 +++++++------
 13 files changed, 55 insertions(+), 54 deletions(-)

diffs (truncated from 389 to 300 lines):

diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_ahcisata.c
--- a/sys/arch/arm/nvidia/tegra_ahcisata.c      Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_ahcisata.c      Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ahcisata.c,v 1.13 2020/12/28 14:08:42 jmcneill Exp $ */
+/* $NetBSD: tegra_ahcisata.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.13 2020/12/28 14:08:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ahcisata.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -231,8 +231,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0,
-           ahci_intr, &sc->sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0,
+           ahci_intr, &sc->sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_apbdma.c
--- a/sys/arch/arm/nvidia/tegra_apbdma.c        Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_apbdma.c        Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_apbdma.c,v 1.7 2019/10/13 06:11:31 skrll Exp $ */
+/* $NetBSD: tegra_apbdma.c,v 1.8 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_apbdma.c,v 1.7 2019/10/13 06:11:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_apbdma.c,v 1.8 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -217,8 +217,8 @@
                return NULL;
        }
 
-       ch->ch_ih = fdtbus_intr_establish(sc->sc_phandle, n, IPL_VM,
-           FDT_INTR_MPSAFE, tegra_apbdma_intr, ch);
+       ch->ch_ih = fdtbus_intr_establish_xname(sc->sc_phandle, n, IPL_VM,
+           FDT_INTR_MPSAFE, tegra_apbdma_intr, ch, device_xname(dev));
        if (ch->ch_ih == NULL) {
                aprint_error_dev(dev, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_cec.c
--- a/sys/arch/arm/nvidia/tegra_cec.c   Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_cec.c   Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_cec.c,v 1.6 2019/10/13 06:11:31 skrll Exp $ */
+/* $NetBSD: tegra_cec.c,v 1.7 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.6 2019/10/13 06:11:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.7 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -166,8 +166,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, tegra_cec_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(faa->faa_phandle, 0, IPL_VM,
+           FDT_INTR_MPSAFE, tegra_cec_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_com.c
--- a/sys/arch/arm/nvidia/tegra_com.c   Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_com.c   Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_com.c,v 1.13 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: tegra_com.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.13 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -130,8 +130,8 @@
                return;
        }
 
-       tsc->tsc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
-           FDT_INTR_MPSAFE, comintr, sc);
+       tsc->tsc_ih = fdtbus_intr_establish_xname(faa->faa_phandle, 0,
+           IPL_SERIAL, FDT_INTR_MPSAFE, comintr, sc, device_xname(self));
        if (tsc->tsc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_drm_mode.c
--- a/sys/arch/arm/nvidia/tegra_drm_mode.c      Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_drm_mode.c      Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $ */
+/* $NetBSD: tegra_drm_mode.c,v 1.20 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.19 2019/10/13 05:56:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_drm_mode.c,v 1.20 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
@@ -320,8 +320,8 @@
        }
        crtc->size = size;
        crtc->intr = intr;
-       crtc->ih = intr_establish(intr, IPL_VM, IST_LEVEL | IST_MPSAFE,
-           tegra_crtc_intr, crtc);
+       crtc->ih = intr_establish_xname(intr, IPL_VM, IST_LEVEL | IST_MPSAFE,
+           tegra_crtc_intr, crtc, device_xname(self)); /* XXX */
        if (crtc->ih == NULL) {
                DRM_ERROR("failed to establish interrupt for crtc %d\n", index);
        }
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_ehci.c
--- a/sys/arch/arm/nvidia/tegra_ehci.c  Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_ehci.c  Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_ehci.c,v 1.16 2018/04/09 16:21:09 jakllsch Exp $ */
+/* $NetBSD: tegra_ehci.c,v 1.17 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.16 2018/04/09 16:21:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_ehci.c,v 1.17 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -129,8 +129,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_USB,
-           FDT_INTR_MPSAFE, ehci_intr, &sc->sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(faa->faa_phandle, 0, IPL_USB,
+           FDT_INTR_MPSAFE, ehci_intr, &sc->sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_hdaudio.c
--- a/sys/arch/arm/nvidia/tegra_hdaudio.c       Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_hdaudio.c       Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdaudio.c,v 1.13 2019/10/13 06:11:31 skrll Exp $ */
+/* $NetBSD: tegra_hdaudio.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.13 2019/10/13 06:11:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.14 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -165,8 +165,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_AUDIO, 0,
-           tegra_hdaudio_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_AUDIO, 0,
+           tegra_hdaudio_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_i2c.c
--- a/sys/arch/arm/nvidia/tegra_i2c.c   Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_i2c.c   Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.24 2020/12/23 16:02:11 thorpej Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.25 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.24 2020/12/23 16:02:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.25 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -143,8 +143,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, tegra_i2c_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+           FDT_INTR_MPSAFE, tegra_i2c_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_mc.c
--- a/sys/arch/arm/nvidia/tegra_mc.c    Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_mc.c    Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_mc.c,v 1.10 2019/10/13 06:11:31 skrll Exp $ */
+/* $NetBSD: tegra_mc.c,v 1.11 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.10 2019/10/13 06:11:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.11 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -111,8 +111,8 @@
                return;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, tegra_mc_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(faa->faa_phandle, 0, IPL_VM,
+           FDT_INTR_MPSAFE, tegra_mc_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_nouveau.c
--- a/sys/arch/arm/nvidia/tegra_nouveau.c       Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_nouveau.c       Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_nouveau.c,v 1.12 2018/11/01 16:14:54 skrll Exp $ */
+/* $NetBSD: tegra_nouveau.c,v 1.13 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.12 2018/11/01 16:14:54 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_nouveau.c,v 1.13 2021/01/15 23:11:59 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -291,8 +291,8 @@
                return -EIO;
        }
 
-       sc->sc_ih = fdtbus_intr_establish(sc->sc_phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, tegra_nouveau_intr, sc);
+       sc->sc_ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, IPL_VM,
+           FDT_INTR_MPSAFE, tegra_nouveau_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt on %s\n",
                    intrstr);
diff -r 6eb06d0124c9 -r 478213e10bf8 sys/arch/arm/nvidia/tegra_pcie.c
--- a/sys/arch/arm/nvidia/tegra_pcie.c  Fri Jan 15 23:02:38 2021 +0000
+++ b/sys/arch/arm/nvidia/tegra_pcie.c  Fri Jan 15 23:11:59 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.31 2020/07/07 03:38:46 thorpej Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.32 2021/01/15 23:11:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@



Home | Main Index | Thread Index | Old Index