mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 08:44:41 +00:00 
			
		
		
		
	[PPC] Fix cpm_dpram_addr returning phys mem instead of virt mem
cpm_dpram_addr returns physical memory of the DP RAM instead of iomapped virtual memory. As there usually is a 1:1 MMU map of the IMMR area, this is often not noticed. However, cpm_dpram_phys assumes this iomapped virtual memory and returns garbage on the 1:1 mapped memory causing CPM1 uart console to fail. This patch fixes the problem (copied from the powerpc tree). Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
		
							parent
							
								
									83af919e0f
								
							
						
					
					
						commit
						bc63818931
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		|  | @ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump); | |||
| 
 | ||||
| void *cpm_dpram_addr(unsigned long offset) | ||||
| { | ||||
| 	return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset; | ||||
| 	return (void *)(dpram_vbase + offset); | ||||
| } | ||||
| EXPORT_SYMBOL(cpm_dpram_addr); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Jochen Friedrich
						Jochen Friedrich