PERFORCE change 117682 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=117682

Change 117682 by mjacob at mjexp on 2007/04/08 19:23:41

	IFC

Affected files ...

.. //depot/projects/mjexp/sys/dev/ata/ata-all.h#6 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-dma.c#5 integrate
.. //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#3 integrate

Differences ...

==== //depot/projects/mjexp/sys/dev/ata/ata-all.h#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.122 2007/04/06 16:18:59 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.123 2007/04/08 19:18:51 sos Exp $
  */
 
 /* ATA register defines */
@@ -441,11 +441,11 @@
     u_int32_t                   segsize;        /* DMA SG list segment size */
     u_int32_t                   max_iosize;     /* DMA data max IO size */
     u_int32_t                   cur_iosize;     /* DMA data current IO size */
+    u_int64_t                   max_address;    /* highest DMA'able address */
     int                         flags;
 #define ATA_DMA_READ                    0x01    /* transaction is a read */
 #define ATA_DMA_LOADED                  0x02    /* DMA tables etc loaded */
 #define ATA_DMA_ACTIVE                  0x04    /* DMA transfer in progress */
-#define ATA_DMA_64BIT                   0x10    /* supports 64bit addressing */
 
     void (*alloc)(device_t dev);
     void (*free)(device_t dev);

==== //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#12 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.195 2007/04/06 17:36:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.196 2007/04/08 19:18:51 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -776,7 +776,7 @@
 	ch->dma->setprd = ata_ahci_dmasetprd;
 	ch->dma->max_iosize = 8192 * DEV_BSIZE;
 	if (ATA_INL(ctlr->r_res2, ATA_AHCI_CAP) & ATA_AHCI_CAP_64BIT)
-	    ch->dma->flags |= ATA_DMA_64BIT;
+	    ch->dma->max_address = BUS_SPACE_MAXADDR;
     }
 }
 
@@ -2734,7 +2734,7 @@
 	ch->dma->setprd = ata_marvell_edma_dmasetprd;
 	
 	if (ATA_INL(ctlr->r_res1, 0x00d00) & 0x00000004)
-	    ch->dma->flags |= ATA_DMA_64BIT;
+	    ch->dma->max_address = BUS_SPACE_MAXADDR;
     }
 }
 
@@ -4816,8 +4816,7 @@
     if (ch->dma) {
 	/* note start and stop are not used here */
 	ch->dma->setprd = ata_siiprb_dmasetprd;
-
-	ch->dma->flags |= ATA_DMA_64BIT;
+	ch->dma->max_address = BUS_SPACE_MAXADDR;
     }
 }
 

==== //depot/projects/mjexp/sys/dev/ata/ata-dma.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.145 2007/04/08 15:31:39 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.146 2007/04/08 19:18:51 sos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,6 +78,7 @@
 	ch->dma->boundary = 128 * DEV_BSIZE;
 	ch->dma->segsize = 128 * DEV_BSIZE;
 	ch->dma->max_iosize = 128 * DEV_BSIZE;
+	ch->dma->max_address = BUS_SPACE_MAXADDR_32BIT;
     }
 }
 
@@ -95,24 +96,22 @@
 {
     struct ata_channel *ch = device_get_softc(dev);
     struct ata_dc_cb_args ccba;
-    int maxaddr = (ch->dma->flags & ATA_DMA_64BIT ?
-		   BUS_SPACE_MAXADDR : BUS_SPACE_MAXADDR_32BIT);
 
     if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
-			   maxaddr, BUS_SPACE_MAXADDR,
+			   ch->dma->max_address, BUS_SPACE_MAXADDR,
 			   NULL, NULL, ch->dma->max_iosize,
 			   ATA_DMA_ENTRIES, ch->dma->segsize,
 			   0, NULL, NULL, &ch->dma->dmatag))
 	goto error;
 
     if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, PAGE_SIZE,
-			   maxaddr, BUS_SPACE_MAXADDR,
+			   ch->dma->max_address, BUS_SPACE_MAXADDR,
 			   NULL, NULL, MAXTABSZ, 1, MAXTABSZ,
 			   0, NULL, NULL, &ch->dma->sg_tag))
 	goto error;
 
     if (bus_dma_tag_create(ch->dma->dmatag,ch->dma->alignment,ch->dma->boundary,
-			   maxaddr, BUS_SPACE_MAXADDR,
+			   ch->dma->max_address, BUS_SPACE_MAXADDR,
 			   NULL, NULL, ch->dma->max_iosize,
 			   ATA_DMA_ENTRIES, ch->dma->segsize,
 			   0, NULL, NULL, &ch->dma->data_tag))
@@ -133,7 +132,7 @@
 	goto error;
 
     if (bus_dma_tag_create(ch->dma->dmatag, PAGE_SIZE, 64 * 1024,
-			   maxaddr, BUS_SPACE_MAXADDR,
+			   ch->dma->max_address, BUS_SPACE_MAXADDR,
 			   NULL, NULL, MAXWSPCSZ, 1, MAXWSPCSZ,
 			   0, NULL, NULL, &ch->dma->work_tag))
 	goto error;

==== //depot/projects/mjexp/sys/dev/cxgb/cxgb_lro.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
 ***************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.2 2007/04/08 15:04:19 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_lro.c,v 1.3 2007/04/08 18:02:37 kmacy Exp $");
 
 
 #include <sys/param.h>
@@ -210,7 +210,7 @@
 	ih->ip_sum = 0;
 	ih->ip_sum = in_cksum_hdr(ih);
 
-	MBUF_HEADER_CHECK(smh);
+	MBUF_HEADER_CHECK(sm);
 	
 	sm->m_flags |= M_LRO;
 	t3_rx_eth(qs->port, &qs->rspq, sm, 2);
@@ -282,7 +282,7 @@
 		return -1;
 	}
 
-	MBUF_HEADER_CHECK(smh);
+	MBUF_HEADER_CHECK(sm);
 	th = (struct tcphdr *)(sm->m_data + IPH_OFFSET + sizeof (struct ip));
 
 	if (olen) {