Tue Oct 30 09:56:41 2018 UTC ()

Pull up the following revisions(s) (requested by rin in ticket #1638):
	sys/dev/hpc/hpckbd.c:	revision 1.33-1.35

Fix kernel crash on hpcmips when console is attached.


(sborrill)

diff -r1.30.12.2 -r1.30.12.3 src/sys/dev/hpc/hpckbd.c

--- src/sys/dev/hpc/hpckbd.c 2017/08/09 06:48:57	1.30.12.2
+++ src/sys/dev/hpc/hpckbd.c 2018/10/30 09:56:41	1.30.12.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hpckbd.c,v 1.30.12.2 2017/08/09 06:48:57 snj Exp $ */
+/*	$NetBSD: hpckbd.c,v 1.30.12.3 2018/10/30 09:56:41 sborrill Exp $ */
 /*-
  * Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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 FOUNDATION OR CONTRIBUTORS
  * 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: hpckbd.c,v 1.30.12.2 2017/08/09 06:48:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.30.12.3 2018/10/30 09:56:41 sborrill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
 #include <sys/bus.h>
 #include <sys/intr.h>
 #include <machine/config_hook.h>
 #include <machine/platid.h>
 @@ -251,45 +251,47 @@ hpckbd_getevent(struct hpckbd_core* hc,
+	}
 	*type = hc->hc_head->hq_type;
 	*data = hc->hc_head->hq_data;
 	hc->hc_nevents--;
 	if (&hc->hc_eventq[NEVENTQ] <= ++hc->hc_head)
 		hc->hc_head = hc->hc_eventq;
 	splx(s);
 	return (1);
+}
-#ifdef hpcsh
+#if defined(hpcsh) || defined(hpcmips)
 /*
- * XXX: Use the old wrong code for now as hpcsh attaches console very
+ * XXX: Use the old wrong code for now as hpcsh and hpcmips attach
- * early and it's convenient to be able to do early DDB on wscons.
+ * console very early when malloc(9) is not yet available.  It is
  * convenient to be able to do early DDB on wscons.
  */
 void
 hpckbd_keymap_setup(struct hpckbd_core *hc,
 		    const keysym_t *map, int mapsize)
+{
 	int i;
 	struct wscons_keydesc *desc;
 	/* fix keydesc table */
 	/*
 	 * XXX The way this is done is really wrong.  The __UNCONST()
 	 * is a hint as to what is wrong.  This actually ends up modifying
 	 * initialized data which is marked "const".
 	 * The reason we get away with it here is that on sh3 kernel
-	 * is directly mapped.
+	 * The reason we get away with it here is that on sh3 and mips
 	 * the kernel is directly mapped.
 	 */
 	desc = (struct wscons_keydesc *)__UNCONST(hpckbd_keymapdata.keydesc);
 	for (i = 0; desc[i].name != 0; i++) {
 		if ((desc[i].name & KB_MACHDEP) && desc[i].map == NULL) {
 			desc[i].map = map;
 			desc[i].map_size = mapsize;
+		}
+	}
 	return;
+}
 #else