From nobody Tue Mar 08 12:52:11 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C051219F41BB; Tue, 8 Mar 2022 12:52:11 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KCZwW4fX5z3lfK; Tue, 8 Mar 2022 12:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646743931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/Ip8eaxwuo6ITidkHnAHmp/wGcGHiC5nUto+/AJRSo=; b=YV7z079yW7P1fpsM8J8kDhfgj+q+pp5Gn9SOfliHhLJjpGETwl8slxn2gEbKeU9zA4mKD6 wQY4GLIy4Afy/oRpAQA0EE7f2URRYHXp6HhnkGkAzYzYbpXn35oMP4Py+MisXxlqRenvCP W0PpKrwUlUPcfPeg3cEdtK3S5OkyJyA2MGHW5q2k2zDhNzzwDVezs83fLx4c2XqhEzPUeb 8HTcAt+pLjoVZAMhzJlHB7dvJmFUPPKquV8IWIu05B27q089ZD7uO/IC9t4nRqZjYbWAPP Rb3iiABqzPPt5laWf0O6lEeHvze27z9MmlbYNHuKA2SKbrNOJkA9ueVYIfBm8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CC911D0BE; Tue, 8 Mar 2022 12:52:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 228CqBHh084079; Tue, 8 Mar 2022 12:52:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 228CqB1n084078; Tue, 8 Mar 2022 12:52:11 GMT (envelope-from git) Date: Tue, 8 Mar 2022 12:52:11 GMT Message-Id: <202203081252.228CqB1n084078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 45b6c31a3801 - main - bcm5974(4): set mode again on resume List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45b6c31a3801555cd7d46620b8aadcd9dd3a607d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646743931; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/Ip8eaxwuo6ITidkHnAHmp/wGcGHiC5nUto+/AJRSo=; b=fu8YmALqLYZonk6wGlKjhSjlJrpr7N18JIRUsWqeGj4mXDiyCUpSfQS+95oYmBVbappf1D 6XIGg0mbGMnMIoHjYl/oTWA5V/QQfQVZHnpJ3N78TNTYkht77lLE6zep3PNRkU5XD/L+vM vXE4X3yOJik0au2YxGFn5b7892J3G+QWM9bt7+SlIyLzhXzZt7dQ6lNJU0hGE/suwQjQGc Jj79U5JWeNDPmXVzbNWugHJJRo7tL4HtsMVSwuYGlQ0Fjcpo1LkU60m2ZMuI1Si03qXZft h6MM5KwMU44Ojmvh0HspmZsWJQgjvT0jnY6OcVYL3ikh3D1mCL8HNsOPT4OS6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646743931; a=rsa-sha256; cv=none; b=t1sGerBsyzdjHqoOtN4oO63wTYdP/38KGYKLp5RXde6tlcxAkZdwkLfuXcQ4T0OUjoHsUi vmmPwK2Ha7xc9cDoLb9B4VyPASuxZog6R6wM6FPaqPYAPyGLPjlsljcN/VKQ1Cyk/FzTmp zkJM3tu0zth842RjAkZGRQMT4HW9QpwdelaM20cnuWNQyX4wxI32ACrJTeoV++e4N5w/am UmiC7grdAT3zFv0ArtjcSrr5gVI1gcS4AWjBq2PfI1KX/BG3YAuFrO2kHMZxry4G2ZXGiI ycFCtzNXMkW6B7DYxkli+StcT+yEkffz/H9dK9eHGLM5zd85CbFHIIZUusV3nA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=45b6c31a3801555cd7d46620b8aadcd9dd3a607d commit 45b6c31a3801555cd7d46620b8aadcd9dd3a607d Author: Greg V AuthorDate: 2022-03-08 12:51:07 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-03-08 12:51:07 +0000 bcm5974(4): set mode again on resume This is necessary to not break SPI devices on suspend-resume. Reviewed by: wulf MFC with: 5aa839c9e2c373275091b8bf529c1311d0b84d76 Differential revision: https://reviews.freebsd.org/D34434 --- sys/dev/hid/bcm5974.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index c940e022d2f1..cef571ed2f49 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -416,6 +416,7 @@ struct bcm5974_softc { struct evdev_dev *sc_evdev; /* device configuration */ const struct bcm5974_dev_params *sc_params; + bool sc_saved_mode; }; static const uint8_t bcm5974_rdesc[] = { @@ -549,6 +550,9 @@ bcm5974_set_device_mode(struct bcm5974_softc *sc, bool on) KASSERT(0 == 1, ("Unknown trackpad type")); } + if (!err) + sc->sc_saved_mode = on; + return (err); } @@ -667,6 +671,16 @@ bcm5974_detach(device_t dev) return (0); } +static int +bcm5974_resume(device_t dev) +{ + struct bcm5974_softc *sc = device_get_softc(dev); + + bcm5974_set_device_mode(sc, sc->sc_saved_mode); + + return (0); +} + static void bcm5974_intr(void *context, void *data, hid_size_t len) { @@ -779,6 +793,7 @@ static device_method_t bcm5974_methods[] = { DEVMETHOD(device_probe, bcm5974_probe), DEVMETHOD(device_attach, bcm5974_attach), DEVMETHOD(device_detach, bcm5974_detach), + DEVMETHOD(device_resume, bcm5974_resume), DEVMETHOD_END };