Oops, map PCI memory space at VA 0xf8000000 instead of in the middle

of user VM space at 0x48000000.
This commit is contained in:
scw 2003-12-08 13:40:33 +00:00
parent 12dc5d733c
commit c2415a0dc3
2 changed files with 13 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ixp425_pci.c,v 1.2 2003/10/08 14:55:04 scw Exp $ */
/* $NetBSD: ixp425_pci.c,v 1.3 2003/12/08 13:40:33 scw Exp $ */
/*
* Copyright (c) 2003
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.2 2003/10/08 14:55:04 scw Exp $");
__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.3 2003/12/08 13:40:33 scw Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -97,8 +97,8 @@ ixp425_pci_init(struct ixp425_softc *sc)
ioext = extent_create("pciio", 0, IXP425_PCI_IO_SIZE - 1,
M_DEVBUF, NULL, 0, EX_NOWAIT);
/* PCI MEM space is mapped same address as real memory */
memext = extent_create("pcimem", IXP425_PCI_MEM_VBASE,
IXP425_PCI_MEM_VBASE +
memext = extent_create("pcimem", IXP425_PCI_MEM_HWBASE,
IXP425_PCI_MEM_HWBASE +
IXP425_PCI_MEM_SIZE - 1,
M_DEVBUF, NULL, 0, EX_NOWAIT);
printf("%s: configuring PCI bus\n", sc->sc_dev.dv_xname);

View File

@ -1,4 +1,4 @@
/* $NetBSD: ixp425reg.h,v 1.14 2003/11/16 12:41:03 scw Exp $ */
/* $NetBSD: ixp425reg.h,v 1.15 2003/12/08 13:40:33 scw Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@ -70,6 +70,12 @@
/*
* FFFF FFFF ---------------------------
*
* FC00 0000 ---------------------------
* PCI Data (memory space)
* F800 0000 ---------------------------
*
* F001 3000 ---------------------------
* SDRAM Controller
* F001 2000 ---------------------------
* PCI Configuration and Status Registers
* F001 1000 ---------------------------
@ -361,8 +367,8 @@
#define IXP425_PCI_CSR_BASE IXP425_PCI_VBASE
/* PCI Memory Space */
#define IXP425_PCI_MEM_HWBASE 0x48000000UL /* VA == PA */
#define IXP425_PCI_MEM_VBASE IXP425_PCI_MEM_HWBASE
#define IXP425_PCI_MEM_HWBASE 0x48000000UL
#define IXP425_PCI_MEM_VBASE 0xf8000000UL
#define IXP425_PCI_MEM_SIZE 0x04000000UL /* 64MB */
/* PCI I/O Space */