From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759094AbZB0TVr (ORCPT ); Fri, 27 Feb 2009 14:21:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756397AbZB0TVf (ORCPT ); Fri, 27 Feb 2009 14:21:35 -0500 Received: from palinux.external.hp.com ([192.25.206.14]:33563 "EHLO mail.parisc-linux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755739AbZB0TVe (ORCPT ); Fri, 27 Feb 2009 14:21:34 -0500 Date: Fri, 27 Feb 2009 12:21:17 -0700 From: Matthew Wilcox To: Jeremy Higdon Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, jesse.barnes@intel.com, habeck@sgi.com, linux-ia64@vger.kernel.org Subject: Re: [PATCH 1/1] Fix PCI DMA flag propagation on SN (Altix) with PICs Message-ID: <20090227192116.GO16891@parisc-linux.org> References: <20090227093835.GA306198@sgi.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090227093835.GA306198@sgi.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 27, 2009 at 01:38:35AM -0800, Jeremy Higdon wrote: > 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 ... > Signed-off-by: Jeremy Higdon > > --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2009-02-25 23:29:21.000000000 -0800 > +++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2009-02-25 23:29:09.318611870 -0800 > @@ -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 majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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."