|
@@ -19,6 +19,7 @@
|
|
|
#include <linux/delay.h>
|
|
|
#include <linux/seq_file.h>
|
|
|
#include <linux/of_platform.h>
|
|
|
+#include <linux/lmb.h>
|
|
|
|
|
|
#include <asm/system.h>
|
|
|
#include <asm/time.h>
|
|
@@ -27,6 +28,7 @@
|
|
|
#include <asm/prom.h>
|
|
|
#include <mm/mmu_decl.h>
|
|
|
#include <asm/udbg.h>
|
|
|
+#include <asm/swiotlb.h>
|
|
|
|
|
|
#include <asm/mpic.h>
|
|
|
|
|
@@ -70,7 +72,9 @@ mpc86xx_hpcn_setup_arch(void)
|
|
|
{
|
|
|
#ifdef CONFIG_PCI
|
|
|
struct device_node *np;
|
|
|
+ struct pci_controller *hose;
|
|
|
#endif
|
|
|
+ dma_addr_t max = 0xffffffff;
|
|
|
|
|
|
if (ppc_md.progress)
|
|
|
ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0);
|
|
@@ -83,6 +87,9 @@ mpc86xx_hpcn_setup_arch(void)
|
|
|
fsl_add_bridge(np, 1);
|
|
|
else
|
|
|
fsl_add_bridge(np, 0);
|
|
|
+ hose = pci_find_hose_for_OF_device(np);
|
|
|
+ max = min(max, hose->dma_window_base_cur +
|
|
|
+ hose->dma_window_size);
|
|
|
}
|
|
|
|
|
|
ppc_md.pci_exclude_device = mpc86xx_exclude_device;
|
|
@@ -94,6 +101,13 @@ mpc86xx_hpcn_setup_arch(void)
|
|
|
#ifdef CONFIG_SMP
|
|
|
mpc86xx_smp_init();
|
|
|
#endif
|
|
|
+
|
|
|
+#ifdef CONFIG_SWIOTLB
|
|
|
+ if (lmb_end_of_DRAM() > max) {
|
|
|
+ ppc_swiotlb_enable = 1;
|
|
|
+ set_pci_dma_ops(&swiotlb_pci_dma_ops);
|
|
|
+ }
|
|
|
+#endif
|
|
|
}
|
|
|
|
|
|
|
|
@@ -158,6 +172,7 @@ static int __init declare_of_platform_devices(void)
|
|
|
return 0;
|
|
|
}
|
|
|
machine_device_initcall(mpc86xx_hpcn, declare_of_platform_devices);
|
|
|
+machine_arch_initcall(mpc86xx_hpcn, swiotlb_setup_bus_notifier);
|
|
|
|
|
|
define_machine(mpc86xx_hpcn) {
|
|
|
.name = "MPC86xx HPCN",
|