Module Name: src
Committed By: bouyer
Date: Wed Aug 1 09:02:04 UTC 2012
Added Files:
src/sys/dev/ata: satapmp_subr.c satapmpvar.h
Log Message:
Apply back changes that were reverted on Jul 24 and Jul 26 (general ata/wdc
cleanup and SATA PMP support), now that I'm back to fix the fallouts.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.9 src/sys/dev/ata/satapmp_subr.c
cvs rdiff -u -r0 -r1.3 src/sys/dev/ata/satapmpvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/ata/satapmp_subr.c
diff -u /dev/null src/sys/dev/ata/satapmp_subr.c:1.9
--- /dev/null Wed Aug 1 09:02:04 2012
+++ src/sys/dev/ata/satapmp_subr.c Wed Aug 1 09:02:03 2012
@@ -0,0 +1,278 @@
+/* $NetBSD: satapmp_subr.c,v 1.9 2012/08/01 09:02:03 bouyer Exp $ */
+
+/*
+ * Copyright (c) 2012 Manuel Bouyer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: satapmp_subr.c,v 1.9 2012/08/01 09:02:03 bouyer Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/conf.h>
+#include <sys/fcntl.h>
+#include <sys/proc.h>
+#include <sys/errno.h>
+#include <sys/kmem.h>
+#include <sys/intr.h>
+
+#include <dev/ata/ataconf.h>
+#include <dev/ata/atareg.h>
+#include <dev/ata/atavar.h>
+
+#include <dev/ata/satapmpvar.h>
+#include <dev/ata/satapmpreg.h>
+#include <dev/ata/satavar.h>
+#include <dev/ata/satareg.h>
+
+static int
+satapmp_read_8(struct ata_channel *chp, int port, int reg, uint64_t *value)
+{
+ struct ata_command ata_c;
+ struct atac_softc *atac = chp->ch_atac;
+ struct ata_drive_datas *drvp;
+
+ KASSERT(port < PMP_MAX_DRIVES);
+ KASSERT(reg < PMP_GSCR_NREGS);
+ KASSERT(chp->ch_ndrives >= PMP_MAX_DRIVES);
+ drvp = &chp->ch_drive[PMP_PORT_CTL];
+ KASSERT(drvp->drive == PMP_PORT_CTL);
+
+ memset(&ata_c, 0, sizeof(struct ata_command));
+
+ ata_c.r_command = PMPC_READ_PORT;
+ ata_c.r_features = reg;
+ ata_c.r_device = port;
+ ata_c.timeout = 3000; /* 3s */
+ ata_c.r_st_bmask = WDCS_DRDY;
+ ata_c.r_st_pmask = 0;
+ ata_c.flags = AT_LBA48 | AT_READREG | AT_WAIT;
+
+ if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,
+ &ata_c) != ATACMD_COMPLETE) {
+ aprint_error_dev(chp->atabus,
+ "PMP register %d read failed\n", reg);
+ return EIO;
+ }
+ if (ata_c.flags & (AT_TIMEOU | AT_DF)) {
+ aprint_error_dev(chp->atabus,
+ "PMP register %d read failed, flags 0x%x\n",
+ reg, ata_c.flags);
+ return EIO;
+ }
+ if (ata_c.flags & AT_ERROR) {
+ aprint_verbose_dev(chp->atabus,
+ "PMP register %d read failed, error 0x%x\n",
+ reg, ata_c.r_error);
+ return EIO;
+ }
+
+ *value = ((uint64_t)((ata_c.r_lba >> 24) & 0xffffff) << 40) |
+ ((uint64_t)((ata_c.r_count >> 8) & 0xff) << 32) |
+ ((uint64_t)((ata_c.r_lba >> 0) & 0xffffff) << 8) |
+ ((uint64_t)((ata_c.r_count >> 0) & 0xff) << 0);
+
+ return 0;
+}
+
+static inline int
+satapmp_read(struct ata_channel *chp, int port, int reg, uint32_t *value)
+{
+ uint64_t value64;
+ int ret;
+
+ ret = satapmp_read_8(chp, port, reg, &value64);
+ if (ret)
+ return ret;
+
+ *value = value64 & 0xffffffff;
+ return ret;
+}
+
+static int
+satapmp_write_8(struct ata_channel *chp, int port, int reg, uint64_t value)
+{
+ struct ata_command ata_c;
+ struct atac_softc *atac = chp->ch_atac;
+ struct ata_drive_datas *drvp;
+
+ KASSERT(port < PMP_MAX_DRIVES);
+ KASSERT(reg < PMP_GSCR_NREGS);
+ KASSERT(chp->ch_ndrives >= PMP_MAX_DRIVES);
+ drvp = &chp->ch_drive[PMP_PORT_CTL];
+ KASSERT(drvp->drive == PMP_PORT_CTL);
+
+ memset(&ata_c, 0, sizeof(struct ata_command));
+
+ ata_c.r_command = PMPC_WRITE_PORT;
+ ata_c.r_features = reg;
+ ata_c.r_device = port;
+ ata_c.r_lba = (((value >> 40) & 0xffffff) << 24) |
+ (((value >> 8) & 0xffffff) << 0);
+ ata_c.r_count = (((value >> 32) & 0xff) << 8) |
+ (((value >> 0) & 0xff) << 0);
+ ata_c.timeout = 3000; /* 3s */
+ ata_c.r_st_bmask = WDCS_DRDY;
+ ata_c.r_st_pmask = 0;
+ ata_c.flags = AT_LBA48 | AT_WAIT;
+
+ if ((*atac->atac_bustype_ata->ata_exec_command)(drvp,
+ &ata_c) != ATACMD_COMPLETE) {
+ aprint_error_dev(chp->atabus,
+ "PMP register %d write failed\n", reg);
+ return EIO;
+ }
+ if (ata_c.flags & (AT_TIMEOU | AT_DF)) {
+ aprint_error_dev(chp->atabus,
+ "PMP register %d write failed, flags 0x%x\n",
+ reg, ata_c.flags);
+ return EIO;
+ }
+ if (ata_c.flags & AT_ERROR) {
+ aprint_verbose_dev(chp->atabus,
+ "PMP register %d write failed, error 0x%x\n",
+ reg, ata_c.r_error);
+ return EIO;
+ }
+ return 0;
+}
+
+static inline int
+satapmp_write(struct ata_channel *chp, int port, int reg, uint32_t value)
+{
+ return satapmp_write_8(chp, port, reg, value);
+}
+
+/*
+ * Reset one port's PHY and bring it online
+ * XXX duplicate of sata_reset_interface()
+ */
+static uint32_t
+satapmp_reset_device_port(struct ata_channel *chp, int port)
+{
+ uint32_t scontrol, sstatus;
+ int i;
+
+ /* bring the PHY online */
+ scontrol = SControl_IPM_NONE | SControl_SPD_ANY | SControl_DET_INIT;
+ if (satapmp_write(chp, port, PMP_PSCR_SControl, scontrol) != 0)
+ return 0;
+
+ tsleep(chp, PRIBIO, "sataup", mstohz(50));
+ scontrol &= ~SControl_DET_INIT;
+ if (satapmp_write(chp, port, PMP_PSCR_SControl, scontrol) != 0)
+ return 0;
+ tsleep(chp, PRIBIO, "sataup", mstohz(50));
+
+ /* wait up to 1s for device to come up */
+ for (i = 0; i < 100; i++) {
+
+ if (satapmp_read(chp, port, PMP_PSCR_SStatus, &sstatus) != 0)
+ return 0;
+ if ((sstatus & SStatus_DET_mask) == SStatus_DET_DEV)
+ break;
+ tsleep(chp, PRIBIO, "sataup", mstohz(10));
+ }
+
+ switch (sstatus & SStatus_DET_mask) {
+ case SStatus_DET_NODEV:
+ /* No Device; be silent. */
+ break;
+ case SStatus_DET_DEV_NE:
+ aprint_error("%s PMP port %d: device connected, but "
+ "communication not established\n",
+ device_xname(chp->atabus), port);
+ break;
+ case SStatus_DET_OFFLINE:
+ aprint_error("%s PMP port %d: PHY offline\n",
+ device_xname(chp->atabus), port);
+ break;
+ case SStatus_DET_DEV:
+ aprint_normal("%s PMP port %d: device present, speed: %s\n",
+ device_xname(chp->atabus), port, sata_speed(sstatus));
+ break;
+ default:
+ aprint_error("%s PMP port %d: unknown SStatus: 0x%08x\n",
+ device_xname(chp->atabus), port, sstatus);
+ }
+ return(sstatus & SStatus_DET_mask);
+}
+
+void
+satapmp_rescan(struct ata_channel *chp) {
+ int i;
+ uint32_t sig;
+
+ KASSERT(chp->ch_satapmp_nports <= PMP_PORT_CTL);
+ KASSERT(chp->ch_satapmp_nports <= chp->ch_ndrives);
+
+ for (i = 0; i < chp->ch_satapmp_nports; i++) {
+ if (chp->ch_drive[i].drive_type != DRIVET_NONE ||
+ satapmp_reset_device_port(chp, i) != SStatus_DET_DEV) {
+ continue;
+ }
+ if (satapmp_write(chp, i, PMP_PSCR_SError, 0xffffffff) != 0) {
+ aprint_error("%s PMP port %d: can't write SError\n",
+ device_xname(chp->atabus), i);
+ continue;
+ }
+ chp->ch_atac->atac_bustype_ata->ata_reset_drive(
+ &chp->ch_drive[i], AT_WAIT, &sig);
+
+ sata_interpret_sig(chp, i, sig);
+ }
+}
+
+void
+satapmp_attach(struct ata_channel *chp)
+{
+ uint32_t id, rev, inf;
+
+ if (satapmp_read(chp, PMP_PORT_CTL, PMP_GSCR_ID, &id) != 0 ||
+ satapmp_read(chp, PMP_PORT_CTL, PMP_GSCR_REV, &rev) != 0 ||
+ satapmp_read(chp, PMP_PORT_CTL, PMP_GSCR_INF, &inf) != 0) {
+ aprint_normal_dev(chp->atabus, "can't read PMP registers\n");
+ return;
+ }
+
+ aprint_normal_dev(chp->atabus,
+ "SATA port multiplier, %d ports\n", PMP_INF_NPORTS(inf));
+ aprint_verbose_dev(chp->atabus,
+ "vendor 0x%04x, product 0x%04x",
+ PMP_ID_VEND(id), PMP_ID_DEV(id));
+ if (rev & PMP_REV_SPEC_11) {
+ aprint_verbose(", revision 1.1");
+ } else if (rev & PMP_REV_SPEC_10) {
+ aprint_verbose(", revision 1.0");
+ } else {
+ aprint_verbose(", unknown revision 0x%x", rev & 0x0f);
+ }
+ aprint_verbose(", level %d\n", PMP_REV_LEVEL(rev));
+
+ chp->ch_satapmp_nports = PMP_INF_NPORTS(inf);
+
+ /* reset and bring up PHYs */
+ satapmp_rescan(chp);
+}
Index: src/sys/dev/ata/satapmpvar.h
diff -u /dev/null src/sys/dev/ata/satapmpvar.h:1.3
--- /dev/null Wed Aug 1 09:02:04 2012
+++ src/sys/dev/ata/satapmpvar.h Wed Aug 1 09:02:03 2012
@@ -0,0 +1,35 @@
+/* $NetBSD: satapmpvar.h,v 1.3 2012/08/01 09:02:03 bouyer Exp $ */
+
+
+/*
+ * Copyright (c) 2012 Manuel Bouyer.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DEV_ATA_SATAPMPVAR_H_
+#define _DEV_ATA_SATAPMPVAR_H_
+
+void satapmp_attach(struct ata_channel *);
+void satapmp_rescan(struct ata_channel *);
+
+#endif /* _DEV_ATA_SATAPMPVAR_H_ */
+
