From nobody Mon Jul 04 10:20:10 2022 X-Original-To: dev-commits-src-branches@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 620228B499D; Mon, 4 Jul 2022 10:20:10 +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 4Lc1yf2KH7z4nt4; Mon, 4 Jul 2022 10:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656930010; 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=d0jIlIOsN3D/20/fOpNW4sv6h4RI414kIRa5j2SUvYI=; b=Kk8NBNMSELLWUpcluZTYowwN3iT4oR9zDm0hfeVbdpV2UM+DrDxKm1bvomJUa3bhB+r+Ql 1trRCkjA0vIW56hJbRZ5Hh8jGvKRWTc0U62vDMjUXb3uQPMBCbCLx3W5WyaK0jRdcOChQP H2w17glC+TLwGtm+E2bRTATRVu+n8N3vpW8bg+aJKkxqmi1FBggYqKsTA1WGvJNjdOyMMQ KA7lVrhuyAt4zrgfwEHCYMwNEYfFQPJHcZ+2TORDvjbJSojbpfRmYanXD+Un1/1BsrC7zx 0fGfj6oqFcdHMOiuByAZzgAslenwdsCf3gzxlSE4TsMkKi6ewGK4zLgloPfN4w== 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 3044D742D; Mon, 4 Jul 2022 10:20:10 +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 264AKAlY029075; Mon, 4 Jul 2022 10:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264AKAG0029072; Mon, 4 Jul 2022 10:20:10 GMT (envelope-from git) Date: Mon, 4 Jul 2022 10:20:10 GMT Message-Id: <202207041020.264AKAG0029072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 3c04909b9cb0 - stable/13 - aw_mmc: add crash dumping support in MMCCAM mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c04909b9cb04f00479327cd3a4079ae2b806e68 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656930010; 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=d0jIlIOsN3D/20/fOpNW4sv6h4RI414kIRa5j2SUvYI=; b=MgbFv5n8WhfozvwLME3xw7QpDIlIghykjbpdLHsxsl/20iNTprTTGTRt73GtvQFyQa/fVJ 2CVuhjzE8DFix6IQf4DUkfMFmNju72jAuRk5NlUhFP89MOKSRuma+YC4/bDjsVYfjfqSKL NVJy9Xrqw0w4xYahV339F+HR/UusUOJZk7vPb2bSzOaXngnOM9cdESqy8uMrAryV2X7JFn zNMnz98Qc7Fo3Ctm8NKJhJSv7QGNmPk6pg1K+lACuOaJuTo/30zZoTybXDnt/EY7tv18PC 28h4k0a+j9NaIrEwiHNIfrSA14+46wkipy/we6A2+umb4XWDWLrQbhpt2FOLlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656930010; a=rsa-sha256; cv=none; b=EQeg/DEuXMDZQ8Z6Urqlw4VzpqrfKHm1xzyKe8JqJRlEFncjdre8iktn0/3/iW93mt1Gdh wHCmF9cmu5jRYQmOQeWY+VjiaONd37hEFGYD2r32CKqYObHocEJLzs/r0NZYyUvstMrSh+ wwSBiap4f90oYr1B3W3uwdKhMcQQNEdXifyC32OCGS6sxyuR+ihXayZhOcx/j4hH3aDRTL zGRsRvGV0ormlYQ3rKK9BMrZoIcUrzw/VhHgJKGgMhLWQVpHIUXasSAxTy1E5j+Cht+CaY qY3xlglVEe5BFkWpHdtqYfT8jfUzGS6qe3e35NZ7fCq3kqjAT4soYrkNxXR5mQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=3c04909b9cb04f00479327cd3a4079ae2b806e68 commit 3c04909b9cb04f00479327cd3a4079ae2b806e68 Author: Andriy Gapon AuthorDate: 2022-02-16 07:56:06 +0000 Commit: Andriy Gapon CommitDate: 2022-07-04 10:19:51 +0000 aw_mmc: add crash dumping support in MMCCAM mode (cherry picked from commit af8b51b0bac932fd0bb80cc1fe672b725bd5f0e8) --- sys/arm/allwinner/aw_mmc.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index 3271090f19e3..81dd34ce8c54 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -304,6 +305,15 @@ aw_mmc_cam_request(device_t dev, union ccb *ccb) return (0); } + +static void +aw_mmc_cam_poll(device_t dev) +{ + struct aw_mmc_softc *sc; + + sc = device_get_softc(dev); + aw_mmc_intr(sc); +} #endif /* MMCCAM */ static void @@ -788,7 +798,8 @@ aw_mmc_req_done(struct aw_mmc_softc *sc) aw_mmc_update_clock(sc, 1); } - callout_stop(&sc->aw_timeoutc); + if (!dumping) + callout_stop(&sc->aw_timeoutc); sc->aw_intr = 0; sc->aw_resid = 0; sc->aw_dma_map_err = 0; @@ -1078,8 +1089,10 @@ aw_mmc_request(device_t bus, device_t child, struct mmc_request *req) AW_MMC_WRITE_4(sc, AW_MMC_CMDR, cmdreg | cmd->opcode); } - callout_reset(&sc->aw_timeoutc, sc->aw_timeout * hz, - aw_mmc_timeout, sc); + if (!dumping) { + callout_reset(&sc->aw_timeoutc, sc->aw_timeout * hz, + aw_mmc_timeout, sc); + } AW_MMC_UNLOCK(sc); return (0); @@ -1491,6 +1504,7 @@ static device_method_t aw_mmc_methods[] = { DEVMETHOD(mmc_sim_get_tran_settings, aw_mmc_get_tran_settings), DEVMETHOD(mmc_sim_set_tran_settings, aw_mmc_set_tran_settings), DEVMETHOD(mmc_sim_cam_request, aw_mmc_cam_request), + DEVMETHOD(mmc_sim_cam_poll, aw_mmc_cam_poll), #endif DEVMETHOD_END