d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved verification of configuration space accesses working:

Browse Source 
Scan for devices instead of assuming that device 0 is present on bus 0
of every PCI motherboard.
This commit is contained in:
se 1995-09-14 20:27:31 +00:00
parent 2ebf50a34b
commit ef09df95b6
6 changed files with 114 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/amd64/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)

23
sys/amd64/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)

23
sys/i386/isa/pcibus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)

23
sys/i386/pci/pci_bus.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)

23
sys/i386/pci/pci_cfgreg.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)

23
sys/i386/pci/pci_pir.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: pcibus.c,v 1.10 1995/06/30 16:11:42 se Exp $
** $Id: pcibus.c,v 1.11 1995/09/13 17:03:47 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@ -83,6 +83,9 @@
**-----------------------------------------------------------------
*/
static int
pcibus_check (void);
static void
pcibus_setup (void);
@ -150,6 +153,18 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_FORWARD_PORT 0x0cfa
static int
pcibus_check (void)
{
u_char device;
for (device = 0; device < pci_maxdevice; device++) {
if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
return 1;
}
return 0;
}
static void
pcibus_setup (void)
{
@ -169,7 +184,7 @@ pcibus_setup (void)
if (result & CONF1_ENABLE) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -183,7 +198,7 @@ pcibus_setup (void)
if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
pci_mechanism = 2;
pci_maxdevice = 16;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
};
@ -201,7 +216,7 @@ pcibus_setup (void)
if (result == CONF1_ENABLE_RES2) {
pci_mechanism = 1;
pci_maxdevice = 32;
if (pcibus_read (pcibus_tag (0,0,0), 0) != 0xfffffffful)
if (pcibus_check())
return;
}
if (result != 0xfffffffful)