Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PCI_MAPREG_TYPE_ROM and allow it to be used with pci_mapreg_map(). 

Fix to configure (but do not enable) BARs for expansion ROMs.
Reviewed by briggs@
This commit is contained in:
gdamore 2006-02-27 16:11:58 +00:00
parent 8c32a44b4d
commit 9978357901
3 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sys/dev/pci/pci_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_map.c,v 1.14 2005/12/11 12:22:50 christos Exp $ */
/* $NetBSD: pci_map.c,v 1.15 2006/02/27 16:11:58 gdamore Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.14 2005/12/11 12:22:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.15 2006/02/27 16:11:58 gdamore Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -111,11 +111,12 @@ pci_mem_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
{
pcireg_t address, mask, address1 = 0, mask1 = 0xffffffff;
u_int64_t waddress, wmask;
int s, is64bit;
int s, is64bit, isrom;
is64bit = (PCI_MAPREG_MEM_TYPE(type) == PCI_MAPREG_MEM_TYPE_64BIT);
isrom = (reg == PCI_MAPREG_ROM);
if (reg < PCI_MAPREG_START ||
if ((!isrom) && (reg < PCI_MAPREG_START ||
#if 0
/*
* Can't do this check; some devices have mapping registers
@ -123,7 +124,7 @@ pci_mem_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
*/
reg >= PCI_MAPREG_END ||
#endif
(reg & 3))
(reg & 3)))
panic("pci_mem_find: bad request");
if (is64bit && (reg + 4) >= PCI_MAPREG_END)
@ -152,15 +153,24 @@ pci_mem_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
}
splx(s);
if (PCI_MAPREG_TYPE(address) != PCI_MAPREG_TYPE_MEM) {
printf("pci_mem_find: expected type mem, found i/o\n");
return (1);
}
if (PCI_MAPREG_MEM_TYPE(address) != PCI_MAPREG_MEM_TYPE(type)) {
printf("pci_mem_find: expected mem type %08x, found %08x\n",
PCI_MAPREG_MEM_TYPE(type),
PCI_MAPREG_MEM_TYPE(address));
return (1);
if (!isrom) {
/*
* roms should have an enable bit instead of a memory
* type decoder bit. For normal BARs, make sure that
* the address decoder type matches what we asked for.
*/
if (PCI_MAPREG_TYPE(address) != PCI_MAPREG_TYPE_MEM) {
printf("pci_mem_find: expected type mem, found i/o\n");
return (1);
}
if (PCI_MAPREG_MEM_TYPE(address) !=
PCI_MAPREG_MEM_TYPE(type)) {
printf("pci_mem_find: "
"expected mem type %08x, found %08x\n",
PCI_MAPREG_MEM_TYPE(type),
PCI_MAPREG_MEM_TYPE(address));
return (1);
}
}
waddress = (u_int64_t)address1 << 32UL | address;
@ -208,7 +218,7 @@ pci_mem_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
*sizep = PCI_MAPREG_MEM64_SIZE(wmask);
}
if (flagsp != 0)
*flagsp = PCI_MAPREG_MEM_PREFETCHABLE(address) ?
*flagsp = (isrom || PCI_MAPREG_MEM_PREFETCHABLE(address)) ?
BUS_SPACE_MAP_PREFETCHABLE : 0;
return (0);
@ -287,6 +297,17 @@ pci_mapreg_map(struct pci_attach_args *pa, int reg, pcireg_t type,
tag = pa->pa_memt;
}
if (reg == PCI_MAPREG_ROM) {
pcireg_t mask;
int s;
/* we have to enable the ROM address decoder... */
s = splhigh();
mask = pci_conf_read(pa->pa_pc, pa->pa_tag, reg);
mask |= PCI_MAPREG_ROM_ENABLE;
pci_conf_write(pa->pa_pc, pa->pa_tag, reg, mask);
splx(s);
}
if (bus_space_map(tag, base, size, busflags | flags, &handle))
return (1);

11
sys/dev/pci/pciconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciconf.c,v 1.28 2006/02/10 20:52:57 gdamore Exp $ */
/* $NetBSD: pciconf.c,v 1.29 2006/02/27 16:11:58 gdamore Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.28 2006/02/10 20:52:57 gdamore Exp $");
__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.29 2006/02/27 16:11:58 gdamore Exp $");
#include "opt_pci.h"
@ -808,7 +808,7 @@ setup_memwins(pciconf_bus_t *pb)
for (pm=pb->pcimemwin; pm < &pb->pcimemwin[pb->nmemwin] ; pm++) {
if (pm->reg == PCI_MAPREG_ROM && pm->address != -1) {
pd = pm->dev;
if (!(pd->enable & PCI_CONF_ENABLE_ROM))
if (!(pd->enable & PCI_CONF_MAP_ROM))
continue;
if (pci_conf_debug) {
print_tag(pd->pc, pd->tag);
@ -817,7 +817,10 @@ setup_memwins(pciconf_bus_t *pb)
PRIx64 " (reg %x)\n", pm->size,
pm->address, pm->reg);
}
base = (pcireg_t) (pm->address | PCI_MAPREG_ROM_ENABLE);
base = (pcireg_t) pm->address;
if (pd->enable & PCI_CONF_ENABLE_ROM)
base |= PCI_MAPREG_ROM_ENABLE;
pci_conf_write(pd->pc, pd->tag, pm->reg, base);
}
}

3
sys/dev/pci/pcireg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcireg.h,v 1.47 2005/12/11 12:22:50 christos Exp $ */
/* $NetBSD: pcireg.h,v 1.48 2006/02/27 16:11:58 gdamore Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@ -352,6 +352,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_MAPREG_TYPE_MASK 0x00000001
#define PCI_MAPREG_TYPE_MEM 0x00000000
#define PCI_MAPREG_TYPE_ROM 0x00000000
#define PCI_MAPREG_TYPE_IO 0x00000001
#define PCI_MAPREG_ROM_ENABLE 0x00000001