[src/trunk]: src/sys/arch/alpha/pci Revert previous. PR/48431 claims ALPHA_P...

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

details:   https://anonhg.NetBSD.org/src/rev/50848ea04500
branches:  trunk
changeset: 325994:50848ea04500
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Jan 15 14:27:49 2014 +0000

description:
Revert previous.  PR/48431 claims ALPHA_PHYS_TO_K0SEG() is necessary.

Actually CHIP_MEM_SYS_START(v) seems a physical address per *_mem_map()
function, but I don't think mmap() function should return K0SEG address
(it should return PA cookie IIUC) so I guess there is something wrong
in Titan's bus space functions.  I'll investigate them later.

diffstat:

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

diffs (30 lines):

diff -r 9dfa4efba303 -r 50848ea04500 sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c      Wed Jan 15 14:00:09 2014 +0000
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c      Wed Jan 15 14:27:49 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.26 2014/01/13 15:48:09 tsutsui Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.27 2014/01/15 14:27:49 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.26 2014/01/13 15:48:09 tsutsui Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.27 2014/01/15 14:27:49 tsutsui Exp $");
 
 #include <sys/extent.h>
 
@@ -499,10 +499,8 @@
        int prot,
        int flags)
 {
-       bus_addr_t memaddr;
 
-       memaddr = CHIP_MEM_SYS_START(v) + addr + off;
-       return (alpha_btop(ALPHA_K0SEG_TO_PHYS(memaddr)));
+       return (alpha_btop(CHIP_MEM_SYS_START(v) + addr + off));
 }
 
 static inline void