Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved SATA support, from Jonathan A. Kollasch in PR bin/36772: 

* use full 5-bit command queue depth that SATA supports
* decode SATA bits
This commit is contained in:
bouyer 2007-08-21 16:53:18 +00:00
parent dc2a5030fc
commit bd627359dd
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sbin/atactl/atactl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atactl.c,v 1.45 2006/10/16 00:45:19 christos Exp $ */
/* $NetBSD: atactl.c,v 1.46 2007/08/21 16:53:18 bouyer Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: atactl.c,v 1.45 2006/10/16 00:45:19 christos Exp $");
__RCSID("$NetBSD: atactl.c,v 1.46 2007/08/21 16:53:18 bouyer Exp $");
#endif
@ -235,6 +235,24 @@ struct bitinfo ata_cmd_ext[] = {
{ 0, NULL },
};
struct bitinfo ata_sata_caps[] = {
{ SATA_SIGNAL_GEN1, "1.5Gb/s signaling" },
{ SATA_SIGNAL_GEN2, "3.0Gb/s signaling" },
{ SATA_NATIVE_CMDQ, "Native Command Queuing" },
{ SATA_HOST_PWR_MGMT, "Host-Initiated Interface Power Management" },
{ SATA_PHY_EVNT_CNT, "PHY Event Counters" },
{ 0, NULL },
};
struct bitinfo ata_sata_feat[] = {
{ SATA_NONZERO_OFFSETS, "Non-zero Offset DMA" },
{ SATA_DMA_SETUP_AUTO, "DMA Setup Auto Activate" },
{ SATA_DRIVE_PWR_MGMT, "Device-Initiated Interface Power Managment" },
{ SATA_IN_ORDER_DATA, "In-order Data Delivery" },
{ SATA_SW_STTNGS_PRS, "Software Settings Perservation" },
{ 0, NULL },
};
static const struct {
const int id;
const char *name;
@ -886,7 +904,7 @@ device_identify(int argc, char *argv[])
if (inqbuf->atap_queuedepth & WDC_QUEUE_DEPTH_MASK)
printf("Device supports command queue depth of %d\n",
inqbuf->atap_queuedepth & 0xf);
inqbuf->atap_queuedepth & WDC_QUEUE_DEPTH_MASK);
printf("Device capabilities:\n");
print_bitinfo("\t", "\n", inqbuf->atap_capabilities1, ata_caps);
@ -917,6 +935,19 @@ device_identify(int argc, char *argv[])
ata_cmd_ext);
}
if (inqbuf->atap_sata_caps != 0 && inqbuf->atap_sata_caps != 0xffff) {
printf("Serial ATA capabilities:\n");
print_bitinfo("\t", "\n", inqbuf->atap_sata_caps, ata_sata_caps);
}
if (inqbuf->atap_sata_features_supp != 0 && inqbuf->atap_sata_features_supp != 0xffff) {
printf("Serial ATA features:\n");
if (inqbuf->atap_sata_features_en != 0 && inqbuf->atap_sata_features_en != 0xffff)
print_bitinfo2("\t", "\n", inqbuf->atap_sata_features_supp, inqbuf->atap_sata_features_en, ata_sata_feat);
else
print_bitinfo("\t", "\n", inqbuf->atap_sata_features_supp, ata_sata_feat);
}
return;
}

7
sys/dev/ata/atareg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: atareg.h,v 1.29 2006/11/16 01:32:47 christos Exp $ */
/* $NetBSD: atareg.h,v 1.30 2007/08/21 16:53:18 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@ -350,17 +350,20 @@ struct ataparams {
u_int16_t atap_pkt_bsyclr; /* 72: tme to clear BSY after service */
u_int16_t __reserved4[2];
u_int16_t atap_queuedepth; /* 75: */
#define WDC_QUEUE_DEPTH_MASK 0x0F
#define WDC_QUEUE_DEPTH_MASK 0x1F
u_int16_t atap_sata_caps;/* 76: */
#define SATA_SIGNAL_GEN1 0x02
#define SATA_SIGNAL_GEN2 0x04
#define SATA_NATIVE_CMDQ 0x0100
#define SATA_HOST_PWR_MGMT 0x0200
#define SATA_PHY_EVNT_CNT 0x0400
u_int16_t atap_sata_reserved; /* 77: */
u_int16_t atap_sata_features_supp; /* 78: */
#define SATA_NONZERO_OFFSETS 0x02
#define SATA_DMA_SETUP_AUTO 0x04
#define SATA_DRIVE_PWR_MGMT 0x08
#define SATA_IN_ORDER_DATA 0x10
#define SATA_SW_STTNGS_PRS 0x40
u_int16_t atap_sata_features_en; /* 79: */
u_int16_t atap_ata_major; /* 80: Major version number */
#define WDC_VER_ATA1 0x0002