PERFORCE change 171505 for review

[Alexander Motin]

http://p4web.freebsd.org/chv.cgi?CH=171505

Change 171505 by mav at mav_mavtest on 2009/12/07 18:19:13

	Explicitly acknowledge MSI completion, as required by SiI3124.
	It makes MSI working there. Later (and cheaper) chips (3132/3531)
	still crashing system in few seconds under high interrupt rate.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#28 edit
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#12 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#28 (text+ko) ====

@@ -143,6 +143,7 @@
 	if (!(ctlr->r_gmem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
 	    &ctlr->r_grid, RF_ACTIVE)))
 		return (ENXIO);
+	ctlr->gctl = ATA_INL(ctlr->r_gmem, SIIS_GCTL);
 	/* Channels memory */
 	ctlr->r_rid = PCIR_BAR(2);
 	if (!(ctlr->r_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
@@ -221,7 +222,8 @@
 
 	bus_generic_suspend(dev);
 	/* Put controller into reset state. */
-	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET);
+	ctlr->gctl |= SIIS_GCTL_GRESET;
+	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
 	return 0;
 }
 
@@ -231,10 +233,13 @@
 	struct siis_controller *ctlr = device_get_softc(dev);
 
 	/* Put controller into reset state. */
-	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, SIIS_GCTL_GRESET);
+	ctlr->gctl |= SIIS_GCTL_GRESET;
+	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
 	DELAY(10000);
 	/* Get controller out of reset state and enable port interrupts. */
-	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, 0x0000000f);
+	ctlr->gctl &= ~(SIIS_GCTL_GRESET | SIIS_GCTL_I2C_IE);
+	ctlr->gctl |= 0x0000000f;
+	ATA_OUTL(ctlr->r_gmem, SIIS_GCTL, ctlr->gctl);
 	return (bus_generic_resume(dev));
 }
 
@@ -288,6 +293,11 @@
 			ctlr->interrupt[unit].function(arg);
 		}
 	}
+	/* Acknowledge interrupt, if MSI enabled. */
+	if (ctlr->irq.r_irq_rid) {
+		ATA_OUTL(ctlr->r_gmem, SIIS_GCTL,
+		    ctlr->gctl | SIIS_GCTL_MSIACK);
+	}
 }
 
 static struct resource *

==== //depot/projects/scottl-camlock/src/sys/dev/siis/siis.h#12 (text+ko) ====

@@ -403,6 +403,7 @@
 	} irq;
 	int			quirks;
 	int			channels;
+	uint32_t		gctl;
 	struct {
 		void			(*function)(void *);
 		void			*argument;