On Wednesday, March 4, 2009 12:09:46 pm akpm@xxxxxxxxxxxxxxxxxxxx wrote: > From: Jeremy Higdon <jeremy@xxxxxxx> > > We recently discovered a problem with passing of DMA attributes on SN > systems with the older PIC chips. > > [akpm@xxxxxxxxxxxxxxxxxxxx: coding-style fixes] > Signed-off-by: Jeremy Higdon <jeremy@xxxxxxx> > Cc: <habeck@xxxxxxx> > Cc: "Luck, Tony" <tony.luck@xxxxxxxxx> > Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> > --- > > 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 > @@ -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)) > _ Tony, want to pick this up? Acked-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> Thanks, -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|