Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb863e85 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Kumar Gala
Browse files

powerpc/85xx: Fix SWIOTLB initalization for MPC85xxMDS boards 



The code inside '#ifdef CONFIG_QUICC_ENGINE' makes the
mpc85xx_mds_setup_arch() return early if no QE nodes present,
and so SWIOTLB is never initialized.

This patch fixes the issue by moving SWIOTLB code above
QE.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@mvista.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent f933a41e

arch/powerpc/platforms/85xx/mpc85xx_mds.c

+8 −8
Original line number Diff line number Diff line
@@ -202,6 +202,14 @@ static void __init mpc85xx_mds_setup_arch(void) 
	mpc85xx_smp_init();

#endif



#ifdef CONFIG_SWIOTLB

	if (lmb_end_of_DRAM() > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

	}

#endif



#ifdef CONFIG_QUICC_ENGINE

	np = of_find_compatible_node(NULL, NULL, "fsl,qe");

	if (!np) {
@@ -323,14 +331,6 @@ static void __init mpc85xx_mds_setup_arch(void) 


	}

#endif	/* CONFIG_QUICC_ENGINE */



#ifdef CONFIG_SWIOTLB

	if (lmb_end_of_DRAM() > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

	}

#endif

}