diff options
author | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-22 05:15:40 +0000 |
---|---|---|
committer | Christopher Pascoe <pascoe@cvs.openbsd.org> | 2007-03-22 05:15:40 +0000 |
commit | b93fdb088d782a58fa4cf8574f67f6e2b426d4d4 (patch) | |
tree | 241eca5b313d55a4880064741deba2b65f890a79 /sys/dev | |
parent | ce8315700497970c966aef6f83555bb8500210b5 (diff) |
Let atascsi issue NCQ commands if the controller supports it.
This includes a nasty hack to reduce openings and throw away command slots
if the device supports a lower queue depth than the host controller does.
Yes, we're thinking about a better solution.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/ata/atascsi.c | 64 | ||||
-rw-r--r-- | sys/dev/ata/atascsi.h | 10 | ||||
-rw-r--r-- | sys/dev/pci/ahci.c | 25 |
3 files changed, 84 insertions, 15 deletions
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index 21f89a636c7..134a027250a 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.32 2007/03/21 23:40:30 pascoe Exp $ */ +/* $OpenBSD: atascsi.c,v 1.33 2007/03/22 05:15:39 pascoe Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -41,6 +41,8 @@ struct atascsi { struct scsi_adapter as_switch; struct scsi_link as_link; struct scsibus_softc *as_scsibus; + + int as_capability; }; int atascsi_cmd(struct scsi_xfer *); @@ -101,6 +103,7 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa) as->as_dev = self; as->as_cookie = aaa->aaa_cookie; as->as_methods = aaa->aaa_methods; + as->as_capability = aaa->aaa_capability; /* copy from template and modify for ourselves */ as->as_switch = atascsi_switch; @@ -114,6 +117,8 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa) as->as_link.luns = 1; /* XXX port multiplier as luns */ as->as_link.adapter_target = aaa->aaa_nports; as->as_link.openings = aaa->aaa_ncmds; + if (as->as_capability & ASAA_CAP_NEEDS_RESERVED) + as->as_link.openings--; as->as_ports = malloc(sizeof(struct ata_port *) * aaa->aaa_nports, M_DEVBUF, M_WAITOK); @@ -128,7 +133,7 @@ atascsi_attach(struct device *self, struct atascsi_attach_args *aaa) /* stash the scsibus so we can do hotplug on it */ as->as_scsibus = (struct scsibus_softc *)config_found(self, &saa, - scsiprint); + scsiprint); return (as); } @@ -161,6 +166,7 @@ atascsi_probe(struct atascsi *as, int port) } ap = malloc(sizeof(struct ata_port), M_DEVBUF, M_WAITOK); + bzero(ap, sizeof(struct ata_port)); ap->ap_as = as; ap->ap_port = port; ap->ap_type = type; @@ -318,7 +324,19 @@ atascsi_disk_cmd(struct scsi_xfer *xs) fis->lba_mid = (lba >> 8) & 0xff; fis->lba_high = (lba >> 16) & 0xff; - if (sector_count > 0x100 || lba > 0xfffffff) { + if (ap->ap_ncqdepth && !(xs->flags & SCSI_POLL)) { + /* Use NCQ */ + xa->flags |= ATA_F_NCQ; + fis->command = (xa->flags & ATA_F_WRITE) ? + ATA_C_WRITE_FPDMA : ATA_C_READ_FPDMA; + fis->device = ATA_H2D_DEVICE_LBA; + fis->lba_low_exp = (lba >> 24) & 0xff; + fis->lba_mid_exp = (lba >> 32) & 0xff; + fis->lba_high_exp = (lba >> 40) & 0xff; + fis->sector_count = xa->tag << 3; + fis->features = sector_count & 0xff; + fis->features_exp = (sector_count >> 8) & 0xff; + } else if (sector_count > 0x100 || lba > 0xfffffff) { /* Use LBA48 */ fis->command = (xa->flags & ATA_F_WRITE) ? ATA_C_WRITEDMA_EXT : ATA_C_READDMA_EXT; @@ -398,8 +416,12 @@ void atascsi_disk_inq_done(struct ata_xfer *xa) { struct scsi_xfer *xs = xa->atascsi_private; + struct scsi_link *link = xs->sc_link; + struct atascsi *as = link->adapter_softc; + struct ata_port *ap = as->as_ports[link->target]; struct ata_identify id; struct scsi_inquiry_data inq; + int host_ncqdepth, complete = 0; switch (xa->state) { case ATA_S_COMPLETE: @@ -417,6 +439,7 @@ atascsi_disk_inq_done(struct ata_xfer *xa) bcopy(&inq, xs->data, MIN(sizeof(inq), xs->datalen)); xs->error = XS_NOERROR; + complete = 1; break; case ATA_S_ERROR: @@ -433,6 +456,41 @@ atascsi_disk_inq_done(struct ata_xfer *xa) xs->flags |= ITSDONE; scsi_done(xs); + + if (!complete || (ap->ap_features & ATA_PORT_F_PROBED)) + return; + + ap->ap_features = ATA_PORT_F_PROBED; + + if (as->as_capability & ASAA_CAP_NCQ && (letoh16(id.satacap) & + (1 << 8))) { + /* + * At this point, openings should be the number of commands the + * host controller supports, less the one that is outstanding + * as a result of this inquiry, less any reserved slot the + * host controller needs for recovery. + */ + host_ncqdepth = link->openings + 1 + ((as->as_capability & + ASAA_CAP_NEEDS_RESERVED) ? 1 : 0); + + ap->ap_ncqdepth = (letoh16(id.qdepth) & 0x1f) + 1; + + /* Limit the number of openings to what the device supports. */ + if (host_ncqdepth > ap->ap_ncqdepth) + link->openings -= (host_ncqdepth - ap->ap_ncqdepth); + + /* + * XXX throw away any xfers that have tag numbers higher than + * what the device supports. + */ + while (host_ncqdepth--) { + struct ata_xfer *xa; + + xa = ata_get_xfer(ap, 1); + if (xa->tag < ap->ap_ncqdepth) + ata_put_xfer(xa); + } + } } int diff --git a/sys/dev/ata/atascsi.h b/sys/dev/ata/atascsi.h index 9ad4176d397..d85ce20a392 100644 --- a/sys/dev/ata/atascsi.h +++ b/sys/dev/ata/atascsi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.h,v 1.19 2007/03/21 12:41:28 pascoe Exp $ */ +/* $OpenBSD: atascsi.h,v 1.20 2007/03/22 05:15:39 pascoe Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -30,6 +30,8 @@ struct atascsi; #define ATA_C_READDMA_EXT 0x25 #define ATA_C_WRITEDMA_EXT 0x35 #define ATA_C_PACKET 0xa0 +#define ATA_C_READ_FPDMA 0x60 +#define ATA_C_WRITE_FPDMA 0x61 struct ata_identify { u_int16_t config; /* 0 */ @@ -198,6 +200,9 @@ struct ata_port { #define ATA_PORT_T_NONE 0 #define ATA_PORT_T_DISK 1 #define ATA_PORT_T_ATAPI 2 + int ap_features; +#define ATA_PORT_F_PROBED (1 << 0) + int ap_ncqdepth; }; struct ata_xfer { @@ -257,6 +262,9 @@ struct atascsi_attach_args { void (*aaa_minphys)(struct buf *); int aaa_nports; int aaa_ncmds; + int aaa_capability; +#define ASAA_CAP_NCQ (1 << 0) +#define ASAA_CAP_NEEDS_RESERVED (1 << 1) }; struct atascsi *atascsi_attach(struct device *, struct atascsi_attach_args *); diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c index e420ec28f39..b26ff882566 100644 --- a/sys/dev/pci/ahci.c +++ b/sys/dev/pci/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.95 2007/03/21 13:08:44 pascoe Exp $ */ +/* $OpenBSD: ahci.c,v 1.96 2007/03/22 05:15:39 pascoe Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -552,7 +552,7 @@ ahci_attach(struct device *parent, struct device *self, void *aux) struct pci_attach_args *pa = aux; const struct ahci_device *ad; struct atascsi_attach_args aaa; - u_int32_t reg; + u_int32_t cap, pi; int i; ad = ahci_lookup_device(pa); @@ -585,13 +585,13 @@ ahci_attach(struct device *parent, struct device *self, void *aux) sc->sc_dmat = pa->pa_dmat; - reg = ahci_read(sc, AHCI_REG_CAP); - sc->sc_ncmds = AHCI_REG_CAP_NCS(reg); + cap = ahci_read(sc, AHCI_REG_CAP); + sc->sc_ncmds = AHCI_REG_CAP_NCS(cap); #ifdef AHCI_DEBUG if (ahcidebug & AHCI_D_VERBOSE) { const char *gen; - switch (reg & AHCI_REG_CAP_ISS) { + switch (cap & AHCI_REG_CAP_ISS) { case AHCI_REG_CAP_ISS_G1: gen = "1 (1.5Gbps)"; break; @@ -604,16 +604,16 @@ ahci_attach(struct device *parent, struct device *self, void *aux) } printf("%s: capabilities: 0x%b ports: %d ncmds: %d gen: %s\n", - DEVNAME(sc), reg, AHCI_FMT_CAP, - AHCI_REG_CAP_NP(reg), sc->sc_ncmds, gen); + DEVNAME(sc), cap, AHCI_FMT_CAP, + AHCI_REG_CAP_NP(cap), sc->sc_ncmds, gen); } #endif - reg = ahci_read(sc, AHCI_REG_PI); + pi = ahci_read(sc, AHCI_REG_PI); DPRINTF(AHCI_D_VERBOSE, "%s: ports implemented: 0x%08x\n", - DEVNAME(sc), reg); + DEVNAME(sc), pi); for (i = 0; i < AHCI_MAX_PORTS; i++) { - if (!ISSET(reg, 1 << i)) { + if (!ISSET(pi, 1 << i)) { /* dont allocate stuff if the port isnt implemented */ continue; } @@ -627,7 +627,10 @@ ahci_attach(struct device *parent, struct device *self, void *aux) aaa.aaa_methods = &ahci_atascsi_methods; aaa.aaa_minphys = minphys; aaa.aaa_nports = AHCI_MAX_PORTS; - aaa.aaa_ncmds = sc->sc_ncmds - 1; /* Reserve a slot for soft resets. */ + aaa.aaa_ncmds = sc->sc_ncmds; + aaa.aaa_capability = ASAA_CAP_NEEDS_RESERVED; + if (cap & AHCI_REG_CAP_SNCQ) + aaa.aaa_capability |= ASAA_CAP_NCQ; sc->sc_atascsi = atascsi_attach(self, &aaa); |