From 25e0f400bcbe39b62aab2e6e768420ede1fa02ba Mon Sep 17 00:00:00 2001 From: Becky Bruce Date: Mon, 20 Apr 2009 11:26:48 -0500 Subject: [PATCH] --- yaml --- r: 149599 b: refs/heads/master c: 89d93347d1f66832c43e6b25a669fddff89929b5 h: refs/heads/master i: 149597: 4231ecaef983e04eb652032ad1e9c4f3b7ad054e 149595: 498547e0261437e9c9808b223807b52e791a3546 149591: 842bc5c0fb5f25d3f2c555db802f04af2159723d 149583: 409d69b09e5bce413276158941f157e16167b637 149567: 63098680bba74bb014081389121d656d406474e6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/pci-bridge.h | 6 ++++-- trunk/arch/powerpc/sysdev/fsl_pci.c | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97f88dd7e1ed..5c95b042b05f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da385780489db4f55dad96609511a9a6d1b041cb +refs/heads/master: 89d93347d1f66832c43e6b25a669fddff89929b5 diff --git a/trunk/arch/powerpc/include/asm/pci-bridge.h b/trunk/arch/powerpc/include/asm/pci-bridge.h index 84007afabdb5..9861258f6a4c 100644 --- a/trunk/arch/powerpc/include/asm/pci-bridge.h +++ b/trunk/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/trunk/arch/powerpc/sysdev/fsl_pci.c b/trunk/arch/powerpc/sysdev/fsl_pci.c index 78021d8afc53..376603df7c49 100644 --- a/trunk/arch/powerpc/sysdev/fsl_pci.c +++ b/trunk/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); }