Skip to contentSkip to conversation

Fix PCI DMA flag propagation on SN (Altix) with PICs

PATCH In review Jeremy Higdon 3 participants 3 messages Feb 27, 2009

lore
Share & tools
lore
#0 lore raw

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

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

arch/ia64/sn/pci/pcibr/pcibr_dma.c +3 -4
@@ -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))
#1 lore raw
Quoted 4 lines · Jeremy Higdon

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

Hm, doubt it will apply (it came through my Exchange account so probably not); I usually have people send to my personal addr for that reason. Do you need this in 2.6.29?

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#2 lore raw
In reply to Jeremy Higdon
Quoted 2 lines · Jeremy Higdon

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

I think this should go in through the ia64 tree, not the PCI tree ...

Quoted 23 lines
arch/ia64/sn/pci/pcibr/pcibr_dma.c +3 -5
@@ -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-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 4 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."