Commit c63c5805 authored by Jeremy Higdon's avatar Jeremy Higdon Committed by Tony Luck

[IA64] 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.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarJeremy Higdon <jeremy@sgi.com>
Cc: <habeck@sgi.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 559595a9
...@@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr, ...@@ -135,11 +135,10 @@ pcibr_dmatrans_direct64(struct pcidev_info * info, u64 paddr,
if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS) if (SN_DMA_ADDRTYPE(dma_flags) == SN_DMA_ADDR_PHYS)
pci_addr = IS_PIC_SOFT(pcibus_info) ? pci_addr = IS_PIC_SOFT(pcibus_info) ?
PHYS_TO_DMA(paddr) : PHYS_TO_DMA(paddr) :
PHYS_TO_TIODMA(paddr) | dma_attributes; PHYS_TO_TIODMA(paddr);
else else
pci_addr = IS_PIC_SOFT(pcibus_info) ? pci_addr = paddr;
paddr : pci_addr |= dma_attributes;
paddr | dma_attributes;
/* Handle Bus mode */ /* Handle Bus mode */
if (IS_PCIX(pcibus_info)) if (IS_PCIX(pcibus_info))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment