[src/trunk]: src/sys/arch/alpha/pci bus_space_mmap(9) function should return ...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa89dfbc7aad
branches:  trunk
changeset: 792691:fa89dfbc7aad
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Mon Jan 13 15:48:09 2014 +0000

description:
bus_space_mmap(9) function should return alpha_btop(PA), not alpha_btop(VA).

Pointed out in PR port-alpha/48431 from nullnilaki.

diffstat:

 sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 9146fe48a325 -r fa89dfbc7aad sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c      Mon Jan 13 12:07:55 2014 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c      Mon Jan 13 15:48:09 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.25 2012/02/06 02:14:15 matt Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.26 2014/01/13 15:48:09 tsutsui Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.25 2012/02/06 02:14:15 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.26 2014/01/13 15:48:09 tsutsui Exp $");
 
 #include <sys/extent.h>
 
@@ -499,8 +499,10 @@
        int prot,
        int flags)
 {
+       bus_addr_t memaddr;
 
-       return (alpha_btop(CHIP_MEM_SYS_START(v) + addr + off));
+       memaddr = CHIP_MEM_SYS_START(v) + addr + off;
+       return (alpha_btop(ALPHA_K0SEG_TO_PHYS(memaddr)));
 }
 
 static inline void