svn commit: r297579 - in head/sys: arm/nvidia dev/usb/controller

[Michal Meloun]

Author: mmel
Date: Tue Apr  5 12:13:53 2016
New Revision: 297579
URL: https://svnweb.freebsd.org/changeset/base/297579

Log:
  ehci_interrupt is MPSAFE code. Most drivers in tree calls bus_setup_intr
  with MPSAFE, some are not. Fix those.
  
  Submitted by: Howard Su <howard0su at gmail.com>
  Differential Revision: https://reviews.freebsd.org/D5755

Modified:
  head/sys/arm/nvidia/tegra_ehci.c
  head/sys/dev/usb/controller/ehci_fsl.c
  head/sys/dev/usb/controller/ehci_imx.c

Modified: head/sys/arm/nvidia/tegra_ehci.c
==============================================================================
--- head/sys/arm/nvidia/tegra_ehci.c	Tue Apr  5 11:30:52 2016	(r297578)
+++ head/sys/arm/nvidia/tegra_ehci.c	Tue Apr  5 12:13:53 2016	(r297579)
@@ -253,8 +253,8 @@ tegra_ehci_attach(device_t dev)
 	}
 
 	/* Setup interrupt handler. */
-	rv = bus_setup_intr(dev, sc->ehci_irq_res, INTR_TYPE_BIO, NULL,
-	    (driver_intr_t *)ehci_interrupt, esc, &esc->sc_intr_hdl);
+	rv = bus_setup_intr(dev, sc->ehci_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (driver_intr_t *)ehci_interrupt, esc, &esc->sc_intr_hdl);
 	if (rv != 0) {
 		device_printf(dev, "Could not setup IRQ\n");
 		goto out;

Modified: head/sys/dev/usb/controller/ehci_fsl.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_fsl.c	Tue Apr  5 11:30:52 2016	(r297578)
+++ head/sys/dev/usb/controller/ehci_fsl.c	Tue Apr  5 12:13:53 2016	(r297579)
@@ -294,7 +294,7 @@ fsl_ehci_attach(device_t self)
 	}
 
 	/* Setup interrupt handler */
-	err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO,
+	err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
 	    NULL, (driver_intr_t *)ehci_interrupt, sc, &sc->sc_intr_hdl);
 	if (err) {
 		device_printf(self, "Could not setup irq, %d\n", err);

Modified: head/sys/dev/usb/controller/ehci_imx.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_imx.c	Tue Apr  5 11:30:52 2016	(r297578)
+++ head/sys/dev/usb/controller/ehci_imx.c	Tue Apr  5 12:13:53 2016	(r297579)
@@ -261,8 +261,8 @@ imx_ehci_attach(device_t dev)
 	}
 
 	/* Setup interrupt handler. */
-	err = bus_setup_intr(dev, sc->ehci_irq_res, INTR_TYPE_BIO, NULL, 
-	    (driver_intr_t *)ehci_interrupt, esc, &esc->sc_intr_hdl);
+	err = bus_setup_intr(dev, sc->ehci_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (driver_intr_t *)ehci_interrupt, esc, &esc->sc_intr_hdl);
 	if (err != 0) {
 		device_printf(dev, "Could not setup IRQ\n");
 		goto out;