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

Apparently, Dell PERC 4/Di controllers can have two memory BARs, with the 

second one empty. The previous revision made it pick the empty one.
Reinstate the BAR size check.
This commit is contained in:
fvdl 2003-11-05 16:03:27 +00:00
parent 4a570157d7
commit aad37eaff6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/pci/amr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amr.c,v 1.18 2003/10/29 02:27:32 mycroft Exp $ */ /* $NetBSD: amr.c,v 1.19 2003/11/05 16:03:27 fvdl Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.18 2003/10/29 02:27:32 mycroft Exp $"); __KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.19 2003/11/05 16:03:27 fvdl Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -272,10 +272,12 @@ amr_attach(struct device *parent, struct device *self, void *aux)
reg = pci_conf_read(pc, pa->pa_tag, i); reg = pci_conf_read(pc, pa->pa_tag, i);
switch (PCI_MAPREG_TYPE(reg)) { switch (PCI_MAPREG_TYPE(reg)) {
case PCI_MAPREG_TYPE_MEM: case PCI_MAPREG_TYPE_MEM:
memreg = i; if (PCI_MAPREG_MEM_SIZE(reg) != 0)
memreg = i;
break; break;
case PCI_MAPREG_TYPE_IO: case PCI_MAPREG_TYPE_IO:
ioreg = i; if (PCI_MAPREG_IO_SIZE(reg) != 0)
ioreg = i;
break; break;
} }