aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h6
-rw-r--r--arch/powerpc/sysdev/fsl_pci.c4
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 84007afabdb5..9861258f6a4c 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -140,10 +140,12 @@ struct pci_controller {
140 struct resource io_resource; 140 struct resource io_resource;
141 struct resource mem_resources[3]; 141 struct resource mem_resources[3];
142 int global_number; /* PCI domain number */ 142 int global_number; /* PCI domain number */
143
144 resource_size_t dma_window_base_cur;
145 resource_size_t dma_window_size;
146
143#ifdef CONFIG_PPC64 147#ifdef CONFIG_PPC64
144 unsigned long buid; 148 unsigned long buid;
145 unsigned long dma_window_base_cur;
146 unsigned long dma_window_size;
147 149
148 void *private_data; 150 void *private_data;
149#endif /* CONFIG_PPC64 */ 151#endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 78021d8afc53..376603df7c49 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,
152 out_be32(&pci->piw[2].piwbar,0x00000000); 152 out_be32(&pci->piw[2].piwbar,0x00000000);
153 out_be32(&pci->piw[2].piwar, PIWAR_2G); 153 out_be32(&pci->piw[2].piwar, PIWAR_2G);
154 154
155 /* Save the base address and size covered by inbound window mappings */
156 hose->dma_window_base_cur = 0x00000000;
157 hose->dma_window_size = 0x80000000;
158
155 iounmap(pci); 159 iounmap(pci);
156} 160}
157 161