Author: emaste
Date: Tue Jun 13 18:59:34 2017
New Revision: 319915
URL: https://svnweb.freebsd.org/changeset/base/319915
Log:
MFC r317428 (cognet): fix arm64 MSI
In arm_gicv2m_alloc_msi(), if we found a suitable irq range, leave the loop
before we increase irq again, or we'd end up choosing an irq, and then
really using the next one, even if it's not available.
Also in the inner loop, correct the end check so that we check every irq,
even the last one.
This makes the msk(4) adapter able to use MSI on Softiron Overdrive 1000.
PR: 219956
Approved by: re (gjb)
Modified:
stable/11/sys/arm/arm/gic.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/arm/arm/gic.c
==============================================================================
--- stable/11/sys/arm/arm/gic.c Tue Jun 13 18:55:21 2017 (r319914)
+++ stable/11/sys/arm/arm/gic.c Tue Jun 13 18:59:34 2017 (r319915)
@@ -1640,7 +1640,7 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int
mtx_lock(&sc->sc_mutex);
found = false;
- for (irq = sc->sc_spi_start; irq < sc->sc_spi_end && !found; irq++) {
+ for (irq = sc->sc_spi_start; irq < sc->sc_spi_end; irq++) {
/* Start on an aligned interrupt */
if ((irq & (maxcount - 1)) != 0)
continue;
@@ -1649,7 +1649,7 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int
found = true;
/* Check this range is valid */
- for (end_irq = irq; end_irq != irq + count - 1; end_irq++) {
+ for (end_irq = irq; end_irq != irq + count; end_irq++) {
/* No free interrupts */
if (end_irq == sc->sc_spi_end) {
found = false;
@@ -1666,6 +1666,8 @@ arm_gicv2m_alloc_msi(device_t dev, device_t child, int
break;
}
}
+ if (found)
+ break;
}
/* Not enough interrupts were found */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
