mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 08:44:41 +00:00 
			
		
		
		
	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: Bharat Bhushan <bharat.bhushan@freescale.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
		
							parent
							
								
									cf8fb5533f
								
							
						
					
					
						commit
						a5cb82da78
					
				
					 8 changed files with 8 additions and 8 deletions
				
			
		|  | @ -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; | ||||
|  |  | |||
|  | @ -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; | ||||
|  |  | |||
|  | @ -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; | ||||
|  |  | |||
|  | @ -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; | ||||
|  |  | |||
|  | @ -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; | ||||
|  |  | |||
|  | @ -359,7 +359,7 @@ static void __init mpc85xx_mds_setup_arch(void) | |||
| 	mpc85xx_mds_qe_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; | ||||
|  |  | |||
|  | @ -450,7 +450,7 @@ static void __init p1022_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; | ||||
|  |  | |||
|  | @ -102,7 +102,7 @@ mpc86xx_hpcn_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; | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Bharat Bhushan
						Bharat Bhushan