summaryrefslogtreecommitdiff
path: root/sys/dev/ic
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2009-11-22 12:51:10 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2009-11-22 12:51:10 +0000
commit9243ce3c703127e01e3c928126df06a53473c862 (patch)
tree1799f6b304850f5d981cb787d46ff3ea056dfde3 /sys/dev/ic
parent11a1c7efa2b12cdf007828372b743c866209f699 (diff)
Probe modes for SATA disks, makes CF behind SATA work and gives
more speed to things like SSDs that do UDMA 6. Tested by many.
Diffstat (limited to 'sys/dev/ic')
-rw-r--r--sys/dev/ic/wdc.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 36ba261cfcc..aaf79e7ab57 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc.c,v 1.103 2009/10/13 19:33:16 pirofti Exp $ */
+/* $OpenBSD: wdc.c,v 1.104 2009/11/22 12:51:09 jsg Exp $ */
/* $NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -1245,21 +1245,6 @@ wdc_probe_caps(drvp, params)
int i, valid_mode_found;
int cf_flags = drvp->cf_flags;
- if ((wdc->cap & WDC_CAPABILITY_SATA) != 0 &&
- (params->atap_sata_caps != 0x0000 &&
- params->atap_sata_caps != 0xffff)) {
- WDCDEBUG_PRINT(("%s: atap_sata_caps=0x%x\n", __func__,
- params->atap_sata_caps), DEBUG_PROBE);
-
- /* Skip ATA modes detection for native SATA drives */
- drvp->PIO_mode = drvp->PIO_cap = 4;
- drvp->DMA_mode = drvp->DMA_cap = 2;
- drvp->UDMA_mode = drvp->UDMA_cap = 5;
- drvp->drive_flags |= DRIVE_SATA | DRIVE_MODE | DRIVE_UDMA;
- drvp->ata_vers = 4;
- return;
- }
-
if ((wdc->cap & (WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32)) ==
(WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32)) {
struct ataparams params2;