From owner-svn-src-head@freebsd.org Mon Jun 22 08:12:21 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B22C2344546; Mon, 22 Jun 2020 08:12:21 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49r2Fd4L1dz4MM4; Mon, 22 Jun 2020 08:12:21 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 90278B176; Mon, 22 Jun 2020 08:12:21 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05M8CLao043361; Mon, 22 Jun 2020 08:12:21 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05M8CLo9043360; Mon, 22 Jun 2020 08:12:21 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202006220812.05M8CLo9043360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Mon, 22 Jun 2020 08:12:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r362489 - head/sys/arm/broadcom/bcm2835 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm/broadcom/bcm2835 X-SVN-Commit-Revision: 362489 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2020 08:12:21 -0000 Author: andrew Date: Mon Jun 22 08:12:21 2020 New Revision: 362489 URL: https://svnweb.freebsd.org/changeset/base/362489 Log: Fix reboot command on the Raspberry Pi series. The Raspbery Pi computers do not properly implement PSCI. The canonical way to reset them is to set a watchdog timer and allow it to expire. Submitted by: Robert Crowston Differential Revision: https://reviews.freebsd.org/D25268 Modified: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Mon Jun 22 07:46:24 2020 (r362488) +++ head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Mon Jun 22 08:12:21 2020 (r362489) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -89,10 +90,12 @@ struct bcmwd_softc { static struct ofw_compat_data compat_data[] = { {"broadcom,bcm2835-wdt", BSD_DTB}, {"brcm,bcm2835-pm-wdt", UPSTREAM_DTB}, + {"brcm,bcm2835-pm", UPSTREAM_DTB}, {NULL, 0} }; static void bcmwd_watchdog_fn(void *private, u_int cmd, int *error); +static void bcmwd_reboot_system(void *, int); static int bcmwd_probe(device_t dev) @@ -143,6 +146,15 @@ bcmwd_attach(device_t dev) mtx_init(&sc->mtx, "BCM2835 Watchdog", "bcmwd", MTX_DEF); EVENTHANDLER_REGISTER(watchdog_list, bcmwd_watchdog_fn, sc, 0); + /* + * Handle reboot events. This needs to happen with slightly greater + * priority than the PSCI handler, since PSCI reset is not properly + * implemented on the Pi and it just puts the Pi into a halt + * state. + */ + EVENTHANDLER_REGISTER(shutdown_final, bcmwd_reboot_system, sc, + SHUTDOWN_PRI_LAST-1); + return (0); } @@ -161,16 +173,17 @@ bcmwd_watchdog_fn(void *private, u_int cmd, int *error if (cmd > 0) { sec = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000000; if (sec == 0 || sec > 15) { - /* + /* * Can't arm * disable watchdog as watchdog(9) requires */ device_printf(sc->dev, "Can't arm, timeout must be between 1-15 seconds\n"); - WRITE(sc, BCM2835_RSTC_REG, + WRITE(sc, BCM2835_RSTC_REG, (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_RESET); mtx_unlock(&sc->mtx); + *error = EINVAL; return; } @@ -187,7 +200,7 @@ bcmwd_watchdog_fn(void *private, u_int cmd, int *error *error = 0; } else - WRITE(sc, BCM2835_RSTC_REG, + WRITE(sc, BCM2835_RSTC_REG, (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_RESET); @@ -208,6 +221,27 @@ bcmwd_watchdog_reset(void) (READ(bcmwd_lsc, BCM2835_RSTC_REG) & BCM2835_RSTC_WRCFG_CLR) | (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_WRCFG_FULL_RESET); +} + +static void +bcmwd_reboot_system(void *sc, int howto) +{ + int cmd, error = 0; + + /* Only handle reset. */ + if (howto & RB_HALT || howto & RB_POWEROFF) + return; + + printf("Resetting system ... "); + + cmd = WD_TO_1SEC; + bcmwd_watchdog_fn(sc, cmd, &error); + + /* Wait for watchdog timeout. */ + DELAY(2000000); + + /* Not reached ... one hopes. */ + printf("failed to reset (errno %d).\n", error); } static device_method_t bcmwd_methods[] = {