From nobody Wed Jan 26 07:32:43 2022 X-Original-To: dev-commits-src-all@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 03A9C19787D1; Wed, 26 Jan 2022 07:32:44 +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 4JkFmq6X6Sz4rZh; Wed, 26 Jan 2022 07:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643182363; 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=XhkHZWZUITbSaYEFpISRFtEyavhwA4YSjxlOR6tCJGo=; b=i4eA2n6osD8OeyQdjSWtb9BoZCIDJFnSSf4uv15vli+GCRt5VecHtF0qaLGl2ChZfb0SdW b624OapwVO1z2S3059yxh5FSLWp8jTEn90LkT8o5IYxFPQLbdI5AYsx32YywZB6CYmxR63 OT+wroVXBRQmT+1cKBJd2rYrQxtaQNlBCjKCyXA8A6V6+QbomcpX9mac8D55YmQwADKGjk LF8cphCFl3wRwk3kQYx0feCLzfBQ/sJnGHedcM5Qj1ksCjHyAg0mA85wPN8DxKEfKeUhOm KkspDLAj9QjaZWc5FqnQ+2EW1WxBc9NEIh5VOV8+IifLPL24juqPTtzoTKIMHw== 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 C1ED519356; Wed, 26 Jan 2022 07:32:43 +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 20Q7WhMr060648; Wed, 26 Jan 2022 07:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20Q7WhuM060647; Wed, 26 Jan 2022 07:32:43 GMT (envelope-from git) Date: Wed, 26 Jan 2022 07:32:43 GMT Message-Id: <202201260732.20Q7WhuM060647@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: 94ff1d9cc8ff - main - sdhci: fix dumping support in MMCCAM configuration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 94ff1d9cc8ffc2b88caafed35168a258f969915c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643182363; 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=XhkHZWZUITbSaYEFpISRFtEyavhwA4YSjxlOR6tCJGo=; b=mWc8FGHqtQilmmbFNrX17W6aIYcEETIEzH3yChFK7j1kJ4ZiQRctO4T0duLbiYT6RvVDaD vxexzRRVaPjLBNP7/v2gBkDeqwP1Gr1Csk2Ixs6ii93jqQdIcE5+vK01JomQ2Tih9zrGYj CWE6YqwWaiguXMV/IUSsbT2a4XAiBxvG0P5p2Gg/SCaB7H9HkeEuZchzTIxnNHkZbbdOF+ SUe+oH+c+UemwoD0MDWPSkmZYescWqvUF50TDBs3uZYYMhpjf0ZUUz5zKBCIJWTEwWHuN1 I06EmSWF+hCttTbE3KM9CAiEvt/AGZRjXY+tyBPg3MobYjEtMBiKnCg1oWeZHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643182363; a=rsa-sha256; cv=none; b=PRkOA8lNT4XnacJLHOAE55dAX5OcwoS1LqdzFsa6F9m3/mPKzVLqv48qlvIPcqLDglnrJo 8xDxW9Kii9JxDwuqC0JwHY9uxgOnrT5Vk1lW+bjyQ1STB80qqGlbHhLKUAikzZVwllGLkF hc3ERyO/vigj4CuEUIqthAaW05/AgktGfVKGVeokd8Ss2U3CX6dvdxOOD8bOLFq5XYof65 E3fK67ToXUCVx8olQT6QHEMKrd19VR6z3j86sYIQG9oIZBHdMJjOCKfy0TmTVxtNZfM0xB qwqcIn8YPGfGFEQ1Tlpc2oqTXFXVe/xsVpTirxn5x8FVvxVbWc9kE3iShJsVjQ== 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=94ff1d9cc8ffc2b88caafed35168a258f969915c commit 94ff1d9cc8ffc2b88caafed35168a258f969915c Author: Andriy Gapon AuthorDate: 2022-01-26 07:16:31 +0000 Commit: Andriy Gapon CommitDate: 2022-01-26 07:31:45 +0000 sdhci: fix dumping support in MMCCAM configuration This change fixes interaction with recently added sddadump. MFC after: 1 week --- 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 126dd23e13fc..541310ba421c 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -2725,7 +2725,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 @@ -2887,12 +2887,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 */