svn commit: r304413 - stable/10/sys/dev/ahci

[Alexander Motin]

Author: mav
Date: Thu Aug 18 11:17:01 2016
New Revision: 304413
URL: https://svnweb.freebsd.org/changeset/base/304413

Log:
  MFC r302946:
  Do not consider the last interrupt shared if there are enough interrupts
  for all channels.

Modified:
  stable/10/sys/dev/ahci/ahci.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ahci/ahci.c
==============================================================================
--- stable/10/sys/dev/ahci/ahci.c	Thu Aug 18 11:15:35 2016	(r304412)
+++ stable/10/sys/dev/ahci/ahci.c	Thu Aug 18 11:17:01 2016	(r304413)
@@ -373,7 +373,8 @@ ahci_setup_interrupt(device_t dev)
 		else if (ctlr->numirqs == 1 || i >= ctlr->channels ||
 		    (ctlr->ccc && i == ctlr->cccv))
 			ctlr->irqs[i].mode = AHCI_IRQ_MODE_ALL;
-		else if (i == ctlr->numirqs - 1)
+		else if (ctlr->channels > ctlr->numirqs &&
+		    i == ctlr->numirqs - 1)
 			ctlr->irqs[i].mode = AHCI_IRQ_MODE_AFTER;
 		else
 			ctlr->irqs[i].mode = AHCI_IRQ_MODE_ONE;