Tue Nov 17 00:08:33 2015 UTC ()

Do not clear the PCIe interrupt until we've allowed its cause to become
deasserted.  This halves the PCIe interrupt rate.


(jakllsch)

diff -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_pcie.c

--- src/sys/arch/arm/nvidia/tegra_pcie.c 2015/11/14 03:44:52	1.10
+++ src/sys/arch/arm/nvidia/tegra_pcie.c 2015/11/17 00:08:33	1.11

 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_pcie.c,v 1.10 2015/11/14 03:44:52 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "locators.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.10 2015/11/14 03:44:52 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/extent.h>
 #include <sys/queue.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 #include <arm/cpufunc.h>
 @@ -227,41 +227,47 @@ tegra_pcie_legacy_intr(struct tegra_pcie
 		    msg);
 	} else {
 		bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_MSG_REG, msg);
 		rv = 1;
+	}
 	return rv;
+}
 static int
 tegra_pcie_intr(void *priv)
+{
 	struct tegra_pcie_softc *sc = priv;
 	int rv;
 	const uint32_t code = bus_space_read_4(sc->sc_bst, sc->sc_bsh_afi,
 	    AFI_INTR_CODE_REG);
 	const uint32_t sig = bus_space_read_4(sc->sc_bst, sc->sc_bsh_afi,
 	    AFI_INTR_SIGNATURE_REG);
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_INTR_CODE_REG, 0);
 	switch (__SHIFTOUT(code, AFI_INTR_CODE_INT_CODE)) {
 	case AFI_INTR_CODE_SM_MSG:
-		return tegra_pcie_legacy_intr(sc);
+		rv = tegra_pcie_legacy_intr(sc);
 		break;
 	default:
 		device_printf(sc->sc_dev, "intr: code %#x sig %#x\n",
 		    code, sig);
-		return 1;
+		rv = 1;
 		break;
+	}
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh_afi, AFI_INTR_CODE_REG, 0);
 	return rv;
+}
 static void
 tegra_pcie_setup(struct tegra_pcie_softc * const sc)
+{
 	size_t i;
 	/*
 	 * Map PCI address spaces into ARM address space via
 	 * HyperTransport-like "FPCI".
 	 */
 	static const struct { uint32_t size, base, fpci; } pcie_init_table[] = {
 		/*