 @@ -1,14 +1,14 @@
-/* $NetBSD: dsk.c,v 1.7 2011/01/11 07:01:21 nisimura Exp $ */
+/* $NetBSD: dsk.c,v 1.8 2011/01/22 00:32:41 nisimura Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -144,38 +144,42 @@ spinwait_unbusy(struct dkdev_ata *l, int
 	/*
 	 * For best compatibility it is recommended to wait 400ns and
 	 * read the alternate status byte four times before the status
 	 * is valid.
 	 */
 	delay(1);
 	(void)CSR_READ_1(chan->alt);
 	(void)CSR_READ_1(chan->alt);
 	(void)CSR_READ_1(chan->alt);
 	(void)CSR_READ_1(chan->alt);
 	sts = CSR_READ_1(chan->cmd + _STS);
-	while (milli-- > 0 && sts != 0xff && (sts & ATA_STS_BUSY)) {
+	while (milli-- > 0
 	    && sts != 0xff
 	    && (sts & (ATA_STS_BUSY|ATA_STS_DRDY)) != ATA_STS_DRDY) {
 		delay(1000);
 		sts = CSR_READ_1(chan->cmd + _STS);
+	}
 	msg = NULL;
 	if (sts == 0xff)
 		msg = "returned 0xff";
 	else if (sts & ATA_STS_ERR)
 		msg = "returned ERR";
 	else if (sts & ATA_STS_BUSY)
 		msg = "remains BUSY";
 	else if ((sts & ATA_STS_DRDY) == 0)
 		msg = "no DRDY";
 	if (err != NULL)
 		*err = msg;
 	return msg == NULL;
+}
 int
 perform_atareset(struct dkdev_ata *l, int n)
+{
 	struct dvata_chan *chan = &l->chan[n];
 	CSR_WRITE_1(chan->ctl, ATA_DREQ);
 	delay(10);
 @@ -241,30 +245,30 @@ drive_ident(struct disk *d, char *ident)
 		p[49], p[82], p[83], p[84],
 		p[85], p[86], p[87], p[88]);
 #endif
 	huge = 0;
 	printf("%s: ", d->xname);
 	printf("<%s> ", mkident((char *)ident + 54, 40));
 	if (p[49] & (1 << 8))
 		printf("DMA ");
 	if (p[49] & (1 << 9)) {
 		printf("LBA ");
 		huge = p[60] | (p[61] << 16);
+	}
 	if ((p[83] & 0xc000) == 0x4000 && (p[83] & (1 << 10))) {
 		printf("LBA48 ");
 		huge = p[100] | (p[101] << 16);
 		huge |= (uint64_t)p[102] << 32;
 		huge |= (uint64_t)p[103] << 48;
 		printf("LBA48 ");
+	}
 	huge >>= (1 + 10);
 	printf("%d MB\n", (int)huge);
 	memcpy(d->ident, ident, sizeof(d->ident));
 	d->nsect = huge;
 	d->lba_read = lba_read;
+}
 static char *
 mkident(char *src, int len)
+{
 	static char local[40];
 @@ -347,74 +351,75 @@ decode_dlabel(struct disk *d, char *iobu
 		if (type != NULL)
 			printf("%s%c: %s\n", d->xname, i + 'a', type);
+	}
 #endif
+}
 static void
 set_xfermode(struct dkdev_ata *l, int n)
+{
 	struct dvata_chan *chan = &l->chan[n];
 	CSR_WRITE_1(chan->cmd + _FEA, ATA_XFER);
 	CSR_WRITE_1(chan->cmd + _NSECT, XFER_PIO0);
-	CSR_WRITE_1(chan->cmd + _LBAL, 0);
+	CSR_WRITE_1(chan->cmd + _DEV, ATA_DEV_OBS); /* ??? */
 	CSR_WRITE_1(chan->cmd + _LBAM, 0);
 	CSR_WRITE_1(chan->cmd + _LBAH, 0);
 	CSR_WRITE_1(chan->cmd + _DEV, ATA_DEV_OBS);
 	CSR_WRITE_1(chan->cmd + _CMD, ATA_CMD_SETF);
 	spinwait_unbusy(l, n, 1000, NULL);
+}
 static int
 lba_read(struct disk *d, uint64_t bno, uint32_t bcnt, void *buf)
+{
 	struct dkdev_ata *l;
 	struct dvata_chan *chan;
 	void (*issue)(struct dvata_chan *, uint64_t, uint32_t);
-	int n, rdcnt, i;
+	int n, rdcnt, i, k;
 	uint16_t *p;
 	const char *err;
 	int error;
 	l = d->dvops;
 	n = d->unittag;
 	p = (uint16_t *)buf;
 	chan = &l->chan[n];
 	error = 0;
 	for ( ; bcnt > 0; bno += rdcnt, bcnt -= rdcnt) {
 		issue = (bno < (1ULL<<28)) ? issue28 : issue48;
 		rdcnt = (bcnt > 255) ? 255 : bcnt;
 		(*issue)(chan, bno, rdcnt);
-		if (spinwait_unbusy(l, n, 1000, &err) == 0) {
+		for (k = 0; k < rdcnt; k++) {
-			printf("%s blk %d %s\n", d->xname, (int)bno, err);
+			if (spinwait_unbusy(l, n, 1000, &err) == 0) {
-			error = EIO;
+				printf("%s blk %d %s\n",
-			continue;
+				   d->xname, (int)bno, err);
 				error = EIO;
-		for (i = 0; i < rdcnt * 512; i += 2) {
+				break;
 			/* arrives in native order */
-			*p++ = *(uint16_t *)(chan->cmd + _DAT);
+			for (i = 0; i < 512; i += 2) {
 				/* arrives in native order */
 				*p++ = *(uint16_t *)(chan->cmd + _DAT);
+			}
 			/* clear irq if any */
 			(void)CSR_READ_1(chan->cmd + _STS);
+		}
 		(void)CSR_READ_1(chan->cmd + _STS);
+	}
 	return error;
+}
 static void
 issue48(struct dvata_chan *chan, uint64_t bno, uint32_t nblk)
+{
-	CSR_WRITE_1(chan->cmd + _NSECT, 0);
+	CSR_WRITE_1(chan->cmd + _NSECT, 0); /* always less than 256 */
 	CSR_WRITE_1(chan->cmd + _LBAL, (bno >> 24) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAM, (bno >> 32) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAH, (bno >> 40) & 0xff);
 	CSR_WRITE_1(chan->cmd + _NSECT, nblk);
 	CSR_WRITE_1(chan->cmd + _LBAL, (bno >>  0) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAM, (bno >>  8) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAH, (bno >> 16) & 0xff);
 	CSR_WRITE_1(chan->cmd + _DEV, ATA_DEV_LBA);
 	CSR_WRITE_1(chan->cmd + _CMD, ATA_CMD_READ_EXT);
+}
 static void
 issue28(struct dvata_chan *chan, uint64_t bno, uint32_t nblk)