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

Don't allow use of mapreg is they are at or above 0x10000 in I/O space. (in 

other words, if the address uses bits in the top 16 bits, don't use it).
This commit is contained in:
matt 2000-11-05 21:14:59 +00:00
parent d458239a94
commit 43ff857e29
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/pci/pciide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide.c,v 1.88 2000/10/04 09:34:09 bouyer Exp $ */ /* $NetBSD: pciide.c,v 1.89 2000/11/05 21:14:59 matt Exp $ */
/* /*
@ -679,6 +679,7 @@ pciide_mapreg_dma(sc, pa)
struct pci_attach_args *pa; struct pci_attach_args *pa;
{ {
pcireg_t maptype; pcireg_t maptype;
bus_addr_t addr;
/* /*
* Map DMA registers * Map DMA registers
@ -700,6 +701,20 @@ pciide_mapreg_dma(sc, pa)
switch (maptype) { switch (maptype) {
case PCI_MAPREG_TYPE_IO: case PCI_MAPREG_TYPE_IO:
sc->sc_dma_ok = (pci_mapreg_info(pa->pa_pc, pa->pa_tag,
PCIIDE_REG_BUS_MASTER_DMA, PCI_MAPREG_TYPE_IO,
&addr, NULL, NULL) == 0);
if (sc->sc_dma_ok == 0) {
printf(", but unused (couldn't query registers)");
break;
}
if (addr >= 0x10000) {
sc->sc_dma_ok = 0;
printf(", but unused (registers at unsafe address %#lx)", addr);
break;
}
/* FALLTHROUGH */
case PCI_MAPREG_MEM_TYPE_32BIT: case PCI_MAPREG_MEM_TYPE_32BIT:
sc->sc_dma_ok = (pci_mapreg_map(pa, sc->sc_dma_ok = (pci_mapreg_map(pa,
PCIIDE_REG_BUS_MASTER_DMA, maptype, 0, PCIIDE_REG_BUS_MASTER_DMA, maptype, 0,