From: akpm@linux-foundation.org
To: linux-ia64@vger.kernel.org
Subject: [patch for 2.6.29? 1/1] ia64: fix PCI DMA flag propagation on SN (Altix) with PICs
Date: Wed, 04 Mar 2009 20:09:46 +0000 [thread overview]
Message-ID: <200903042009.n24K9kpC029740@imap1.linux-foundation.org> (raw)
From: Jeremy Higdon <jeremy@sgi.com>
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: Jeremy Higdon <jeremy@sgi.com>
Cc: <habeck@sgi.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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-sn-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))
_
next reply other threads:[~2009-03-04 20:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-04 20:09 akpm [this message]
2009-03-12 17:15 ` [patch for 2.6.29? 1/1] ia64: fix PCI DMA flag propagation on SN (Altix) with PICs Jesse Barnes
2009-03-12 17:41 ` [patch for 2.6.29? 1/1] ia64: fix PCI DMA flag propagation on Luck, Tony
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200903042009.n24K9kpC029740@imap1.linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-ia64@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox