ia64: fix PCI DMA flag propagation on SN (Altix) with PICs
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.
[[email protected]: coding-style fixes]
Signed-off-by Jeremy Higdon <[email protected]>
Cc <[email protected]>
Cc "Luck, Tony" <[email protected]>
Cc Jesse Barnes <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
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
@@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_inif (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 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.
[[email protected]: coding-style fixes]Signed-off-by Jeremy Higdon <[email protected]>Cc <[email protected]>Cc "Luck, Tony" <[email protected]>Cc Jesse Barnes <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
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-picsarch/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.carch/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_inif (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?
Acked-by Jesse Barnes <[email protected]>
Thanks,
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
RE: [patch for 2.6.29? 1/1] ia64: fix PCI DMA flag propagation on
In reply to [email protected]