From nobody Wed Feb 16 07:58:15 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 E0CD219CA1F3; Wed, 16 Feb 2022 07:58:15 +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 4Jz9Lb5XRxz4XJg; Wed, 16 Feb 2022 07:58:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644998295; 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=6HW/uZdzZYqX6t3u3ApXdy7GTw/1SDrJckUpyhLG+gw=; b=I7ZuQITrHRMpns/UHffulDoCyQolFRNkNXZLxcQjvo7Xp9TDWEgvzVVz1sEgftmUaMducF zAAcWSi74PSLkCH/WTot+EloYv7n0Z2DtxA116bq2WVmOiqWyWNY+uJ7ahWP6Pdwvj1wYP v1vONJwPKn5hAsIcZMyAgL7umBB+B0ERO0HVE+9T3vKpGwuBIooA6PIkPZL7hCwg9nFoAO S+N1CItcmDvjSF7HWyQ2sLYzO3R7EkD5xAFuSW5uwsM/3lfsL9oyQhjUyQgKz1CUTUps3R hyirN5nPQms3iXfbn0oRi/wC3VfAxsnuFec5B+nSMSvamCkGrw/uN5cCAterXA== 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 95241127EA; Wed, 16 Feb 2022 07:58:15 +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 21G7wF2N046810; Wed, 16 Feb 2022 07:58:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G7wF6t046809; Wed, 16 Feb 2022 07:58:15 GMT (envelope-from git) Date: Wed, 16 Feb 2022 07:58:15 GMT Message-Id: <202202160758.21G7wF6t046809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: af8b51b0bac9 - main - aw_mmc: add crash dumping support in MMCCAM mode 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af8b51b0bac932fd0bb80cc1fe672b725bd5f0e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644998295; 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=6HW/uZdzZYqX6t3u3ApXdy7GTw/1SDrJckUpyhLG+gw=; b=Hw94XsbbVr4CHHrQVOl4Cp5uThjmAoTDFzXA9Il+/6Dsm+wUjekJb+EDKA4ztiv/Fexzlu dx7J7jNILnRLkOvIqlQK3+/Xim2RACn0p82BWi4tUNW2ZWlYRq4Gmzv3Kbq3+QlUwG0hAe HORu0SvUEXwT9l0yLZFOzCKAJ+DfBroKsSJVSJUCXYoIxY9XevQHttOCaJ3ka8D3Y/8XV7 ds7wdIQwjWQUZAJTUaoqGo2PF5fYulCQMd6mTFPtoP5iJPWb0MebBMXelZjJJ41EaoFA1Z jwgm9VDrHs7vxPaIZ6NS+b0K5/ew5bL/bn5eUh7pB+mTlqSf9A915CLyUgL+kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644998295; a=rsa-sha256; cv=none; b=x4olKuYdDddTjPnI4Fhy5qP5RV+FXP49NJ029vPrDXuyxwo0OSC/A5dfliCZ4psix24DxN 3kKeN5JFjQa8KnxLZpcHv8J6d4/3D/2aCBYhCvkXV7lYqxLwPLL2kE87jVNT0BzapWqVf6 v2Dg1DCuz4p2PgZJoTffFYAvhRpwZbMJfWp8SoSMqg4SU1NG9TWJGmyCqgeLijxxTEtIex AcLxmOHKgql9zZG3SGI7TCLROqTYlkbhWPT9UIEsGctF4uXnSGMo/AXbzyN/4VzIyPXfeG MKekJ1kG1AEo8bF/VX7re879BZvxxVMZpGulNc0SP/lglw8AwkXBbFXLzITnJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=af8b51b0bac932fd0bb80cc1fe672b725bd5f0e8 commit af8b51b0bac932fd0bb80cc1fe672b725bd5f0e8 Author: Andriy Gapon AuthorDate: 2022-02-16 07:56:06 +0000 Commit: Andriy Gapon CommitDate: 2022-02-16 07:58:08 +0000 aw_mmc: add crash dumping support in MMCCAM mode MFC after: 1 week --- 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