diff options
| author | msmith <msmith@FreeBSD.org> | 2000-09-01 23:09:02 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 2000-09-01 23:09:02 +0000 |
| commit | 8221b137c1637fd489edff43924af352ba2c1d20 (patch) | |
| tree | 18c12ae67f900d0e6faeda2be9bf81636bb25cd3 | |
| parent | f1b30bdb023013dc95e47514ca4a9bf919981630 (diff) | |
| download | FreeBSD-src-8221b137c1637fd489edff43924af352ba2c1d20.zip FreeBSD-src-8221b137c1637fd489edff43924af352ba2c1d20.tar.gz | |
If a base address register has been set up by the BIOS, but the relevant
enable bit hasn't been set in the command register, set the bit and
honour the register. It seems that quite a few lazy BIOS writers
aren't bothering to do this, which upsets the existing code and causes
us to miss out on properly-configured devices.
| -rw-r--r-- | sys/dev/pci/pci.c | 19 | ||||
| -rw-r--r-- | sys/pci/pci.c | 19 |
2 files changed, 26 insertions, 12 deletions
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 64f86b8..49b4611 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -948,7 +948,7 @@ pci_add_map(device_t pcib, int b, int s, int f, int reg, u_int8_t ln2size; u_int8_t ln2range; u_int32_t testval; - + u_int16_t cmd; int type; map = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); @@ -983,11 +983,18 @@ pci_add_map(device_t pcib, int b, int s, int f, int reg, else printf(", enabled\n"); } - - if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) - return 1; - if (type == SYS_RES_MEMORY && !pci_memen(pcib, b, s, f)) - return 1; + + /* Turn on resources that have been left off by a lazy BIOS */ + if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) { + cmd = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_COMMAND, 2); + cmd |= PCIM_CMD_PORTEN; + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); + } + if (type == SYS_RES_MEMORY && !pci_memen(pcib, b, s, f)) { + cmd = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_COMMAND, 2); + cmd |= PCIM_CMD_MEMEN; + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); + } resource_list_add(rl, type, reg, base, base + (1 << ln2size) - 1, diff --git a/sys/pci/pci.c b/sys/pci/pci.c index 64f86b8..49b4611 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -948,7 +948,7 @@ pci_add_map(device_t pcib, int b, int s, int f, int reg, u_int8_t ln2size; u_int8_t ln2range; u_int32_t testval; - + u_int16_t cmd; int type; map = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); @@ -983,11 +983,18 @@ pci_add_map(device_t pcib, int b, int s, int f, int reg, else printf(", enabled\n"); } - - if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) - return 1; - if (type == SYS_RES_MEMORY && !pci_memen(pcib, b, s, f)) - return 1; + + /* Turn on resources that have been left off by a lazy BIOS */ + if (type == SYS_RES_IOPORT && !pci_porten(pcib, b, s, f)) { + cmd = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_COMMAND, 2); + cmd |= PCIM_CMD_PORTEN; + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); + } + if (type == SYS_RES_MEMORY && !pci_memen(pcib, b, s, f)) { + cmd = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_COMMAND, 2); + cmd |= PCIM_CMD_MEMEN; + PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); + } resource_list_add(rl, type, reg, base, base + (1 << ln2size) - 1, |
