From nobody Wed Feb 02 06:51:22 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 49E5F19A73B1; Wed, 2 Feb 2022 06:51:23 +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 4JpXWv1HJ5z3R4X; Wed, 2 Feb 2022 06:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643784683; 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=A98S4dtODrBU9WS5hd82FZlkPaeRxOfH8hgLrqySnec=; b=iwjiiz95fHscodGdf8H0uQtpoUhHFRDaLxB1wxw2u5n5Gd14pvscX5WSxRM8wG7PE5k2Dp tYeFNR/SsRal3oUFZNhpBIdpsdqtN8j6y7ZRIW6e78nTYT48VLKmeQbtoeZNr7gsIOQc7p 0cZj8YEsn1eGoKny8uXVvYziTH7aLom/1G/tFON11tln+7eL2krPQ5jwxwY560TSpQeVIr yDoI7C41hsRvT6inWuPzE1qTLKWULteMr59iQ3yH+I9vcqpxgN8sfxAKZ71AibNkZYNzcR lBk8Bvx7HQURiuoYTGbq7poEfkmOXO14aR/YZFs0hLvJ3Iam5ad9BknN+tF2vw== 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 0BFC41F9C9; Wed, 2 Feb 2022 06:51:23 +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 2126pMLC095233; Wed, 2 Feb 2022 06:51:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2126pMYb095232; Wed, 2 Feb 2022 06:51:22 GMT (envelope-from git) Date: Wed, 2 Feb 2022 06:51:22 GMT Message-Id: <202202020651.2126pMYb095232@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: 8934d3e7b9b9 - stable/13 - sdhci: fix dumping support in MMCCAM configuration 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: 8934d3e7b9b9005150f39b9d0679821890009cf0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643784683; 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=A98S4dtODrBU9WS5hd82FZlkPaeRxOfH8hgLrqySnec=; b=IaVUgJGtJaHJ9jzLQaymS3GYuHfl9BgO7DXuG87kQ3rM+26tyfld0XrVF/elw18IB+cQDI STQLMKcic5xqWLy5bi3OlN9E12JBSXHjA1s7XfERtGjJ42oteMD0muFE3u04McsRrithnz nob4kEZRtIvm8+1ucz7v3+uwWun2fqKJlWKCj4J/FuZsrAj7ayMugaJCiQRycLHMCT8Zlk jIitjjnEtvOcl7av/isos7YpYfmHSoFwVAkat/vxddiK4yTxa38FWmyr6oIkIIX23w8E6M OdSm9Tscm0V4nwytFMcQorimcLYRbip679uLdTCpNNp6zIMz2nL3SWtAcrvpTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643784683; a=rsa-sha256; cv=none; b=WPDPB96enuzk3HlkjE093IFoZktBzeuKpyCAfH+5/M6SGBoHR4PNOnpRSrNinCRyQPVreW gzUaC/BuURXxyGebcs6sSbgdzW0tAUuTezjHqRjbsZk8S7Rbg99SKyjDx0PdVs0/MxAUYE LeyqVp52kkF5FSQ43Ijnw+wBzRHpMD82Hef3ixN11nzFD1yRSdD9+TSpSSlBKZALa96Nyo FNieLfLytydhh12xzuGc/vZNuAd2mmcZWMy0p63ngrDRyKEVe/miJEwV3+Kn7uxFXnsB/k 5ls1nZb3yhr1Y7JOiBNzwy+W8PAMGNwMs/OD8ziCgdrw7qT7dJr2xrzyBPgOPQ== 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=8934d3e7b9b9005150f39b9d0679821890009cf0 commit 8934d3e7b9b9005150f39b9d0679821890009cf0 Author: Andriy Gapon AuthorDate: 2022-01-26 07:16:31 +0000 Commit: Andriy Gapon CommitDate: 2022-02-02 06:51:13 +0000 sdhci: fix dumping support in MMCCAM configuration This change fixes interaction with recently added sddadump. (cherry picked from commit 94ff1d9cc8ffc2b88caafed35168a258f969915c) --- sys/dev/sdhci/sdhci.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 0441320d4b35..33a34b28b44d 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -2608,7 +2608,7 @@ sdhci_cam_action(struct cam_sim *sim, union ccb *ccb) void sdhci_cam_poll(struct cam_sim *sim) { - return; + sdhci_generic_intr(cam_sim_softc(sim)); } static int @@ -2769,12 +2769,6 @@ sdhci_cam_request(struct sdhci_slot *slot, union ccb *ccb) slot->flags = 0; sdhci_start(slot); SDHCI_UNLOCK(slot); - if (dumping) { - while (slot->ccb != NULL) { - sdhci_generic_intr(slot); - DELAY(10); - } - } return (0); } #endif /* MMCCAM */