diff options
| author | jhb <jhb@FreeBSD.org> | 2009-12-30 20:47:14 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2009-12-30 20:47:14 +0000 |
| commit | 9b53c8050d11d206fc12ee51b23d56389bd41bd3 (patch) | |
| tree | 2e18981b24feef6425f28326218e699e93b7e1d7 /sys/dev/cardbus/cardbus_cis.c | |
| parent | 8c20c2b016bbf46383564d9219cd1f96c9d02af5 (diff) | |
| download | FreeBSD-src-9b53c8050d11d206fc12ee51b23d56389bd41bd3.zip FreeBSD-src-9b53c8050d11d206fc12ee51b23d56389bd41bd3.tar.gz | |
Teach the PCI bus driver to handle PCIR_BIOS BARs properly and remove special
handling for the PCIR_BIOS decoding enable bit from the cardbus driver.
The PCIR_BIOS BAR does include type bits like other BARs. Instead, it is
always a 32-bit non-prefetchable memory BAR where the low bit is used as a
flag to enable decoding.
Reviewed by: imp
Diffstat (limited to 'sys/dev/cardbus/cardbus_cis.c')
| -rw-r--r-- | sys/dev/cardbus/cardbus_cis.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/dev/cardbus/cardbus_cis.c b/sys/dev/cardbus/cardbus_cis.c index 9d443b2..5e52c3b 100644 --- a/sys/dev/cardbus/cardbus_cis.c +++ b/sys/dev/cardbus/cardbus_cis.c @@ -430,9 +430,6 @@ cardbus_read_tuple_finish(device_t cbdev, device_t child, int rid, { if (res != CIS_CONFIG_SPACE) { bus_release_resource(child, SYS_RES_MEMORY, rid, res); - if (rid == PCIM_CIS_ASI_ROM) - pci_write_config(child, rid, pci_read_config(child, - rid, 4) & ~PCIR_BIOS, 4); } } @@ -477,9 +474,6 @@ cardbus_read_tuple_init(device_t cbdev, device_t child, uint32_t *start, return (NULL); } DEVPRINTF((cbdev, "CIS Mapped to %#lx\n", rman_get_start(res))); - if (*rid == PCIR_BIOS) - pci_write_config(child, *rid, - rman_get_start(res) | PCIM_BIOS_ENABLE, 4); /* Flip to the right ROM image if CIS is in ROM */ if (space == PCIM_CIS_ASI_ROM) { |
