[PATCH 1/1] Fix PCI DMA flag propagation on SN (Altix) with PICs

[Jeremy Higdon]

We recently discovered a problem with passing of DMA attributes on
SN systems with the older PIC chips.

Signed-off-by: Jeremy Higdon <jeremy@xxxxxxx>

--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c	2009-02-25 23:29:21.000000000 -0800
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c	2009-02-25 23:29:09.318611870 -0800
@@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_in
 	if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)
 		pci_addr = IS_PIC_SOFT(pcibus_info) ?
 				PHYS_TO_DMA(paddr) :
-		    		PHYS_TO_TIODMA(paddr) | dma_attributes;
+		    		PHYS_TO_TIODMA(paddr);
 	else
-		pci_addr = IS_PIC_SOFT(pcibus_info) ?
-				paddr :
-				paddr | dma_attributes;
+		pci_addr = paddr;
+	pci_addr |= dma_attributes;
 
 	/* Handle Bus mode */
 	if (IS_PCIX(pcibus_info))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/