From: Becky Bruce <beckyb@kernel.crashing.org>
To: linuxppc-dev@ozlabs.org, fujita.tomonori@lab.ntt.co.jp
Subject: [PATCH 3/5] powerpc: make dma_window_* in pci_controller struct avail on 32b
Date: Mon, 20 Apr 2009 11:26:48 -0500 [thread overview]
Message-ID: <1240244810-32193-6-git-send-email-beckyb@kernel.crashing.org> (raw)
In-Reply-To: <1240244810-32193-5-git-send-email-beckyb@kernel.crashing.org>
Also, convert them to resource_size_t (which is unsigned long
on 64-bit, so it's not a change there).
We will be using these on fsl 32b to indicate the start and size
address of memory that the pci controller can actually reach - this
is needed to determine if an address requires bounce buffering. For
now, initialize them to a standard value; in the near future, the
value will be calculated based on how the inbound windows are
programmed.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
---
arch/powerpc/include/asm/pci-bridge.h | 6 ++++--
arch/powerpc/sysdev/fsl_pci.c | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 84007af..9861258 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -140,10 +140,12 @@ struct pci_controller {
struct resource io_resource;
struct resource mem_resources[3];
int global_number; /* PCI domain number */
+
+ resource_size_t dma_window_base_cur;
+ resource_size_t dma_window_size;
+
#ifdef CONFIG_PPC64
unsigned long buid;
- unsigned long dma_window_base_cur;
- unsigned long dma_window_size;
void *private_data;
#endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 78021d8..376603d 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -152,6 +152,10 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
out_be32(&pci->piw[2].piwbar,0x00000000);
out_be32(&pci->piw[2].piwar, PIWAR_2G);
+ /* Save the base address and size covered by inbound window mappings */
+ hose->dma_window_base_cur = 0x00000000;
+ hose->dma_window_size = 0x80000000;
+
iounmap(pci);
}
--
1.6.0.6
next prev parent reply other threads:[~2009-04-20 16:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-20 16:26 [PATCH 0/5] SWIOTLB for ppc/mpc86xx Becky Bruce
2009-04-20 16:26 ` [PATCH 0/5] enable swiotlb on ppc/86xx Becky Bruce
2009-04-20 16:26 ` [PATCH 0/5] Allow swiotlb use on ppc/mpc86xx Becky Bruce
2009-04-20 16:26 ` [PATCH 1/5] powerpc: Use sg->dma_length in sg_dma_len() macro on 32-bit Becky Bruce
2009-04-20 16:26 ` [PATCH 2/5] powerpc: Add 36-bit device tree for mpc8641hpcn Becky Bruce
2009-04-20 16:26 ` Becky Bruce [this message]
2009-04-20 16:26 ` [PATCH 4/5] powerpc: Add support for swiotlb on 32-bit Becky Bruce
2009-04-20 16:26 ` [PATCH 5/5] powerpc: Add 86xx support for SWIOTLB Becky Bruce
2009-04-20 17:00 ` Kumar Gala
2009-04-20 17:58 ` Becky Bruce
2009-04-21 2:14 ` Michael Ellerman
2009-04-20 16:57 ` [PATCH 4/5] powerpc: Add support for swiotlb on 32-bit Kumar Gala
2009-04-20 18:03 ` Becky Bruce
2009-04-21 2:39 ` FUJITA Tomonori
2009-04-20 18:31 ` Kumar Gala
2009-04-20 19:06 ` Becky Bruce
2009-04-20 20:04 ` Kumar Gala
2009-04-20 20:16 ` Scott Wood
2009-04-20 16:58 ` [PATCH 3/5] powerpc: make dma_window_* in pci_controller struct avail on 32b Kumar Gala
2009-04-21 1:10 ` [PATCH 2/5] powerpc: Add 36-bit device tree for mpc8641hpcn David Gibson
2009-04-21 15:33 ` Becky Bruce
2009-04-22 1:26 ` David Gibson
2009-04-21 21:11 ` Kumar Gala
2009-04-20 20:06 ` [PATCH 1/5] powerpc: Use sg->dma_length in sg_dma_len() macro on 32-bit Kumar Gala
2009-04-21 2:27 ` FUJITA Tomonori
2009-04-21 15:23 ` Becky Bruce
2009-04-20 16:29 ` [PATCH 0/5] Allow swiotlb use on ppc/mpc86xx Becky Bruce
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=1240244810-32193-6-git-send-email-beckyb@kernel.crashing.org \
--to=beckyb@kernel.crashing.org \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=linuxppc-dev@ozlabs.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;
as well as URLs for NNTP newsgroup(s).