 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -48,27 +48,27 @@
  * 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 OR HIS RELATIVES 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 MIND, 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: machdep.c,v 1.68 2009/05/29 08:39:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2009/05/29 08:44:29 skrll Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_useleds.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -1646,75 +1646,77 @@ hppa_pim64_dump(int check_type)
 		        (unsigned long)checks->pim_check_responder);
 		printf("\nSystem Requestor 0x%016lx",
 		        (unsigned long)checks->pim_check_requestor);
 		printf("\nPath Info 0x%08x",
 		        checks->pim_check_path_info);
+	}
+}
 void
 hppa_machine_check(int check_type)
+{
 	int pdc_pim_type;
 	const char *name;
-	int error;
+	int pimerror, error;
 	/* Do an fcacheall(). */
 	fcacheall();
 	/* Dispatch on the check type. */
 	switch (check_type) {
 	case T_HPMC:
 		name = "HPMC";
 		pdc_pim_type = PDC_PIM_HPMC;
 		break;
 	case T_LPMC:
 		name = "LPMC";
 		pdc_pim_type = PDC_PIM_LPMC;
 		break;
 	case T_INTERRUPT:
 		name = "TOC";
 		pdc_pim_type = PDC_PIM_TOC;
 		break;
 	default:
 		panic("unknown machine check type");
 		/* NOTREACHED */
+	}
-	error = pdc_call((iodcio_t)pdc, 0, PDC_PIM, pdc_pim_type,
+	pimerror = pdc_call((iodcio_t)pdc, 0, PDC_PIM, pdc_pim_type,
-		&pdc_pim, pim_data_buffer, sizeof(pim_data_buffer));
+	    &pdc_pim, pim_data_buffer, sizeof(pim_data_buffer));
 	if (error < 0)
 		printf(" - WARNING: could not transfer PIM info (%d)", error);
-	CTASSERT(pdc_pim.count <= sizeof(pim_data_buffer));
+	KASSERT(pdc_pim.count <= sizeof(pim_data_buffer));
 	/*
 	 * Reset IO and log errors.
+	 *
 	 * This seems to be needed in order to output to the console
 	 * if we take a HPMC interrupt. This PDC procedure may not be
 	 * implemented by some machines.
 	 */
 	error = pdc_call((iodcio_t)pdc, 0, PDC_IO, 0, 0, 0, 0);
-	if (error  != PDC_ERR_OK && error != PDC_ERR_NOPROC)
+	if (error != PDC_ERR_OK && error != PDC_ERR_NOPROC)
 		/* This seems futile if we can't print to the console. */
 		panic("PDC_IO failed");
 	printf("\nmachine check: %s", name);
-	if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
+	if (pimerror < 0) {
-		hppa_pim64_dump(check_type);
+		printf(" - WARNING: could not transfer PIM info (%d)", pimerror);
-	else
+	} else {
-		hppa_pim_dump(check_type);
+		if (hppa_cpu_info->hci_features & HPPA_FTRS_W32B)
 			hppa_pim64_dump(check_type);
 		else
 			hppa_pim_dump(check_type);
+	}
 	printf("\n");
 	/* If this is our first check, panic. */
 	if (in_check == 0) {
 		in_check = 1;
 		DELAY(250000);
 		panic("machine check");
+	}
 	/* Reboot the machine. */
 	printf("Rebooting...\n");
 	cpu_die();