summaryrefslogtreecommitdiffstats
path: root/sys/i386/pci
diff options
context:
space:
mode:
authorse <se@FreeBSD.org>1995-09-22 19:10:54 +0000
committerse <se@FreeBSD.org>1995-09-22 19:10:54 +0000
commitfe9800b86b648ddcde4e28736fb304c5e646c309 (patch)
tree54d5a54c2f0df7e867843b2172fdab657d53c622 /sys/i386/pci
parentde8f4a44c285d5a7dd142d964c76e7fdb9f94ee8 (diff)
downloadFreeBSD-src-fe9800b86b648ddcde4e28736fb304c5e646c309.zip
FreeBSD-src-fe9800b86b648ddcde4e28736fb304c5e646c309.tar.gz
New approach to the PCI bus configuration mechanism probe problem:
- try to make sure there is any kind of PCI device - if there is anything at port 0x0cf8, then check for mech. 1 or 2
Diffstat (limited to 'sys/i386/pci')
-rw-r--r--sys/i386/pci/pci_bus.c113
-rw-r--r--sys/i386/pci/pci_cfgreg.c113
-rw-r--r--sys/i386/pci/pci_pir.c113
3 files changed, 189 insertions, 150 deletions
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 43346bd..cd8353d 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcibus.c,v 1.13 1995/09/15 21:43:45 se Exp $
+** $Id: pcibus.c,v 1.14 1995/09/18 21:48:39 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@@ -145,11 +145,10 @@ DATA_SET (pcibus_set, i386pci);
#define CONF1_DATA_PORT 0x0cfc
#define CONF1_ENABLE 0x80000000ul
-#define CONF1_ENABLE_CHK1 0xF0000001ul
-#define CONF1_ENABLE_MSK1 0x80000001ul
+#define CONF1_ENABLE_CHK 0x80000000ul
+#define CONF1_ENABLE_CHK1 0xFF000001ul
+#define CONF1_ENABLE_MSK1 0x80000000ul
#define CONF1_ENABLE_RES1 0x80000000ul
-#define CONF1_ENABLE_CHK2 0xfffffffful
-#define CONF1_ENABLE_RES2 0x80fffffcul
#define CONF2_ENABLE_PORT 0x0cf8
#define CONF2_FORWARD_PORT 0x0cfa
@@ -157,91 +156,105 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_ENABLE_CHK 0x0e
#define CONF2_ENABLE_RES 0x0e
-
static int
pcibus_check (void)
{
u_char device;
+ if (bootverbose) printf ("pcibus_check:\tdevice ");
+
for (device = 0; device < pci_maxdevice; device++) {
- if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
+ if (bootverbose) printf ("%d ", device);
+ if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful) {
+ if (bootverbose) printf ("is there\n");
return 1;
+ }
}
+ if (bootverbose) printf ("-- nothing found\n");
return 0;
}
static void
pcibus_setup (void)
{
- u_long result, oldval;
+ unsigned long mode1res,oldval;
+ unsigned char mode2res;
+
+ oldval = inl (CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
+ outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
+ mode1res = inl(CONF1_ADDR_PORT);
+ mode2res = inb(CONF2_ENABLE_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose) {
+ printf ("pcibus_setup(1):\tmode1res=0x%08lx (0x%08lx), "
+ "mode2res=0x%02x (0x%02x)\n",
+ mode1res,CONF1_ENABLE_CHK,
+ (int)mode2res,CONF2_ENABLE_CHK);
+ }
/*---------------------------------------
- ** Configuration mode 1 ?
+ ** No PCI, if neither mode1res nor mode2res could be read back
**---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ if ((mode1res != CONF1_ENABLE_CHK) && (mode2res != CONF2_ENABLE_CHK)) {
+ return;
+ }
+
+ /*---------------------------------------
+ ** Assume configuration mechanism 1 for now ...
+ **---------------------------------------
+ */
+
+ pci_mechanism = 1;
+ pci_maxdevice = 32;
+
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
outb (CONF1_ADDR_PORT +3, 0);
- result = inl (CONF1_ADDR_PORT);
+ mode1res = inl (CONF1_ADDR_PORT);
outl (CONF1_ADDR_PORT, oldval);
- if ((result & CONF1_ENABLE_MSK1) == CONF1_ENABLE_RES1) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
+ if (bootverbose)
+ printf ("pcibus_setup(2):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK);
+
+ if (mode1res) {
if (pcibus_check())
return;
};
- /*---------------------------------------
- ** Configuration mode 2 ?
- **---------------------------------------
- */
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ outl (CONF1_DATA_PORT, 0);
+ mode1res = inl(CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose)
+ printf ("pcibus_setup(3):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK1);
- outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
- outb (CONF2_FORWARD_PORT, 0);
- result = inb (CONF2_ENABLE_PORT);
-
- outb (CONF2_ENABLE_PORT, 0);
- outb (CONF2_FORWARD_PORT, 0);
- if ((result == CONF2_ENABLE_RES)
- && !inb (CONF2_ENABLE_PORT)
- && !inb (CONF2_FORWARD_PORT)) {
- pci_mechanism = 2;
- pci_maxdevice = 16;
+ if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_CHK1) {
if (pcibus_check())
return;
};
-
- /*-----------------------------------------------------
- ** Well, is it Configuration mode 1, after all ?
- **-----------------------------------------------------
+ /*---------------------------------------
+ ** Try configuration mechanism 2 ...
+ **---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK2);
- outl (CONF1_DATA_PORT, 0);
- result = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, oldval);
+ pci_mechanism = 2;
+ pci_maxdevice = 16;
- if (result == CONF1_ENABLE_RES2) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
- if (pcibus_check())
- return;
- }
+ if (pcibus_check())
+ return;
/*---------------------------------------
** No PCI bus host bridge found
**---------------------------------------
*/
- if (bootverbose && (result != 0xfffffffful))
- printf ("pcibus_setup: "
- "wrote 0x%08x, read back 0x%08x, expected 0x%08x\n",
- CONF1_ENABLE_CHK2, result, CONF1_ENABLE_RES2);
-
pci_mechanism = 0;
pci_maxdevice = 0;
}
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 43346bd..cd8353d 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcibus.c,v 1.13 1995/09/15 21:43:45 se Exp $
+** $Id: pcibus.c,v 1.14 1995/09/18 21:48:39 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@@ -145,11 +145,10 @@ DATA_SET (pcibus_set, i386pci);
#define CONF1_DATA_PORT 0x0cfc
#define CONF1_ENABLE 0x80000000ul
-#define CONF1_ENABLE_CHK1 0xF0000001ul
-#define CONF1_ENABLE_MSK1 0x80000001ul
+#define CONF1_ENABLE_CHK 0x80000000ul
+#define CONF1_ENABLE_CHK1 0xFF000001ul
+#define CONF1_ENABLE_MSK1 0x80000000ul
#define CONF1_ENABLE_RES1 0x80000000ul
-#define CONF1_ENABLE_CHK2 0xfffffffful
-#define CONF1_ENABLE_RES2 0x80fffffcul
#define CONF2_ENABLE_PORT 0x0cf8
#define CONF2_FORWARD_PORT 0x0cfa
@@ -157,91 +156,105 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_ENABLE_CHK 0x0e
#define CONF2_ENABLE_RES 0x0e
-
static int
pcibus_check (void)
{
u_char device;
+ if (bootverbose) printf ("pcibus_check:\tdevice ");
+
for (device = 0; device < pci_maxdevice; device++) {
- if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
+ if (bootverbose) printf ("%d ", device);
+ if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful) {
+ if (bootverbose) printf ("is there\n");
return 1;
+ }
}
+ if (bootverbose) printf ("-- nothing found\n");
return 0;
}
static void
pcibus_setup (void)
{
- u_long result, oldval;
+ unsigned long mode1res,oldval;
+ unsigned char mode2res;
+
+ oldval = inl (CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
+ outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
+ mode1res = inl(CONF1_ADDR_PORT);
+ mode2res = inb(CONF2_ENABLE_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose) {
+ printf ("pcibus_setup(1):\tmode1res=0x%08lx (0x%08lx), "
+ "mode2res=0x%02x (0x%02x)\n",
+ mode1res,CONF1_ENABLE_CHK,
+ (int)mode2res,CONF2_ENABLE_CHK);
+ }
/*---------------------------------------
- ** Configuration mode 1 ?
+ ** No PCI, if neither mode1res nor mode2res could be read back
**---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ if ((mode1res != CONF1_ENABLE_CHK) && (mode2res != CONF2_ENABLE_CHK)) {
+ return;
+ }
+
+ /*---------------------------------------
+ ** Assume configuration mechanism 1 for now ...
+ **---------------------------------------
+ */
+
+ pci_mechanism = 1;
+ pci_maxdevice = 32;
+
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
outb (CONF1_ADDR_PORT +3, 0);
- result = inl (CONF1_ADDR_PORT);
+ mode1res = inl (CONF1_ADDR_PORT);
outl (CONF1_ADDR_PORT, oldval);
- if ((result & CONF1_ENABLE_MSK1) == CONF1_ENABLE_RES1) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
+ if (bootverbose)
+ printf ("pcibus_setup(2):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK);
+
+ if (mode1res) {
if (pcibus_check())
return;
};
- /*---------------------------------------
- ** Configuration mode 2 ?
- **---------------------------------------
- */
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ outl (CONF1_DATA_PORT, 0);
+ mode1res = inl(CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose)
+ printf ("pcibus_setup(3):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK1);
- outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
- outb (CONF2_FORWARD_PORT, 0);
- result = inb (CONF2_ENABLE_PORT);
-
- outb (CONF2_ENABLE_PORT, 0);
- outb (CONF2_FORWARD_PORT, 0);
- if ((result == CONF2_ENABLE_RES)
- && !inb (CONF2_ENABLE_PORT)
- && !inb (CONF2_FORWARD_PORT)) {
- pci_mechanism = 2;
- pci_maxdevice = 16;
+ if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_CHK1) {
if (pcibus_check())
return;
};
-
- /*-----------------------------------------------------
- ** Well, is it Configuration mode 1, after all ?
- **-----------------------------------------------------
+ /*---------------------------------------
+ ** Try configuration mechanism 2 ...
+ **---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK2);
- outl (CONF1_DATA_PORT, 0);
- result = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, oldval);
+ pci_mechanism = 2;
+ pci_maxdevice = 16;
- if (result == CONF1_ENABLE_RES2) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
- if (pcibus_check())
- return;
- }
+ if (pcibus_check())
+ return;
/*---------------------------------------
** No PCI bus host bridge found
**---------------------------------------
*/
- if (bootverbose && (result != 0xfffffffful))
- printf ("pcibus_setup: "
- "wrote 0x%08x, read back 0x%08x, expected 0x%08x\n",
- CONF1_ENABLE_CHK2, result, CONF1_ENABLE_RES2);
-
pci_mechanism = 0;
pci_maxdevice = 0;
}
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 43346bd..cd8353d 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pcibus.c,v 1.13 1995/09/15 21:43:45 se Exp $
+** $Id: pcibus.c,v 1.14 1995/09/18 21:48:39 se Exp $
**
** pci bus subroutines for i386 architecture.
**
@@ -145,11 +145,10 @@ DATA_SET (pcibus_set, i386pci);
#define CONF1_DATA_PORT 0x0cfc
#define CONF1_ENABLE 0x80000000ul
-#define CONF1_ENABLE_CHK1 0xF0000001ul
-#define CONF1_ENABLE_MSK1 0x80000001ul
+#define CONF1_ENABLE_CHK 0x80000000ul
+#define CONF1_ENABLE_CHK1 0xFF000001ul
+#define CONF1_ENABLE_MSK1 0x80000000ul
#define CONF1_ENABLE_RES1 0x80000000ul
-#define CONF1_ENABLE_CHK2 0xfffffffful
-#define CONF1_ENABLE_RES2 0x80fffffcul
#define CONF2_ENABLE_PORT 0x0cf8
#define CONF2_FORWARD_PORT 0x0cfa
@@ -157,91 +156,105 @@ DATA_SET (pcibus_set, i386pci);
#define CONF2_ENABLE_CHK 0x0e
#define CONF2_ENABLE_RES 0x0e
-
static int
pcibus_check (void)
{
u_char device;
+ if (bootverbose) printf ("pcibus_check:\tdevice ");
+
for (device = 0; device < pci_maxdevice; device++) {
- if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful)
+ if (bootverbose) printf ("%d ", device);
+ if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful) {
+ if (bootverbose) printf ("is there\n");
return 1;
+ }
}
+ if (bootverbose) printf ("-- nothing found\n");
return 0;
}
static void
pcibus_setup (void)
{
- u_long result, oldval;
+ unsigned long mode1res,oldval;
+ unsigned char mode2res;
+
+ oldval = inl (CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
+ outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
+ mode1res = inl(CONF1_ADDR_PORT);
+ mode2res = inb(CONF2_ENABLE_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose) {
+ printf ("pcibus_setup(1):\tmode1res=0x%08lx (0x%08lx), "
+ "mode2res=0x%02x (0x%02x)\n",
+ mode1res,CONF1_ENABLE_CHK,
+ (int)mode2res,CONF2_ENABLE_CHK);
+ }
/*---------------------------------------
- ** Configuration mode 1 ?
+ ** No PCI, if neither mode1res nor mode2res could be read back
**---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ if ((mode1res != CONF1_ENABLE_CHK) && (mode2res != CONF2_ENABLE_CHK)) {
+ return;
+ }
+
+ /*---------------------------------------
+ ** Assume configuration mechanism 1 for now ...
+ **---------------------------------------
+ */
+
+ pci_mechanism = 1;
+ pci_maxdevice = 32;
+
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK);
outb (CONF1_ADDR_PORT +3, 0);
- result = inl (CONF1_ADDR_PORT);
+ mode1res = inl (CONF1_ADDR_PORT);
outl (CONF1_ADDR_PORT, oldval);
- if ((result & CONF1_ENABLE_MSK1) == CONF1_ENABLE_RES1) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
+ if (bootverbose)
+ printf ("pcibus_setup(2):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK);
+
+ if (mode1res) {
if (pcibus_check())
return;
};
- /*---------------------------------------
- ** Configuration mode 2 ?
- **---------------------------------------
- */
+ outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK1);
+ outl (CONF1_DATA_PORT, 0);
+ mode1res = inl(CONF1_ADDR_PORT);
+ outl (CONF1_ADDR_PORT, oldval);
+
+ if (bootverbose)
+ printf ("pcibus_setup(3):\tmode1res=0x%08lx (0x%08lx)\n",
+ mode1res, CONF1_ENABLE_CHK1);
- outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK);
- outb (CONF2_FORWARD_PORT, 0);
- result = inb (CONF2_ENABLE_PORT);
-
- outb (CONF2_ENABLE_PORT, 0);
- outb (CONF2_FORWARD_PORT, 0);
- if ((result == CONF2_ENABLE_RES)
- && !inb (CONF2_ENABLE_PORT)
- && !inb (CONF2_FORWARD_PORT)) {
- pci_mechanism = 2;
- pci_maxdevice = 16;
+ if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_CHK1) {
if (pcibus_check())
return;
};
-
- /*-----------------------------------------------------
- ** Well, is it Configuration mode 1, after all ?
- **-----------------------------------------------------
+ /*---------------------------------------
+ ** Try configuration mechanism 2 ...
+ **---------------------------------------
*/
- oldval = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, CONF1_ENABLE_CHK2);
- outl (CONF1_DATA_PORT, 0);
- result = inl (CONF1_ADDR_PORT);
- outl (CONF1_ADDR_PORT, oldval);
+ pci_mechanism = 2;
+ pci_maxdevice = 16;
- if (result == CONF1_ENABLE_RES2) {
- pci_mechanism = 1;
- pci_maxdevice = 32;
- if (pcibus_check())
- return;
- }
+ if (pcibus_check())
+ return;
/*---------------------------------------
** No PCI bus host bridge found
**---------------------------------------
*/
- if (bootverbose && (result != 0xfffffffful))
- printf ("pcibus_setup: "
- "wrote 0x%08x, read back 0x%08x, expected 0x%08x\n",
- CONF1_ENABLE_CHK2, result, CONF1_ENABLE_RES2);
-
pci_mechanism = 0;
pci_maxdevice = 0;
}
OpenPOWER on IntegriCloud