port-evbmips/51563: ERLITE reboots immediately when it halts

[rokuyama%rk.phys.keio.ac.jp@localhost]

>Number:         51563
>Category:       port-evbmips
>Synopsis:       ERLITE reboots immediately when it halts
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    port-evbmips-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 19 19:35:00 +0000 2016
>Originator:     Rin Okuyama
>Release:        7.99.39
>Organization:
Faculty of Science and Technology, Keio University
>Environment:
NetBSD erlite 7.99.39 NetBSD 7.99.39 (ERLITE_RO) #1: Thu Oct 20 03:48:18 JST 2016  rin@xxx:xxx evbmips
>Description:
When we halt ERLITE, it says "Press any key to reboot", but it
immediately reboots instead of waiting key input.
>How-To-Repeat:
Do halt ERLITE.
>Fix:
Poll and getc from console in the same manner to other boards.

--- src/sys/arch/evbmips/cavium/machdep.c.orig	2016-10-20 03:43:50.808605975 +0900
+++ src/sys/arch/evbmips/cavium/machdep.c	2016-10-20 03:47:14.595360479 +0900
@@ -448,6 +448,9 @@
 		printf("\n");
 		printf("The operating system has halted.\n");
 		printf("Please press any key to reboot.\n\n");
+		cnpollc(1);	/* For proper keyboard command handling */
+		cngetc();
+		cnpollc(0);
 	}
 
 	printf("%s\n\n", ((howto & RB_HALT) != 0) ? "halted." : "rebooting...");