Skip to contentSkip to conversation

ia64: fix PCI DMA flag propagation on SN (Altix) with PICs

PATCH In review [email protected] 3 participants 3 messages Mar 4, 2009 – Mar 12, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ia64: fix PCI DMA flag propagation on SN (Altix) with PICs

From: Jeremy Higdon <[email protected]>

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 |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
arch/ia64/sn/pci/pcibr/pcibr_dma.c renamed from arch/ia64/sn/pci/pcibr/pcibr_dma.c~ia64-fix-pci-dma-flag-propagation-on-sn-altix-with-pics +3 -4
diff -puN arch/ia64/sn/pci/pcibr/pcibr_dma.c~ia64-fix-pci-dma-flag-propagation-on-sn-altix-with-pics arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -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))

_

Acked-by on v1 1/1
#1 lore raw
Quoted 36 lines · On Wednesday, March 4, 2009 12:09:46 pm [email protected] wrote:

From: Jeremy Higdon <[email protected]>

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 |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff -puN arch/ia64/sn/pci/pcibr/pcibr_dma.c~ia64-fix-pci-dma-flag-propagation-on-sn- altix-with-pics arch/ia64/sn/pci/pcibr/pcibr_dma.c --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c~ia64-fix-pci-dma-flag-propagation-on-s n-altix-with-pics +++ a/arch/ia64/sn/pci/pcibr/pcibr_dma.c

arch/ia64/sn/pci/pcibr/pcibr_dma.c renamed from arch/ia64/sn/pci/pcibr/pcibr_dma.c~ia64-fix-pci-dma-flag-propagation-on-sn-altix-with-pics +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))
Quoted 1 line

_

Tony, want to pick this up?

Thanks,

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center