Browse Source

[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>
Jochen Friedrich 17 years ago
parent
commit
bc63818931
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/ppc/8xx_io/commproc.c

+ 1 - 1
arch/ppc/8xx_io/commproc.c

@@ -459,7 +459,7 @@ EXPORT_SYMBOL(cpm_dpdump);
 
 
 void *cpm_dpram_addr(unsigned long offset)
 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);
 EXPORT_SYMBOL(cpm_dpram_addr);