diff options
| author | Scott Long <scottl@FreeBSD.org> | 2013-08-12 23:30:01 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2013-08-12 23:30:01 +0000 |
| commit | c68534f1d5bab4ad466384c4fb9bb2956811e8b9 (patch) | |
| tree | 34ad11c71aadd28f5ff680b63e3f0fd70956bed5 /sys/dev/ata | |
| parent | 4dc63104ae991922e7116022661fb3c7f366dd33 (diff) | |
| download | src-c68534f1d5bab4ad466384c4fb9bb2956811e8b9.tar.gz src-c68534f1d5bab4ad466384c4fb9bb2956811e8b9.zip | |
Update PCI drivers to no longer look at the MEMIO-enabled bit in the PCI
command register. The lazy BAR allocation code in FreeBSD sometimes
disables this bit when it detects a range conflict, and will re-enable
it on demand when a driver allocates the BAR. Thus, the bit is no longer
a reliable indication of capability, and should not be checked. This
results in the elimination of a lot of code from drivers, and also gives
the opportunity to simplify a lot of drivers to use a helper API to set
the busmaster enable bit.
This changes fixes some recent reports of disk controllers and their
associated drives/enclosures disappearing during boot.
Submitted by: jhb
Reviewed by: jfv, marius, achadd, achim
MFC after: 1 day
Notes
Notes:
svn path=/head/; revision=254263
Diffstat (limited to 'sys/dev/ata')
| -rw-r--r-- | sys/dev/ata/ata-pci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index 0f7e8af4435a..00ad6c73c3e5 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -98,11 +98,8 @@ ata_pci_attach(device_t dev) ctlr->dev = dev; /* if needed try to enable busmastering */ + pci_enable_busmaster(dev); cmd = pci_read_config(dev, PCIR_COMMAND, 2); - if (!(cmd & PCIM_CMD_BUSMASTEREN)) { - pci_write_config(dev, PCIR_COMMAND, cmd | PCIM_CMD_BUSMASTEREN, 2); - cmd = pci_read_config(dev, PCIR_COMMAND, 2); - } /* if busmastering mode "stuck" use it */ if ((cmd & PCIM_CMD_BUSMASTEREN) == PCIM_CMD_BUSMASTEREN) { |