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

Commit a5cb82da authored by Bharat Bhushan's avatar Bharat Bhushan Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix assmption of end_of_DRAM() returns end address 



memblock_end_of_DRAM() returns end_address + 1, not end address.
While some code assumes that it returns end address.

Signed-off-by: default avatarBharat Bhushan <bharat.bhushan@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent cf8fb553

arch/powerpc/platforms/44x/currituck.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void __init ppc47x_setup_arch(void) 
	/* No need to check the DMA config as we /know/ our windows are all of

 	 * RAM.  Lets hope that doesn't change */

#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > 0xffffffff) {

	if ((memblock_end_of_DRAM() - 1) > 0xffffffff) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

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

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ void __init corenet_ds_setup_arch(void) 
#endif



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {

	if ((memblock_end_of_DRAM() - 1) > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void __init ge_imp3a_setup_arch(void) 
	mpc85xx_smp_init();



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {

	if ((memblock_end_of_DRAM() - 1) > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void __init mpc8536_ds_setup_arch(void) 
#endif



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {

	if ((memblock_end_of_DRAM() - 1) > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;

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

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void __init mpc85xx_ds_setup_arch(void) 
	mpc85xx_smp_init();



#ifdef CONFIG_SWIOTLB

	if (memblock_end_of_DRAM() > max) {

	if ((memblock_end_of_DRAM() - 1) > max) {

		ppc_swiotlb_enable = 1;

		set_pci_dma_ops(&swiotlb_dma_ops);

		ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;