 @@ -1,14 +1,14 @@
-/*	$NetBSD: ata_raid_via.c,v 1.5 2008/03/18 20:46:36 cube Exp $	*/
+/*	$NetBSD: ata_raid_via.c,v 1.6 2008/09/19 16:49:27 christos Exp $	*/
 /*-
  * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
  * 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,
  *    without modification, immediately at the beginning of the file.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Support for parsing VIA V-RAID ATA RAID controller configuration blocks.
+ *
  * Adapted to NetBSD by Tim Rightnour (garbled@netbsd.org)
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.5 2008/03/18 20:46:36 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_via.c,v 1.6 2008/09/19 16:49:27 christos Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/fcntl.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/kauth.h>
 @@ -110,27 +110,27 @@ ata_raid_via_print_info(struct via_raid_
 	printf("=================================================\n");
+}
 #endif
 int
 ata_raid_read_config_via(struct wd_softc *sc)
+{
 	struct via_raid_conf *info;
 	struct atabus_softc *atabus;
 	struct vnode *vp;
 	int bmajor, error;
 	dev_t dev;
 	uint32_t drive;
-	uint8_t checksum, *ptr;
+	uint8_t checksum, checksum_alt, byte3, *ptr;
 	int count, disk;
 	struct ataraid_array_info *aai;
 	struct ataraid_disk_info *adi;
 	info = malloc(sizeof(*info), M_DEVBUF, M_WAITOK);
 	bmajor = devsw_name2blk(device_xname(sc->sc_dev), NULL, 0);
 	/* Get a vnode for the raw partition of this disk. */
 	dev = MAKEDISKDEV(bmajor, device_unit(sc->sc_dev), RAW_PART);
 	error = bdevvp(dev, &vp);
 	if (error)
 		goto out;
 @@ -155,35 +155,38 @@ ata_raid_read_config_via(struct wd_softc
 	ata_raid_via_print_info(info);
 	printf("MAGIC == 0x%02x\n", info->magic);
 #endif
 	/* Check the signature. */
 	if (info->magic != VIA_MAGIC) {
 		DPRINTF(("%s: VIA V-RAID signature check failed\n",
 		    device_xname(sc->sc_dev)));
 		error = ESRCH;
 		goto out;
+	}
 	/* calculate checksum and compare for valid */
-	for (checksum = 0, ptr = (uint8_t *)info, count = 0; count < 50;
+	for (byte3 = 0, checksum = 0, ptr = (uint8_t *)info, count = 0;
-	    count++)
+	    count < 50; count++)
 		if (count == 3)
-			checksum += *ptr++ & ~ VIA_T_BOOTABLE;
+			byte3 = *ptr++;
 		else
 			checksum += *ptr++;
-	if (checksum != info->checksum) {
+	checksum_alt = checksum + (byte3 & ~VIA_T_BOOTABLE);
-		DPRINTF(("%s: VIA V-RAID checksum failed 0x%02x != 0x%02x\n",
+	checksum += byte3;
-		    device_xname(sc->sc_dev), checksum, info->checksum));
+	if (checksum != info->checksum && checksum_alt != info->checksum) {
 		DPRINTF(("%s: VIA V-RAID checksum failed 0x%02x != "
 		    "0x%02x or 0x%02x\n", device_xname(sc->sc_dev),
 		    info->checksum, checksum, checksum_alt));
 		error = ESRCH;
 		goto out;
+	}
 	/*
 	 * Lookup or allocate a new array info structure for
 	 * this array. Use the serial number of disk0 as the array#
 	 */
 	aai = ata_raid_get_array_info(ATA_RAID_TYPE_VIA, info->disks[0]);
 	aai->aai_status = AAI_S_READY;
 	switch (info->type & VIA_T_MASK) {