summaryrefslogtreecommitdiff
path: root/usr.sbin/bhyve
diff options
context:
space:
mode:
authorPeter Grehan <grehan@FreeBSD.org>2020-11-15 12:59:24 +0000
committerPeter Grehan <grehan@FreeBSD.org>2020-11-15 12:59:24 +0000
commitcd5b6d16cae3fc15b0f673aabde5da5eaa8dba87 (patch)
treeb7b49e407f5b5823575b77d1bfbc05f955ccd75b /usr.sbin/bhyve
parent1b249101df13bc8cd455a28d5eeb87730fe2c0ae (diff)
downloadsrc-test2-cd5b6d16cae3fc15b0f673aabde5da5eaa8dba87.tar.gz
src-test2-cd5b6d16cae3fc15b0f673aabde5da5eaa8dba87.zip
Fix regression in AHCI controller settings.
When the AHCI code was reworked to use FreeBSD struct definitions, the valid element was mis-transcribed resulting in the UMDA capability being hidden. This prevented Illumos from using AHCI disk/cdrom drives. Fix by using definitions that match the code pre-rework. PR: 250924 Submitted by: Rolf Stalder Reported by: Rolf Stalder MFC after: 3 days
Notes
Notes: svn path=/head/; revision=367709
Diffstat (limited to 'usr.sbin/bhyve')
-rw-r--r--usr.sbin/bhyve/pci_ahci.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index 80146916e927..64c1fe0b90ca 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -1004,7 +1004,7 @@ ata_identify_init(struct ahci_port* p, int atapi)
ata_ident->capabilities1 = ATA_SUPPORT_LBA |
ATA_SUPPORT_DMA;
ata_ident->capabilities2 = (1 << 14 | 1);
- ata_ident->atavalid = ATA_FLAG_54_58 | ATA_FLAG_64_70;
+ ata_ident->atavalid = ATA_FLAG_64_70 | ATA_FLAG_88;
ata_ident->obsolete62 = 0x3f;
ata_ident->mwdmamodes = 7;
if (p->xfermode & ATA_WDMA0)
@@ -1053,8 +1053,7 @@ ata_identify_init(struct ahci_port* p, int atapi)
ata_ident->capabilities1 = ATA_SUPPORT_DMA |
ATA_SUPPORT_LBA | ATA_SUPPORT_IORDY;
ata_ident->capabilities2 = (1 << 14);
- ata_ident->atavalid = ATA_FLAG_54_58 |
- ATA_FLAG_64_70;
+ ata_ident->atavalid = ATA_FLAG_64_70 | ATA_FLAG_88;
if (p->mult_sectors)
ata_ident->multi = (ATA_MULTI_VALID | p->mult_sectors);
if (sectors <= 0x0fffffff) {