Re: [PATCH 2.6.11+ sata_qstor] libata: sata_qstor cosmetic fixes

[Mark Lord <mlord@pobox.com>]

[-- Attachment #1: Type: text/plain, Size: 678 bytes --]

Jeff Garzik wrote:
> Mark Lord wrote:
> 
>> Minor patch for new 2.6.xx sata_qstor driver attached,
>> as per Alexey's fine-toothed comb!  :)
>>
>> Signed-off-by: Mark Lord <mlord@pobox.com>
> 
> I had to apply this manually, since your mailer "corrupts" the patch by 
> encoding text/plain as base64.  Please fix your mailer...

Mmm.. first time that's ever happened here.
It's not the mailer, but the mime-types,
which must have gotten confused by the ".patch1"
extension, as opposed to the normal ".patch".

Here it is again, renamed to avoid the faulty mime handling.

Signed-off-by: Mark Lord <mlord@pobox.com>

Cheers
-- 
Mark Lord
Real-Time Remedies Inc.
mlord@pobox.com


[-- Attachment #2: sata_qstor-1.patch --]
[-- Type: text/x-patch, Size: 2031 bytes --]

--- linux/drivers/scsi/sata_qstor.c.orig	2005-02-16 20:31:57.000000000 -0500
+++ linux/drivers/scsi/sata_qstor.c	2005-02-23 18:19:31.000000000 -0500
@@ -261,11 +261,11 @@
 		u32 len;
 
 		addr = sg_dma_address(sg);
-		*(u64 *)prd = cpu_to_le64(addr);
+		*(__le64 *)prd = cpu_to_le64(addr);
 		prd += sizeof(u64);
 
 		len = sg_dma_len(sg);
-		*(u32 *)prd = cpu_to_le32(len);
+		*(__le32 *)prd = cpu_to_le32(len);
 		prd += sizeof(u64);
 
 		VPRINTK("PRD[%u] = (0x%llX, 0x%X)\n", nelem,
@@ -298,10 +298,10 @@
 	/* host control block (HCB) */
 	buf[ 0] = QS_HCB_HDR;
 	buf[ 1] = hflags;
-	*(u32 *)(&buf[ 4]) = cpu_to_le32(qc->nsect * ATA_SECT_SIZE);
-	*(u32 *)(&buf[ 8]) = cpu_to_le32(qc->n_elem);
+	*(__le32 *)(&buf[ 4]) = cpu_to_le32(qc->nsect * ATA_SECT_SIZE);
+	*(__le32 *)(&buf[ 8]) = cpu_to_le32(qc->n_elem);
 	addr = ((u64)pp->pkt_dma) + QS_CPB_BYTES;
-	*(u64 *)(&buf[16]) = cpu_to_le64(addr);
+	*(__le64 *)(&buf[16]) = cpu_to_le64(addr);
 
 	/* device control block (DCB) */
 	buf[24] = QS_DCB_HDR;
@@ -566,10 +566,10 @@
 	int rc, have_64bit_bus = (bus_info & QS_HPHY_64BIT);
 
 	if (have_64bit_bus &&
-	    !pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
-		rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);
+	    !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+		rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
 		if (rc) {
-			rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+			rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
 			if (rc) {
 				printk(KERN_ERR DRV_NAME
 					"(%s): 64-bit DMA enable failed\n",
@@ -578,14 +578,14 @@
 			}
 		}
 	} else {
-		rc = pci_set_dma_mask(pdev, 0xffffffffULL);
+		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
 		if (rc) {
 			printk(KERN_ERR DRV_NAME
 				"(%s): 32-bit DMA enable failed\n",
 				pci_name(pdev));
 			return rc;
 		}
-		rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
+		rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
 		if (rc) {
 			printk(KERN_ERR DRV_NAME
 				"(%s): 32-bit consistent DMA enable failed\n",